diff --git a/README.md b/README.md
deleted file mode 100644
index b1e5f0fc13..0000000000
--- a/README.md
+++ /dev/null
@@ -1,779 +0,0 @@
-# Vulkan GLSL RetroArch shader system
-
-This document is a draft of RetroArch's new GPU shader system.
-It will outline the features in the new shader subsystem and describe details for how it will work in practice.
-
-In addition this document will contain various musings on why certain design choices are made and which compromised have been made to arrive at the conclusion. This is mostly for discussing and deliberation while the new system is under development.
-
-## Introduction
-
-### Target shader languages
- - Vulkan
- - GL 2.x (legacy desktop)
- - GL 3.x+ (modern desktop)
- - GLES2 (legacy mobile)
- - GLES3 (modern mobile)
- - (HLSL, potentially)
- - (Metal, potentially)
-
-RetroArch is still expected to run on GLES2 and GL2 systems.
-GL2 is mostly not relevant any longer, but GLES2 is certainly a very relevant platform still and having GLES2 compatibility makes GL2 very easy.
-We therefore want to avoid speccing out a design which deliberately ruins GLES2 compatibility.
-
-However, we also do not want to artificially limit ourselves to shader features which are only available in GLES2.
-There are many shader builtins for example which only work in GLES3/GL3 and we should not hold back support in these cases.
-When we want to consider GLES2 compat we should not spec out high level features which do not make much sense in the context of GLES2.
-
-### Why a new spec?
-
-The current shader subsystem in RetroArch is quite mature with a large body of shaders written for it.
-While it has served us well, it is not forward-compatible.
-
-The current state of writing high-level shading languages that work "everywhere" is very challenging.
-There was no good ready-made solution for this.
-Up until now, we have relied on nVidia Cg to serve as a basic foundation for shaders, but Cg has been discontinued for years and is closed source.
-This is very problematic since Cg is not a forward compatible platform.
-It has many warts which are heavily tied in to legacy APIs and systems.
-For this reason, we cannot use Cg for newer APIs such as Vulkan and potentially D3D12 and Metal.
-
-Cg cross compilation to GLSL is barely working and it is horribly unmaintainable with several unfixable issues.
-The output is so horribly mangled and unoptimized that it is clearly not the approach we should be taking.
-We also cannot do the Cg transform in runtime on mobile due to lack of open source Cg runtime, so there's that as well.
-
-Another alternative is to write straight-up GLSL, but this too has some severe problems.
-All the different GL versions and GLSL variants are different enough that it becomes painful to write portable GLSL code that works without modification.
-Examples include:
-
- - varying/attribute vs in/out (legacy vs modern)
- - precision qualifiers (GLSL vs ESSL)
- - texture2D vs texture (legacy vs modern)
- - Lack of standard support for #include to reduce copy-pasta
-
-The problem really is that GLSL shaders are dependent on the runtime GL version, which makes it very annoying and hard to test all shader variants.
-
-We do not want to litter every shader with heaps of #ifdefs everywhere to combat this problem.
-We also want to avoid having to write pseudo-GLSL with some text based replacement behind the scenes.
-
-#### Vulkan GLSL as the portable solution
-
-Fortunately, there is now a forward looking and promising solution to our problems.
-Vulkan GLSL is a GLSL dialect designed for Vulkan and SPIR-V intermediate representation.
-The good part is that we can use whatever GLSL version we want when writing shaders, as it is decoupled from the GL runtime.
-
-In runtime, we can have a vendor-neutral mature compiler,
-[https://github.com/KhronosGroup/glslang](glslang) which compiles our Vulkan GLSL to SPIR-V.
-Using [https://github.com/KhronosGroup/SPIRV-Cross](SPIRV-Cross), we can then do reflection on the SPIR-V binary to deduce our filter chain layout.
-We can also disassemble back to our desired GLSL dialect in the GL backend based on which GL version we're running,
-which effectively means we can completely sidestep all our current problems with a pure GLSL based shading system.
-
-Another upside of this is that we no longer have to deal with vendor-specific quirks in the GLSL frontend.
-A common problem when people write for nVidia is that people mistakingly use float2/float3/float4 types from Cg/HLSL, which is supported
-as an extension in their GLSL frontend.
-
-##### Why not SPIR-V directly?
-
-This was considered, but there are several convenience problems with having a shading spec around pure SPIR-V.
-The first problem is metadata. In GLSL, we can quite easily extend with custom #pragmas or similar, but there is no trivial way to do this in SPIR-V
-outside writing custom tools to emit special metadata as debug information or similar with OpSource.
-
-We could also have this metadata outside in a separate file, but juggling more files means more churn, which we should try to avoid.
-The other problem is convenience. If RetroArch only accepts SPIR-V, we would need an explicit build step outside RetroArch first before we could
-test a shader. This gets very annoying during shader development,
-so it is clear that we need to support GLSL anyways, making SPIR-V support kinda redundant.
-
-The main argument for supporting SPIR-V would be to allow new shading languages to be used. This is a reasonable thing to consider, which is why
-the goal is to not design ourselves into a corner where it's only Vulkan GLSL that can possibly work down the line. We are open to the idea that
-new shading languages that target SPIR-V will emerge.
-
-### Warts in old shader system
-
-While the old shader system is functional it has some severe warts which have accumulated over time.
-In hindsight, some of the early design decisions were misguided and need to be properly fixed.
-
-#### Forced POT with padding
-
-This is arguably the largest wart of them all. The original reason behind this design decision was caused by a misguided effort to combat FP precision issues with texture sampling. The idea at the time was to avoid cases where nearest neighbor sampling at texel edges would cause artifacts. This is a typical case when textures are scaled with non-integer factors. However, the problem to begin with is naive nearest neighbor and non-integer scaling factors, and not FP precision. It was pure luck that POT tended to give better results with broken shaders, but we should not make this mistake again. POT padding has some severe issues which are not just cleanliness related either.
-
-Technically, GLES2 doesn't require non-POT support, but in practice, all GPUs support this.
-
-##### No proper UV wrapping
-Since the texture "ends" at UV coords < 1.0, we cannot properly
-use sampler wrapping modes. We can only fake `CLAMP_TO_BORDER` by padding with black color, but this filtering mode is not available by default in GLES2 and even GLES3!
-`CLAMP_TO_BORDER` isn't necessarily what we want either. `CLAMP_TO_EDGE` is usually a far more sane default.
-
-##### Extra arguments for actual width vs. texture width
-
-With normalized coordinates we need to think in both real resolution (e.g. 320x240) vs. POT padded resolutions (512x512) to deal with normalized UV coords. This complicates things massively and
-we were passing an insane amount of attributes and varyings to deal with this because the ratios between the two needn't be the same for two different textures.
-
-#### Arbitrary limits
-The way the old shader system deals with limits is quite naive.
-There is a hard limit of 8 when referencing other passes and older frames.
-There is no reason why we should have arbitrary limits like these.
-Part of the reason is C where dealing with dynamic memory is more painful than it should be so it was easier to take the lazy way out.
-
-#### Tacked on format handling
-
-In more complex shaders we need to consider more than just the plain `RGBA8_UNORM` format.
-The old shader system tacked on these things after the fact by adding booleans for SRGB and FP support, but this obviously doesn't scale.
-This point does get problematic since GLES2 has terrible support for render target formats, but we should allow complex shaders to use complex RT formats
-and rather just allow some shader presets to drop GLES2 compat.
-
-#### PASS vs PASSPREV
-
-Ugly. We do not need two ways to access previous passes, the actual solution is to have aliases for passes instead and access by name.
-
-#### Inconsistencies in parameter passing
-
-MVP matrices are passed in with weird conventions in the Cg spec, and its casing is weird.
-The source texture is passed with magic TEXUNIT0 semantic while other textures are passed via uniform struct members, etc.
-This is the result of tacking on feature support slowly over time without proper forethought.
-
-## High level Overview
-
-The RetroArch shader format outlines a filter chain/graph, a series of shader passes which operate on previously generated data to produce a final result.
-The goal is for every individual pass to access information from *all* previous shader passes, even across frames, easily.
-
- - The filter chain specifies a number of shader passes to be executed one after the other.
- - Each pass renders a full-screen quad to a texture of a certain resolution and format.
- - The resolution can be dependent on external information.
- - All filter chains begin at an input texture, which is created by a libretro core or similar.
- - All filter chains terminate by rendering to the "backbuffer".
-
-The backbuffer is somewhat special since the resolution of it cannot be controlled by the shader.
-It can also not be fed back into the filter chain later
-because the frontend (here RetroArch) will render UI elements and such on top of the final pass output.
-
-Let's first look at what we mean by filter chains and how far we can expand this idea.
-
-### Simplest filter chain
-
-The simplest filter chain we can specify is a single pass.
-
-```
-(Input) -> [ Shader Pass #0 ] -> (Backbuffer)
-```
-
-In this case there are no offscreen render targets necessary since our input is rendered directly to screen.
-
-### Multiple passes
-
-A trivial extension is to keep our straight line view of the world where each pass looks at the previous output.
-
-```
-(Input) -> [ Shader Pass #0 ] -> (Framebuffer) -> [ Shader Pass #1 ] -> (Backbuffer)
-```
-
-Framebuffer here might have a different resolution than both Input and Backbuffer.
-A very common scenario for this is separable filters where we first scale horizontally, then vertically.
-
-### Multiple passes and multiple inputs
-
-There is no reason why we should restrict ourselves to a straight-line view.
-
-```
-     /------------------------------------------------\
-    /                                                  v
-(Input) -> [ Shader Pass #0 ] -> (Framebuffer #0) -> [ Shader Pass #1 ] -> (Backbuffer)
-```
-
-In this scenario, we have two inputs to shader pass #1, both the original, untouched input as well as the result of a pass in-between.
-All the inputs to a pass can have different resolutions.
-We have a way to query the resolution of individual textures to allow highly controlled sampling.
-
-We are now at a point where we can express an arbitrarily complex filter graph, but we can do better.
-For certain effects, time (or rather, results from earlier frames) can be an important factor.
-
-### Multiple passes, multiple inputs, with history
-
-We now extend our filter graph, where we also have access to information from earlier frames. Note that this is still a causal filter system.
-
-```
-Frame N:        (Input     N, Input N - 1, Input N - 2) -> [ Shader Pass #0 ] -> (Framebuffer     N, Framebuffer N - 1, Input N - 3) -> [ Shader Pass #1 ] -> (Backbuffer)
-Frame N - 1:    (Input N - 1, Input N - 2, Input N - 3) -> [ Shader Pass #0 ] -> (Framebuffer N - 1, Framebuffer N - 2, Input N - 4) -> [ Shader Pass #1 ] -> (Backbuffer)
-Frame N - 2:    (Input N - 2, Input N - 3, Input N - 4) -> [ Shader Pass #0 ] -> (Framebuffer N - 2, Framebuffer N - 3, Input N - 5) -> [ Shader Pass #1 ] -> (Backbuffer)
-```
-
-For framebuffers we can read the previous frame's framebuffer. We don't really need more than one frame of history since we have a feedback effect in place.
-Just like IIR filters, the "response" of such a feedback in the filter graph gives us essentially "infinite" history back in time,
-although it is mostly useful for long-lasting blurs and ghosting effects. Supporting more than one frame of feedback would also be extremely memory intensive since framebuffers tend to be
-much higher resolution than their input counterparts. One frame is also a nice "clean" limit. Once we go beyond just 1, the floodgate opens to arbitrary numbers, which we would want to avoid.
-It is also possible to fake as many feedback frames of history we want anyways,
-since we can copy a feedback frame to a separate pass anyways which effectively creates a "shift register" of feedback framebuffers in memory.
-
-Input textures can have arbitrary number of textures as history (just limited by memory).
-They cannot feedback since the filter chain cannot render into it, so it effectively is finite response (FIR).
-
-For the very first frames, frames with frame N < 0 are transparent black (all values 0).
-
-### No POT padding
-
-No texture in the filter chain is padded at any time. It is possible for resolutions in the filter chain to vary over time which is common with certain emulated systems.
-In this scenarios, the textures and framebuffers are simply resized appropriately.
-Older frames still keep their old resolution in the brief moment that the resolution is changing.
-
-It is very important that shaders do not blindly sample with nearest filter with any scale factor. If naive nearest neighbor sampling is to be used, shaders must make sure that
-the filter chain is configured with integer scaling factors so that ambiguous texel-edge sampling is avoided.
-
-### Deduce shader inputs by reflection
-
-We want to have as much useful information in the shader source as possible. We want to avoid having to explicitly write out metadata in shaders whereever we can.
-The biggest hurdle to overcome is how we describe our pipeline layout. The pipeline layout contains information about how we access resources such as uniforms and textures.
-There are three main types of inputs in this shader system.
-
- - Texture samplers (sampler2D)
- - Look-up textures for static input data
- - Uniform data describing dimensions of textures
- - Uniform ancillary data for render target dimensions, backbuffer target dimensions, frame count, etc
- - Uniform user-defined parameters
- - Uniform MVP for vertex shader
-
-#### Deduction by name
-
-There are two main approaches to deduce what a sampler2D uniform wants to sample from.
-The first way is to explicitly state somewhere else what that particular sampler needs, e.g.
-
-```
-uniform sampler2D geeWhatAmI;
-
-// Metadata somewhere else
-SAMPLER geeWhatAmI = Input[-2]; // Input frame from 2 frames ago
-```
-
-The other approach is to have built-in identifiers which correspond to certain textures.
-
-```
-// Source here being defined as the texture from previous framebuffer pass or the input texture if this is the first pass in the chain.
-uniform sampler2D Source;
-```
-
-In SPIR-V, we can use `OpName` to describe these names, so we do not require the original Vulkan GLSL source to perform this reflection.
-We use this approach throughout the specification. An identifier is mapped to an internal meaning (semantic). The shader backend looks at these semantics and constructs
-a filter chain based on all shaders in the chain.
-
-Identifiers can also have user defined meaning, either as an alias to existing identifiers or mapping to user defined parameters.
-
-### Combining vertex and fragment into a single shader file
-
-One strength of Cg is its ability to contain multiple shader stages in the same .cg file.
-This is very convenient since we always want to consider vertex and fragment together.
-This is especially needed when trying to mix and match shaders in a GUI window for example.
-We don't want to require users to load first a vertex shader, then fragment manually.
-
-GLSL however does not support this out of the box. This means we need to define a light-weight system for preprocessing
-one GLSL source file into multiple stages.
-
-#### Should we make vertex optional?
-
-In most cases, the vertex shader will remain the same.
-This leaves us with the option to provide a "default" vertex stage if the shader stage is not defined.
-
-### #include support
-
-With complex filter chains there is a lot of oppurtunity to reuse code.
-We therefore want light support for the #include directive.
-
-### User parameter support
-
-Since we already have a "preprocessor" of sorts, we can also trivially extend this idea with user parameters.
-In the shader source we can specify which uniform inputs are user controlled, GUI visible name, their effective range, etc.
-
-### Lookup textures
-
-A handy feature to have is reading from lookup textures.
-We can specify that some sampler inputs are loaded from a PNG file on disk as a plain RGBA8 texture.
-
-#### Do we want to support complex reinterpretation?
-
-There could be valid use cases for supporting other formats than plain `RGBA8_UNORM`.
-`SRGB` and `UINT` might be valid cases as well and maybe even 2x16-bit, 1x32-bit integer formats.
-
-#### Lookup buffers
-
-Do we want to support lookup buffers as UBOs as well?
-This wouldn't be doable in GLES2, but it could be useful as a more modern feature.
-If the LUT is small enough, we could realize it via plain old uniforms as well perhaps.
-
-This particular feature could be very interesting for generic polyphase lookup banks with different LUT files for different filters.
-
-## Vulkan GLSL specification
-
-This part of the spec considers how Vulkan GLSL shaders are written. The frontend uses the glslang frontend to compile GLSL sources.
-This ensures that we do not end up with vendor-specific extensions.
-The #version string should be as recent as possible, e.g. `#version 450` or `#version 310 es`.
-It is recommended to use 310 es since it allows mediump which can help on mobile.
-Note that after the Vulkan GLSL is turned into SPIR-V, the original #version string does not matter anymore.
-Also note that SPIR-V cannot be generated from legacy shader versions such as #version 100 (ES 2.0) or #version 120 (GL 2.1).
-
-The frontend will use reflection on the resulting SPIR-V file in order to deduce what each element in the UBO or what each texture means.
-The main types of data passed to shaders are read-only and can be classified as:
-
- - `uniform sampler2D`: This is used for input textures, framebuffer results and lookup-textures.
- - `uniform Block { };`: This is used for any constant data which is passed to the shader.
- - `layout(push_constant) uniform Push {} name;`: This is used for any push constant data which is passed to the shader.
-
-### Resource usage rules
-
-Certain rules must be adhered to in order to make it easier for the frontend to dynamically set up bindings to resources.
-
- - All resources must be using descriptor set #0, or don't use layout(set = #N) at all.
- - layout(binding = #N) must be declared for all UBOs and sampler2Ds.
- - All resources must use different bindings.
- - There can be only one UBO.
- - There can be only use push constant block.
- - It is possible to have one regular UBO and one push constant UBO.
- - If a UBO is used in both vertex and fragment, their binding number must match.
- - If a UBO is used in both vertex and fragment, members with the same name must have the same offset/binary interface.
-   This problem is easily avoided by having the same UBO visible to both vertex and fragment as "common" code.
- - If a push constant block is used in both vertex and fragment, members with the same name must have the same offset/binary interface.
- - sampler2D cannot be used in vertex, although the size parameters of samplers can be used in vertex.
- - Other resource types such as SSBOs, images, atomic counters, etc, etc, are not allowed.
- - Every member of the UBOs and push constant blocks as well as every texture must be meaningful
-   to the frontend in some way, or an error is generated.
-
-### Initial preprocess of slang files
-
-The very first line of a `.slang` file must contain a `#version` statement.
-
-The first process which takes place is dealing with `#include` statements.
-A slang file is preprocessed by scanning through the slang and resolving all `#include` statements.
-The include process does not consider any preprocessor defines or conditional expressions.
-The include path must always be relative, and it will be relative to the file path of the current file.
-Nested includes are allowed, but includes in a cycle are undefined as preprocessor guards are not considered.
-
-E.g.:
-```
-#include "common.inc"
-```
-
-After includes have been resolved, the frontend scans through all lines of the shader and considers `#pragma` statements.
-These pragmas build up ancillary reflection information and otherwise meaningful metadata.
-
-#### `#pragma stage`
-This pragma controls which part of a `.slang` file are visible to certain shader stages.
-Currently, two variants of this pragma are supported:
-
- - `#pragma stage vertex`
- - `#pragma stage fragment`
-
-If no `#pragma stage` has been encountered yet, lines of code in a shader belong to all shader stages.
-If a `#pragma stage` statement has been encountered, that stage is considered active, and the following lines of shader code will only be used when building source for that particular shader stage. A new `#pragma stage` can override which stage is active.
-
-#### `#pragma name`
-This pragma lets a shader set its identifier. This identifier can be used to create simple aliases for other passes.
-
-E.g.:
-```
-#pragma name HorizontalPass
-```
-
-#### `#pragma format`
-This pragma controls the format of the framebuffer which this shader will render to.
-The default render target format is `R8G8B8A8_UNORM`.
-
-Supported render target formats are listed below. From a portability perspective,
-please be aware that GLES2 has abysmal render target format support,
-and GLES3/GL3 may have restricted floating point render target support.
-
-If rendering to uint/int formats, make sure your fragment shader output target is uint/int.
-
-#### 8-bit
- - `R8_UNORM`
- - `R8_UINT`
- - `R8_SINT`
- - `R8G8_UNORM`
- - `R8G8_UINT`
- - `R8G8_SINT`
- - `R8G8B8A8_UNORM`
- - `R8G8B8A8_UINT`
- - `R8G8B8A8_SINT`
- - `R8G8B8A8_SRGB`
-
-#### 10-bit
- - `A2B10G10R10_UNORM_PACK32`
- - `A2B10G10R10_UINT_PACK32`
-
-#### 16-bit
- - `R16_UINT`
- - `R16_SINT`
- - `R16_SFLOAT`
- - `R16G16_UINT`
- - `R16G16_SINT`
- - `R16G16_SFLOAT`
- - `R16G16B16A16_UINT`
- - `R16G16B16A16_SINT`
- - `R16G16B16A16_SFLOAT`
-
-#### 32-bit
- - `R32_UINT`
- - `R32_SINT`
- - `R32_SFLOAT`
- - `R32G32_UINT`
- - `R32G32_SINT`
- - `R32G32_SFLOAT`
- - `R32G32B32A32_UINT`
- - `R32G32B32A32_SINT`
- - `R32G32B32A32_SFLOAT`
-
-E.g.:
-```
-#pragma format R16_SFLOAT
-```
-#### `#pragma parameter`
-
-Shader parameters allow shaders to take user-defined inputs as uniform values.
-This makes shaders more configurable.
-
-The format is:
-```
-#pragma parameter IDENTIFIER "DESCRIPTION" INITIAL MINIMUM MAXIMUM [STEP]
-```
-The step parameter is optional.
-INITIAL, MINIMUM and MAXIMUM are floating point values.
-IDENTIFIER is the meaningful string which is the name of the uniform which will be used in a UBO or push constant block.
-DESCRIPTION is a string which is human readable representation of IDENTIFIER.
-
-E.g:
-```
-layout(push_constant) uniform Push {
-   float DummyVariable;
-} registers;
-#pragma parameter DummyVariable "This is a dummy variable" 1.0 0.2 2.0 0.1
-```
-
-### I/O interface variables
-
-The slang shader spec specifies two vertex inputs and one fragment output.
-Varyings between vertex and fragment shaders are user-defined.
-
-#### Vertex inputs
-Two attributes are provided and must be present in a shader.
-It is only the layout(location = #N) which is actually significant.
-The particular names of input and output variables are ignored, but should be consistent for readability.
-
-##### `layout(location = 0) in vec4 Position;`
-This attribute is a 2D position in the form `vec4(x, y, 0.0, 1.0);`.
-Shaders should not try to extract meaning from the x, y.
-`gl_Position` must be assigned as:
-
-```
-gl_Position = MVP * Position;
-```
-##### `layout(location = 1) in vec2 TexCoord;`
-The texture coordinate is semantically such that (0.0, 0.0) is top-left and (1.0, 1.0) is bottom right.
-If TexCoord is passed to a varying unmodified, the interpolated varying will be `uv = 0.5 / OutputSize` when rendering the upper left pixel as expected and `uv = 1.0 - 0.5 / OutputSize` when rendering the bottom-right pixel.
-
-#### Vertex/Fragment interface
-Vertex outputs and fragment inputs link by location, and not name.
-
-E.g.:
-```
-// Vertex
-layout(location = 0) out vec4 varying;
-// Fragment
-layout(location = 0) in vec4 some_other_name;
-```
-will still link fine, although using same names are encouraged for readability.
-
-#### Fragment outputs
-
-##### `layout(location = 0) out vec4 FragColor;`
-Fragment shaders must have a single output to location = 0.
-Multiple render targets are not allowed. The type of the output depends on the render target format.
-int/uint type must be used if UINT/INT render target formats are used, otherwise float type.
-
-### Builtin variables
-
-#### Builtin texture variables
-The input of textures get their meaning from their name.
-
- - Original: This accesses the input of the filter chain, accessible from any pass.
- - Source: This accesses the input from previous shader pass, or Original if accessed in the first pass of the filter chain.
- - OriginalHistory#: This accesses the input # frames back in time.
-   There is no limit on #, except larger numbers will consume more VRAM.
-   OriginalHistory0 is an alias for Original, OriginalHistory1 is the previous frame and so on.
- - PassOutput#: This accesses the output from pass # in this frame.
-   PassOutput# must be causal, it is an error to access PassOutputN in pass M if N >= M.
-   PassOutput# will typically be aliased to a more readable value.
- - PassFeedback#: This accesses PassOutput# from the previous frame.
-   Any pass can read the feedback of any feedback, since it is causal.
-   PassFeedback# will typically be aliased to a more readable value.
- - User#: This accesses look-up textures.
-   However, the direct use of User# is discouraged and should always be accessed via aliases.
-
-#### Builtin texture size uniform variables
-
-If a member of a UBO or a push constant block is called ???Size# where ???# is the name of a texture variable,
-that member must be a vec4, which will receive these values:
- - X: Horizontal size of texture
- - Y: Vertical size of texture
- - Z: 1.0 / (Horizontal size of texture)
- - W: 1.0 / (Vertical size of texture)
-
-It is valid to use a size variable without declaring the texture itself. This is useful for vertex shading.
-It is valid (although probably not useful) for a variable to be present in both a push constant block and a UBO block at the same time.
-
-#### Builtin uniform variables
-
-Other than uniforms related to textures, there are other special uniforms available.
-These builtin variables may be part of a UBO block and/or a push constant block.
-
- - MVP: mat4 model view projection matrix.
- - OutputSize: a vec4(x, y, 1.0 / x, 1.0 / y) variable describing the render target size (x, y) for this pass.
- - FinalViewportSize: a vec4(x, y, 1.0 / x, 1.0 / y) variable describing the render target size for the final pass.
-   Accessible from any pass.
- - FrameCount: a uint variable taking a value which increases by one every frame.
-   This value could be pre-wrapped by modulo if specified in preset.
-   This is useful for creating time-dependent effects.
-
-#### Aliases
-Aliases can give meaning to arbitrary names in a slang file.
-This is mostly relevant for LUT textures, shader parameters and accessing other passes by name.
-
-If a shader pass has a `#pragma name NAME` associated with it, meaning is given to the shader:
- - NAME, is a sampler2D.
- - NAMESize is a vec4 size uniform associated with NAME.
- - NAMEFeedback is a sampler2D for the previous frame.
- - NAMEFeedbackSize is a vec4 size uniform associated with NAMEFeedback.
-
-#### Example slang shader
-
-```
-#version 450
-// 450 or 310 es are recommended
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-   vec4 SourceSize; // Not used here, but doesn't hurt
-   float ColorMod;
-};
-
-#pragma name StockShader
-#pragma format R8G8B8A8_UNORM
-#pragma parameter ColorMod "Color intensity" 1.0 0.1 2.0 0.1
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-void main()
-{
-   gl_Position = MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-void main()
-{
-   FragColor = texture(Source, vTexCoord) * ColorMod;
-}
-```
-
-### Push constants vs uniform blocks
-Push constants are fast-access uniform data which on some GPUs will improve performance over plain UBOs.
-It is encouraged to use push constant data as much as possible.
-
-```
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 FinalViewportSize;
-} registers;
-```
-
-However, be aware that there is a limit to how large push constant blocks can be used.
-Vulkan puts a minimum required size of 128 bytes, which equals 8 vec4s.
-It is an error to use more than 128 bytes.
-If you're running out of space, you can move the MVP to a UBO instead, which frees up 64 bytes.
-Always prioritize push constants for data used in fragment shaders as there are many more fragment threads than vertex.
-Also note that like UBOs, the push constant space is shared across vertex and fragment.
-
-If you need more than 8 vec4s, you can spill uniforms over to plain UBOs,
-but more than 8 vec4s should be quite rare in practice.
-
-E.g.:
-
-```
-layout(binding = 0, std140) uniform UBO
-{
-   mat4 MVP; // Only used in vertex
-   vec4 SpilledUniform;
-} global;
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 BlurPassSize;
-   // ...
-} registers;
-```
-
-### Samplers
-Which samplers are used for textures are specified by the preset format.
-The sampler remains constant throughout the frame, there is currently no way to select samplers on a frame-by-frame basis.
-This is mostly to make it possible to use the spec in GLES2 as GLES2 has no concept of separate samplers and images.
-
-### sRGB
-The input to the filter chain will not be of an sRGB format.
-This is due to many reasons, the main one being that it is very difficult for the frontend to get "free" passthrough of sRGB. It is possible to have a first pass which linearizes the input to a proper sRGB render target. In this way, custom gammas can be used as well.
-
-Similarly, the final pass will not be an sRGB backbuffer for similar reasons.
-
-### Caveats
-
-#### Frag Coord
-TexCoord also replaces `gl_FragCoord`. Do not use `gl_FragCoord` as it doesn't consider the viewports correctly.
-If you need `gl_FragCoord` use `vTexCoord * OutputSize.xy` instead.
-
-#### Derivatives
-Be careful with derivatives of vTexCoord. The screen might have been rotated by the vertex shader, which will also rotate the derivatives, especially in the final pass which hits the backbuffer.
-However, derivatives are fortunately never really needed, since w = 1 (we render flat 2D quads),
-which means derivatives of varyings are constant. You can do some trivial replacements which will be faster and more robust.
-
-```
-dFdx(vTexCoord) = vec2(OutputSize.z, 0.0);
-dFdy(vTexCoord) = vec2(0.0, OutputSize.w);
-fwidth(vTexCoord) = max(OutputSize.z, OutputSize.w);
-```
-To avoid issues with rotation or unexpected derivatives in case derivatives are really needed,
-off-screen passes will not have rotation and
-dFdx and dFdy will behave as expected.
-
-#### Correctly sampling textures
-A common mistake made by shaders is that they aren't careful enough about sampling textures correctly.
-There are three major cases to consider
-
-##### Bilinear sampling
-If bilinear is used, it is always safe to sample a texture.
-
-##### Nearest, with integer scale
-If the OutputSize / InputSize is integer,
-the interpolated vTexCoord will always fall inside the texel safely, so no special precautions have to be used.
-For very particular shaders which rely on nearest neighbor sampling, using integer scale to a framebuffer and upscaling that
-with more stable upscaling filters like bicubic for example is usually a great choice.
-
-##### Nearest, with non-integer scale
-Sometimes, it is necessary to upscale images to the backbuffer which have an arbitrary size.
-Bilinear is not always good enough here, so we must deal with a complicated case.
-
-If we interpolate vTexCoord over a frame with non-integer scale, it is possible that we end up just between two texels.
-Nearest neighbor will have to find a texel which is nearest, but there is no clear "nearest" texel. In this scenario, we end up having lots of failure cases which are typically observed as weird glitches in the image which change based on the resolution.
-
-To correctly sample nearest textures with non-integer scale, we must pre-quantize our texture coordinates.
-Here's a snippet which lets us safely sample a nearest filtered texture and emulate bilinear filtering.
-
-```
-   vec2 uv = vTexCoord * global.SourceSize.xy - 0.5; // Shift by 0.5 since the texel sampling points are in the texel center.
-   vec2 a = fract(uv);
-   vec2 tex = (floor(uv) + 0.5) * global.SourceSize.zw; // Build a sampling point which is in the center of the texel.
-
-   // Sample the bilinear footprint.
-   vec4 t0 = textureLodOffset(Source, tex, 0.0, ivec2(0, 0));
-   vec4 t1 = textureLodOffset(Source, tex, 0.0, ivec2(1, 0));
-   vec4 t2 = textureLodOffset(Source, tex, 0.0, ivec2(0, 1));
-   vec4 t3 = textureLodOffset(Source, tex, 0.0, ivec2(1, 1));
-
-   // Bilinear filter.
-   vec4 result = mix(mix(t0, t1, a.x), mix(t2, t3, a.x), a.y);
-```
-
-The concept of splitting up the integer texel along with the fractional texel helps us safely
-do arbitrary non-integer scaling safely.
-The uv variable could also be passed pre-computed from vertex to avoid the extra computation in fragment.
-
-### Preset format (.slangp)
-
-The present format is essentially unchanged from the old .cgp and .glslp, except the new preset format is called .slangp.
-
-## Porting guide from legacy Cg spec
-
-### Common functions
- - mul(mat, vec) -> mat * vec
- - lerp() -> mix()
- - ddx() -> dFdx()
- - ddy() -> dFdy()
- - tex2D() -> texture()
- - frac() -> fract()
-
-### Types
-
- - floatN -> vecN
- - boolN -> bvecN
- - intN -> ivecN
- - uintN -> uvecN
- - float4x4 -> mat4
-
-### Builtin uniforms and misc
-
- - modelViewProj -> MVP
- - IN.video\_size -> SourceSize.xy
- - IN.texture\_size -> SourceSize.xy (no POT shenanigans, so they are the same)
- - IN.output\_size -> OutputSize.xy
- - IN.frame\_count -> FrameCount (uint instead of float)
- - \*.tex\_coord -> TexCoord (no POT shenanigans, so they are all the same)
- - \*.lut\_tex\_coord -> TexCoord
- - ORIG -> `Original`
- - PASS# -> PassOutput#
- - PASSPREV# -> No direct analog, PassOutput(CurrentPass - #), but prefer aliases
-
-### Cg semantics
-
- - POSITION -> gl\_Position
- - float2 texcoord : TEXCOORD0 -> layout(location = 1) in vec2 TexCoord;
- - float4 varying : TEXCOORD# -> layout(location = #) out vec4 varying;
- - uniform float4x4 modelViewProj -> uniform UBO { mat4 MVP; };
-
-Output structs should be flattened into separate varyings.
-
-E.g. instead of
-```
-struct VertexData
-{
-   float pos : POSITION;
-   float4 tex0 : TEXCOORD0;
-   float4 tex1 : TEXCOORD1;
-};
-
-void main_vertex(out VertexData vout)
-{
-   vout.pos = ...;
-   vout.tex0 = ...;
-   vout.tex1 = ...;
-}
-
-void main_fragment(in VertexData vout)
-{
-   ...
-}
-```
-
-do this
-
-```
-#pragma stage vertex
-layout(location = 0) out vec4 tex0;
-layout(location = 1) out vec4 tex1;
-void main()
-{
-   gl_Position = ...;
-   tex0 = ...;
-   tex1 = ...;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex0;
-layout(location = 1) in vec4 tex1;
-void main()
-{
-}
-```
-
-Instead of returning a float4 from main\_fragment, have an output in fragment:
-
-```
-layout(location = 0) out vec4 FragColor;
-```
diff --git a/anti-aliasing/fxaa.slangp b/anti-aliasing/fxaa.slangp
deleted file mode 100644
index c043cb54cd..0000000000
--- a/anti-aliasing/fxaa.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/fxaa.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/anti-aliasing/reverse-aa.slangp b/anti-aliasing/reverse-aa.slangp
deleted file mode 100644
index 2b6781e67b..0000000000
--- a/anti-aliasing/reverse-aa.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = shaders/reverse-aa.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 2.0
-
-shader1 = ../interpolation/shaders/bicubic.slang
-filter_linear1 = false
-scale_type1 = viewport
diff --git a/anti-aliasing/shaders/ewa_curvature.slang b/anti-aliasing/shaders/ewa_curvature.slang
deleted file mode 100644
index 457cc71fcf..0000000000
--- a/anti-aliasing/shaders/ewa_curvature.slang
+++ /dev/null
@@ -1,318 +0,0 @@
-#version 450
-
-/**
-* Practical Elliptical Texture Filtering on the GPU
-* Copyright 2010-2011 Pavlos Mavridis, All rights reserved.
-*
-* Version: 0.6 - 12 / 7 / 2011 (DD/MM/YY)
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float warpX, warpY;
-   float DOTMASK_STRENGTH;
-   float maskDark;
-   float maskLight;
-   float shadowMask;
-} params;
-
-#pragma parameter warpX "EWA Curvature X-Axis" 0.031 0.0 0.125 0.01
-#pragma parameter warpY "EWA Curvature Y-Axis" 0.041 0.0 0.125 0.01
-vec2 Distortion = vec2(params.warpX, params.warpY) * 15.;
-#pragma parameter shadowMask "Mask Style" 3.0 -1.0 5.0 1.0
-#pragma parameter DOTMASK_STRENGTH "CGWG Dot Mask Strength" 0.3 0.0 1.0 0.01
-#pragma parameter maskDark "Lottes maskDark" 0.5 0.0 2.0 0.1
-#pragma parameter maskLight "Lottes maskLight" 1.5 0.0 2.0 0.1
-
-#define mod_factor vTexCoord.x * params.SourceSize.x * params.OutputSize.x / params.SourceSize.x
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-//{========= TEXTURE FILTERING (EWA) PARAMETERS =========
-#define MAX_ECCENTRICITY 1
-#define FILTER_WIDTH 0.8
-#define FILTER_SHARPNESS 1.0
-#define TEXELS_PER_PIXEL 1.0
-#define TEXEL_LIMIT 32
-#define FILTER_FUNC gaussFilter
-//}======================================================
-
-#define M_PI 3.14159265358979323846
-
-#define SourceImage Source
-
-//{========================= FILTER FUNCTIONS =======================
-// We only use the Gaussian filter function. The other filters give
-// very similar results.
- 
-float boxFilter(float r2){
-    return 1.0;
-}
- 
-float gaussFilter(float r2){
-    float alpha = FILTER_SHARPNESS;
-    return exp(-alpha * r2);
-}
- 
-float triFilter(float r2){
-    float alpha = FILTER_SHARPNESS;
-    float r= sqrt(r2);
-    return max(0, 1.-r);///alpha);
-}
- 
-float sinc(float x){
-    return sin(M_PI*x)/(M_PI*x);
-}
- 
-float lanczosFilter(float r2){
-    if (r2==0)
-        return 1.;
-    float r= sqrt(r2);
-    return sinc(r)*sinc(r/1.3);
-}
- 
-//catmull-rom filter
-float crFilter(float r2){
-    float r = sqrt(r2);
-    return (r>=2.)?.0:(r<1.)?(3.*r*r2-5.*r2+2.):(-r*r2+5.*r2-8*r+4.);
-}
- 
-float quadraticFilter(float r2){
-    float a = FILTER_SHARPNESS;
-    return 1.0 - r2/(a*a);
-}
- 
-float cubicFilter(float r2){
-    float a = FILTER_SHARPNESS;
-    float r = sqrt(r2);
-    return 1.0 - 3*r2/(a*a) + 2*r*r2/(a*a*a);
-}
-
-//}
-
-//==================== EWA ( reference / 2-tex / 4-tex) ====================
- 
-/**
-*   EWA filter
-*   Adapted from an ANSI C implementation from Matt Pharr
-*/
-vec4 ewaFilter(sampler2D Source, vec2 p0, vec2 du, vec2 dv, int scale){
-
-    vec4 foo = texture(Source,p0);
-   
-    //don't bother with elliptical filtering if the scale is very small
-    if(scale<2)
-        return foo;
- 
-    p0 -=vec2(0.5,0.5)/scale;
-    vec2 p = scale * p0;
- 
-    float ux = FILTER_WIDTH * du.s * scale;
-    float vx = FILTER_WIDTH * du.t * scale;
-    float uy = FILTER_WIDTH * dv.s * scale;
-    float vy = FILTER_WIDTH * dv.t * scale;
- 
-    // compute ellipse coefficients
-    // A*x*x + B*x*y + C*y*y = F.
-    float A = vx*vx+vy*vy+1;
-    float B = -2*(ux*vx+uy*vy);
-    float C = ux*ux+uy*uy+1;
-    float F = A*C-B*B/4.;
- 
-    // Compute the ellipse's (u,v) bounding box in texture space
-    float bbox_du = 2. / (-B*B+4.0*C*A) * sqrt((-B*B+4.0*C*A)*C*F);
-    float bbox_dv = 2. / (-B*B+4.0*C*A) * sqrt(A*(-B*B+4.0*C*A)*F);
- 
-    //the ellipse bbox             
-    int u0 = int(floor(p.s - bbox_du));
-    int u1 = int(ceil (p.s + bbox_du));
-    int v0 = int(floor(p.t - bbox_dv));
-    int v1 = int(ceil (p.t + bbox_dv));
- 
-    // Heckbert MS thesis, p. 59; scan over the bounding box of the ellipse
-    // and incrementally update the value of Ax^2+Bxy*Cy^2; when this
-    // value, q, is less than F, we're inside the ellipse so we filter
-    // away..
-    vec4 num= vec4(0., 0., 0., 1.);
-    float den = 0;
-    float ddq = 2 * A;
-    float U = u0 - p.s;
-   
-    for (int v = v0; v <= v1; ++v) {
-        float V = v - p.t;
-        float dq = A*(2*U+1) + B*V;
-        float q = (C*V + B*U)*V + A*U*U;
-
-        for (int u = u0; u <= u1; ++u) {
-            if (q < F)
-            {
-                float r2 = q / F;
-                float weight = FILTER_FUNC(r2);
-           
-                num += weight* texture(Source, vec2(u+0.5,v+0.5)/scale);
-                den += weight;
-            }
-            q += dq;
-            dq += ddq;
-        }
-
-    }
- 
- 
-    vec4 color = num*(1./den);
-    return color;
-}
-
-vec4 texture2DEWA(sampler2D tex, vec2 coords){
- 
-    vec2 du = dFdx(coords);
-    vec2 dv = dFdy(coords);
-   
-    int scale = textureSize(tex, 0).x;
- 
-    return ewaFilter(tex, coords, du, dv, scale );
- 
-}
-
-vec2 Warp(vec2 texCoord){
-  vec2 curvedCoords = texCoord * 2.0 - 1.0;
-  float curvedCoordsDistance = sqrt(curvedCoords.x*curvedCoords.x+curvedCoords.y*curvedCoords.y);
-
-  curvedCoords = curvedCoords / curvedCoordsDistance;
-
-  curvedCoords = curvedCoords * (1.0-pow(vec2(1.0-(curvedCoordsDistance/1.4142135623730950488016887242097)),(1.0/(1.0+Distortion*0.2))));
-
-  curvedCoords = curvedCoords / (1.0-pow(vec2(0.29289321881345247559915563789515),(1.0/(vec2(1.0)+Distortion*0.2))));
-
-  curvedCoords = curvedCoords * 0.5 + 0.5;
-  return curvedCoords;
-}
-
-// Lottes' public domain mask code
-// Shadow mask.
-vec3 Mask(vec2 pos){
-  vec3 mask=vec3(params.maskDark,params.maskDark,params.maskDark);
-  
-// Very compressed TV style shadow mask.
-  if (params.shadowMask == 1.0) {
-    float line=params.maskLight;
-    float odd=0.0;
-    if(fract(pos.x/6.0)<0.5)odd=1.0;
-    if(fract((pos.y+odd)/2.0)<0.5)line=params.maskDark;  
-    pos.x=fract(pos.x/3.0);
-   
-    if(pos.x<0.333)mask.r=params.maskLight;
-    else if(pos.x<0.666)mask.g=params.maskLight;
-    else mask.b=params.maskLight;
-    mask*=line;  
-  } 
-
-// Aperture-grille.
-  else if (params.shadowMask == 2.0) {
-    pos.x=fract(pos.x/3.0);
-
-    if(pos.x<0.333)mask.r=params.maskLight;
-    else if(pos.x<0.666)mask.g=params.maskLight;
-    else mask.b=params.maskLight;
-  } 
-
-// Stretched VGA style shadow mask (same as prior shaders).
-  else if (params.shadowMask == 3.0) {
-    pos.x+=pos.y*3.0;
-    pos.x=fract(pos.x/6.0);
-
-    if(pos.x<0.333)mask.r=params.maskLight;
-    else if(pos.x<0.666)mask.g=params.maskLight;
-    else mask.b=params.maskLight;
-  }
-
-// VGA style shadow mask.
-  else if (params.shadowMask == 4.0) {
-    pos.xy=floor(pos.xy*vec2(1.0,0.5));
-    pos.x+=pos.y*3.0;
-    pos.x=fract(pos.x/6.0);
-
-    if(pos.x<0.333)mask.r=params.maskLight;
-    else if(pos.x<0.666)mask.g=params.maskLight;
-    else mask.b=params.maskLight;
-  }
-
-  return mask;
-}
-
-// torridgristle's shadowmask code
-const float Pi = 3.1415926536;
-
-vec3 SinPhosphor(vec3 image)
-{
-    float MaskR = sin(params.OutputSize.x*vTexCoord.x*Pi*1.0+Pi*0.00000+vTexCoord.y*params.OutputSize.y*Pi*0.5)*0.5+0.5;
-    float MaskG = sin(params.OutputSize.x*vTexCoord.x*Pi*1.0+Pi*1.33333+vTexCoord.y*params.OutputSize.y*Pi*0.5)*0.5+0.5;
-    float MaskB = sin(params.OutputSize.x*vTexCoord.x*Pi*1.0+Pi*0.66667+vTexCoord.y*params.OutputSize.y*Pi*0.5)*0.5+0.5;
-    
-    vec3 Mask = vec3(MaskR,MaskG,MaskB);
-    
-    Mask = min(Mask*2.0,1.0);
-    
-    return vec3(Mask * image);
-}
-
-// cgwg's aperture grille
-vec3 cgwg_mask(vec3 image)
-{
-   float mask = 1.0 - params.DOTMASK_STRENGTH;
-   //Output pixels are alternately tinted green and magenta
-   vec3 dotMaskWeights = mix(vec3(1.0, mask, 1.0),
-						  vec3(mask, 1.0, mask),
-						  floor(mod(mod_factor, 2.0)));
-   return image * dotMaskWeights;
-}
-
-void main()
-{
-   FragColor = texture2DEWA(SourceImage, Warp(vTexCoord));
-   if(params.shadowMask < -0.5)
-      return;
-   else
-   {
-      if (params.shadowMask == 0.0)
-      {
-         FragColor.rgb = cgwg_mask(FragColor.rgb);
-         FragColor = vec4(FragColor.rgb, 1.0);
-         return;
-      }
-      else if (params.shadowMask == 5.0)
-      {
-         FragColor.rgb *= SinPhosphor(FragColor.rgb);
-      }
-      else
-      {
-         // Lottes mask needs linear gamma
-         FragColor.rgb = pow(FragColor.rgb, vec3(2.2));
-         FragColor.rgb *= Mask(floor(1.000001 * vTexCoord.xy * params.OutputSize.xy + vec2(0.5)));
-      }
-      FragColor = vec4(pow(FragColor.rgb, vec3(1.0/2.2)), 1.0);
-   }
-}
diff --git a/anti-aliasing/shaders/fxaa.slang b/anti-aliasing/shaders/fxaa.slang
deleted file mode 100644
index 00d870f2ee..0000000000
--- a/anti-aliasing/shaders/fxaa.slang
+++ /dev/null
@@ -1,271 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/**
- * @license
- * Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
- *
- * TO  THE MAXIMUM  EXTENT PERMITTED  BY APPLICABLE  LAW, THIS SOFTWARE  IS PROVIDED
- * *AS IS*  AND NVIDIA AND  ITS SUPPLIERS DISCLAIM  ALL WARRANTIES,  EITHER  EXPRESS
- * OR IMPLIED, INCLUDING, BUT NOT LIMITED  TO, NONINFRINGEMENT,IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL  NVIDIA 
- * OR ITS SUPPLIERS BE  LIABLE  FOR  ANY  DIRECT, SPECIAL,  INCIDENTAL,  INDIRECT,  OR  
- * CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION,  DAMAGES FOR LOSS 
- * OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY 
- * OTHER PECUNIARY LOSS) ARISING OUT OF THE  USE OF OR INABILITY  TO USE THIS SOFTWARE, 
- * EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
-FXAA_PRESET - Choose compile-in knob preset 0-5.
-------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD - The minimum amount of local contrast required 
-                      to apply algorithm.
-                      1.0/3.0  - too little
-                      1.0/4.0  - good start
-                      1.0/8.0  - applies to more edges
-                      1.0/16.0 - overkill
-------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD_MIN - Trims the algorithm from processing darks.
-                          Perf optimization.
-                          1.0/32.0 - visible limit (smaller isn't visible)
-                          1.0/16.0 - good compromise
-                          1.0/12.0 - upper limit (seeing artifacts)
-------------------------------------------------------------------------------
-FXAA_SEARCH_STEPS - Maximum number of search steps for end of span.
-------------------------------------------------------------------------------
-FXAA_SEARCH_THRESHOLD - Controls when to stop searching.
-                        1.0/4.0 - seems to be the best quality wise
-------------------------------------------------------------------------------
-FXAA_SUBPIX_TRIM - Controls sub-pixel aliasing removal.
-                   1.0/2.0 - low removal
-                   1.0/3.0 - medium removal
-                   1.0/4.0 - default removal
-                   1.0/8.0 - high removal
-                   0.0 - complete removal
-------------------------------------------------------------------------------
-FXAA_SUBPIX_CAP - Insures fine detail is not completely removed.
-                  This is important for the transition of sub-pixel detail,
-                  like fences and wires.
-                  3.0/4.0 - default (medium amount of filtering)
-                  7.0/8.0 - high amount of filtering
-                  1.0 - no capping of sub-pixel aliasing removal
-*/
-
-#ifndef FXAA_PRESET
-    #define FXAA_PRESET 5
-#endif
-#if (FXAA_PRESET == 3)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/16.0)
-    #define FXAA_SEARCH_STEPS        16
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 4)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        24
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 5)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        32
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-
-#define FXAA_SUBPIX_TRIM_SCALE (1.0/(1.0 - FXAA_SUBPIX_TRIM))
-
-// Return the luma, the estimation of luminance from rgb inputs.
-// This approximates luma using one FMA instruction,
-// skipping normalization and tossing out blue.
-// FxaaLuma() will range 0.0 to 2.963210702.
-float FxaaLuma(vec3 rgb) {
-    return rgb.y * (0.587/0.299) + rgb.x;
-}
-
-vec3 FxaaLerp3(vec3 a, vec3 b, float amountOfA) {
-    return (vec3(-amountOfA) * b) + ((a * vec3(amountOfA)) + b);
-}
-
-vec4 FxaaTexOff(sampler2D tex, vec2 pos, ivec2 off, vec2 rcpFrame) {
-    float x = pos.x + float(off.x) * rcpFrame.x;
-    float y = pos.y + float(off.y) * rcpFrame.y;
-    return texture(tex, vec2(x, y));
-}
-
-// pos is the output of FxaaVertexShader interpolated across screen.
-// xy -> actual texture position {0.0 to 1.0}
-// rcpFrame should be a uniform equal to  {1.0/frameWidth, 1.0/frameHeight}
-vec3 FxaaPixelShader(vec2 pos, sampler2D tex, vec2 rcpFrame)
-{
-    vec3 rgbN = FxaaTexOff(tex, pos.xy, ivec2( 0,-1), rcpFrame).xyz;
-    vec3 rgbW = FxaaTexOff(tex, pos.xy, ivec2(-1, 0), rcpFrame).xyz;
-    vec3 rgbM = FxaaTexOff(tex, pos.xy, ivec2( 0, 0), rcpFrame).xyz;
-    vec3 rgbE = FxaaTexOff(tex, pos.xy, ivec2( 1, 0), rcpFrame).xyz;
-    vec3 rgbS = FxaaTexOff(tex, pos.xy, ivec2( 0, 1), rcpFrame).xyz;
-    
-    float lumaN = FxaaLuma(rgbN);
-    float lumaW = FxaaLuma(rgbW);
-    float lumaM = FxaaLuma(rgbM);
-    float lumaE = FxaaLuma(rgbE);
-    float lumaS = FxaaLuma(rgbS);
-    float rangeMin = min(lumaM, min(min(lumaN, lumaW), min(lumaS, lumaE)));
-    float rangeMax = max(lumaM, max(max(lumaN, lumaW), max(lumaS, lumaE)));
-    
-    float range = rangeMax - rangeMin;
-    if(range < max(FXAA_EDGE_THRESHOLD_MIN, rangeMax * FXAA_EDGE_THRESHOLD))
-    {
-        return rgbM;
-    }
-    
-    vec3 rgbL = rgbN + rgbW + rgbM + rgbE + rgbS;
-    
-    float lumaL = (lumaN + lumaW + lumaE + lumaS) * 0.25;
-    float rangeL = abs(lumaL - lumaM);
-    float blendL = max(0.0, (rangeL / range) - FXAA_SUBPIX_TRIM) * FXAA_SUBPIX_TRIM_SCALE; 
-    blendL = min(FXAA_SUBPIX_CAP, blendL);
-    
-    vec3 rgbNW = FxaaTexOff(tex, pos.xy, ivec2(-1,-1), rcpFrame).xyz;
-    vec3 rgbNE = FxaaTexOff(tex, pos.xy, ivec2( 1,-1), rcpFrame).xyz;
-    vec3 rgbSW = FxaaTexOff(tex, pos.xy, ivec2(-1, 1), rcpFrame).xyz;
-    vec3 rgbSE = FxaaTexOff(tex, pos.xy, ivec2( 1, 1), rcpFrame).xyz;
-    rgbL += (rgbNW + rgbNE + rgbSW + rgbSE);
-    rgbL *= vec3(1.0/9.0);
-    
-    float lumaNW = FxaaLuma(rgbNW);
-    float lumaNE = FxaaLuma(rgbNE);
-    float lumaSW = FxaaLuma(rgbSW);
-    float lumaSE = FxaaLuma(rgbSE);
-    
-    float edgeVert = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaN) + (0.25 * lumaNE)) +
-        abs((0.50 * lumaW ) + (-1.0 * lumaM) + (0.50 * lumaE )) +
-        abs((0.25 * lumaSW) + (-0.5 * lumaS) + (0.25 * lumaSE));
-    float edgeHorz = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaW) + (0.25 * lumaSW)) +
-        abs((0.50 * lumaN ) + (-1.0 * lumaM) + (0.50 * lumaS )) +
-        abs((0.25 * lumaNE) + (-0.5 * lumaE) + (0.25 * lumaSE));
-        
-    bool horzSpan = edgeHorz >= edgeVert;
-    float lengthSign = horzSpan ? -rcpFrame.y : -rcpFrame.x;
-    
-    if(!horzSpan)
-    {
-        lumaN = lumaW;
-        lumaS = lumaE;
-    }
-    
-    float gradientN = abs(lumaN - lumaM);
-    float gradientS = abs(lumaS - lumaM);
-    lumaN = (lumaN + lumaM) * 0.5;
-    lumaS = (lumaS + lumaM) * 0.5;
-    
-    if (gradientN < gradientS)
-    {
-        lumaN = lumaS;
-        lumaN = lumaS;
-        gradientN = gradientS;
-        lengthSign *= -1.0;
-    }
-    
-    vec2 posN;
-    posN.x = pos.x + (horzSpan ? 0.0 : lengthSign * 0.5);
-    posN.y = pos.y + (horzSpan ? lengthSign * 0.5 : 0.0);
-    
-    gradientN *= FXAA_SEARCH_THRESHOLD;
-    
-    vec2 posP = posN;
-    vec2 offNP = horzSpan ? vec2(rcpFrame.x, 0.0) : vec2(0.0, rcpFrame.y); 
-    float lumaEndN = lumaN;
-    float lumaEndP = lumaN;
-    bool doneN = false;
-    bool doneP = false;
-    posN += offNP * vec2(-1.0, -1.0);
-    posP += offNP * vec2( 1.0,  1.0);
-    
-    for(int i = 0; i < FXAA_SEARCH_STEPS; i++) {
-        if(!doneN)
-        {
-            lumaEndN = FxaaLuma(texture(tex, posN.xy).xyz);
-        }
-        if(!doneP)
-        {
-            lumaEndP = FxaaLuma(texture(tex, posP.xy).xyz);
-        }
-        
-        doneN = doneN || (abs(lumaEndN - lumaN) >= gradientN);
-        doneP = doneP || (abs(lumaEndP - lumaN) >= gradientN);
-        
-        if(doneN && doneP)
-        {
-            break;
-        }
-        if(!doneN)
-        {
-            posN -= offNP;
-        }
-        if(!doneP)
-        {
-            posP += offNP;
-        }
-    }
-    
-    float dstN = horzSpan ? pos.x - posN.x : pos.y - posN.y;
-    float dstP = horzSpan ? posP.x - pos.x : posP.y - pos.y;
-    bool directionN = dstN < dstP;
-    lumaEndN = directionN ? lumaEndN : lumaEndP;
-    
-    if(((lumaM - lumaN) < 0.0) == ((lumaEndN - lumaN) < 0.0))
-    {
-        lengthSign = 0.0;
-    }
- 
-
-    float spanLength = (dstP + dstN);
-    dstN = directionN ? dstN : dstP;
-    float subPixelOffset = (0.5 + (dstN * (-1.0/spanLength))) * lengthSign;
-    vec3 rgbF = texture(tex, vec2(
-        pos.x + (horzSpan ? 0.0 : subPixelOffset),
-        pos.y + (horzSpan ? subPixelOffset : 0.0))).xyz;
-    return FxaaLerp3(rgbL, rgbF, blendL); 
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(FxaaPixelShader(vTexCoord, Source, vec2(params.SourceSize.z, params.SourceSize.w)), 1.0) * 1.0;
-}
diff --git a/anti-aliasing/shaders/shock.slang b/anti-aliasing/shaders/shock.slang
deleted file mode 100644
index 80c026bac2..0000000000
--- a/anti-aliasing/shaders/shock.slang
+++ /dev/null
@@ -1,71 +0,0 @@
-#version 450
-
-// based on Nvidia's GPU Gems article:
-// https://developer.nvidia.com/gpugems/GPUGems2/gpugems2_chapter27.html
-// slang shader by torridgristle and hunterk
-// This shader needs several iterations for a noticeable deblur effect
-// Nvidia's example uses 5 passes at 0.05 intensity, which seems good
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float shockMagnitude;
-} params;
-
-#pragma parameter shockMagnitude "Shock Magnitude" 0.05 0.0 4.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define Euler 2.718281828459045
-
-const vec3 ones = vec3(1.0, 1.0, 1.0);
-
-void main()
-{
-    vec3 inc = vec3(params.OutputSize.zw,0.0);
-    
-    vec3   curCol = texture(Source, vTexCoord).xyz;
-    vec3    upCol = texture(Source, vTexCoord + inc.zy).xyz;
-    vec3  downCol = texture(Source, vTexCoord - inc.zy).xyz;
-    vec3 rightCol = texture(Source, vTexCoord + inc.xz).xyz;
-    vec3  leftCol = texture(Source, vTexCoord - inc.xz).xyz;
-    
-    vec3 Convexity = 4.0 * curCol - rightCol - leftCol - upCol - downCol;
-
-    vec2 Diffusion = vec2(dot((rightCol - leftCol) * Convexity, ones),
-                             dot((upCol - downCol) * Convexity, ones));
-
-    Diffusion *= params.shockMagnitude/(length(Diffusion) + 0.00001);
-
-    curCol += (Diffusion.x > 0 ? Diffusion.x * rightCol :
-
-             -Diffusion.x*leftCol) +
-
-            (Diffusion.y > 0 ? Diffusion.y * upCol :
-
-             -Diffusion.y * downCol);
-
-    FragColor = vec4(curCol/(1 + dot(abs(Diffusion), ones.xy)),1.0);
-}
diff --git a/anti-aliasing/smaa+linear.slangp b/anti-aliasing/smaa+linear.slangp
deleted file mode 100644
index e460272a91..0000000000
--- a/anti-aliasing/smaa+linear.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-alias0 = SMAA_Input
-
-shader1 = shaders/smaa/smaa-pass0.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = shaders/smaa/smaa-pass1.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = shaders/smaa/smaa-pass2.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 1.0
-
-textures = "areaTex;searchTex"
-areaTex = shaders/smaa/AreaTex.png
-searchTex = shaders/smaa/SearchTex.png
-
-shader4 = ../stock.slang
-filter_linear4 = true
-scale_type4 = viewport
-
-parameters = "SMAA_EDT"
-SMAA_EDT = 0.0
diff --git a/anti-aliasing/smaa+sharpen.slangp b/anti-aliasing/smaa+sharpen.slangp
deleted file mode 100644
index 1fa31c5139..0000000000
--- a/anti-aliasing/smaa+sharpen.slangp
+++ /dev/null
@@ -1,42 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-alias0 = SMAA_Input
-
-shader1 = shaders/smaa/smaa-pass0.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = shaders/smaa/smaa-pass1.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = shaders/smaa/smaa-pass2.slang
-filter_linear3 = true
-scale_type3 = viewport
-scale3 = 1.0
-
-textures = "areaTex;searchTex"
-areaTex = shaders/smaa/AreaTex.png
-searchTex = shaders/smaa/SearchTex.png
-
-shader4 = ../sharpen/shaders/fast-sharpen.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-parameters = "SMAA_EDT;SMAA_THRESHOLD;SMAA_MAX_SEARCH_STEPS;SMAA_MAX_SEARCH_STEPS_DIAG;SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR;SMAA_CORNER_ROUNDING;SHARPEN;CONTR;DETAILS"
-SMAA_EDT = 1.0
-SMAA_THRESHOLD = 0.05
-SMAA_MAX_SEARCH_STEPS = 40
-SMAA_MAX_SEARCH_STEPS_DIAG = 20
-SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR = 2.5
-SMAA_CORNER_ROUNDING = 50.0
-SHARPEN = 0.9
-CONTR = 0.0
-DETAILS = 0.2
diff --git a/anti-aliasing/smaa.slangp b/anti-aliasing/smaa.slangp
deleted file mode 100644
index afd4de1bf8..0000000000
--- a/anti-aliasing/smaa.slangp
+++ /dev/null
@@ -1,34 +0,0 @@
-shaders = 4
-
-shader0 = ../stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-alias0 = SMAA_Input
-
-shader1 = shaders/smaa/smaa-pass0.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = shaders/smaa/smaa-pass1.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = shaders/smaa/smaa-pass2.slang
-filter_linear3 = true
-scale_type3 = viewport
-scale3 = 1.0
-
-textures = "areaTex;searchTex"
-areaTex = shaders/smaa/AreaTex.png
-searchTex = shaders/smaa/SearchTex.png
-
-parameters = "SMAA_EDT;SMAA_THRESHOLD;SMAA_MAX_SEARCH_STEPS;SMAA_MAX_SEARCH_STEPS_DIAG;SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR;SMAA_CORNER_ROUNDING"
-SMAA_EDT = 1.0
-SMAA_THRESHOLD = 0.05
-SMAA_MAX_SEARCH_STEPS = 32
-SMAA_MAX_SEARCH_STEPS_DIAG = 16
-SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR = 2.0
-SMAA_CORNER_ROUNDING = 25.0
diff --git a/bezel/Mega_Bezel/MegaBezelLogo.png b/bezel/Mega_Bezel/MegaBezelLogo.png
deleted file mode 100644
index bf9a1284cf..0000000000
Binary files a/bezel/Mega_Bezel/MegaBezelLogo.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp
deleted file mode 100644
index fae64aaf68..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp
deleted file mode 100644
index 01c970f714..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp
deleted file mode 100644
index c720fd0c34..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp
deleted file mode 100644
index 787ed8dd98..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp
deleted file mode 100644
index f3695c624e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp
deleted file mode 100644
index 0d835235ff..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp
deleted file mode 100644
index 49c28f7b17..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp
deleted file mode 100644
index ea64aea024..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp
deleted file mode 100644
index bd189f5877..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp
deleted file mode 100644
index f1ebeb8e7a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp
deleted file mode 100644
index 07ac54b285..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp
deleted file mode 100644
index f469cc99ec..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp
deleted file mode 100644
index 7cadbee533..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
deleted file mode 100644
index 1d8d91e399..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp
deleted file mode 100644
index 1dcaed10c2..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp
deleted file mode 100644
index afc14e2f9c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp
deleted file mode 100644
index 522ba4fe0a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp
deleted file mode 100644
index f48c11fa95..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp
deleted file mode 100644
index 177cfb3a20..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp
deleted file mode 100644
index b6073c9071..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp
deleted file mode 100644
index bde11ad56d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 27cf89b8ff..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 8ae6947991..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp
deleted file mode 100644
index c93066fd00..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__EASYMODE.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 12a859a970..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp
deleted file mode 100644
index 538002ca5a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp
deleted file mode 100644
index dba51d69c1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp
deleted file mode 100644
index 2330aeaa7c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp
deleted file mode 100644
index b1aec15450..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp
deleted file mode 100644
index 9e387f9f5a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp
deleted file mode 100644
index 6aa176a8e1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp
deleted file mode 100644
index 0e7220a0f6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 5e7cdb9a3d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 03dcae3109..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp
deleted file mode 100644
index 15322b3c23..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp
deleted file mode 100644
index d6eb8e8020..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp
deleted file mode 100644
index 8796378bb4..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp
deleted file mode 100644
index 5d774099fb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp
deleted file mode 100644
index 4862990de8..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp
deleted file mode 100644
index 3467034356..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp
deleted file mode 100644
index fcdd9c270a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp
deleted file mode 100644
index 6acf389e7b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 95a078da50..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 8c2c42cdf7..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp
deleted file mode 100644
index f6d2ae10f0..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp
deleted file mode 100644
index f67973c82f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp
deleted file mode 100644
index 568b6f5ff4..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp
deleted file mode 100644
index 207e8dd830..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
deleted file mode 100644
index 70cca2361d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 052ce56b83..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 6c6e3d14b7..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 4147a588d6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp
deleted file mode 100644
index 9b1c943ef9..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp
deleted file mode 100644
index 3e8db17b19..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp
deleted file mode 100644
index b57d67abc0..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
deleted file mode 100644
index df3c6ada7f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp
deleted file mode 100644
index 3777dd2274..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index d90cd1aee8..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp
deleted file mode 100644
index de309dcd8b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 3cdab1d9bb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp
deleted file mode 100644
index 7a79da9485..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp
deleted file mode 100644
index b840b0009d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp
deleted file mode 100644
index 8cbda91ad9..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp
deleted file mode 100644
index 1e6f61ca17..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp
deleted file mode 100644
index 71d126e053..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp
deleted file mode 100644
index 068b6dc42e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__PASSTHROUGH.slangp
deleted file mode 100644
index 777da609ab..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-GLASS__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-NO-TUBE-FX__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-NO-TUBE-FX__PASSTHROUGH.slangp
deleted file mode 100644
index 70ee29c15b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-NO-TUBE-FX__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-NO-TUBE-FX__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 9e9afd387d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 3d13df6e03..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp
deleted file mode 100644
index 80222247bd..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__EASYMODE.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 5b29e4b55c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp
deleted file mode 100644
index 79428e61f6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp
deleted file mode 100644
index 13d3afb9aa..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp
deleted file mode 100644
index 74e951df21..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp
deleted file mode 100644
index 5ed7987931..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp
deleted file mode 100644
index 9951d0f295..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp
deleted file mode 100644
index 43e4701b1d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__PASSTHROUGH.slangp
deleted file mode 100644
index edc8b94d94..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-NO-TUBE-FX__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-NO-TUBE-FX__PASSTHROUGH.slangp
deleted file mode 100644
index 80a092ded6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-NO-TUBE-FX__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT-NO-TUBE-FX__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index d7d16b16f4..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 6552396f09..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp
deleted file mode 100644
index 4ed8a07470..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 017cabd22d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp
deleted file mode 100644
index 930a6b72ad..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp
deleted file mode 100644
index cbf86bb111..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp
deleted file mode 100644
index dbc1ac7e21..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp
deleted file mode 100644
index 190c5e8a84..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp
deleted file mode 100644
index 74c097f553..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp
deleted file mode 100644
index 88a7f50cc8..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__PASSTHROUGH.slangp
deleted file mode 100644
index 6beba0294d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-NO-REFLECT__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
deleted file mode 100644
index f0a01c6f5d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__PASSTHROUGH.slangp
deleted file mode 100644
index f4b0ad6fb1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index c7e62c4790..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 20b45af603..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp
deleted file mode 100644
index ca31fe5547..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 85a90c7a67..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp
deleted file mode 100644
index 7846883cb6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp
deleted file mode 100644
index 522f81b7b6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp
deleted file mode 100644
index 1006502d58..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp
deleted file mode 100644
index 93274f4cec..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp
deleted file mode 100644
index b54a0fb735..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp
deleted file mode 100644
index 4a5e07e2f5..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__PASSTHROUGH.slangp
deleted file mode 100644
index 2ad9ea3260..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__4__STD-SCREEN-ONLY__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 4ff8e89586..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 2e65918c23..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__EASYMODE.slangp
deleted file mode 100644
index 0a9d131164..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__EASYMODE.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__EASYMODE.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp
deleted file mode 100644
index ff39e578f4..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp
deleted file mode 100644
index 2b4e75e00c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-MINI.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp
deleted file mode 100644
index 622f93a01f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp
deleted file mode 100644
index 7547b4d815..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__LCD-GRID.slangp
deleted file mode 100644
index ab520c36c1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__LCD-GRID.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__LCD-GRID.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp
deleted file mode 100644
index 17bb17b48e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON.slangp
deleted file mode 100644
index e86462152b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__MEGATRON.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__PASSTHROUGH.slangp
deleted file mode 100644
index a199d43af5..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__PASSTHROUGH.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp
deleted file mode 100644
index 76aed2b947..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp
+++ /dev/null
@@ -1,406 +0,0 @@
-shaders = 43
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang
-filter_linear32 = false
-srgb_framebuffer32 = true
-
-shader33 = ../../../shaders/easymode/hsm-crt-easymode-blur_vert.slang
-filter_linear33 = false
-srgb_framebuffer33 = true
-
-shader34 = ../../../shaders/easymode/hsm-crt-easymode-threshold.slang
-filter_linear34 = false
-srgb_framebuffer34 = true
-
-# Easymode's Shader!
-shader35 = ../../../shaders/easymode/hsm-crt-easymode-halation.slang
-filter_linear35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "CRTPass"
-
-g_gamma_out = 2.45
-
-shader36 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader37 = ../../../shaders/base/linearize-crt.slang
-mipmap_input37 = true
-filter_linear37 = true
-scale_type37 = absolute
-# scale_x37 = 480
-# scale_y37 = 270
-# scale_x37 = 960
-# scale_y37 = 540
-scale_x37 = 800
-scale_y37 = 600
-float_framebuffer37 = true
-alias37 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader38 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input38 = true
-filter_linear38 = true
-float_framebuffer38 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear39 = true
-float_framebuffer39 = true
-alias39 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader40 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input40 = true
-filter_linear40 = true
-scale_type40 = absolute
-scale_x40 = 128
-scale_y40 = 128
-float_framebuffer40 = true
-alias40 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 12
-scale_y41 = 12
-float_framebuffer41 = true
-alias41 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader42 = ../../../shaders/base/reflection-glass.slang
-scale_type42 = viewport
-srgb_framebuffer42 = true
-alias42 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Easymode Parameters
-gamma_out = 2.2
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp
deleted file mode 100644
index f0b26b4ec9..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp
+++ /dev/null
@@ -1,398 +0,0 @@
-shaders = 41
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/base/delinearize.slang
-scale_type32 = source
-float_framebuffer32 = "true"
-
-shader33 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-filter_linear33 = true
-float_framebuffer33 = "true"
-alias33 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader34 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection-glass.slang
-scale_type40 = viewport
-srgb_framebuffer40 = true
-alias40 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp
deleted file mode 100644
index 1705c15ae3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp
+++ /dev/null
@@ -1,458 +0,0 @@
-shaders = 48
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../shaders/base/linearize-crt.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-# scale_x42 = 480
-# scale_y42 = 270
-# scale_x42 = 960
-# scale_y42 = 540
-scale_x42 = 800
-scale_y42 = 600
-float_framebuffer42 = true
-alias42 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input43 = true
-filter_linear43 = true
-float_framebuffer43 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader44 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear44 = true
-float_framebuffer44 = true
-alias44 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 128
-scale_y45 = 128
-float_framebuffer45 = true
-alias45 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader46 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input46 = true
-filter_linear46 = true
-scale_type46 = absolute
-scale_x46 = 12
-scale_y46 = 12
-float_framebuffer46 = true
-alias46 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader47 = ../../../shaders/base/reflection-glass.slang
-scale_type47 = viewport
-srgb_framebuffer47 = true
-alias47 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp
deleted file mode 100644
index e1e9a21aa4..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp
+++ /dev/null
@@ -1,431 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = GlowPass
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = BloomPass
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../shaders/base/linearize-crt.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-# scale_x39 = 480
-# scale_y39 = 270
-# scale_x39 = 960
-# scale_y39 = 540
-scale_x39 = 800
-scale_y39 = 600
-float_framebuffer39 = true
-alias39 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input40 = true
-filter_linear40 = true
-float_framebuffer40 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader41 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear41 = true
-float_framebuffer41 = true
-alias41 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 128
-scale_y42 = 128
-float_framebuffer42 = true
-alias42 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader43 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input43 = true
-filter_linear43 = true
-scale_type43 = absolute
-scale_x43 = 12
-scale_y43 = 12
-float_framebuffer43 = true
-alias43 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader44 = ../../../shaders/base/reflection-glass.slang
-scale_type44 = viewport
-srgb_framebuffer44 = true
-alias44 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp
deleted file mode 100644
index d34205eaf0..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp
+++ /dev/null
@@ -1,387 +0,0 @@
-shaders = 41
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/base/delinearize.slang
-float_framebuffer32 = "true"
-
-shader33 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear33 = "false"
-scale_type33 = "viewport"
-scale33 = "1.0"
-float_framebuffer33 = "true"
-alias33 = "CRTPass"
-
-shader34 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection-glass.slang
-scale_type40 = viewport
-srgb_framebuffer40 = true
-alias40 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# SMOOTH-ADV LCD-GRID Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 100
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-shadowMask = 3
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp
deleted file mode 100644
index bd76108a81..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,436 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-float_framebuffer31 = true
-alias31 = "PrePass"
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-float_framebuffer32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader34 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear34 = "false"
-scale_type34 = "source"
-scale34 = "1.0"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-alias34 = "SourceSDR"
-float_framebuffer34 = "true"
-
-shader35 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear35 = "false"
-scale_type35 = "source"
-scale35 = "1.0"
-wrap_mode35 = "clamp_to_border"
-mipmap_input35 = "false"
-alias35 = "SourceHDR"
-float_framebuffer35 = "true"
-
-shader36 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear36 = "false"
-wrap_mode36 = "clamp_to_border"
-mipmap_input36 = "false"
-scale_type36 = "viewport"
-float_framebuffer36 = "true"
-alias36 = "CRTPass"
-
-shader37 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection-glass-hdr.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/output-hdr.slang
-alias44 = "OutputPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp
deleted file mode 100644
index 303f3876be..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp
+++ /dev/null
@@ -1,418 +0,0 @@
-shaders = 43
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-float_framebuffer29 = true
-alias29 = "PrePass"
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-float_framebuffer30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader32 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear32 = "false"
-scale_type32 = "source"
-scale32 = "1.0"
-wrap_mode32 = "clamp_to_border"
-mipmap_input32 = "false"
-alias32 = "SourceSDR"
-float_framebuffer32 = "true"
-
-shader33 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear33 = "false"
-scale_type33 = "source"
-scale33 = "1.0"
-wrap_mode33 = "clamp_to_border"
-mipmap_input33 = "false"
-alias33 = "SourceHDR"
-float_framebuffer33 = "true"
-
-shader34 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear34 = "false"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-scale_type34 = "viewport"
-float_framebuffer34 = "true"
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader36 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input36 = true
-filter_linear36 = true
-scale_type36 = absolute
-# scale_x36 = 480
-# scale_y36 = 270
-# scale_x36 = 960
-# scale_y36 = 540
-scale_x36 = 800
-scale_y36 = 600
-float_framebuffer36 = true
-alias36 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input37 = true
-filter_linear37 = true
-float_framebuffer37 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader38 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear38 = true
-float_framebuffer38 = true
-alias38 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 128
-scale_y39 = 128
-float_framebuffer39 = true
-alias39 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader40 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input40 = true
-filter_linear40 = true
-scale_type40 = absolute
-scale_x40 = 12
-scale_y40 = 12
-float_framebuffer40 = true
-alias40 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader41 = ../../../shaders/base/reflection-glass-hdr.slang
-scale_type41 = viewport
-alias41 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader42 = ../../../shaders/base/output-hdr.slang
-alias42 = "OutputPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp
deleted file mode 100644
index 565a5e3ae3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp
+++ /dev/null
@@ -1,381 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = "GlowPass"
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = "BloomPass" 
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader42 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear42 = true
-scale_type42 = viewport
-float_framebuffer42 = true
-alias42 = "BR_LayersUnderCRTPass"
-
-shader43 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear43 = true
-scale_type43 = viewport
-float_framebuffer43 = true
-alias43 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp
deleted file mode 100644
index 535835d723..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp
+++ /dev/null
@@ -1,354 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = "GlowPass"
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = "BloomPass"
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader39 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersUnderCRTPass"
-
-shader40 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp
deleted file mode 100644
index 2a054cf98c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,356 +0,0 @@
-shaders = 41
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-float_framebuffer31 = true
-alias31 = "PrePass"
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-float_framebuffer32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader34 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear34 = "false"
-scale_type34 = "source"
-scale34 = "1.0"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-alias34 = "SourceSDR"
-float_framebuffer34 = "true"
-
-shader35 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear35 = "false"
-scale_type35 = "source"
-scale35 = "1.0"
-wrap_mode35 = "clamp_to_border"
-mipmap_input35 = "false"
-alias35 = "SourceHDR"
-float_framebuffer35 = "true"
-
-shader36 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear36 = "false"
-wrap_mode36 = "clamp_to_border"
-mipmap_input36 = "false"
-scale_type36 = "viewport"
-float_framebuffer36 = "true"
-alias36 = "CRTPass"
-
-shader37 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader38 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "BR_LayersUnderCRTPass"
-
-shader39 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader40 = ../../../shaders/base/combine-passes-no-reflect-hdr.slang
-alias40 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp
deleted file mode 100644
index 5403eee70f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp
+++ /dev/null
@@ -1,338 +0,0 @@
-shaders = 39
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-float_framebuffer29 = true
-alias29 = "PrePass"
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-float_framebuffer30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader32 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear32 = "false"
-scale_type32 = "source"
-scale32 = "1.0"
-wrap_mode32 = "clamp_to_border"
-mipmap_input32 = "false"
-alias32 = "SourceSDR"
-float_framebuffer32 = "true"
-
-shader33 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear33 = "false"
-scale_type33 = "source"
-scale33 = "1.0"
-wrap_mode33 = "clamp_to_border"
-mipmap_input33 = "false"
-alias33 = "SourceHDR"
-float_framebuffer33 = "true"
-
-shader34 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear34 = "false"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-scale_type34 = "viewport"
-float_framebuffer34 = "true"
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader38 = ../../../shaders/base/combine-passes-no-reflect-hdr.slang
-alias38 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp
deleted file mode 100644
index cdafc82c45..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp
+++ /dev/null
@@ -1,367 +0,0 @@
-shaders = 43
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = "GlowPass"
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = "BloomPass" 
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader42 = ../../../shaders/base/output-sdr.slang
-alias42 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp
deleted file mode 100644
index 8f1188bd1f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp
+++ /dev/null
@@ -1,340 +0,0 @@
-shaders = 40
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = "GlowPass"
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = "BloomPass"
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader39 = ../../../shaders/base/output-sdr.slang
-alias39 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
deleted file mode 100644
index 2a09d2753d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,342 +0,0 @@
-shaders = 39
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-float_framebuffer31 = true
-alias31 = "PrePass"
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-float_framebuffer32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader34 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear34 = "false"
-scale_type34 = "source"
-scale34 = "1.0"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-alias34 = "SourceSDR"
-float_framebuffer34 = "true"
-
-shader35 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear35 = "false"
-scale_type35 = "source"
-scale35 = "1.0"
-wrap_mode35 = "clamp_to_border"
-mipmap_input35 = "false"
-alias35 = "SourceHDR"
-float_framebuffer35 = "true"
-
-shader36 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear36 = "false"
-wrap_mode36 = "clamp_to_border"
-mipmap_input36 = "false"
-scale_type36 = "viewport"
-float_framebuffer36 = "true"
-alias36 = "CRTPass"
-
-shader37 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader38 = ../../../shaders/base/output-hdr.slang
-alias38 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp
deleted file mode 100644
index 5fd80f4a56..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp
+++ /dev/null
@@ -1,324 +0,0 @@
-shaders = 37
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-float_framebuffer29 = true
-alias29 = "PrePass"
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-float_framebuffer30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader32 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear32 = "false"
-scale_type32 = "source"
-scale32 = "1.0"
-wrap_mode32 = "clamp_to_border"
-mipmap_input32 = "false"
-alias32 = "SourceSDR"
-float_framebuffer32 = "true"
-
-shader33 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear33 = "false"
-scale_type33 = "source"
-scale33 = "1.0"
-wrap_mode33 = "clamp_to_border"
-mipmap_input33 = "false"
-alias33 = "SourceHDR"
-float_framebuffer33 = "true"
-
-shader34 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear34 = "false"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-scale_type34 = "viewport"
-float_framebuffer34 = "true"
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader36 = ../../../shaders/base/output-hdr.slang
-alias36 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp
deleted file mode 100644
index b7ff876b37..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp
+++ /dev/null
@@ -1,439 +0,0 @@
-shaders = 51
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader42 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear42 = true
-scale_type42 = viewport
-float_framebuffer42 = true
-alias42 = "BR_LayersUnderCRTPass"
-
-shader43 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear43 = true
-scale_type43 = viewport
-float_framebuffer43 = true
-alias43 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader44 = ../../../shaders/base/linearize-crt.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-# scale_x44 = 480
-# scale_y44 = 270
-# scale_x44 = 960
-# scale_y44 = 540
-scale_x44 = 800
-scale_y44 = 600
-float_framebuffer44 = true
-alias44 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader45 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input45 = true
-filter_linear45 = true
-float_framebuffer45 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader46 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear46 = true
-float_framebuffer46 = true
-alias46 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader47 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input47 = true
-filter_linear47 = true
-scale_type47 = absolute
-scale_x47 = 128
-scale_y47 = 128
-float_framebuffer47 = true
-alias47 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader48 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input48 = true
-filter_linear48 = true
-scale_type48 = absolute
-scale_x48 = 12
-scale_y48 = 12
-float_framebuffer48 = true
-alias48 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader49 = ../../../shaders/base/reflection.slang
-scale_type49 = viewport
-alias49 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader50 = ../../../shaders/base/combine-passes.slang
-alias50 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp
deleted file mode 100644
index 95f0ae0b60..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp
+++ /dev/null
@@ -1,412 +0,0 @@
-shaders = 48
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = GlowPass
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = BloomPass
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader39 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersUnderCRTPass"
-
-shader40 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader41 = ../../../shaders/base/linearize-crt.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-# scale_x41 = 480
-# scale_y41 = 270
-# scale_x41 = 960
-# scale_y41 = 540
-scale_x41 = 800
-scale_y41 = 600
-float_framebuffer41 = true
-alias41 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader42 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input42 = true
-filter_linear42 = true
-float_framebuffer42 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear43 = true
-float_framebuffer43 = true
-alias43 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader44 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-scale_x44 = 128
-scale_y44 = 128
-float_framebuffer44 = true
-alias44 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 12
-scale_y45 = 12
-float_framebuffer45 = true
-alias45 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader46 = ../../../shaders/base/reflection.slang
-scale_type46 = viewport
-alias46 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader47 = ../../../shaders/base/combine-passes.slang
-alias47 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp
deleted file mode 100644
index 8baa7af70e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp
+++ /dev/null
@@ -1,371 +0,0 @@
-shaders = 44
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/base/delinearize.slang
-float_framebuffer32 = "true"
-
-shader33 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear33 = "false"
-scale_type33 = "viewport"
-scale33 = "1.0"
-float_framebuffer33 = "true"
-alias33 = "CRTPass"
-
-shader34 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader35 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "BR_LayersUnderCRTPass"
-
-shader36 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader37 = ../../../shaders/base/linearize-crt.slang
-mipmap_input37 = true
-filter_linear37 = true
-scale_type37 = absolute
-# scale_x37 = 480
-# scale_y37 = 270
-# scale_x37 = 960
-# scale_y37 = 540
-scale_x37 = 800
-scale_y37 = 600
-float_framebuffer37 = true
-alias37 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader38 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input38 = true
-filter_linear38 = true
-float_framebuffer38 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear39 = true
-float_framebuffer39 = true
-alias39 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader40 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input40 = true
-filter_linear40 = true
-scale_type40 = absolute
-scale_x40 = 128
-scale_y40 = 128
-float_framebuffer40 = true
-alias40 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 12
-scale_y41 = 12
-float_framebuffer41 = true
-alias41 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader42 = ../../../shaders/base/reflection.slang
-scale_type42 = viewport
-alias42 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader43 = ../../../shaders/base/combine-passes.slang
-alias43 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV LCD-GRID Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 100
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-shadowMask = 3
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp
deleted file mode 100644
index d2f7791b80..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,414 +0,0 @@
-shaders = 47
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-float_framebuffer31 = true
-alias31 = "PrePass"
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-float_framebuffer32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader34 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear34 = "false"
-scale_type34 = "source"
-scale34 = "1.0"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-alias34 = "SourceSDR"
-float_framebuffer34 = "true"
-
-shader35 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear35 = "false"
-scale_type35 = "source"
-scale35 = "1.0"
-wrap_mode35 = "clamp_to_border"
-mipmap_input35 = "false"
-alias35 = "SourceHDR"
-float_framebuffer35 = "true"
-
-shader36 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear36 = "false"
-wrap_mode36 = "clamp_to_border"
-mipmap_input36 = "false"
-scale_type36 = "viewport"
-float_framebuffer36 = "true"
-alias36 = "CRTPass"
-
-shader37 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader38 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "BR_LayersUnderCRTPass"
-
-shader39 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader40 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input40 = true
-filter_linear40 = true
-scale_type40 = absolute
-# scale_x40 = 480
-# scale_y40 = 270
-# scale_x40 = 960
-# scale_y40 = 540
-scale_x40 = 800
-scale_y40 = 600
-float_framebuffer40 = true
-alias40 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader41 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input41 = true
-filter_linear41 = true
-float_framebuffer41 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader42 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear42 = true
-float_framebuffer42 = true
-alias42 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader43 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input43 = true
-filter_linear43 = true
-scale_type43 = absolute
-scale_x43 = 128
-scale_y43 = 128
-float_framebuffer43 = true
-alias43 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader44 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-scale_x44 = 12
-scale_y44 = 12
-float_framebuffer44 = true
-alias44 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader45 = ../../../shaders/base/reflection.slang
-scale_type45 = viewport
-alias45 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader46 = ../../../shaders/base/combine-passes-hdr.slang
-alias46 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp
deleted file mode 100644
index 824ceb4c1f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp
+++ /dev/null
@@ -1,396 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-float_framebuffer29 = true
-alias29 = "PrePass"
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-float_framebuffer30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader32 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear32 = "false"
-scale_type32 = "source"
-scale32 = "1.0"
-wrap_mode32 = "clamp_to_border"
-mipmap_input32 = "false"
-alias32 = "SourceSDR"
-float_framebuffer32 = "true"
-
-shader33 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear33 = "false"
-scale_type33 = "source"
-scale33 = "1.0"
-wrap_mode33 = "clamp_to_border"
-mipmap_input33 = "false"
-alias33 = "SourceHDR"
-float_framebuffer33 = "true"
-
-shader34 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear34 = "false"
-wrap_mode34 = "clamp_to_border"
-mipmap_input34 = "false"
-scale_type34 = "viewport"
-float_framebuffer34 = "true"
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes-hdr.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp
deleted file mode 100644
index 1197820512..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp
+++ /dev/null
@@ -1,483 +0,0 @@
-shaders = 51
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-# GTU TV Processing
-shader15 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type15 = source
-scale15 = 1.0
-float_framebuffer15 = true
-
-shader16 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x16 = source
-scale_x16 = 1.0
-scale_type_y16 = source
-scale_y16 = 1.0
-filter_linear16 = false
-float_framebuffer16 = true
-
-shader17 = "../../../../../reshade/shaders/bloom/BloomPass0.slang"
-filter_linear17 = "true"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = "SamplerBloom1"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "4.000000"
-scale_type_y17 = "source"
-scale_y17 = "4.000000"
-float_framebuffer17 = "true"
-
-shader18 = "../../../../../reshade/shaders/bloom/BloomPass1.slang"
-filter_linear18 = "true"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = "SamplerBloom2"
-srgb_framebuffer18 = "false"
-float_framebuffer18 = "true"
-
-shader19 = "../../../../../reshade/shaders/bloom/BloomPass2.slang"
-filter_linear19 = "true"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = "SamplerBloom3"
-float_framebuffer19 = "true"
-
-shader20 = "../../../../../reshade/shaders/bloom/BloomPass3.slang"
-filter_linear20 = "true"
-wrap_mode20 = "clamp_to_border"
-mipmap_input20 = "false"
-alias20 = "SamplerBloom4"
-float_framebuffer20 = "true"
-
-shader21 = "../../../../../reshade/shaders/bloom/BloomPass4.slang"
-filter_linear21 = "true"
-wrap_mode21 = "clamp_to_border"
-mipmap_input21 = "false"
-alias21 = "SamplerBloom5"
-float_framebuffer21 = "true"
-
-shader22 = "../../../../../reshade/shaders/bloom/LensFlarePass0.slang"
-filter_linear22 = "true"
-wrap_mode22 = "clamp_to_border"
-mipmap_input22 = "false"
-alias22 = "LensFlare1"
-float_framebuffer22 = "true"
-
-shader23 = "../../../../../reshade/shaders/bloom/LensFlarePass1.slang"
-filter_linear23 = "true"
-wrap_mode23 = "clamp_to_border"
-mipmap_input23 = "false"
-alias23 = "LensFlare2"
-float_framebuffer23 = "true"
-
-shader24 = "../../../../../reshade/shaders/bloom/LensFlarePass2.slang"
-filter_linear24 = "true"
-wrap_mode24 = "clamp_to_border"
-mipmap_input24 = "false"
-alias24 = "LensFlare3"
-float_framebuffer24 = "true"
-
-shader25 = "../../../../../reshade/shaders/bloom/LightingCombine.slang"
-filter_linear25 = "true"
-wrap_mode25 = "clamp_to_border"
-mipmap_input25 = "false"
-alias25 = ""
-scale_type_x25 = "source"
-scale_x25 = "0.250000"
-scale_type_y25 = "source"
-scale_y25 = "0.250000"
-float_framebuffer25 = "true"
-
-shader26 = ../../../shaders/base/intro.slang
-filter_linear26 = false
-float_framebuffer26 = true
-scale_type26 = source
-scale26 = 1.0
-alias26 = "IntroPass"
-
-shader27 = ../../../shaders/base/stock.slang
-alias27 = "PreCRTPass"
-
-shader28 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear28 = true
-scale_type28 = source
-scale28 = 1.0
-alias28 = "AfterglowPass"
-
-shader29 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear29 = true
-scale_type29 = source
-mipmap_input29 = true
-scale29 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader30 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear30 = false
-scale_type30 = source
-scale30 = 1.0
-alias30 = "ColorCorrectPass"
-
-shader31 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-
-shader32 = ../../../shaders/base/stock.slang
-filter_linear32 = true
-scale_type32 = source
-scale_x32 = 1.0
-scale_y32 = 1.0
-alias32 = "PrePass"
-mipmap_input32 = true
-
-shader33 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-mipmap_input33 = true
-alias33 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader34 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear34 = true
-scale_type34 = source
-scale34 = 1.0
-float_framebuffer34 = true
-alias34 = "LinearizePass"
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 800.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 800.0
-scale_type_y36 = absolute
-scale_y36 = 600.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 800.0
-scale_type_y37 = absolute
-scale_y37 = 600.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = source
-scale_x38 = 1.0
-scale_type_y38 = source
-scale_y38 = 1.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader42 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear42 = true
-scale_type42 = viewport
-float_framebuffer42 = true
-alias42 = "BR_LayersUnderCRTPass"
-
-shader43 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear43 = true
-scale_type43 = viewport
-float_framebuffer43 = true
-alias43 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader44 = ../../../shaders/base/linearize-crt.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-# scale_x44 = 480
-# scale_y44 = 270
-# scale_x44 = 960
-# scale_y44 = 540
-scale_x44 = 800
-scale_y44 = 600
-float_framebuffer44 = true
-alias44 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader45 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input45 = true
-filter_linear45 = true
-float_framebuffer45 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader46 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear46 = true
-float_framebuffer46 = true
-alias46 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader47 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input47 = true
-filter_linear47 = true
-scale_type47 = absolute
-scale_x47 = 128
-scale_y47 = 128
-float_framebuffer47 = true
-alias47 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader48 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input48 = true
-filter_linear48 = true
-scale_type48 = absolute
-scale_x48 = 12
-scale_y48 = 12
-float_framebuffer48 = true
-alias48 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader49 = ../../../shaders/base/reflection.slang
-scale_type49 = viewport
-alias49 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader50 = ../../../shaders/base/combine-passes.slang
-alias50 = "CombinePass"
-
-# Textures All-Reshade-Fx
-# Define textures to be used by the different passes
-textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-Dirt = ../../../../../reshade/shaders/bloom/LensDB.png
-Dirt_wrap_mode = "clamp_to_border"
-Dirt_mipmap = "false"
-
-Sprite = ../../../../../reshade/shaders/bloom/LensSprite.png
-Sprite_wrap_mode = "clamp_to_border"
-Sprite_mipmap = "false"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Reshade-FX Parameters
-SGPT_BLEND_OPTION = 1
-
-bLensdirtEnable_toggle = "1.000000"
-bAnamFlareEnable_toggle = "1.000000"
-bChapFlareEnable_toggle = "1.000000"
-bGodrayEnable_toggle = "1.000000"
-iBloomMixmode = "1.000000"
-fBloomAmount = "1.500000"
-fBloomSaturation = "1.100000"
-fBloomTint_r = "1.000000"
-fBloomTint_g = "0.500000"
-fBloomTint_b = "0.800000"
-iLensdirtMixmode = "1.000000"
-fAnamFlareWideness = "1.200000"
-fAnamFlareAmount = "2.500000"
-fChapFlareIntensity = "10.000000"
-fGodrayDecay = "0.999900"
-fGodrayWeight = "0.400000"
-fGodrayThreshold = "0.850000"
-iGodraySamples = "48.000000"
-fFlareLuminance = "0.875000"
-fFlareBlur = "10000.000000"
-fFlareIntensity = "1.570000"
-fFlareTint_r = "1.000000"
-fFlareTint_g = "1.000000"
-glow = "0.000000"
-gamma_c = "1.100000"
-brightboost1 = "1.300000"
-scanline2 = "15.000000"
-beam_min = "1.999999"
-shadowMask = "10.000000"
-deconrr = "-1.000000"
-deconrb = "1.000000"
-deconrry = "-1.000000"
-deconrby = "1.000000"
-post_br = "1.100000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index da9f81bdc6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,480 +0,0 @@
-shaders = 51
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader42 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear42 = true
-scale_type42 = viewport
-float_framebuffer42 = true
-alias42 = "BR_LayersUnderCRTPass"
-
-shader43 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear43 = true
-scale_type43 = viewport
-float_framebuffer43 = true
-alias43 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader44 = ../../../shaders/base/linearize-crt.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-# scale_x44 = 480
-# scale_y44 = 270
-# scale_x44 = 960
-# scale_y44 = 540
-scale_x44 = 800
-scale_y44 = 600
-float_framebuffer44 = true
-alias44 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader45 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input45 = true
-filter_linear45 = true
-float_framebuffer45 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader46 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear46 = true
-float_framebuffer46 = true
-alias46 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader47 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input47 = true
-filter_linear47 = true
-scale_type47 = absolute
-scale_x47 = 128
-scale_y47 = 128
-float_framebuffer47 = true
-alias47 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader48 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input48 = true
-filter_linear48 = true
-scale_type48 = absolute
-scale_x48 = 12
-scale_y48 = 12
-float_framebuffer48 = true
-alias48 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader49 = ../../../shaders/base/reflection.slang
-scale_type49 = viewport
-alias49 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader50 = ../../../shaders/base/combine-passes.slang
-alias50 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 8d50ec2584..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,453 +0,0 @@
-shaders = 48
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = GlowPass
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = BloomPass
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader39 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersUnderCRTPass"
-
-shader40 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader41 = ../../../shaders/base/linearize-crt.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-# scale_x41 = 480
-# scale_y41 = 270
-# scale_x41 = 960
-# scale_y41 = 540
-scale_x41 = 800
-scale_y41 = 600
-float_framebuffer41 = true
-alias41 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader42 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input42 = true
-filter_linear42 = true
-float_framebuffer42 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear43 = true
-float_framebuffer43 = true
-alias43 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader44 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-scale_x44 = 128
-scale_y44 = 128
-float_framebuffer44 = true
-alias44 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 12
-scale_y45 = 12
-float_framebuffer45 = true
-alias45 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader46 = ../../../shaders/base/reflection.slang
-scale_type46 = viewport
-alias46 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader47 = ../../../shaders/base/combine-passes.slang
-alias47 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__EASYMODE.slangp
deleted file mode 100644
index 21ab3c757d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__EASYMODE.slangp
+++ /dev/null
@@ -1,339 +0,0 @@
-shaders = 40
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang
-filter_linear26 = false
-srgb_framebuffer26 = true
-
-shader27 = ../../../shaders/easymode/hsm-crt-easymode-blur_vert.slang
-filter_linear27 = false
-srgb_framebuffer27 = true
-
-shader28 = ../../../shaders/easymode/hsm-crt-easymode-threshold.slang
-filter_linear28 = false
-srgb_framebuffer28 = true
-
-# Easymode's Shader!
-shader29 = ../../../shaders/easymode/hsm-crt-easymode-halation.slang
-filter_linear29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "CRTPass"
-
-g_gamma_out = 2.45
-
-shader30 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader31 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "BR_LayersUnderCRTPass"
-
-shader32 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader33 = ../../../shaders/base/linearize-crt.slang
-mipmap_input33 = true
-filter_linear33 = true
-scale_type33 = absolute
-# scale_x33 = 480
-# scale_y33 = 270
-# scale_x33 = 960
-# scale_y33 = 540
-scale_x33 = 800
-scale_y33 = 600
-float_framebuffer33 = true
-alias33 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader34 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input34 = true
-filter_linear34 = true
-float_framebuffer34 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader35 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear35 = true
-float_framebuffer35 = true
-alias35 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader36 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input36 = true
-filter_linear36 = true
-scale_type36 = absolute
-scale_x36 = 128
-scale_y36 = 128
-float_framebuffer36 = true
-alias36 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader37 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input37 = true
-filter_linear37 = true
-scale_type37 = absolute
-scale_x37 = 12
-scale_y37 = 12
-float_framebuffer37 = true
-alias37 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader38 = ../../../shaders/base/reflection.slang
-scale_type38 = viewport
-alias38 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader39 = ../../../shaders/base/combine-passes.slang
-alias39 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Easymode Parameters
-gamma_out = 2.2
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 03095aed2f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,349 +0,0 @@
-shaders = 40
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/base/delinearize.slang
-scale_type28 = source
-float_framebuffer28 = "true"
-
-shader29 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type29 = viewport
-scale_x29 = 1.0
-scale_y29 = 1.0
-filter_linear29 = true
-float_framebuffer29 = "true"
-alias29 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader30 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader31 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "BR_LayersUnderCRTPass"
-
-shader32 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader33 = ../../../shaders/base/linearize-crt.slang
-mipmap_input33 = true
-filter_linear33 = true
-scale_type33 = absolute
-# scale_x33 = 480
-# scale_y33 = 270
-# scale_x33 = 960
-# scale_y33 = 540
-scale_x33 = 800
-scale_y33 = 600
-float_framebuffer33 = true
-alias33 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader34 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input34 = true
-filter_linear34 = true
-float_framebuffer34 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader35 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear35 = true
-float_framebuffer35 = true
-alias35 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader36 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input36 = true
-filter_linear36 = true
-scale_type36 = absolute
-scale_x36 = 128
-scale_y36 = 128
-float_framebuffer36 = true
-alias36 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader37 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input37 = true
-filter_linear37 = true
-scale_type37 = absolute
-scale_x37 = 12
-scale_y37 = 12
-float_framebuffer37 = true
-alias37 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader38 = ../../../shaders/base/reflection.slang
-scale_type38 = viewport
-alias38 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader39 = ../../../shaders/base/combine-passes.slang
-alias39 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-MINI.slangp
deleted file mode 100644
index 7bcaaf5917..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-MINI.slangp
+++ /dev/null
@@ -1,331 +0,0 @@
-shaders = 38
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-scale_type26 = source
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type27 = viewport
-scale_x27 = 1.0
-scale_y27 = 1.0
-filter_linear27 = true
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader28 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader29 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "BR_LayersUnderCRTPass"
-
-shader30 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader31 = ../../../shaders/base/linearize-crt.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-# scale_x31 = 480
-# scale_y31 = 270
-# scale_x31 = 960
-# scale_y31 = 540
-scale_x31 = 800
-scale_y31 = 600
-float_framebuffer31 = true
-alias31 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input32 = true
-filter_linear32 = true
-float_framebuffer32 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear33 = true
-float_framebuffer33 = true
-alias33 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 128
-scale_y34 = 128
-float_framebuffer34 = true
-alias34 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 12
-scale_y35 = 12
-float_framebuffer35 = true
-alias35 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader36 = ../../../shaders/base/reflection.slang
-scale_type36 = viewport
-alias36 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader37 = ../../../shaders/base/combine-passes.slang
-alias37 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-NTSC.slangp
deleted file mode 100644
index 90799f58be..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV-NTSC.slangp
+++ /dev/null
@@ -1,391 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = GlowPass
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = BloomPass
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV.slangp
deleted file mode 100644
index f7a627910b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__GDV.slangp
+++ /dev/null
@@ -1,364 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__LCD-GRID.slangp
deleted file mode 100644
index 31a6a88ee3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__LCD-GRID.slangp
+++ /dev/null
@@ -1,328 +0,0 @@
-shaders = 38
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear27 = "false"
-scale_type27 = "viewport"
-scale27 = "1.0"
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-shader28 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader29 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "BR_LayersUnderCRTPass"
-
-shader30 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader31 = ../../../shaders/base/linearize-crt.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-# scale_x31 = 480
-# scale_y31 = 270
-# scale_x31 = 960
-# scale_y31 = 540
-scale_x31 = 800
-scale_y31 = 600
-float_framebuffer31 = true
-alias31 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input32 = true
-filter_linear32 = true
-float_framebuffer32 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear33 = true
-float_framebuffer33 = true
-alias33 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 128
-scale_y34 = 128
-float_framebuffer34 = true
-alias34 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 12
-scale_y35 = 12
-float_framebuffer35 = true
-alias35 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader36 = ../../../shaders/base/reflection.slang
-scale_type36 = viewport
-alias36 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader37 = ../../../shaders/base/combine-passes.slang
-alias37 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp
deleted file mode 100644
index d4f5688706..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,366 +0,0 @@
-shaders = 41
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-float_framebuffer25 = true
-alias25 = "PrePass"
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-float_framebuffer26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader28 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear28 = "false"
-scale_type28 = "source"
-scale28 = "1.0"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-alias28 = "SourceSDR"
-float_framebuffer28 = "true"
-
-shader29 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear29 = "false"
-scale_type29 = "source"
-scale29 = "1.0"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = "SourceHDR"
-float_framebuffer29 = "true"
-
-shader30 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear30 = "false"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-scale_type30 = "viewport"
-float_framebuffer30 = "true"
-alias30 = "CRTPass"
-
-shader31 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader32 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "BR_LayersUnderCRTPass"
-
-shader33 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader34 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-# scale_x34 = 480
-# scale_y34 = 270
-# scale_x34 = 960
-# scale_y34 = 540
-scale_x34 = 800
-scale_y34 = 600
-float_framebuffer34 = true
-alias34 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader35 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input35 = true
-filter_linear35 = true
-float_framebuffer35 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear36 = true
-float_framebuffer36 = true
-alias36 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader37 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input37 = true
-filter_linear37 = true
-scale_type37 = absolute
-scale_x37 = 128
-scale_y37 = 128
-float_framebuffer37 = true
-alias37 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 12
-scale_y38 = 12
-float_framebuffer38 = true
-alias38 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader39 = ../../../shaders/base/reflection.slang
-scale_type39 = viewport
-alias39 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader40 = ../../../shaders/base/combine-passes-hdr.slang
-alias40 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__MEGATRON.slangp
deleted file mode 100644
index 9922c32ceb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV__MEGATRON.slangp
+++ /dev/null
@@ -1,348 +0,0 @@
-shaders = 39
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-float_framebuffer23 = true
-alias23 = "PrePass"
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-float_framebuffer24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader26 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear26 = "false"
-scale_type26 = "source"
-scale26 = "1.0"
-wrap_mode26 = "clamp_to_border"
-mipmap_input26 = "false"
-alias26 = "SourceSDR"
-float_framebuffer26 = "true"
-
-shader27 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear27 = "false"
-scale_type27 = "source"
-scale27 = "1.0"
-wrap_mode27 = "clamp_to_border"
-mipmap_input27 = "false"
-alias27 = "SourceHDR"
-float_framebuffer27 = "true"
-
-shader28 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear28 = "false"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-scale_type28 = "viewport"
-float_framebuffer28 = "true"
-alias28 = "CRTPass"
-
-shader29 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader30 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "BR_LayersUnderCRTPass"
-
-shader31 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader32 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-# scale_x32 = 480
-# scale_y32 = 270
-# scale_x32 = 960
-# scale_y32 = 540
-scale_x32 = 800
-scale_y32 = 600
-float_framebuffer32 = true
-alias32 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input33 = true
-filter_linear33 = true
-float_framebuffer33 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader34 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear34 = true
-float_framebuffer34 = true
-alias34 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 128
-scale_y35 = 128
-float_framebuffer35 = true
-alias35 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader36 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input36 = true
-filter_linear36 = true
-scale_type36 = absolute
-scale_x36 = 12
-scale_y36 = 12
-float_framebuffer36 = true
-alias36 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader37 = ../../../shaders/base/reflection.slang
-scale_type37 = viewport
-alias37 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader38 = ../../../shaders/base/combine-passes-hdr.slang
-alias38 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp
deleted file mode 100644
index f9efbd57c0..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp
+++ /dev/null
@@ -1,502 +0,0 @@
-shaders = 48
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-# GTU TV Processing
-shader15 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type15 = source
-scale15 = 1.0
-float_framebuffer15 = true
-
-shader16 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x16 = source
-scale_x16 = 1.0
-scale_type_y16 = source
-scale_y16 = 1.0
-filter_linear16 = false
-float_framebuffer16 = true
-
-shader17 = "../../../../../reshade/shaders/bloom/BloomPass0.slang"
-filter_linear17 = "true"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = "SamplerBloom1"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "4.000000"
-scale_type_y17 = "source"
-scale_y17 = "4.000000"
-float_framebuffer17 = "true"
-
-shader18 = "../../../../../reshade/shaders/bloom/BloomPass1.slang"
-filter_linear18 = "true"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = "SamplerBloom2"
-srgb_framebuffer18 = "false"
-float_framebuffer18 = "true"
-
-shader19 = "../../../../../reshade/shaders/bloom/BloomPass2.slang"
-filter_linear19 = "true"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = "SamplerBloom3"
-float_framebuffer19 = "true"
-
-shader20 = "../../../../../reshade/shaders/bloom/BloomPass3.slang"
-filter_linear20 = "true"
-wrap_mode20 = "clamp_to_border"
-mipmap_input20 = "false"
-alias20 = "SamplerBloom4"
-float_framebuffer20 = "true"
-
-shader21 = "../../../../../reshade/shaders/bloom/BloomPass4.slang"
-filter_linear21 = "true"
-wrap_mode21 = "clamp_to_border"
-mipmap_input21 = "false"
-alias21 = "SamplerBloom5"
-float_framebuffer21 = "true"
-
-shader22 = "../../../../../reshade/shaders/bloom/LensFlarePass0.slang"
-filter_linear22 = "true"
-wrap_mode22 = "clamp_to_border"
-mipmap_input22 = "false"
-alias22 = "LensFlare1"
-float_framebuffer22 = "true"
-
-shader23 = "../../../../../reshade/shaders/bloom/LensFlarePass1.slang"
-filter_linear23 = "true"
-wrap_mode23 = "clamp_to_border"
-mipmap_input23 = "false"
-alias23 = "LensFlare2"
-float_framebuffer23 = "true"
-
-shader24 = "../../../../../reshade/shaders/bloom/LensFlarePass2.slang"
-filter_linear24 = "true"
-wrap_mode24 = "clamp_to_border"
-mipmap_input24 = "false"
-alias24 = "LensFlare3"
-float_framebuffer24 = "true"
-
-shader25 = "../../../../../reshade/shaders/bloom/LightingCombine.slang"
-filter_linear25 = "true"
-wrap_mode25 = "clamp_to_border"
-mipmap_input25 = "false"
-alias25 = ""
-scale_type_x25 = "source"
-scale_x25 = "0.250000"
-scale_type_y25 = "source"
-scale_y25 = "0.250000"
-float_framebuffer25 = "true"
-
-shader26 = ../../../shaders/base/intro.slang
-filter_linear26 = false
-float_framebuffer26 = true
-scale_type26 = source
-scale26 = 1.0
-alias26 = "IntroPass"
-
-shader27 = ../../../shaders/base/stock.slang
-alias27 = "PreCRTPass"
-
-shader28 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear28 = true
-scale_type28 = source
-scale28 = 1.0
-alias28 = "AfterglowPass"
-
-shader29 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear29 = true
-scale_type29 = source
-mipmap_input29 = true
-scale29 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader30 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear30 = false
-scale_type30 = source
-scale30 = 1.0
-alias30 = "ColorCorrectPass"
-
-shader31 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-
-shader32 = ../../../shaders/base/stock.slang
-filter_linear32 = true
-scale_type32 = source
-scale_x32 = 1.0
-scale_y32 = 1.0
-alias32 = "PrePass"
-mipmap_input32 = true
-
-shader33 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-mipmap_input33 = true
-alias33 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader34 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear34 = true
-scale_type34 = source
-scale34 = 1.0
-float_framebuffer34 = true
-alias34 = "LinearizePass"
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 800.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 800.0
-scale_type_y36 = absolute
-scale_y36 = 600.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 800.0
-scale_type_y37 = absolute
-scale_y37 = 600.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = source
-scale_x38 = 1.0
-scale_type_y38 = source
-scale_y38 = 1.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../shaders/base/linearize-crt.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-# scale_x42 = 480
-# scale_y42 = 270
-# scale_x42 = 960
-# scale_y42 = 540
-scale_x42 = 800
-scale_y42 = 600
-float_framebuffer42 = true
-alias42 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input43 = true
-filter_linear43 = true
-float_framebuffer43 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader44 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear44 = true
-float_framebuffer44 = true
-alias44 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 128
-scale_y45 = 128
-float_framebuffer45 = true
-alias45 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader46 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input46 = true
-filter_linear46 = true
-scale_type46 = absolute
-scale_x46 = 12
-scale_y46 = 12
-float_framebuffer46 = true
-alias46 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader47 = ../../../shaders/base/reflection-glass.slang
-scale_type47 = viewport
-srgb_framebuffer47 = true
-alias47 = "ReflectionPass"
-
-# Textures Glass-Reshade
-# Define textures to be used by the different passes
-textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-Dirt = ../../../../../reshade/shaders/bloom/LensDB.png
-Dirt_wrap_mode = "clamp_to_border"
-Dirt_mipmap = "false"
-
-Sprite = ../../../../../reshade/shaders/bloom/LensSprite.png
-Sprite_wrap_mode = "clamp_to_border"
-Sprite_mipmap = "false"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Reshade-FX Parameters
-SGPT_BLEND_OPTION = 1
-
-bLensdirtEnable_toggle = "1.000000"
-bAnamFlareEnable_toggle = "1.000000"
-bChapFlareEnable_toggle = "1.000000"
-bGodrayEnable_toggle = "1.000000"
-iBloomMixmode = "1.000000"
-fBloomAmount = "1.500000"
-fBloomSaturation = "1.100000"
-fBloomTint_r = "1.000000"
-fBloomTint_g = "0.500000"
-fBloomTint_b = "0.800000"
-iLensdirtMixmode = "1.000000"
-fAnamFlareWideness = "1.200000"
-fAnamFlareAmount = "2.500000"
-fChapFlareIntensity = "10.000000"
-fGodrayDecay = "0.999900"
-fGodrayWeight = "0.400000"
-fGodrayThreshold = "0.850000"
-iGodraySamples = "48.000000"
-fFlareLuminance = "0.875000"
-fFlareBlur = "10000.000000"
-fFlareIntensity = "1.570000"
-fFlareTint_r = "1.000000"
-fFlareTint_g = "1.000000"
-glow = "0.000000"
-gamma_c = "1.100000"
-brightboost1 = "1.300000"
-scanline2 = "15.000000"
-beam_min = "1.999999"
-shadowMask = "10.000000"
-deconrr = "-1.000000"
-deconrb = "1.000000"
-deconrry = "-1.000000"
-deconrby = "1.000000"
-post_br = "1.100000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 80a20ff41a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,499 +0,0 @@
-shaders = 48
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../shaders/base/linearize-crt.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-# scale_x42 = 480
-# scale_y42 = 270
-# scale_x42 = 960
-# scale_y42 = 540
-scale_x42 = 800
-scale_y42 = 600
-float_framebuffer42 = true
-alias42 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input43 = true
-filter_linear43 = true
-float_framebuffer43 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader44 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear44 = true
-float_framebuffer44 = true
-alias44 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 128
-scale_y45 = 128
-float_framebuffer45 = true
-alias45 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader46 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input46 = true
-filter_linear46 = true
-scale_type46 = absolute
-scale_x46 = 12
-scale_y46 = 12
-float_framebuffer46 = true
-alias46 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader47 = ../../../shaders/base/reflection-glass.slang
-scale_type47 = viewport
-srgb_framebuffer47 = true
-alias47 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp
deleted file mode 100644
index ace7d4e29b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,472 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = GlowPass
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = BloomPass
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../shaders/base/linearize-crt.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-# scale_x39 = 480
-# scale_y39 = 270
-# scale_x39 = 960
-# scale_y39 = 540
-scale_x39 = 800
-scale_y39 = 600
-float_framebuffer39 = true
-alias39 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input40 = true
-filter_linear40 = true
-float_framebuffer40 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader41 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear41 = true
-float_framebuffer41 = true
-alias41 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 128
-scale_y42 = 128
-float_framebuffer42 = true
-alias42 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader43 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input43 = true
-filter_linear43 = true
-scale_type43 = absolute
-scale_x43 = 12
-scale_y43 = 12
-float_framebuffer43 = true
-alias43 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader44 = ../../../shaders/base/reflection-glass.slang
-scale_type44 = viewport
-srgb_framebuffer44 = true
-alias44 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp
deleted file mode 100644
index 5a00e7604b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp
+++ /dev/null
@@ -1,358 +0,0 @@
-shaders = 37
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang
-filter_linear26 = false
-srgb_framebuffer26 = true
-
-shader27 = ../../../shaders/easymode/hsm-crt-easymode-blur_vert.slang
-filter_linear27 = false
-srgb_framebuffer27 = true
-
-shader28 = ../../../shaders/easymode/hsm-crt-easymode-threshold.slang
-filter_linear28 = false
-srgb_framebuffer28 = true
-
-# Easymode's Shader!
-shader29 = ../../../shaders/easymode/hsm-crt-easymode-halation.slang
-filter_linear29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "CRTPass"
-
-g_gamma_out = 2.45
-
-shader30 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader31 = ../../../shaders/base/linearize-crt.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-# scale_x31 = 480
-# scale_y31 = 270
-# scale_x31 = 960
-# scale_y31 = 540
-scale_x31 = 800
-scale_y31 = 600
-float_framebuffer31 = true
-alias31 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input32 = true
-filter_linear32 = true
-float_framebuffer32 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear33 = true
-float_framebuffer33 = true
-alias33 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 128
-scale_y34 = 128
-float_framebuffer34 = true
-alias34 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 12
-scale_y35 = 12
-float_framebuffer35 = true
-alias35 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader36 = ../../../shaders/base/reflection-glass.slang
-scale_type36 = viewport
-srgb_framebuffer36 = true
-alias36 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Easymode Parameters
-gamma_out = 2.2
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 78d691bf2b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,368 +0,0 @@
-shaders = 37
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/base/delinearize.slang
-scale_type28 = source
-float_framebuffer28 = "true"
-
-shader29 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type29 = viewport
-scale_x29 = 1.0
-scale_y29 = 1.0
-filter_linear29 = true
-float_framebuffer29 = "true"
-alias29 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader30 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader31 = ../../../shaders/base/linearize-crt.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-# scale_x31 = 480
-# scale_y31 = 270
-# scale_x31 = 960
-# scale_y31 = 540
-scale_x31 = 800
-scale_y31 = 600
-float_framebuffer31 = true
-alias31 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input32 = true
-filter_linear32 = true
-float_framebuffer32 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear33 = true
-float_framebuffer33 = true
-alias33 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 128
-scale_y34 = 128
-float_framebuffer34 = true
-alias34 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 12
-scale_y35 = 12
-float_framebuffer35 = true
-alias35 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader36 = ../../../shaders/base/reflection-glass.slang
-scale_type36 = viewport
-srgb_framebuffer36 = true
-alias36 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp
deleted file mode 100644
index 3730dad186..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp
+++ /dev/null
@@ -1,350 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-scale_type26 = source
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type27 = viewport
-scale_x27 = 1.0
-scale_y27 = 1.0
-filter_linear27 = true
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader28 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader29 = ../../../shaders/base/linearize-crt.slang
-mipmap_input29 = true
-filter_linear29 = true
-scale_type29 = absolute
-# scale_x29 = 480
-# scale_y29 = 270
-# scale_x29 = 960
-# scale_y29 = 540
-scale_x29 = 800
-scale_y29 = 600
-float_framebuffer29 = true
-alias29 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader30 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input30 = true
-filter_linear30 = true
-float_framebuffer30 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader31 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear31 = true
-float_framebuffer31 = true
-alias31 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader32 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-scale_x32 = 128
-scale_y32 = 128
-float_framebuffer32 = true
-alias32 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader33 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input33 = true
-filter_linear33 = true
-scale_type33 = absolute
-scale_x33 = 12
-scale_y33 = 12
-float_framebuffer33 = true
-alias33 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader34 = ../../../shaders/base/reflection-glass.slang
-scale_type34 = viewport
-srgb_framebuffer34 = true
-alias34 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp
deleted file mode 100644
index 73b8d75dd9..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp
+++ /dev/null
@@ -1,410 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = GlowPass
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = BloomPass
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader36 = ../../../shaders/base/linearize-crt.slang
-mipmap_input36 = true
-filter_linear36 = true
-scale_type36 = absolute
-# scale_x36 = 480
-# scale_y36 = 270
-# scale_x36 = 960
-# scale_y36 = 540
-scale_x36 = 800
-scale_y36 = 600
-float_framebuffer36 = true
-alias36 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input37 = true
-filter_linear37 = true
-float_framebuffer37 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader38 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear38 = true
-float_framebuffer38 = true
-alias38 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 128
-scale_y39 = 128
-float_framebuffer39 = true
-alias39 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader40 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input40 = true
-filter_linear40 = true
-scale_type40 = absolute
-scale_x40 = 12
-scale_y40 = 12
-float_framebuffer40 = true
-alias40 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader41 = ../../../shaders/base/reflection-glass.slang
-scale_type41 = viewport
-srgb_framebuffer41 = true
-alias41 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV.slangp
deleted file mode 100644
index 01fc8197df..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__GDV.slangp
+++ /dev/null
@@ -1,383 +0,0 @@
-shaders = 39
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader33 = ../../../shaders/base/linearize-crt.slang
-mipmap_input33 = true
-filter_linear33 = true
-scale_type33 = absolute
-# scale_x33 = 480
-# scale_y33 = 270
-# scale_x33 = 960
-# scale_y33 = 540
-scale_x33 = 800
-scale_y33 = 600
-float_framebuffer33 = true
-alias33 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader34 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input34 = true
-filter_linear34 = true
-float_framebuffer34 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader35 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear35 = true
-float_framebuffer35 = true
-alias35 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader36 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input36 = true
-filter_linear36 = true
-scale_type36 = absolute
-scale_x36 = 128
-scale_y36 = 128
-float_framebuffer36 = true
-alias36 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader37 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input37 = true
-filter_linear37 = true
-scale_type37 = absolute
-scale_x37 = 12
-scale_y37 = 12
-float_framebuffer37 = true
-alias37 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader38 = ../../../shaders/base/reflection-glass.slang
-scale_type38 = viewport
-srgb_framebuffer38 = true
-alias38 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp
deleted file mode 100644
index 163a5bc68b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp
+++ /dev/null
@@ -1,344 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear27 = "false"
-scale_type27 = "viewport"
-scale27 = "1.0"
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-shader28 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader29 = ../../../shaders/base/linearize-crt.slang
-mipmap_input29 = true
-filter_linear29 = true
-scale_type29 = absolute
-# scale_x29 = 480
-# scale_y29 = 270
-# scale_x29 = 960
-# scale_y29 = 540
-scale_x29 = 800
-scale_y29 = 600
-float_framebuffer29 = true
-alias29 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader30 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input30 = true
-filter_linear30 = true
-float_framebuffer30 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader31 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear31 = true
-float_framebuffer31 = true
-alias31 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader32 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-scale_x32 = 128
-scale_y32 = 128
-float_framebuffer32 = true
-alias32 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader33 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input33 = true
-filter_linear33 = true
-scale_type33 = absolute
-scale_x33 = 12
-scale_y33 = 12
-float_framebuffer33 = true
-alias33 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader34 = ../../../shaders/base/reflection-glass.slang
-scale_type34 = viewport
-srgb_framebuffer34 = true
-alias34 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp
deleted file mode 100644
index 7de9ce2940..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,388 +0,0 @@
-shaders = 39
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-float_framebuffer25 = true
-alias25 = "PrePass"
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-float_framebuffer26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader28 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear28 = "false"
-scale_type28 = "source"
-scale28 = "1.0"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-alias28 = "SourceSDR"
-float_framebuffer28 = "true"
-
-shader29 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear29 = "false"
-scale_type29 = "source"
-scale29 = "1.0"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = "SourceHDR"
-float_framebuffer29 = "true"
-
-shader30 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear30 = "false"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-scale_type30 = "viewport"
-float_framebuffer30 = "true"
-alias30 = "CRTPass"
-
-shader31 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader32 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-# scale_x32 = 480
-# scale_y32 = 270
-# scale_x32 = 960
-# scale_y32 = 540
-scale_x32 = 800
-scale_y32 = 600
-float_framebuffer32 = true
-alias32 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input33 = true
-filter_linear33 = true
-float_framebuffer33 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader34 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear34 = true
-float_framebuffer34 = true
-alias34 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 128
-scale_y35 = 128
-float_framebuffer35 = true
-alias35 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader36 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input36 = true
-filter_linear36 = true
-scale_type36 = absolute
-scale_x36 = 12
-scale_y36 = 12
-float_framebuffer36 = true
-alias36 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader37 = ../../../shaders/base/reflection-glass-hdr.slang
-scale_type37 = viewport
-alias37 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader38 = ../../../shaders/base/output-hdr.slang
-alias38 = "OutputPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp
deleted file mode 100644
index 36456717d5..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp
+++ /dev/null
@@ -1,370 +0,0 @@
-shaders = 37
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-float_framebuffer23 = true
-alias23 = "PrePass"
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-float_framebuffer24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader26 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear26 = "false"
-scale_type26 = "source"
-scale26 = "1.0"
-wrap_mode26 = "clamp_to_border"
-mipmap_input26 = "false"
-alias26 = "SourceSDR"
-float_framebuffer26 = "true"
-
-shader27 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear27 = "false"
-scale_type27 = "source"
-scale27 = "1.0"
-wrap_mode27 = "clamp_to_border"
-mipmap_input27 = "false"
-alias27 = "SourceHDR"
-float_framebuffer27 = "true"
-
-shader28 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear28 = "false"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-scale_type28 = "viewport"
-float_framebuffer28 = "true"
-alias28 = "CRTPass"
-
-shader29 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader30 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input30 = true
-filter_linear30 = true
-scale_type30 = absolute
-# scale_x30 = 480
-# scale_y30 = 270
-# scale_x30 = 960
-# scale_y30 = 540
-scale_x30 = 800
-scale_y30 = 600
-float_framebuffer30 = true
-alias30 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader31 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input31 = true
-filter_linear31 = true
-float_framebuffer31 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear32 = true
-float_framebuffer32 = true
-alias32 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader33 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input33 = true
-filter_linear33 = true
-scale_type33 = absolute
-scale_x33 = 128
-scale_y33 = 128
-float_framebuffer33 = true
-alias33 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 12
-scale_y34 = 12
-float_framebuffer34 = true
-alias34 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader35 = ../../../shaders/base/reflection-glass-hdr.slang
-scale_type35 = viewport
-alias35 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader36 = ../../../shaders/base/output-hdr.slang
-alias36 = "OutputPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 0e51eca2e1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,422 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = "GlowPass"
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = "BloomPass" 
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader42 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear42 = true
-scale_type42 = viewport
-float_framebuffer42 = true
-alias42 = "BR_LayersUnderCRTPass"
-
-shader43 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear43 = true
-scale_type43 = viewport
-float_framebuffer43 = true
-alias43 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 67d2109895..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,395 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = "GlowPass"
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = "BloomPass"
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader39 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersUnderCRTPass"
-
-shader40 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp
deleted file mode 100644
index 6511465afc..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp
+++ /dev/null
@@ -1,333 +0,0 @@
-shaders = 39
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = "GlowPass"
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = "BloomPass" 
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader38 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias38 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp
deleted file mode 100644
index dcce1c8e14..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp
+++ /dev/null
@@ -1,306 +0,0 @@
-shaders = 36
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = "GlowPass"
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = "BloomPass"
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader35 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias35 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp
deleted file mode 100644
index 20119f61a6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,308 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-float_framebuffer25 = true
-alias25 = "PrePass"
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-float_framebuffer26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader28 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear28 = "false"
-scale_type28 = "source"
-scale28 = "1.0"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-alias28 = "SourceSDR"
-float_framebuffer28 = "true"
-
-shader29 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear29 = "false"
-scale_type29 = "source"
-scale29 = "1.0"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = "SourceHDR"
-float_framebuffer29 = "true"
-
-shader30 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear30 = "false"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-scale_type30 = "viewport"
-float_framebuffer30 = "true"
-alias30 = "CRTPass"
-
-shader31 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader32 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "BR_LayersUnderCRTPass"
-
-shader33 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader34 = ../../../shaders/base/combine-passes-no-reflect-hdr.slang
-alias34 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp
deleted file mode 100644
index 61b612c6c3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp
+++ /dev/null
@@ -1,290 +0,0 @@
-shaders = 33
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-float_framebuffer23 = true
-alias23 = "PrePass"
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-float_framebuffer24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader26 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear26 = "false"
-scale_type26 = "source"
-scale26 = "1.0"
-wrap_mode26 = "clamp_to_border"
-mipmap_input26 = "false"
-alias26 = "SourceSDR"
-float_framebuffer26 = "true"
-
-shader27 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear27 = "false"
-scale_type27 = "source"
-scale27 = "1.0"
-wrap_mode27 = "clamp_to_border"
-mipmap_input27 = "false"
-alias27 = "SourceHDR"
-float_framebuffer27 = "true"
-
-shader28 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear28 = "false"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-scale_type28 = "viewport"
-float_framebuffer28 = "true"
-alias28 = "CRTPass"
-
-shader29 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader30 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "BR_LayersUnderCRTPass"
-
-shader31 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader32 = ../../../shaders/base/combine-passes-no-reflect-hdr.slang
-alias32 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
deleted file mode 100644
index 8d66191f12..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
+++ /dev/null
@@ -1,292 +0,0 @@
-shaders = 34
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = "GlowPass"
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = "BloomPass"
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-minimum-no-reflect.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader33 = ../../../shaders/base/output-sdr.slang
-alias33 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 45eff00e8d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,408 +0,0 @@
-shaders = 43
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = "GlowPass"
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = "BloomPass" 
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader42 = ../../../shaders/base/output-sdr.slang
-alias42 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp
deleted file mode 100644
index a18918049f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,381 +0,0 @@
-shaders = 40
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-# filter_linear15 = "false"
-# wrap_mode15 = "clamp_to_border"
-# mipmap_input15 = "false"
-# float_framebuffer15 = "false"
-# srgb_framebuffer15 = "true"
-alias15 = XbrSource
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_x18 = "1.000000"
-scale_type_y18 = "source"
-scale_y18 = "1.000000"
-
-shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "true"
-scale_type_x19 = "source"
-scale_x19 = "1.000000"
-scale_type_y19 = "source"
-scale_y19 = "1.000000"
-
-shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear20 = false
-scale_type_x20 = source
-scale_x20 = 1
-scale_type_y20 = source
-scale_y20 = 0.5
-wrap_mode20 = "clamp_to_edge"
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = "GlowPass"
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = "BloomPass"
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader39 = ../../../shaders/base/output-sdr.slang
-alias39 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp
deleted file mode 100644
index f0563401f3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,277 +0,0 @@
-shaders = 32
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/base/delinearize.slang
-scale_type28 = source
-float_framebuffer28 = "true"
-
-shader29 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type29 = viewport
-scale_x29 = 1.0
-scale_y29 = 1.0
-filter_linear29 = true
-float_framebuffer29 = "true"
-alias29 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader30 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader31 = ../../../shaders/base/output-sdr.slang
-alias31 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp
deleted file mode 100644
index 0e9fa6b7c4..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp
+++ /dev/null
@@ -1,259 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-scale_type26 = source
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type27 = viewport
-scale_x27 = 1.0
-scale_y27 = 1.0
-filter_linear27 = true
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader28 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/output-sdr.slang
-alias29 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp
deleted file mode 100644
index 0639cb3899..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 37
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = "GlowPass"
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = "BloomPass" 
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader36 = ../../../shaders/base/output-sdr.slang
-alias36 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp
deleted file mode 100644
index b5d7aed219..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp
+++ /dev/null
@@ -1,292 +0,0 @@
-shaders = 34
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = "GlowPass"
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = "BloomPass"
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader33 = ../../../shaders/base/output-sdr.slang
-alias33 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
deleted file mode 100644
index 38a4e0af94..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,294 +0,0 @@
-shaders = 33
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-float_framebuffer25 = true
-alias25 = "PrePass"
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-float_framebuffer26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader28 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear28 = "false"
-scale_type28 = "source"
-scale28 = "1.0"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-alias28 = "SourceSDR"
-float_framebuffer28 = "true"
-
-shader29 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear29 = "false"
-scale_type29 = "source"
-scale29 = "1.0"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = "SourceHDR"
-float_framebuffer29 = "true"
-
-shader30 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear30 = "false"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-scale_type30 = "viewport"
-float_framebuffer30 = "true"
-alias30 = "CRTPass"
-
-shader31 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input31 = true
-scale_type31 = viewport
-float_framebuffer31 = true
-alias31 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader32 = ../../../shaders/base/output-hdr.slang
-alias32 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp
deleted file mode 100644
index 363a40bb7d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp
+++ /dev/null
@@ -1,276 +0,0 @@
-shaders = 31
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-float_framebuffer23 = true
-alias23 = "PrePass"
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-float_framebuffer24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader26 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear26 = "false"
-scale_type26 = "source"
-scale26 = "1.0"
-wrap_mode26 = "clamp_to_border"
-mipmap_input26 = "false"
-alias26 = "SourceSDR"
-float_framebuffer26 = "true"
-
-shader27 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear27 = "false"
-scale_type27 = "source"
-scale27 = "1.0"
-wrap_mode27 = "clamp_to_border"
-mipmap_input27 = "false"
-alias27 = "SourceHDR"
-float_framebuffer27 = "true"
-
-shader28 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear28 = "false"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "false"
-scale_type28 = "viewport"
-float_framebuffer28 = "true"
-alias28 = "CRTPass"
-
-shader29 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader30 = ../../../shaders/base/output-hdr.slang
-alias30 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index a60968a88c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,494 +0,0 @@
-shaders = 46
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PrePass0"
-
-shader25 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear25 = false
-float_framebuffer25 = true
-scale_type_x25 = source
-scale_type_y25 = source
-scale_x25 = 4.0
-scale_y25 = 1.0
-frame_count_mod25 = 2
-alias25 = NPass1
-
-shader26 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer26 = true
-filter_linear26 = true
-scale_type26 = source
-scale_x26 = 0.5
-scale_y26 = 1.0
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear27 = true
-scale_type27 = source
-scale_x27 = 1.0
-scale_y27 = 1.0
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear32 = true
-scale_type_x32 = viewport
-scale_x32 = 1.0
-scale_type_y32 = source
-scale_y32 = 1.0
-float_framebuffer32 = true
-alias32 = Pass1
-
-shader33 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 640.0
-scale_type_y33 = source
-scale_y33 = 1.0 
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 640.0
-scale_type_y34 = absolute
-scale_y34 = 480.0
-float_framebuffer34 = true
-alias34 = GlowPass
-
-shader35 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = absolute
-scale_y35 = 480.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = BloomPass
-
-shader37 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear38 = true
-scale_type38 = viewport
-scale_x38 = 1.0
-scale_y38 = 1.0
-float_framebuffer38 = true
-alias38 = "CRTPass"
-
-shader39 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader40 = ../../../shaders/base/linearize-crt.slang
-mipmap_input40 = true
-filter_linear40 = true
-scale_type40 = absolute
-# scale_x40 = 480
-# scale_y40 = 270
-# scale_x40 = 960
-# scale_y40 = 540
-scale_x40 = 800
-scale_y40 = 600
-float_framebuffer40 = true
-alias40 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader41 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input41 = true
-filter_linear41 = true
-float_framebuffer41 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader42 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear42 = true
-float_framebuffer42 = true
-alias42 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader43 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input43 = true
-filter_linear43 = true
-scale_type43 = absolute
-scale_x43 = 128
-scale_y43 = 128
-float_framebuffer43 = true
-alias43 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader44 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-scale_x44 = 12
-scale_y44 = 12
-float_framebuffer44 = true
-alias44 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader45 = ../../../shaders/base/reflection-glass.slang
-scale_type45 = viewport
-srgb_framebuffer45 = true
-alias45 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp
deleted file mode 100644
index af5a0cc29d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,453 +0,0 @@
-shaders = 41
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = source
-scale_y28 = 1.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 800.0
-scale_type_y29 = absolute
-scale_y29 = 600.0
-float_framebuffer29 = true
-alias29 = GlowPass
-
-shader30 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 800.0
-scale_type_y30 = absolute
-scale_y30 = 600.0 
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear31 = true
-scale_type_x31 = source
-scale_x31 = 1.0
-scale_type_y31 = source
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = BloomPass
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear32 = true
-scale_type32 = viewport
-scale_x32 = 1.0
-scale_y32 = 1.0
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-alias33 = "CRTPass"
-
-shader34 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection-glass.slang
-scale_type40 = viewport
-srgb_framebuffer40 = true
-alias40 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 073ceb6c67..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,333 +0,0 @@
-shaders = 27
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader21 = ../../../shaders/base/linearize-crt.slang
-mipmap_input21 = true
-filter_linear21 = true
-scale_type21 = absolute
-# scale_x21 = 480
-# scale_y21 = 270
-# scale_x21 = 960
-# scale_y21 = 540
-scale_x21 = 800
-scale_y21 = 600
-float_framebuffer21 = true
-alias21 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader22 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input22 = true
-filter_linear22 = true
-float_framebuffer22 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader23 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear23 = true
-float_framebuffer23 = true
-alias23 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader24 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input24 = true
-filter_linear24 = true
-scale_type24 = absolute
-scale_x24 = 128
-scale_y24 = 128
-float_framebuffer24 = true
-alias24 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader25 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input25 = true
-filter_linear25 = true
-scale_type25 = absolute
-scale_x25 = 12
-scale_y25 = 12
-float_framebuffer25 = true
-alias25 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader26 = ../../../shaders/base/reflection-glass.slang
-scale_type26 = viewport
-srgb_framebuffer26 = true
-alias26 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp
deleted file mode 100644
index 85cce7e3ce..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp
+++ /dev/null
@@ -1,301 +0,0 @@
-shaders = 23
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader17 = ../../../shaders/base/linearize-crt.slang
-mipmap_input17 = true
-filter_linear17 = true
-scale_type17 = absolute
-# scale_x17 = 480
-# scale_y17 = 270
-# scale_x17 = 960
-# scale_y17 = 540
-scale_x17 = 800
-scale_y17 = 600
-float_framebuffer17 = true
-alias17 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader18 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input18 = true
-filter_linear18 = true
-float_framebuffer18 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader19 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear19 = true
-float_framebuffer19 = true
-alias19 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader20 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input20 = true
-filter_linear20 = true
-scale_type20 = absolute
-scale_x20 = 128
-scale_y20 = 128
-float_framebuffer20 = true
-alias20 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader21 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input21 = true
-filter_linear21 = true
-scale_type21 = absolute
-scale_x21 = 12
-scale_y21 = 12
-float_framebuffer21 = true
-alias21 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader22 = ../../../shaders/base/reflection-glass.slang
-scale_type22 = viewport
-srgb_framebuffer22 = true
-alias22 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp
deleted file mode 100644
index 9ad40fe57d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp
+++ /dev/null
@@ -1,375 +0,0 @@
-shaders = 32
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = GlowPass
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = BloomPass
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader26 = ../../../shaders/base/linearize-crt.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-# scale_x26 = 480
-# scale_y26 = 270
-# scale_x26 = 960
-# scale_y26 = 540
-scale_x26 = 800
-scale_y26 = 600
-float_framebuffer26 = true
-alias26 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader27 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input27 = true
-filter_linear27 = true
-float_framebuffer27 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader28 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear28 = true
-float_framebuffer28 = true
-alias28 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader29 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input29 = true
-filter_linear29 = true
-scale_type29 = absolute
-scale_x29 = 128
-scale_y29 = 128
-float_framebuffer29 = true
-alias29 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader30 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input30 = true
-filter_linear30 = true
-scale_type30 = absolute
-scale_x30 = 12
-scale_y30 = 12
-float_framebuffer30 = true
-alias30 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader31 = ../../../shaders/base/reflection-glass.slang
-scale_type31 = viewport
-srgb_framebuffer31 = true
-alias31 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV.slangp
deleted file mode 100644
index b2ae6f275b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__GDV.slangp
+++ /dev/null
@@ -1,334 +0,0 @@
-shaders = 27
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader21 = ../../../shaders/base/linearize-crt.slang
-mipmap_input21 = true
-filter_linear21 = true
-scale_type21 = absolute
-# scale_x21 = 480
-# scale_y21 = 270
-# scale_x21 = 960
-# scale_y21 = 540
-scale_x21 = 800
-scale_y21 = 600
-float_framebuffer21 = true
-alias21 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader22 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input22 = true
-filter_linear22 = true
-float_framebuffer22 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader23 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear23 = true
-float_framebuffer23 = true
-alias23 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader24 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input24 = true
-filter_linear24 = true
-scale_type24 = absolute
-scale_x24 = 128
-scale_y24 = 128
-float_framebuffer24 = true
-alias24 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader25 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input25 = true
-filter_linear25 = true
-scale_type25 = absolute
-scale_x25 = 12
-scale_y25 = 12
-float_framebuffer25 = true
-alias25 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader26 = ../../../shaders/base/reflection-glass.slang
-scale_type26 = viewport
-srgb_framebuffer26 = true
-alias26 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp
deleted file mode 100644
index 17a4db5292..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp
+++ /dev/null
@@ -1,295 +0,0 @@
-shaders = 23
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader17 = ../../../shaders/base/linearize-crt.slang
-mipmap_input17 = true
-filter_linear17 = true
-scale_type17 = absolute
-# scale_x17 = 480
-# scale_y17 = 270
-# scale_x17 = 960
-# scale_y17 = 540
-scale_x17 = 800
-scale_y17 = 600
-float_framebuffer17 = true
-alias17 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader18 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input18 = true
-filter_linear18 = true
-float_framebuffer18 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader19 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear19 = true
-float_framebuffer19 = true
-alias19 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader20 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input20 = true
-filter_linear20 = true
-scale_type20 = absolute
-scale_x20 = 128
-scale_y20 = 128
-float_framebuffer20 = true
-alias20 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader21 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input21 = true
-filter_linear21 = true
-scale_type21 = absolute
-scale_x21 = 12
-scale_y21 = 12
-float_framebuffer21 = true
-alias21 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader22 = ../../../shaders/base/reflection-glass.slang
-scale_type22 = viewport
-srgb_framebuffer22 = true
-alias22 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp
deleted file mode 100644
index ce29e8451b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,353 +0,0 @@
-shaders = 29
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-float_framebuffer15 = true
-alias15 = "PrePass"
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-float_framebuffer16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader18 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear18 = "false"
-scale_type18 = "source"
-scale18 = "1.0"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = "SourceSDR"
-float_framebuffer18 = "true"
-
-shader19 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear19 = "false"
-scale_type19 = "source"
-scale19 = "1.0"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = "SourceHDR"
-float_framebuffer19 = "true"
-
-shader20 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear20 = "false"
-wrap_mode20 = "clamp_to_border"
-mipmap_input20 = "false"
-scale_type20 = "viewport"
-float_framebuffer20 = "true"
-alias20 = "CRTPass"
-
-shader21 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader22 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-# scale_x22 = 480
-# scale_y22 = 270
-# scale_x22 = 960
-# scale_y22 = 540
-scale_x22 = 800
-scale_y22 = 600
-float_framebuffer22 = true
-alias22 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader23 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input23 = true
-filter_linear23 = true
-float_framebuffer23 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear24 = true
-float_framebuffer24 = true
-alias24 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader25 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input25 = true
-filter_linear25 = true
-scale_type25 = absolute
-scale_x25 = 128
-scale_y25 = 128
-float_framebuffer25 = true
-alias25 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 12
-scale_y26 = 12
-float_framebuffer26 = true
-alias26 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader27 = ../../../shaders/base/reflection-glass-hdr.slang
-scale_type27 = viewport
-alias27 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader28 = ../../../shaders/base/output-hdr.slang
-alias28 = "OutputPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp
deleted file mode 100644
index 22e2c3916c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp
+++ /dev/null
@@ -1,321 +0,0 @@
-shaders = 25
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-float_framebuffer11 = true
-alias11 = "PrePass"
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-float_framebuffer12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader14 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear14 = "false"
-scale_type14 = "source"
-scale14 = "1.0"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-alias14 = "SourceSDR"
-float_framebuffer14 = "true"
-
-shader15 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear15 = "false"
-scale_type15 = "source"
-scale15 = "1.0"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = "SourceHDR"
-float_framebuffer15 = "true"
-
-shader16 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-scale_type16 = "viewport"
-float_framebuffer16 = "true"
-alias16 = "CRTPass"
-
-shader17 = ../../../shaders/base/post-crt-prep-glass.slang
-mipmap_input17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader18 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input18 = true
-filter_linear18 = true
-scale_type18 = absolute
-# scale_x18 = 480
-# scale_y18 = 270
-# scale_x18 = 960
-# scale_y18 = 540
-scale_x18 = 800
-scale_y18 = 600
-float_framebuffer18 = true
-alias18 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader19 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input19 = true
-filter_linear19 = true
-float_framebuffer19 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear20 = true
-float_framebuffer20 = true
-alias20 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader21 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input21 = true
-filter_linear21 = true
-scale_type21 = absolute
-scale_x21 = 128
-scale_y21 = 128
-float_framebuffer21 = true
-alias21 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 12
-scale_y22 = 12
-float_framebuffer22 = true
-alias22 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader23 = ../../../shaders/base/reflection-glass-hdr.slang
-scale_type23 = viewport
-alias23 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader24 = ../../../shaders/base/output-hdr.slang
-alias24 = "OutputPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__PASSTHROUGH.slangp
deleted file mode 100644
index 2ee5978e21..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,261 +0,0 @@
-shaders = 17
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-glass-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-glass.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-minimum-glass.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader11 = ../../../shaders/base/linearize-crt.slang
-mipmap_input11 = true
-filter_linear11 = true
-scale_type11 = absolute
-# scale_x11 = 480
-# scale_y11 = 270
-# scale_x11 = 960
-# scale_y11 = 540
-scale_x11 = 800
-scale_y11 = 600
-float_framebuffer11 = true
-alias11 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader12 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input12 = true
-filter_linear12 = true
-float_framebuffer12 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader13 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear13 = true
-float_framebuffer13 = true
-alias13 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader14 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input14 = true
-filter_linear14 = true
-scale_type14 = absolute
-scale_x14 = 128
-scale_y14 = 128
-float_framebuffer14 = true
-alias14 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader15 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input15 = true
-filter_linear15 = true
-scale_type15 = absolute
-scale_x15 = 12
-scale_y15 = 12
-float_framebuffer15 = true
-alias15 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader16 = ../../../shaders/base/reflection-glass.slang
-scale_type16 = viewport
-srgb_framebuffer16 = true
-alias16 = "ReflectionPass"
-
-# Textures Glass
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/TopLayerImageGradient_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Parameters
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "90.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = -7
-HSM_BG_OPACITY = "1.000000"
-HSM_GLASS_BORDER_ON = "1.000000"
-HSM_BZL_WIDTH = 3000
-HSM_BZL_HEIGHT = 3000
-HSM_BZL_INNER_EDGE_THICKNESS = 350
-HSM_BZL_INNER_EDGE_SHARPNESS = 30
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "100.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "0.000000"
-HSM_FRM_OPACITY = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "35.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "0.900000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "60.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "30.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.500000"
-HSM_REFLECT_FADE_AMOUNT = "20.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "500.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "300.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "500.000000"
-HSM_REFLECT_CORNER_FADE = "0.000000"
-HSM_REFLECT_BLUR_MIN = "30.0000"
-HSM_REFLECT_BLUR_MAX = "60.0000"
-HSM_REFLECT_NOISE_AMOUNT = "100.000000"
-HSM_REFLECT_NOISE_SAMPLES = "4.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "15.0000"
-HSM_BG_BRIGHTNESS = "0.000000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "20.000000"
-HSM_SCREEN_VIGNETTE_POWER = "4.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000"
-
-g_vignette = "0.0"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-NO-TUBE-FX__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-NO-TUBE-FX__PASSTHROUGH.slangp
deleted file mode 100644
index 6071cfd13f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-NO-TUBE-FX__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,287 +0,0 @@
-shaders = 27
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# GTU TV Processing
-shader6 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-
-shader7 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x7 = source
-scale_x7 = 1.0
-scale_type_y7 = source
-scale_y7 = 1.0
-filter_linear7 = false
-float_framebuffer7 = true
-
-shader8 = ../../../shaders/base/stock.slang
-alias8 = "PreCRTPass"
-
-shader9 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-alias9 = "AfterglowPass"
-
-shader10 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear10 = true
-scale_type10 = source
-mipmap_input10 = true
-scale10 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader11 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear11 = false
-scale_type11 = source
-scale11 = 1.0
-alias11 = "ColorCorrectPass"
-
-shader12 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 1.0
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/base/stock.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-alias13 = "PrePass"
-mipmap_input13 = true
-
-shader14 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear14 = true
-scale_type14 = source
-scale14 = 1.0
-mipmap_input14 = true
-alias14 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader15 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear15 = true
-scale_type15 = source
-scale15 = 1.0
-float_framebuffer15 = true
-alias15 = "LinearizePass"
-
-shader16 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
-filter_linear16 = "false"
-scale_type16 = "viewport"
-scale16 = "1.0"
-float_framebuffer16 = "true"
-alias16 = "CRTPass"
-
-shader17 = ../../../shaders/base/post-crt-prep-minimum-no-reflect.slang
-mipmap_input17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader18 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersUnderCRTPass"
-
-shader19 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear19 = true
-scale_type19 = viewport
-float_framebuffer19 = true
-alias19 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader20 = ../../../shaders/base/linearize-crt.slang
-mipmap_input20 = true
-filter_linear20 = true
-scale_type20 = absolute
-# scale_x20 = 480
-# scale_y20 = 270
-# scale_x20 = 960
-# scale_y20 = 540
-scale_x20 = 800
-scale_y20 = 600
-float_framebuffer20 = true
-alias20 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input21 = true
-filter_linear21 = true
-float_framebuffer21 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader22 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear22 = true
-float_framebuffer22 = true
-alias22 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 128
-scale_y23 = 128
-float_framebuffer23 = true
-alias23 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader24 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input24 = true
-filter_linear24 = true
-scale_type24 = absolute
-scale_x24 = 12
-scale_y24 = 12
-float_framebuffer24 = true
-alias24 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader25 = ../../../shaders/base/reflection.slang
-scale_type25 = viewport
-alias25 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader26 = ../../../shaders/base/combine-passes.slang
-alias26 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 0c1249beff..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,475 +0,0 @@
-shaders = 49
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PrePass0"
-
-shader25 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear25 = false
-float_framebuffer25 = true
-scale_type_x25 = source
-scale_type_y25 = source
-scale_x25 = 4.0
-scale_y25 = 1.0
-frame_count_mod25 = 2
-alias25 = NPass1
-
-shader26 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer26 = true
-filter_linear26 = true
-scale_type26 = source
-scale_x26 = 0.5
-scale_y26 = 1.0
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear27 = true
-scale_type27 = source
-scale_x27 = 1.0
-scale_y27 = 1.0
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear32 = true
-scale_type_x32 = viewport
-scale_x32 = 1.0
-scale_type_y32 = source
-scale_y32 = 1.0
-float_framebuffer32 = true
-alias32 = Pass1
-
-shader33 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 640.0
-scale_type_y33 = source
-scale_y33 = 1.0 
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 640.0
-scale_type_y34 = absolute
-scale_y34 = 480.0
-float_framebuffer34 = true
-alias34 = GlowPass
-
-shader35 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = absolute
-scale_y35 = 480.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = BloomPass
-
-shader37 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear38 = true
-scale_type38 = viewport
-scale_x38 = 1.0
-scale_y38 = 1.0
-float_framebuffer38 = true
-alias38 = "CRTPass"
-
-shader39 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader40 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersUnderCRTPass"
-
-shader41 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../shaders/base/linearize-crt.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-# scale_x42 = 480
-# scale_y42 = 270
-# scale_x42 = 960
-# scale_y42 = 540
-scale_x42 = 800
-scale_y42 = 600
-float_framebuffer42 = true
-alias42 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input43 = true
-filter_linear43 = true
-float_framebuffer43 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader44 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear44 = true
-float_framebuffer44 = true
-alias44 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 128
-scale_y45 = 128
-float_framebuffer45 = true
-alias45 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader46 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input46 = true
-filter_linear46 = true
-scale_type46 = absolute
-scale_x46 = 12
-scale_y46 = 12
-float_framebuffer46 = true
-alias46 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader47 = ../../../shaders/base/reflection.slang
-scale_type47 = viewport
-alias47 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader48 = ../../../shaders/base/combine-passes.slang
-alias48 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 1d1906c703..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,434 +0,0 @@
-shaders = 44
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = source
-scale_y28 = 1.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 800.0
-scale_type_y29 = absolute
-scale_y29 = 600.0
-float_framebuffer29 = true
-alias29 = GlowPass
-
-shader30 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 800.0
-scale_type_y30 = absolute
-scale_y30 = 600.0 
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear31 = true
-scale_type_x31 = source
-scale_x31 = 1.0
-scale_type_y31 = source
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = BloomPass
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear32 = true
-scale_type32 = viewport
-scale_x32 = 1.0
-scale_y32 = 1.0
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-alias33 = "CRTPass"
-
-shader34 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader35 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "BR_LayersUnderCRTPass"
-
-shader36 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader37 = ../../../shaders/base/linearize-crt.slang
-mipmap_input37 = true
-filter_linear37 = true
-scale_type37 = absolute
-# scale_x37 = 480
-# scale_y37 = 270
-# scale_x37 = 960
-# scale_y37 = 540
-scale_x37 = 800
-scale_y37 = 600
-float_framebuffer37 = true
-alias37 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader38 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input38 = true
-filter_linear38 = true
-float_framebuffer38 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear39 = true
-float_framebuffer39 = true
-alias39 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader40 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input40 = true
-filter_linear40 = true
-scale_type40 = absolute
-scale_x40 = 128
-scale_y40 = 128
-float_framebuffer40 = true
-alias40 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 12
-scale_y41 = 12
-float_framebuffer41 = true
-alias41 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader42 = ../../../shaders/base/reflection.slang
-scale_type42 = viewport
-alias42 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader43 = ../../../shaders/base/combine-passes.slang
-alias43 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__EASYMODE.slangp
deleted file mode 100644
index ade78a0b3d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__EASYMODE.slangp
+++ /dev/null
@@ -1,290 +0,0 @@
-shaders = 28
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang
-filter_linear14 = false
-srgb_framebuffer14 = true
-
-shader15 = ../../../shaders/easymode/hsm-crt-easymode-blur_vert.slang
-filter_linear15 = false
-srgb_framebuffer15 = true
-
-shader16 = ../../../shaders/easymode/hsm-crt-easymode-threshold.slang
-filter_linear16 = false
-srgb_framebuffer16 = true
-
-# Easymode's Shader!
-shader17 = ../../../shaders/easymode/hsm-crt-easymode-halation.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "CRTPass"
-
-g_gamma_out = 2.45
-
-shader18 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader19 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear19 = true
-scale_type19 = viewport
-float_framebuffer19 = true
-alias19 = "BR_LayersUnderCRTPass"
-
-shader20 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader21 = ../../../shaders/base/linearize-crt.slang
-mipmap_input21 = true
-filter_linear21 = true
-scale_type21 = absolute
-# scale_x21 = 480
-# scale_y21 = 270
-# scale_x21 = 960
-# scale_y21 = 540
-scale_x21 = 800
-scale_y21 = 600
-float_framebuffer21 = true
-alias21 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader22 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input22 = true
-filter_linear22 = true
-float_framebuffer22 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader23 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear23 = true
-float_framebuffer23 = true
-alias23 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader24 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input24 = true
-filter_linear24 = true
-scale_type24 = absolute
-scale_x24 = 128
-scale_y24 = 128
-float_framebuffer24 = true
-alias24 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader25 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input25 = true
-filter_linear25 = true
-scale_type25 = absolute
-scale_x25 = 12
-scale_y25 = 12
-float_framebuffer25 = true
-alias25 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader26 = ../../../shaders/base/reflection.slang
-scale_type26 = viewport
-alias26 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader27 = ../../../shaders/base/combine-passes.slang
-alias27 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Easymode Parameters
-gamma_out = 2.2
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp
deleted file mode 100644
index c948b0d6df..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,314 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-MINI.slangp
deleted file mode 100644
index 4fb674677c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-MINI.slangp
+++ /dev/null
@@ -1,282 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-NTSC.slangp
deleted file mode 100644
index 73e0c55e1e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV-NTSC.slangp
+++ /dev/null
@@ -1,356 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = GlowPass
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = BloomPass
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader26 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear26 = true
-scale_type26 = viewport
-float_framebuffer26 = true
-alias26 = "BR_LayersUnderCRTPass"
-
-shader27 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear27 = true
-scale_type27 = viewport
-float_framebuffer27 = true
-alias27 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader28 = ../../../shaders/base/linearize-crt.slang
-mipmap_input28 = true
-filter_linear28 = true
-scale_type28 = absolute
-# scale_x28 = 480
-# scale_y28 = 270
-# scale_x28 = 960
-# scale_y28 = 540
-scale_x28 = 800
-scale_y28 = 600
-float_framebuffer28 = true
-alias28 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader29 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input29 = true
-filter_linear29 = true
-float_framebuffer29 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader30 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear30 = true
-float_framebuffer30 = true
-alias30 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader31 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-scale_x31 = 128
-scale_y31 = 128
-float_framebuffer31 = true
-alias31 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader32 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-scale_x32 = 12
-scale_y32 = 12
-float_framebuffer32 = true
-alias32 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader33 = ../../../shaders/base/reflection.slang
-scale_type33 = viewport
-alias33 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader34 = ../../../shaders/base/combine-passes.slang
-alias34 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV.slangp
deleted file mode 100644
index b2a972254b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__GDV.slangp
+++ /dev/null
@@ -1,315 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__LCD-GRID.slangp
deleted file mode 100644
index 3566975b5a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__LCD-GRID.slangp
+++ /dev/null
@@ -1,279 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp
deleted file mode 100644
index 114e5ae882..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,331 +0,0 @@
-shaders = 31
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-float_framebuffer15 = true
-alias15 = "PrePass"
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-float_framebuffer16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader18 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear18 = "false"
-scale_type18 = "source"
-scale18 = "1.0"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = "SourceSDR"
-float_framebuffer18 = "true"
-
-shader19 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear19 = "false"
-scale_type19 = "source"
-scale19 = "1.0"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = "SourceHDR"
-float_framebuffer19 = "true"
-
-shader20 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear20 = "false"
-wrap_mode20 = "clamp_to_border"
-mipmap_input20 = "false"
-scale_type20 = "viewport"
-float_framebuffer20 = "true"
-alias20 = "CRTPass"
-
-shader21 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader22 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersUnderCRTPass"
-
-shader23 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear23 = true
-scale_type23 = viewport
-float_framebuffer23 = true
-alias23 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader24 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input24 = true
-filter_linear24 = true
-scale_type24 = absolute
-# scale_x24 = 480
-# scale_y24 = 270
-# scale_x24 = 960
-# scale_y24 = 540
-scale_x24 = 800
-scale_y24 = 600
-float_framebuffer24 = true
-alias24 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input25 = true
-filter_linear25 = true
-float_framebuffer25 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader26 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear26 = true
-float_framebuffer26 = true
-alias26 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 128
-scale_y27 = 128
-float_framebuffer27 = true
-alias27 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader28 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input28 = true
-filter_linear28 = true
-scale_type28 = absolute
-scale_x28 = 12
-scale_y28 = 12
-float_framebuffer28 = true
-alias28 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader29 = ../../../shaders/base/reflection.slang
-scale_type29 = viewport
-alias29 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader30 = ../../../shaders/base/combine-passes-hdr.slang
-alias30 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__MEGATRON.slangp
deleted file mode 100644
index 69d0ebe08b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__MEGATRON.slangp
+++ /dev/null
@@ -1,299 +0,0 @@
-shaders = 27
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-float_framebuffer11 = true
-alias11 = "PrePass"
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-float_framebuffer12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader14 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear14 = "false"
-scale_type14 = "source"
-scale14 = "1.0"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-alias14 = "SourceSDR"
-float_framebuffer14 = "true"
-
-shader15 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear15 = "false"
-scale_type15 = "source"
-scale15 = "1.0"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = "SourceHDR"
-float_framebuffer15 = "true"
-
-shader16 = "../../../shaders/megatron/crt-sony-megatron.slang"
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-scale_type16 = "viewport"
-float_framebuffer16 = "true"
-alias16 = "CRTPass"
-
-shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader18 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersUnderCRTPass"
-
-shader19 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear19 = true
-scale_type19 = viewport
-float_framebuffer19 = true
-alias19 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader20 = ../../../shaders/base/linearize-crt-hdr.slang
-mipmap_input20 = true
-filter_linear20 = true
-scale_type20 = absolute
-# scale_x20 = 480
-# scale_y20 = 270
-# scale_x20 = 960
-# scale_y20 = 540
-scale_x20 = 800
-scale_y20 = 600
-float_framebuffer20 = true
-alias20 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input21 = true
-filter_linear21 = true
-float_framebuffer21 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader22 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear22 = true
-float_framebuffer22 = true
-alias22 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 128
-scale_y23 = 128
-float_framebuffer23 = true
-alias23 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader24 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input24 = true
-filter_linear24 = true
-scale_type24 = absolute
-scale_x24 = 12
-scale_y24 = 12
-float_framebuffer24 = true
-alias24 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader25 = ../../../shaders/base/reflection.slang
-scale_type25 = viewport
-alias25 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader26 = ../../../shaders/base/combine-passes-hdr.slang
-alias26 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__PASSTHROUGH.slangp
deleted file mode 100644
index 952932cb36..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,242 +0,0 @@
-shaders = 20
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader11 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear11 = true
-scale_type11 = viewport
-float_framebuffer11 = true
-alias11 = "BR_LayersUnderCRTPass"
-
-shader12 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear12 = true
-scale_type12 = viewport
-float_framebuffer12 = true
-alias12 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader13 = ../../../shaders/base/linearize-crt.slang
-mipmap_input13 = true
-filter_linear13 = true
-scale_type13 = absolute
-# scale_x13 = 480
-# scale_y13 = 270
-# scale_x13 = 960
-# scale_y13 = 540
-scale_x13 = 800
-scale_y13 = 600
-float_framebuffer13 = true
-alias13 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader14 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input14 = true
-filter_linear14 = true
-float_framebuffer14 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader15 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear15 = true
-float_framebuffer15 = true
-alias15 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader16 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input16 = true
-filter_linear16 = true
-scale_type16 = absolute
-scale_x16 = 128
-scale_y16 = 128
-float_framebuffer16 = true
-alias16 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader17 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input17 = true
-filter_linear17 = true
-scale_type17 = absolute
-scale_x17 = 12
-scale_y17 = 12
-float_framebuffer17 = true
-alias17 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader18 = ../../../shaders/base/reflection.slang
-scale_type18 = viewport
-alias18 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader19 = ../../../shaders/base/combine-passes.slang
-alias19 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-NO-TUBE-FX__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-NO-TUBE-FX__PASSTHROUGH.slangp
deleted file mode 100644
index deaf7dce8f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-NO-TUBE-FX__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,184 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-no-reflect.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-minimum-no-reflect.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader11 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear11 = true
-scale_type11 = viewport
-float_framebuffer11 = true
-alias11 = "BR_LayersUnderCRTPass"
-
-shader12 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear12 = true
-scale_type12 = viewport
-float_framebuffer12 = true
-alias12 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader13 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias13 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index 8836842421..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,417 +0,0 @@
-shaders = 43
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PrePass0"
-
-shader25 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear25 = false
-float_framebuffer25 = true
-scale_type_x25 = source
-scale_type_y25 = source
-scale_x25 = 4.0
-scale_y25 = 1.0
-frame_count_mod25 = 2
-alias25 = NPass1
-
-shader26 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer26 = true
-filter_linear26 = true
-scale_type26 = source
-scale_x26 = 0.5
-scale_y26 = 1.0
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear27 = true
-scale_type27 = source
-scale_x27 = 1.0
-scale_y27 = 1.0
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear32 = true
-scale_type_x32 = viewport
-scale_x32 = 1.0
-scale_type_y32 = source
-scale_y32 = 1.0
-float_framebuffer32 = true
-alias32 = Pass1
-
-shader33 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 640.0
-scale_type_y33 = source
-scale_y33 = 1.0 
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 640.0
-scale_type_y34 = absolute
-scale_y34 = 480.0
-float_framebuffer34 = true
-alias34 = "GlowPass"
-
-shader35 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = absolute
-scale_y35 = 480.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = "BloomPass" 
-
-shader37 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear38 = true
-scale_type38 = viewport
-scale_x38 = 1.0
-scale_y38 = 1.0
-float_framebuffer38 = true
-alias38 = "CRTPass"
-
-shader39 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader40 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersUnderCRTPass"
-
-shader41 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader42 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias42 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp
deleted file mode 100644
index ef50054d68..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,376 +0,0 @@
-shaders = 38
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = source
-scale_y28 = 1.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 800.0
-scale_type_y29 = absolute
-scale_y29 = 600.0
-float_framebuffer29 = true
-alias29 = "GlowPass"
-
-shader30 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 800.0
-scale_type_y30 = absolute
-scale_y30 = 600.0 
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear31 = true
-scale_type_x31 = source
-scale_x31 = 1.0
-scale_type_y31 = source
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "BloomPass"
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear32 = true
-scale_type32 = viewport
-scale_x32 = 1.0
-scale_y32 = 1.0
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-alias33 = "CRTPass"
-
-shader34 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader35 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "BR_LayersUnderCRTPass"
-
-shader36 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader37 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias37 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp
deleted file mode 100644
index fd31323575..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp
+++ /dev/null
@@ -1,232 +0,0 @@
-shaders = 22
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang
-filter_linear14 = false
-srgb_framebuffer14 = true
-
-shader15 = ../../../shaders/easymode/hsm-crt-easymode-blur_vert.slang
-filter_linear15 = false
-srgb_framebuffer15 = true
-
-shader16 = ../../../shaders/easymode/hsm-crt-easymode-threshold.slang
-filter_linear16 = false
-srgb_framebuffer16 = true
-
-# Easymode's Shader!
-shader17 = ../../../shaders/easymode/hsm-crt-easymode-halation.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "CRTPass"
-
-g_gamma_out = 2.45
-
-shader18 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader19 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear19 = true
-scale_type19 = viewport
-float_framebuffer19 = true
-alias19 = "BR_LayersUnderCRTPass"
-
-shader20 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader21 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias21 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Easymode Parameters
-gamma_out = 2.2
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 33002f249a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,256 +0,0 @@
-shaders = 24
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader23 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias23 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp
deleted file mode 100644
index 82d5550ba7..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp
+++ /dev/null
@@ -1,224 +0,0 @@
-shaders = 20
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader19 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias19 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp
deleted file mode 100644
index 30682a2070..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp
+++ /dev/null
@@ -1,298 +0,0 @@
-shaders = 29
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = "GlowPass"
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = "BloomPass" 
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader26 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear26 = true
-scale_type26 = viewport
-float_framebuffer26 = true
-alias26 = "BR_LayersUnderCRTPass"
-
-shader27 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear27 = true
-scale_type27 = viewport
-float_framebuffer27 = true
-alias27 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader28 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias28 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp
deleted file mode 100644
index 962100ec30..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp
+++ /dev/null
@@ -1,257 +0,0 @@
-shaders = 24
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = "GlowPass"
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = "BloomPass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader23 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias23 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp
deleted file mode 100644
index b2e966a8c3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp
+++ /dev/null
@@ -1,218 +0,0 @@
-shaders = 20
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2-no-reflect.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader19 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias19 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp
deleted file mode 100644
index 167874b7b1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,273 +0,0 @@
-shaders = 25
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-float_framebuffer15 = true
-alias15 = "PrePass"
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-float_framebuffer16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader18 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear18 = "false"
-scale_type18 = "source"
-scale18 = "1.0"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = "SourceSDR"
-float_framebuffer18 = "true"
-
-shader19 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear19 = "false"
-scale_type19 = "source"
-scale19 = "1.0"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = "SourceHDR"
-float_framebuffer19 = "true"
-
-shader20 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear20 = "false"
-wrap_mode20 = "clamp_to_border"
-mipmap_input20 = "false"
-scale_type20 = "viewport"
-float_framebuffer20 = "true"
-alias20 = "CRTPass"
-
-shader21 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader22 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersUnderCRTPass"
-
-shader23 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear23 = true
-scale_type23 = viewport
-float_framebuffer23 = true
-alias23 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader24 = ../../../shaders/base/combine-passes-no-reflect-hdr.slang
-alias24 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp
deleted file mode 100644
index 8bde696d6f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp
+++ /dev/null
@@ -1,241 +0,0 @@
-shaders = 21
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-float_framebuffer11 = true
-alias11 = "PrePass"
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-float_framebuffer12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader14 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear14 = "false"
-scale_type14 = "source"
-scale14 = "1.0"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-alias14 = "SourceSDR"
-float_framebuffer14 = "true"
-
-shader15 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear15 = "false"
-scale_type15 = "source"
-scale15 = "1.0"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = "SourceHDR"
-float_framebuffer15 = "true"
-
-shader16 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-scale_type16 = "viewport"
-float_framebuffer16 = "true"
-alias16 = "CRTPass"
-
-shader17 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader18 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersUnderCRTPass"
-
-shader19 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear19 = true
-scale_type19 = viewport
-float_framebuffer19 = true
-alias19 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader20 = ../../../shaders/base/combine-passes-no-reflect-hdr.slang
-alias20 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__PASSTHROUGH.slangp
deleted file mode 100644
index cd7c163c48..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,184 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-no-reflect.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader11 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear11 = true
-scale_type11 = viewport
-float_framebuffer11 = true
-alias11 = "BR_LayersUnderCRTPass"
-
-shader12 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear12 = true
-scale_type12 = viewport
-float_framebuffer12 = true
-alias12 = "BR_LayersOverCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader13 = ../../../shaders/base/combine-passes-no-reflect.slang
-alias13 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
deleted file mode 100644
index 43a9d1aadc..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__GDV.slangp
+++ /dev/null
@@ -1,243 +0,0 @@
-shaders = 22
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = "GlowPass"
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = "BloomPass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-minimum-no-reflect.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader21 = ../../../shaders/base/output-sdr.slang
-alias21 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__PASSTHROUGH.slangp
deleted file mode 100644
index 19963ed68b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-NO-TUBE-FX__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,170 +0,0 @@
-shaders = 12
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-no-reflect.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-minimum-no-reflect.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader11 = ../../../shaders/base/output-sdr.slang
-alias11 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index b61fc975f7..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,403 +0,0 @@
-shaders = 41
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PrePass0"
-
-shader25 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear25 = false
-float_framebuffer25 = true
-scale_type_x25 = source
-scale_type_y25 = source
-scale_x25 = 4.0
-scale_y25 = 1.0
-frame_count_mod25 = 2
-alias25 = NPass1
-
-shader26 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer26 = true
-filter_linear26 = true
-scale_type26 = source
-scale_x26 = 0.5
-scale_y26 = 1.0
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear27 = true
-scale_type27 = source
-scale_x27 = 1.0
-scale_y27 = 1.0
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear32 = true
-scale_type_x32 = viewport
-scale_x32 = 1.0
-scale_type_y32 = source
-scale_y32 = 1.0
-float_framebuffer32 = true
-alias32 = Pass1
-
-shader33 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 640.0
-scale_type_y33 = source
-scale_y33 = 1.0 
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 640.0
-scale_type_y34 = absolute
-scale_y34 = 480.0
-float_framebuffer34 = true
-alias34 = "GlowPass"
-
-shader35 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = absolute
-scale_y35 = 480.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = "BloomPass" 
-
-shader37 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear38 = true
-scale_type38 = viewport
-scale_x38 = 1.0
-scale_y38 = 1.0
-float_framebuffer38 = true
-alias38 = "CRTPass"
-
-shader39 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader40 = ../../../shaders/base/output-sdr.slang
-alias40 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 437d00db26..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,362 +0,0 @@
-shaders = 36
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader12 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias12 = "DeditherPass"
-
-shader13 = ../../../shaders/base/stock.slang
-# filter_linear13 = "false"
-# wrap_mode13 = "clamp_to_border"
-# mipmap_input13 = "false"
-# float_framebuffer13 = "false"
-# srgb_framebuffer13 = "true"
-alias13 = XbrSource
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "2.000000"
-scale_type_y15 = "source"
-scale_y15 = "2.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "false"
-srgb_framebuffer17 = "true"
-scale_type_x17 = "source"
-scale_x17 = "1.000000"
-scale_type_y17 = "source"
-scale_y17 = "1.000000"
-
-shader18 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear18 = false
-scale_type_x18 = source
-scale_x18 = 1
-scale_type_y18 = source
-scale_y18 = 0.5
-wrap_mode18 = "clamp_to_edge"
-
-shader19 = ../../../shaders/base/intro.slang
-filter_linear19 = false
-float_framebuffer19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "IntroPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PreCRTPass"
-
-shader21 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "AfterglowPass"
-
-shader22 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear22 = true
-scale_type22 = source
-mipmap_input22 = true
-scale22 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader23 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear23 = false
-scale_type23 = source
-scale23 = 1.0
-alias23 = "ColorCorrectPass"
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = source
-scale_y28 = 1.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 800.0
-scale_type_y29 = absolute
-scale_y29 = 600.0
-float_framebuffer29 = true
-alias29 = "GlowPass"
-
-shader30 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 800.0
-scale_type_y30 = absolute
-scale_y30 = 600.0 
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear31 = true
-scale_type_x31 = source
-scale_x31 = 1.0
-scale_type_y31 = source
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "BloomPass"
-
-shader32 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear32 = true
-scale_type32 = viewport
-scale_x32 = 1.0
-scale_y32 = 1.0
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-alias33 = "CRTPass"
-
-shader34 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader35 = ../../../shaders/base/output-sdr.slang
-alias35 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp
deleted file mode 100644
index f137b21e04..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp
+++ /dev/null
@@ -1,218 +0,0 @@
-shaders = 20
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang
-filter_linear14 = false
-srgb_framebuffer14 = true
-
-shader15 = ../../../shaders/easymode/hsm-crt-easymode-blur_vert.slang
-filter_linear15 = false
-srgb_framebuffer15 = true
-
-shader16 = ../../../shaders/easymode/hsm-crt-easymode-threshold.slang
-filter_linear16 = false
-srgb_framebuffer16 = true
-
-# Easymode's Shader!
-shader17 = ../../../shaders/easymode/hsm-crt-easymode-halation.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "CRTPass"
-
-g_gamma_out = 2.45
-
-shader18 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader19 = ../../../shaders/base/output-sdr.slang
-alias19 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Easymode Parameters
-gamma_out = 2.2
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 31dcf0c576..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,242 +0,0 @@
-shaders = 22
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader21 = ../../../shaders/base/output-sdr.slang
-alias21 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp
deleted file mode 100644
index 8b2e2b580b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp
+++ /dev/null
@@ -1,210 +0,0 @@
-shaders = 18
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader17 = ../../../shaders/base/output-sdr.slang
-alias17 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp
deleted file mode 100644
index a53c498b1c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp
+++ /dev/null
@@ -1,284 +0,0 @@
-shaders = 27
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = "GlowPass"
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = "BloomPass" 
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader26 = ../../../shaders/base/output-sdr.slang
-alias26 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp
deleted file mode 100644
index 3342cb584b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp
+++ /dev/null
@@ -1,243 +0,0 @@
-shaders = 22
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = "GlowPass"
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = "BloomPass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence-no-reflect.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader21 = ../../../shaders/base/output-sdr.slang
-alias21 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp
deleted file mode 100644
index 98ac936dd2..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp
+++ /dev/null
@@ -1,204 +0,0 @@
-shaders = 18
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader17 = ../../../shaders/base/output-sdr.slang
-alias17 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp
deleted file mode 100644
index 8eb047135c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,259 +0,0 @@
-shaders = 23
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-float_framebuffer15 = true
-alias15 = "PrePass"
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-float_framebuffer16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader18 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear18 = "false"
-scale_type18 = "source"
-scale18 = "1.0"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = "SourceSDR"
-float_framebuffer18 = "true"
-
-shader19 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear19 = "false"
-scale_type19 = "source"
-scale19 = "1.0"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = "SourceHDR"
-float_framebuffer19 = "true"
-
-shader20 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear20 = "false"
-wrap_mode20 = "clamp_to_border"
-mipmap_input20 = "false"
-scale_type20 = "viewport"
-float_framebuffer20 = "true"
-alias20 = "CRTPass"
-
-shader21 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader22 = ../../../shaders/base/output-hdr.slang
-alias22 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp
deleted file mode 100644
index eda617090d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp
+++ /dev/null
@@ -1,227 +0,0 @@
-shaders = 19
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-float_framebuffer11 = true
-alias11 = "PrePass"
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-float_framebuffer12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader14 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear14 = "false"
-scale_type14 = "source"
-scale14 = "1.0"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-alias14 = "SourceSDR"
-float_framebuffer14 = "true"
-
-shader15 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear15 = "false"
-scale_type15 = "source"
-scale15 = "1.0"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = "SourceHDR"
-float_framebuffer15 = "true"
-
-shader16 = "../../../shaders/megatron/crt-sony-megatron-no-reflect.slang"
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-scale_type16 = "viewport"
-float_framebuffer16 = "true"
-alias16 = "CRTPass"
-
-shader17 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader18 = ../../../shaders/base/output-hdr.slang
-alias18 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__PASSTHROUGH.slangp
deleted file mode 100644
index 718a396ffe..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,170 +0,0 @@
-shaders = 12
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-no-reflect-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std-no-reflect.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-no-reflect.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-no-reflect.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader11 = ../../../shaders/base/output-sdr.slang
-alias11 = "OutputPass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp
deleted file mode 100644
index b9be5dc706..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp
+++ /dev/null
@@ -1,303 +0,0 @@
-shaders = 34
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-shader3 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias3 = LinearGamma
-
-shader4 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = CB_Output
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear8 = false
-
-shader9 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader10 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias11 = "DeditherPass"
-
-shader12 = ../../../shaders/base/stock.slang
-# filter_linear12 = "false"
-# wrap_mode12 = "clamp_to_border"
-# mipmap_input12 = "false"
-# float_framebuffer12 = "false"
-# srgb_framebuffer12 = "true"
-alias12 = XbrSource
-
-shader13 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear13 = "false"
-wrap_mode13 = "clamp_to_border"
-mipmap_input13 = "false"
-float_framebuffer13 = "false"
-srgb_framebuffer13 = "true"
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-alias14 = ""
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "1.000000"
-scale_type_y15 = "source"
-scale_y15 = "1.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear17 = false
-scale_type_x17 = source
-scale_x17 = 1
-scale_type_y17 = source
-scale_y17 = 0.5
-wrap_mode17 = "clamp_to_edge"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader18 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-alias18 = "ColorCorrectPass"
-
-shader19 = ../../../shaders/base/stock.slang
-alias19 = "PrePass0"
-
-shader20 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear20 = false
-float_framebuffer20 = true
-scale_type_x20 = source
-scale_type_y20 = source
-scale_x20 = 4.0
-scale_y20 = 1.0
-frame_count_mod20 = 2
-alias20 = NPass1
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer21 = true
-filter_linear21 = true
-scale_type21 = source
-scale_x21 = 0.5
-scale_y21 = 1.0
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear26 = true
-scale_type_x26 = viewport
-scale_x26 = 1.0
-scale_type_y26 = source
-scale_y26 = 1.0
-float_framebuffer26 = true
-alias26 = Pass1
-
-shader27 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 640.0
-scale_type_y27 = source
-scale_y27 = 1.0 
-float_framebuffer27 = true
-
-shader28 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 640.0
-scale_type_y28 = absolute
-scale_y28 = 480.0
-float_framebuffer28 = true
-alias28 = GlowPass
-
-shader29 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = absolute
-scale_y29 = 480.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = BloomPass
-
-shader31 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear32 = true
-scale_type32 = viewport
-scale_x32 = 1.0
-scale_y32 = 1.0
-float_framebuffer32 = true
-alias32 = "CRTPass"
-
-shader33 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp
deleted file mode 100644
index 2c73a47bf3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp
+++ /dev/null
@@ -1,262 +0,0 @@
-shaders = 29
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-shader3 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias3 = LinearGamma
-
-shader4 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = CB_Output
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear8 = false
-
-shader9 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader10 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader11 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias11 = "DeditherPass"
-
-shader12 = ../../../shaders/base/stock.slang
-# filter_linear12 = "false"
-# wrap_mode12 = "clamp_to_border"
-# mipmap_input12 = "false"
-# float_framebuffer12 = "false"
-# srgb_framebuffer12 = "true"
-alias12 = XbrSource
-
-shader13 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
-filter_linear13 = "false"
-wrap_mode13 = "clamp_to_border"
-mipmap_input13 = "false"
-float_framebuffer13 = "false"
-srgb_framebuffer13 = "true"
-
-shader14 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_border"
-mipmap_input14 = "false"
-alias14 = ""
-float_framebuffer14 = "false"
-srgb_framebuffer14 = "true"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-
-shader15 = ../../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
-filter_linear15 = "false"
-wrap_mode15 = "clamp_to_border"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "false"
-srgb_framebuffer15 = "true"
-scale_type_x15 = "source"
-scale_x15 = "1.000000"
-scale_type_y15 = "source"
-scale_y15 = "1.000000"
-
-shader16 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
-filter_linear16 = "false"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "false"
-srgb_framebuffer16 = "true"
-scale_type_x16 = "source"
-scale_x16 = "1.000000"
-scale_type_y16 = "source"
-scale_y16 = "1.000000"
-
-shader17 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
-filter_linear17 = false
-scale_type_x17 = source
-scale_x17 = 1
-scale_type_y17 = source
-scale_y17 = 0.5
-wrap_mode17 = "clamp_to_edge"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader18 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-alias18 = "ColorCorrectPass"
-
-shader19 = ../../../shaders/base/stock.slang
-filter_linear19 = true
-scale_type19 = source
-scale_x19 = 1.0
-scale_y19 = 1.0
-alias19 = "PrePass"
-mipmap_input19 = true
-
-shader20 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear20 = true
-scale_type20 = source
-scale20 = 1.0
-mipmap_input20 = true
-alias20 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader21 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear21 = true
-scale_type21 = source
-scale21 = 1.0
-float_framebuffer21 = true
-alias21 = "LinearizePass"
-
-shader22 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 800.0
-scale_type_y22 = source
-scale_y22 = 1.0 
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear23 = true
-scale_type_x23 = absolute
-scale_x23 = 800.0
-scale_type_y23 = absolute
-scale_y23 = 600.0
-float_framebuffer23 = true
-alias23 = GlowPass
-
-shader24 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear24 = true
-scale_type_x24 = absolute
-scale_x24 = 800.0
-scale_type_y24 = absolute
-scale_y24 = 600.0 
-float_framebuffer24 = true
-
-shader25 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear25 = true
-scale_type_x25 = source
-scale_x25 = 1.0
-scale_type_y25 = source
-scale_y25 = 1.0
-float_framebuffer25 = true
-alias25 = BloomPass
-
-shader26 = ../../../shaders/guest/hsm-crt-guest-advanced-potato.slang
-filter_linear26 = true
-scale_type26 = viewport
-scale_x26 = 1.0
-scale_y26 = 1.0
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-deconvergence-potato.slang
-filter_linear27 = true
-scale_type27 = viewport
-scale_x27 = 1.0
-scale_y27 = 1.0
-float_framebuffer27 = true
-alias27 = "CRTPass"
-
-shader28 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SUPER-XBR GDV Parameters
-SGPT_BLEND_OPTION = 1
-
-SHARPSMOOTHER_ON = 1
-max_w = 0.05
-min_w = 0
-smoot = 0.4
-lumad = 0.5
-mtric = 0.3
-
-SUPERXBR_ON = 1
-
-SHARPEN = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-
-# gamma_c = 0.9
-# gsl = -1
-# scanline1 = 3
-# shadowMask = 3
-# maskDark = 0.4
-# maskLight = 1.2
-# mask_gamma = 4
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__EASYMODE.slangp
deleted file mode 100644
index 7d04b5e8eb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__EASYMODE.slangp
+++ /dev/null
@@ -1,114 +0,0 @@
-shaders = 12
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang
-filter_linear7 = false
-srgb_framebuffer7 = true
-
-shader8 = ../../../shaders/easymode/hsm-crt-easymode-blur_vert.slang
-filter_linear8 = false
-srgb_framebuffer8 = true
-
-shader9 = ../../../shaders/easymode/hsm-crt-easymode-threshold.slang
-filter_linear9 = false
-srgb_framebuffer9 = true
-
-# Easymode's Shader!
-shader10 = ../../../shaders/easymode/hsm-crt-easymode-halation.slang
-filter_linear10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "CRTPass"
-
-g_gamma_out = 2.45
-
-shader11 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input11 = true
-scale_type11 = viewport
-float_framebuffer11 = true
-alias11 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Easymode Parameters
-gamma_out = 2.2
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp
deleted file mode 100644
index 4ad23aefba..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp
+++ /dev/null
@@ -1,138 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = "PrePass"
-mipmap_input8 = true
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-
-shader11 = ../../../shaders/base/delinearize.slang
-scale_type11 = source
-float_framebuffer11 = "true"
-
-shader12 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type12 = viewport
-scale_x12 = 1.0
-scale_y12 = 1.0
-filter_linear12 = true
-float_framebuffer12 = "true"
-alias12 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader13 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input13 = true
-scale_type13 = viewport
-float_framebuffer13 = true
-alias13 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-MINI.slangp
deleted file mode 100644
index 1395962984..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-MINI.slangp
+++ /dev/null
@@ -1,106 +0,0 @@
-shaders = 10
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/base/delinearize.slang
-scale_type7 = source
-float_framebuffer7 = "true"
-
-shader8 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type8 = viewport
-scale_x8 = 1.0
-scale_y8 = 1.0
-filter_linear8 = true
-float_framebuffer8 = "true"
-alias8 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader9 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input9 = true
-scale_type9 = viewport
-float_framebuffer9 = true
-alias9 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-NTSC.slangp
deleted file mode 100644
index f7c94fa7da..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV-NTSC.slangp
+++ /dev/null
@@ -1,180 +0,0 @@
-shaders = 19
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = "PrePass"
-mipmap_input8 = true
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear11 = true
-scale_type_x11 = viewport
-scale_x11 = 1.0
-scale_type_y11 = source
-scale_y11 = 1.0
-float_framebuffer11 = true
-alias11 = Pass1
-
-shader12 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear12 = true
-scale_type_x12 = absolute
-scale_x12 = 640.0
-scale_type_y12 = source
-scale_y12 = 1.0 
-float_framebuffer12 = true
-
-shader13 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear13 = true
-scale_type_x13 = absolute
-scale_x13 = 640.0
-scale_type_y13 = absolute
-scale_y13 = 480.0
-float_framebuffer13 = true
-alias13 = GlowPass
-
-shader14 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 640.0
-scale_type_y14 = absolute
-scale_y14 = 480.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 640.0
-scale_type_y15 = absolute
-scale_y15 = 480.0
-float_framebuffer15 = true
-alias15 = BloomPass
-
-shader16 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang
-filter_linear16 = true
-scale_type16 = viewport
-scale_x16 = 1.0
-scale_y16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear17 = true
-scale_type17 = viewport
-scale_x17 = 1.0
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = "CRTPass"
-
-shader18 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV.slangp
deleted file mode 100644
index 39e4b8c210..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__GDV.slangp
+++ /dev/null
@@ -1,139 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear7 = true
-scale_type_x7 = absolute
-scale_x7 = 800.0
-scale_type_y7 = source
-scale_y7 = 1.0 
-float_framebuffer7 = true
-
-shader8 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear8 = true
-scale_type_x8 = absolute
-scale_x8 = 800.0
-scale_type_y8 = absolute
-scale_y8 = 600.0
-float_framebuffer8 = true
-alias8 = GlowPass
-
-shader9 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear9 = true
-scale_type_x9 = absolute
-scale_x9 = 800.0
-scale_type_y9 = absolute
-scale_y9 = 600.0 
-float_framebuffer9 = true
-
-shader10 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear10 = true
-scale_type_x10 = source
-scale_x10 = 1.0
-scale_type_y10 = source
-scale_y10 = 1.0
-float_framebuffer10 = true
-alias10 = BloomPass
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-potato.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale_x11 = 1.0
-scale_y11 = 1.0
-float_framebuffer11 = true
-
-shader12 = ../../../shaders/guest/hsm-deconvergence-potato.slang
-filter_linear12 = true
-scale_type12 = viewport
-scale_x12 = 1.0
-scale_y12 = 1.0
-float_framebuffer12 = true
-alias12 = "CRTPass"
-
-shader13 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input13 = true
-scale_type13 = viewport
-float_framebuffer13 = true
-alias13 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__LCD-GRID.slangp
deleted file mode 100644
index ee50b7e269..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__LCD-GRID.slangp
+++ /dev/null
@@ -1,100 +0,0 @@
-shaders = 10
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/base/delinearize.slang
-float_framebuffer7 = "true"
-
-shader8 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang
-filter_linear8 = "false"
-scale_type8 = "viewport"
-scale8 = "1.0"
-float_framebuffer8 = "true"
-alias8 = "CRTPass"
-
-shader9 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input9 = true
-scale_type9 = viewport
-float_framebuffer9 = true
-alias9 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp
deleted file mode 100644
index a908094fa6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp
+++ /dev/null
@@ -1,159 +0,0 @@
-shaders = 16
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-float_framebuffer8 = true
-alias8 = "PrePass"
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-float_framebuffer9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader11 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear11 = "false"
-scale_type11 = "source"
-scale11 = "1.0"
-wrap_mode11 = "clamp_to_border"
-mipmap_input11 = "false"
-alias11 = "SourceSDR"
-float_framebuffer11 = "true"
-
-shader12 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear12 = "false"
-scale_type12 = "source"
-scale12 = "1.0"
-wrap_mode12 = "clamp_to_border"
-mipmap_input12 = "false"
-alias12 = "SourceHDR"
-float_framebuffer12 = "true"
-
-shader13 = "../../../shaders/megatron/crt-sony-megatron-potato.slang"
-filter_linear13 = "false"
-wrap_mode13 = "clamp_to_border"
-mipmap_input13 = "false"
-scale_type13 = "viewport"
-float_framebuffer13 = "true"
-alias13 = "CRTPass"
-
-shader14 = ../../../shaders/base/post-crt-prep-potato-megatron.slang
-mipmap_input14 = true
-scale_type14 = viewport
-float_framebuffer14 = true
-alias14 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader15 = ../../../shaders/base/output-hdr.slang
-alias15 = "OutputPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__MEGATRON.slangp
deleted file mode 100644
index dfe2e0f9eb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__MEGATRON.slangp
+++ /dev/null
@@ -1,127 +0,0 @@
-shaders = 12
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-float_framebuffer4 = true
-alias4 = "PrePass"
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-float_framebuffer5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-feedback_pass = "0"
-
-# Sony Megatron Colour Video Monitor by Major Pain The Cactus
-shader7 = "../../../shaders/megatron/crt-sony-megatron-source-pass.slang"
-filter_linear7 = "false"
-scale_type7 = "source"
-scale7 = "1.0"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "SourceSDR"
-float_framebuffer7 = "true"
-
-shader8 = "../../../shaders/megatron/crt-sony-megatron-hdr-pass.slang"
-filter_linear8 = "false"
-scale_type8 = "source"
-scale8 = "1.0"
-wrap_mode8 = "clamp_to_border"
-mipmap_input8 = "false"
-alias8 = "SourceHDR"
-float_framebuffer8 = "true"
-
-shader9 = "../../../shaders/megatron/crt-sony-megatron-potato.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_border"
-mipmap_input9 = "false"
-scale_type9 = "viewport"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-potato-megatron.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader11 = ../../../shaders/base/output-hdr.slang
-alias11 = "OutputPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Sony Megatron Color Monitor Parameters
-hcrt_hdr = "0.000000"
-
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000"
-HSM_REFLECT_GLOBAL_AMOUNT = "7.000000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__PASSTHROUGH.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__PASSTHROUGH.slangp
deleted file mode 100644
index 06acb8324b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO__PASSTHROUGH.slangp
+++ /dev/null
@@ -1,96 +0,0 @@
-shaders = 9
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-none.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = source
-scale_x0 = 1
-scale_y0 = 1
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-shader3 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer3 = "true"
-alias3 = "DeditherPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader4 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-alias4 = "ColorCorrectPass"
-
-shader5 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear5 = true
-scale_type5 = source
-scale_x5 = 1.0
-scale_y5 = 1.0
-
-shader6 = ../../../shaders/base/linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-potato.slang
-filter_linear7 = "false"
-scale_type7 = "viewport"
-scale7 = "1.0"
-float_framebuffer7 = "true"
-alias7 = "CRTPass"
-
-shader8 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input8 = true
-scale_type8 = viewport
-float_framebuffer8 = true
-alias8 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# PASSTHROUGH Parameters
-HSM_FXAA_ON = 0
-HSM_SCREEN_SCALE_GSHARP_MODE = 1
-HSM_CRT_CURVATURE_SCALE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp
deleted file mode 100644
index 0306fad49a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index 693562d0c2..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp
deleted file mode 100644
index c4c710b2c6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp
deleted file mode 100644
index ca48a72a50..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp
deleted file mode 100644
index 55d414a062..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index 5322890c81..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index 3dd9459421..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-320p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-320p.slangp
deleted file mode 100644
index 645c7fd87e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-320p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-320p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index e27e9a22fd..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-1080p.slangp
deleted file mode 100644
index f3ad37f45e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-1080p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-1080p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-224p.slangp
deleted file mode 100644
index 76c67b3eb5..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-224p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-224p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-240p.slangp
deleted file mode 100644
index 264f3aba2b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp
deleted file mode 100644
index b4aa9a41bb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-480p.slangp
deleted file mode 100644
index 82eecfad3b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 10c4b182be..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp
deleted file mode 100644
index c93cb3dfee..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp
deleted file mode 100644
index 37a89403c5..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-272p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-272p.slangp
deleted file mode 100644
index ca4a31714b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-272p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-272p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-544p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-544p.slangp
deleted file mode 100644
index 409e853e4d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-544p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-544p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
deleted file mode 100644
index 4ee244b1f8..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-224p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index f20fd12c68..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-320p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-320p.slangp
deleted file mode 100644
index 04a384cb29..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-320p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-320p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index df3f5260f8..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp
deleted file mode 100644
index 69e34a4a8f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 1065f8b490..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp
deleted file mode 100644
index f739fe6d64..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp
deleted file mode 100644
index 2c84fe0005..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp
deleted file mode 100644
index a9449e8de9..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index ba2245f148..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index bdb6a7c3ec..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp
deleted file mode 100644
index 23562646fb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp
deleted file mode 100644
index f8eeb25dd5..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp
deleted file mode 100644
index da17c9a2b7..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 528fec4702..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-VIEWPORT.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index 2cd3f905bf..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 70a31aa9c3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp
deleted file mode 100644
index 8389881c43..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index f17c6363dc..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index d5f9405f83..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index c729037d0f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-1080p.slangp
deleted file mode 100644
index cbdf0224be..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-1080p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-1080p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-224p.slangp
deleted file mode 100644
index b839624133..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-224p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-224p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-240p.slangp
deleted file mode 100644
index df4c89a421..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp
deleted file mode 100644
index 7ddc111d9a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp
deleted file mode 100644
index 5de06ca9ab..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-480p.slangp
deleted file mode 100644
index 54b956d047..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp
deleted file mode 100644
index 73ec093786..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 5c22e15119..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp
deleted file mode 100644
index 5da2772d26..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp
deleted file mode 100644
index 20a4784f29..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-272.slangp
deleted file mode 100644
index 6064b07425..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-272.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-272.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-544.slangp
deleted file mode 100644
index 14a8437806..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-544.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-544.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 0f7867044a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ-VIEWPORT.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
deleted file mode 100644
index 9fdb476173..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-224p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index d81e566f9c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-240p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 387b728939..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp
deleted file mode 100644
index 6dc9654cae..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 6f835d21d2..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp
deleted file mode 100644
index 67edc659f0..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP_X-VIEWPORT_Y-272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP_X-VIEWPORT_Y-272.slangp
deleted file mode 100644
index 4a3020c5bc..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP_X-VIEWPORT_Y-272.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP_X-VIEWPORT_Y-272.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-1080p.slangp
deleted file mode 100644
index 9728cea0ca..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-1080p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-1080p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-480p.slangp
deleted file mode 100644
index 4169c210e6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 3d1a45054e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__PASSTHROUGH__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-VIEWPORT.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp
deleted file mode 100644
index e475db0f1c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 204740e394..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp
deleted file mode 100644
index 1d6c33b84d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index c321e1307e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index fefa9e5635..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-VIEWPORT.slangp
deleted file mode 100644
index c833ac01b2..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-VIEWPORT.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index b07db75d5f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-480p.slangp
deleted file mode 100644
index 4d4a40a7ad..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 958783d93b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV__DREZ-VIEWPORT.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 3c3ecfc903..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__GDV__DREZ_X-VIEWPORT_Y-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-1080p.slangp
deleted file mode 100644
index c1a97a0554..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-1080p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-1080p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-480p.slangp
deleted file mode 100644
index b4636b22c6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-480p.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-480p.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 121e8e111b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__PASSTHROUGH__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-VIEWPORT.slangp"
-#reference "../../resource/param_values/base/auto-settings.params"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp
deleted file mode 100644
index b70ce5fcbe..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,443 +0,0 @@
-shaders = 51
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader42 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear42 = true
-scale_type42 = viewport
-float_framebuffer42 = true
-alias42 = "BR_LayersUnderCRTPass"
-
-shader43 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear43 = true
-scale_type43 = viewport
-float_framebuffer43 = true
-alias43 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader44 = ../../../shaders/base/linearize-crt.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-# scale_x44 = 480
-# scale_y44 = 270
-# scale_x44 = 960
-# scale_y44 = 540
-scale_x44 = 800
-scale_y44 = 600
-float_framebuffer44 = true
-alias44 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader45 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input45 = true
-filter_linear45 = true
-float_framebuffer45 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader46 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear46 = true
-float_framebuffer46 = true
-alias46 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader47 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input47 = true
-filter_linear47 = true
-scale_type47 = absolute
-scale_x47 = 128
-scale_y47 = 128
-float_framebuffer47 = true
-alias47 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader48 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input48 = true
-filter_linear48 = true
-scale_type48 = absolute
-scale_x48 = 12
-scale_y48 = 12
-float_framebuffer48 = true
-alias48 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader49 = ../../../shaders/base/reflection.slang
-scale_type49 = viewport
-alias49 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader50 = ../../../shaders/base/combine-passes.slang
-alias50 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index ce9d2eb64b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,443 +0,0 @@
-shaders = 51
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-shader22 = ../../../shaders/base/stock.slang
-alias22 = "PreCRTPass"
-
-shader23 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear23 = true
-scale_type23 = source
-scale23 = 1.0
-alias23 = "AfterglowPass"
-
-shader24 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear24 = true
-scale_type24 = source
-mipmap_input24 = true
-scale24 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader25 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear25 = false
-scale_type25 = source
-scale25 = 1.0
-alias25 = "ColorCorrectPass"
-
-shader26 = ../../../shaders/base/stock.slang
-alias26 = "PrePass0"
-
-shader27 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear27 = false
-float_framebuffer27 = true
-scale_type_x27 = source
-scale_type_y27 = source
-scale_x27 = 4.0
-scale_y27 = 1.0
-frame_count_mod27 = 2
-alias27 = NPass1
-
-shader28 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer28 = true
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 0.5
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-
-shader30 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear30 = true
-scale_type30 = source
-scale_x30 = 1.0
-scale_y30 = 1.0
-
-shader31 = ../../../shaders/base/stock.slang
-filter_linear31 = true
-scale_type31 = source
-scale_x31 = 1.0
-scale_y31 = 1.0
-alias31 = "PrePass"
-mipmap_input31 = true
-
-shader32 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear32 = true
-scale_type32 = source
-scale32 = 1.0
-mipmap_input32 = true
-alias32 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader33 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear33 = true
-scale_type33 = source
-scale33 = 1.0
-float_framebuffer33 = true
-alias33 = "LinearizePass"
-
-shader34 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear34 = true
-scale_type_x34 = viewport
-scale_x34 = 1.0
-scale_type_y34 = source
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = Pass1
-
-shader35 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear35 = true
-scale_type_x35 = absolute
-scale_x35 = 640.0
-scale_type_y35 = source
-scale_y35 = 1.0 
-float_framebuffer35 = true
-
-shader36 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear36 = true
-scale_type_x36 = absolute
-scale_x36 = 640.0
-scale_type_y36 = absolute
-scale_y36 = 480.0
-float_framebuffer36 = true
-alias36 = GlowPass
-
-shader37 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear37 = true
-scale_type_x37 = absolute
-scale_x37 = 640.0
-scale_type_y37 = absolute
-scale_y37 = 480.0 
-float_framebuffer37 = true
-
-shader38 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear38 = true
-scale_type_x38 = absolute
-scale_x38 = 640.0
-scale_type_y38 = absolute
-scale_y38 = 480.0
-float_framebuffer38 = true
-alias38 = BloomPass
-
-shader39 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear39 = true
-scale_type39 = viewport
-scale_x39 = 1.0
-scale_y39 = 1.0
-float_framebuffer39 = true
-
-shader40 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear40 = true
-scale_type40 = viewport
-scale_x40 = 1.0
-scale_y40 = 1.0
-float_framebuffer40 = true
-alias40 = "CRTPass"
-
-shader41 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input41 = true
-scale_type41 = viewport
-float_framebuffer41 = true
-alias41 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader42 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear42 = true
-scale_type42 = viewport
-float_framebuffer42 = true
-alias42 = "BR_LayersUnderCRTPass"
-
-shader43 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear43 = true
-scale_type43 = viewport
-float_framebuffer43 = true
-alias43 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader44 = ../../../shaders/base/linearize-crt.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-# scale_x44 = 480
-# scale_y44 = 270
-# scale_x44 = 960
-# scale_y44 = 540
-scale_x44 = 800
-scale_y44 = 600
-float_framebuffer44 = true
-alias44 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader45 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input45 = true
-filter_linear45 = true
-float_framebuffer45 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader46 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear46 = true
-float_framebuffer46 = true
-alias46 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader47 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input47 = true
-filter_linear47 = true
-scale_type47 = absolute
-scale_x47 = 128
-scale_y47 = 128
-float_framebuffer47 = true
-alias47 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader48 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input48 = true
-filter_linear48 = true
-scale_type48 = absolute
-scale_x48 = 12
-scale_y48 = 12
-float_framebuffer48 = true
-alias48 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader49 = ../../../shaders/base/reflection.slang
-scale_type49 = viewport
-alias49 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader50 = ../../../shaders/base/combine-passes.slang
-alias50 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp
deleted file mode 100644
index d4b109c39c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,437 +0,0 @@
-shaders = 48
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 400
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = GlowPass
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = BloomPass
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader39 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersUnderCRTPass"
-
-shader40 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader41 = ../../../shaders/base/linearize-crt.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-# scale_x41 = 480
-# scale_y41 = 270
-# scale_x41 = 960
-# scale_y41 = 540
-scale_x41 = 800
-scale_y41 = 600
-float_framebuffer41 = true
-alias41 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader42 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input42 = true
-filter_linear42 = true
-float_framebuffer42 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear43 = true
-float_framebuffer43 = true
-alias43 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader44 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-scale_x44 = 128
-scale_y44 = 128
-float_framebuffer44 = true
-alias44 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 12
-scale_y45 = 12
-float_framebuffer45 = true
-alias45 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader46 = ../../../shaders/base/reflection.slang
-scale_type46 = viewport
-alias46 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader47 = ../../../shaders/base/combine-passes.slang
-alias47 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# 3DS Parameters
-HSM_FLIP_VIEWPORT_VERTICAL = 1
-HSM_ASPECT_RATIO_MODE = 5
-HSM_INT_SCALE_MODE = 0
-HSM_NON_INTEGER_SCALE = 88.888
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-HSM_2ND_SCREEN_ASPECT_RATIO_MODE = 1
-HSM_2ND_SCREEN_CROP_PERCENT_LEFT = "10"
-HSM_2ND_SCREEN_CROP_PERCENT_RIGHT = "10"
-HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS = "-2.8"
-
-HSM_CURVATURE_MODE = 0
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp
deleted file mode 100644
index f29d402956..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,416 +0,0 @@
-shaders = 48
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/stock.slang
-alias15 = refpass
-
-shader16 = ../../../shaders/scalefx/hsm-scalefx-pass0.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-alias16 = scalefx_pass0
-
-shader17 = ../../../shaders/scalefx/hsm-scalefx-pass1.slang
-filter_linear17 = false
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer12 = true
-
-shader18 = ../../../shaders/scalefx/hsm-scalefx-pass2.slang
-filter_linear18 = false
-scale_type18 = source
-scale18 = 1.0
-
-shader19 = ../../../shaders/scalefx/hsm-scalefx-pass3.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-
-shader20 = ../../../shaders/scalefx/hsm-scalefx-pass4.slang
-filter_linear20 = false
-scale_type20 = source
-scale20 = 3
-
-shader21 = ../../../shaders/base/intro.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type21 = source
-scale21 = 1.0
-alias21 = "IntroPass"
-
-# GTU TV Processing
-shader22 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type22 = source
-scale22 = 1.0
-float_framebuffer22 = true
-
-shader23 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x23 = source
-scale_x23 = 1.0
-scale_type_y23 = source
-scale_y23 = 1.0
-filter_linear23 = false
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/base/stock.slang
-alias24 = "PreCRTPass"
-
-shader25 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-alias25 = "AfterglowPass"
-
-shader26 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear26 = true
-scale_type26 = source
-mipmap_input26 = true
-scale26 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader27 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear27 = false
-scale_type27 = source
-scale27 = 1.0
-alias27 = "ColorCorrectPass"
-
-shader28 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear28 = true
-scale_type28 = source
-scale_x28 = 1.0
-scale_y28 = 1.0
-
-shader29 = ../../../shaders/base/stock.slang
-filter_linear29 = true
-scale_type29 = source
-scale_x29 = 1.0
-scale_y29 = 1.0
-alias29 = "PrePass"
-mipmap_input29 = true
-
-shader30 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear30 = true
-scale_type30 = source
-scale30 = 1.0
-mipmap_input30 = true
-alias30 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader31 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear31 = true
-scale_type31 = source
-scale31 = 1.0
-float_framebuffer31 = true
-alias31 = "LinearizePass"
-
-shader32 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 800.0
-scale_type_y32 = source
-scale_y32 = 1.0 
-float_framebuffer32 = true
-
-shader33 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear33 = true
-scale_type_x33 = absolute
-scale_x33 = 800.0
-scale_type_y33 = absolute
-scale_y33 = 600.0
-float_framebuffer33 = true
-alias33 = GlowPass
-
-shader34 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear34 = true
-scale_type_x34 = absolute
-scale_x34 = 800.0
-scale_type_y34 = absolute
-scale_y34 = 600.0 
-float_framebuffer34 = true
-
-shader35 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear35 = true
-scale_type_x35 = source
-scale_x35 = 1.0
-scale_type_y35 = source
-scale_y35 = 1.0
-float_framebuffer35 = true
-alias35 = BloomPass
-
-shader36 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear36 = true
-scale_type36 = viewport
-scale_x36 = 1.0
-scale_y36 = 1.0
-float_framebuffer36 = true
-
-shader37 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear37 = true
-scale_type37 = viewport
-scale_x37 = 1.0
-scale_y37 = 1.0
-float_framebuffer37 = true
-alias37 = "CRTPass"
-
-shader38 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input38 = true
-scale_type38 = viewport
-float_framebuffer38 = true
-alias38 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader39 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear39 = true
-scale_type39 = viewport
-float_framebuffer39 = true
-alias39 = "BR_LayersUnderCRTPass"
-
-shader40 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear40 = true
-scale_type40 = viewport
-float_framebuffer40 = true
-alias40 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader41 = ../../../shaders/base/linearize-crt.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-# scale_x41 = 480
-# scale_y41 = 270
-# scale_x41 = 960
-# scale_y41 = 540
-scale_x41 = 800
-scale_y41 = 600
-float_framebuffer41 = true
-alias41 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader42 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input42 = true
-filter_linear42 = true
-float_framebuffer42 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader43 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear43 = true
-float_framebuffer43 = true
-alias43 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader44 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input44 = true
-filter_linear44 = true
-scale_type44 = absolute
-scale_x44 = 128
-scale_y44 = 128
-float_framebuffer44 = true
-alias44 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader45 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input45 = true
-filter_linear45 = true
-scale_type45 = absolute
-scale_x45 = 12
-scale_y45 = 12
-float_framebuffer45 = true
-alias45 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader46 = ../../../shaders/base/reflection.slang
-scale_type46 = viewport
-alias46 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader47 = ../../../shaders/base/combine-passes.slang
-alias47 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# SMOOTH-ADV Parameters
-SGPT_BLEND_OPTION = 1
-
-HSM_SCALEFX_ON = 1
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 600
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30
-
-# Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-mask_bloom = 0.3
-
-# Mask Size is Auto, so it will look the same at 1080p and 4K
-masksize = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp
deleted file mode 100644
index 5165bcc07c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,395 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = GlowPass
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = BloomPass
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index 4ee26299eb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,395 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = GlowPass
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = BloomPass
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index 3cf575d166..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,399 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = GlowPass
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = BloomPass
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-320p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-320p.slangp
deleted file mode 100644
index ee84b6095e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-320p.slangp
+++ /dev/null
@@ -1,399 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 320
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = GlowPass
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = BloomPass
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 0b7b2bc6c2..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,399 +0,0 @@
-shaders = 45
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-shader16 = ../../../shaders/base/stock.slang
-alias16 = "PreCRTPass"
-
-shader17 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-alias17 = "AfterglowPass"
-
-shader18 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear18 = true
-scale_type18 = source
-mipmap_input18 = true
-scale18 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader19 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear19 = false
-scale_type19 = source
-scale19 = 1.0
-alias19 = "ColorCorrectPass"
-
-shader20 = ../../../shaders/base/stock.slang
-alias20 = "PrePass0"
-
-shader21 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear21 = false
-float_framebuffer21 = true
-scale_type_x21 = source
-scale_type_y21 = source
-scale_x21 = 4.0
-scale_y21 = 1.0
-frame_count_mod21 = 2
-alias21 = NPass1
-
-shader22 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer22 = true
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 0.5
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-
-shader24 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear24 = true
-scale_type24 = source
-scale_x24 = 1.0
-scale_y24 = 1.0
-
-shader25 = ../../../shaders/base/stock.slang
-filter_linear25 = true
-scale_type25 = source
-scale_x25 = 1.0
-scale_y25 = 1.0
-alias25 = "PrePass"
-mipmap_input25 = true
-
-shader26 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear26 = true
-scale_type26 = source
-scale26 = 1.0
-mipmap_input26 = true
-alias26 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader27 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear27 = true
-scale_type27 = source
-scale27 = 1.0
-float_framebuffer27 = true
-alias27 = "LinearizePass"
-
-shader28 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear28 = true
-scale_type_x28 = viewport
-scale_x28 = 1.0
-scale_type_y28 = source
-scale_y28 = 1.0
-float_framebuffer28 = true
-alias28 = Pass1
-
-shader29 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear29 = true
-scale_type_x29 = absolute
-scale_x29 = 640.0
-scale_type_y29 = source
-scale_y29 = 1.0 
-float_framebuffer29 = true
-
-shader30 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear30 = true
-scale_type_x30 = absolute
-scale_x30 = 640.0
-scale_type_y30 = absolute
-scale_y30 = 480.0
-float_framebuffer30 = true
-alias30 = GlowPass
-
-shader31 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear31 = true
-scale_type_x31 = absolute
-scale_x31 = 640.0
-scale_type_y31 = absolute
-scale_y31 = 480.0 
-float_framebuffer31 = true
-
-shader32 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear32 = true
-scale_type_x32 = absolute
-scale_x32 = 640.0
-scale_type_y32 = absolute
-scale_y32 = 480.0
-float_framebuffer32 = true
-alias32 = BloomPass
-
-shader33 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear33 = true
-scale_type33 = viewport
-scale_x33 = 1.0
-scale_y33 = 1.0
-float_framebuffer33 = true
-
-shader34 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear34 = true
-scale_type34 = viewport
-scale_x34 = 1.0
-scale_y34 = 1.0
-float_framebuffer34 = true
-alias34 = "CRTPass"
-
-shader35 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input35 = true
-scale_type35 = viewport
-float_framebuffer35 = true
-alias35 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader36 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear36 = true
-scale_type36 = viewport
-float_framebuffer36 = true
-alias36 = "BR_LayersUnderCRTPass"
-
-shader37 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear37 = true
-scale_type37 = viewport
-float_framebuffer37 = true
-alias37 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader38 = ../../../shaders/base/linearize-crt.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-# scale_x38 = 480
-# scale_y38 = 270
-# scale_x38 = 960
-# scale_y38 = 540
-scale_x38 = 800
-scale_y38 = 600
-float_framebuffer38 = true
-alias38 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader39 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input39 = true
-filter_linear39 = true
-float_framebuffer39 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader40 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear40 = true
-float_framebuffer40 = true
-alias40 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader41 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input41 = true
-filter_linear41 = true
-scale_type41 = absolute
-scale_x41 = 128
-scale_y41 = 128
-float_framebuffer41 = true
-alias41 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader42 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input42 = true
-filter_linear42 = true
-scale_type42 = absolute
-scale_x42 = 12
-scale_y42 = 12
-float_framebuffer42 = true
-alias42 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader43 = ../../../shaders/base/reflection.slang
-scale_type43 = viewport
-alias43 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader44 = ../../../shaders/base/combine-passes.slang
-alias44 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-1080p.slangp
deleted file mode 100644
index bc5403d806..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-1080p.slangp
+++ /dev/null
@@ -1,368 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 1440
-scale_type_y0 = absolute
-scale_y0 = 1080
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-224p.slangp
deleted file mode 100644
index 7f02a4fa0c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-224p.slangp
+++ /dev/null
@@ -1,368 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 224
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-240p.slangp
deleted file mode 100644
index b050b6cf49..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-240p.slangp
+++ /dev/null
@@ -1,368 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp
deleted file mode 100644
index a5bb483ce9..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,389 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 400
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# 3DS Parameters
-HSM_FLIP_VIEWPORT_VERTICAL = 1
-HSM_ASPECT_RATIO_MODE = 5
-HSM_INT_SCALE_MODE = 0
-HSM_NON_INTEGER_SCALE = 88.888
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-HSM_2ND_SCREEN_ASPECT_RATIO_MODE = 1
-HSM_2ND_SCREEN_CROP_PERCENT_LEFT = "10"
-HSM_2ND_SCREEN_CROP_PERCENT_RIGHT = "10"
-HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS = "-2.8"
-
-HSM_CURVATURE_MODE = 0
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-480p.slangp
deleted file mode 100644
index 495e5bea52..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,368 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp
deleted file mode 100644
index d65294cbcd..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,384 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 256
-scale_type_y0 = absolute
-scale_y0 = 384
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# NDS Parameters
-HSM_ASPECT_RATIO_MODE = 5
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp
deleted file mode 100644
index 893693ea89..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,382 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 480
-scale_type_y0 = absolute
-scale_y0 = 272
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# PSP Parameters
-HSM_ASPECT_RATIO_MODE = 5
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp
deleted file mode 100644
index 0198363960..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp
+++ /dev/null
@@ -1,382 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 960
-scale_type_y0 = absolute
-scale_y0 = 544
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# PSP Parameters
-HSM_ASPECT_RATIO_MODE = 5
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-272p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-272p.slangp
deleted file mode 100644
index 45ca13a83b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-272p.slangp
+++ /dev/null
@@ -1,383 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 272
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# PSP Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-544p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-544p.slangp
deleted file mode 100644
index 88eb0e9acd..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ-PSP_X-VIEWPORT_Y-544p.slangp
+++ /dev/null
@@ -1,383 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 544
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# PSP Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
deleted file mode 100644
index 2754593b35..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
+++ /dev/null
@@ -1,372 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 224
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index 7df1471f7c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,372 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-320p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-320p.slangp
deleted file mode 100644
index b1553fc3cc..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-320p.slangp
+++ /dev/null
@@ -1,372 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 320
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index a4550b9034..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,372 +0,0 @@
-shaders = 42
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear26 = true
-scale_type_x26 = absolute
-scale_x26 = 800.0
-scale_type_y26 = source
-scale_y26 = 1.0 
-float_framebuffer26 = true
-
-shader27 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear27 = true
-scale_type_x27 = absolute
-scale_x27 = 800.0
-scale_type_y27 = absolute
-scale_y27 = 600.0
-float_framebuffer27 = true
-alias27 = GlowPass
-
-shader28 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear28 = true
-scale_type_x28 = absolute
-scale_x28 = 800.0
-scale_type_y28 = absolute
-scale_y28 = 600.0 
-float_framebuffer28 = true
-
-shader29 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear29 = true
-scale_type_x29 = source
-scale_x29 = 1.0
-scale_type_y29 = source
-scale_y29 = 1.0
-float_framebuffer29 = true
-alias29 = BloomPass
-
-shader30 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear30 = true
-scale_type30 = viewport
-scale_x30 = 1.0
-scale_y30 = 1.0
-float_framebuffer30 = true
-
-shader31 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear31 = true
-scale_type31 = viewport
-scale_x31 = 1.0
-scale_y31 = 1.0
-float_framebuffer31 = true
-alias31 = "CRTPass"
-
-shader32 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input32 = true
-scale_type32 = viewport
-float_framebuffer32 = true
-alias32 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader33 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear33 = true
-scale_type33 = viewport
-float_framebuffer33 = true
-alias33 = "BR_LayersUnderCRTPass"
-
-shader34 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear34 = true
-scale_type34 = viewport
-float_framebuffer34 = true
-alias34 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../shaders/base/linearize-crt.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-# scale_x35 = 480
-# scale_y35 = 270
-# scale_x35 = 960
-# scale_y35 = 540
-scale_x35 = 800
-scale_y35 = 600
-float_framebuffer35 = true
-alias35 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader36 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input36 = true
-filter_linear36 = true
-float_framebuffer36 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader37 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear37 = true
-float_framebuffer37 = true
-alias37 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader38 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input38 = true
-filter_linear38 = true
-scale_type38 = absolute
-scale_x38 = 128
-scale_y38 = 128
-float_framebuffer38 = true
-alias38 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader39 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input39 = true
-filter_linear39 = true
-scale_type39 = absolute
-scale_x39 = 12
-scale_y39 = 12
-float_framebuffer39 = true
-alias39 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader40 = ../../../shaders/base/reflection.slang
-scale_type40 = viewport
-alias40 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader41 = ../../../shaders/base/combine-passes.slang
-alias41 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp
deleted file mode 100644
index 7b78d14fdc..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,353 +0,0 @@
-shaders = 38
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 400
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear27 = "false"
-scale_type27 = "viewport"
-scale27 = "1.0"
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-shader28 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader29 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "BR_LayersUnderCRTPass"
-
-shader30 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader31 = ../../../shaders/base/linearize-crt.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-# scale_x31 = 480
-# scale_y31 = 270
-# scale_x31 = 960
-# scale_y31 = 540
-scale_x31 = 800
-scale_y31 = 600
-float_framebuffer31 = true
-alias31 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input32 = true
-filter_linear32 = true
-float_framebuffer32 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear33 = true
-float_framebuffer33 = true
-alias33 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 128
-scale_y34 = 128
-float_framebuffer34 = true
-alias34 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 12
-scale_y35 = 12
-float_framebuffer35 = true
-alias35 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader36 = ../../../shaders/base/reflection.slang
-scale_type36 = viewport
-alias36 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader37 = ../../../shaders/base/combine-passes.slang
-alias37 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# 3DS Parameters
-HSM_FLIP_VIEWPORT_VERTICAL = 1
-HSM_ASPECT_RATIO_MODE = 5
-HSM_INT_SCALE_MODE = 0
-HSM_NON_INTEGER_SCALE = 88.888
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-HSM_2ND_SCREEN_ASPECT_RATIO_MODE = 1
-HSM_2ND_SCREEN_CROP_PERCENT_LEFT = "10"
-HSM_2ND_SCREEN_CROP_PERCENT_RIGHT = "10"
-HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS = "-2.8"
-
-HSM_CURVATURE_MODE = 0
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 5ca7566a09..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,348 +0,0 @@
-shaders = 38
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 256
-scale_type_y0 = absolute
-scale_y0 = 384
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear27 = "false"
-scale_type27 = "viewport"
-scale27 = "1.0"
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-shader28 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader29 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "BR_LayersUnderCRTPass"
-
-shader30 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader31 = ../../../shaders/base/linearize-crt.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-# scale_x31 = 480
-# scale_y31 = 270
-# scale_x31 = 960
-# scale_y31 = 540
-scale_x31 = 800
-scale_y31 = 600
-float_framebuffer31 = true
-alias31 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input32 = true
-filter_linear32 = true
-float_framebuffer32 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear33 = true
-float_framebuffer33 = true
-alias33 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 128
-scale_y34 = 128
-float_framebuffer34 = true
-alias34 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 12
-scale_y35 = 12
-float_framebuffer35 = true
-alias35 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader36 = ../../../shaders/base/reflection.slang
-scale_type36 = viewport
-alias36 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader37 = ../../../shaders/base/combine-passes.slang
-alias37 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# NDS Parameters
-HSM_ASPECT_RATIO_MODE = 5
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp
deleted file mode 100644
index 832410bfe3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,346 +0,0 @@
-shaders = 38
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 480
-scale_type_y0 = absolute
-scale_y0 = 272
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-adv.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/dedither/dedither-gamma-prep-1-before.slang
-alias4 = LinearGamma
-
-shader5 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = CB_Output
-
-shader8 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear9 = false
-
-shader10 = ../../../shaders/dedither/dedither-gamma-prep-2-after.slang
-
-shader11 = ../../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
-
-shader12 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer12 = "true"
-
-shader13 = ../../../shaders/guest/extras/hsm-g-sharp_resampler.slang
-
-shader14 = ../../../shaders/guest/extras/hsm-sharpsmoother.slang
-alias14 = "DeditherPass"
-
-shader15 = ../../../shaders/base/intro.slang
-filter_linear15 = false
-float_framebuffer15 = true
-scale_type15 = source
-scale15 = 1.0
-alias15 = "IntroPass"
-
-# GTU TV Processing
-shader16 = ../../../shaders/gtu/hsm-gtu-pass1.slang
-scale_type16 = source
-scale16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/gtu/hsm-gtu-pass2.slang
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-filter_linear17 = false
-float_framebuffer17 = true
-
-shader18 = ../../../shaders/base/stock.slang
-alias18 = "PreCRTPass"
-
-shader19 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 1.0
-alias19 = "AfterglowPass"
-
-shader20 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear20 = true
-scale_type20 = source
-mipmap_input20 = true
-scale20 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader21 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear21 = false
-scale_type21 = source
-scale21 = 1.0
-alias21 = "ColorCorrectPass"
-
-shader22 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear22 = true
-scale_type22 = source
-scale_x22 = 1.0
-scale_y22 = 1.0
-
-shader23 = ../../../shaders/base/stock.slang
-filter_linear23 = true
-scale_type23 = source
-scale_x23 = 1.0
-scale_y23 = 1.0
-alias23 = "PrePass"
-mipmap_input23 = true
-
-shader24 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear24 = true
-scale_type24 = source
-scale24 = 1.0
-mipmap_input24 = true
-alias24 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader25 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear25 = true
-scale_type25 = source
-scale25 = 1.0
-float_framebuffer25 = true
-alias25 = "LinearizePass"
-
-shader26 = ../../../shaders/base/delinearize.slang
-float_framebuffer26 = "true"
-
-shader27 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear27 = "false"
-scale_type27 = "viewport"
-scale27 = "1.0"
-float_framebuffer27 = "true"
-alias27 = "CRTPass"
-
-shader28 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input28 = true
-scale_type28 = viewport
-float_framebuffer28 = true
-alias28 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader29 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear29 = true
-scale_type29 = viewport
-float_framebuffer29 = true
-alias29 = "BR_LayersUnderCRTPass"
-
-shader30 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear30 = true
-scale_type30 = viewport
-float_framebuffer30 = true
-alias30 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader31 = ../../../shaders/base/linearize-crt.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-# scale_x31 = 480
-# scale_y31 = 270
-# scale_x31 = 960
-# scale_y31 = 540
-scale_x31 = 800
-scale_y31 = 600
-float_framebuffer31 = true
-alias31 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader32 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input32 = true
-filter_linear32 = true
-float_framebuffer32 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader33 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear33 = true
-float_framebuffer33 = true
-alias33 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader34 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input34 = true
-filter_linear34 = true
-scale_type34 = absolute
-scale_x34 = 128
-scale_y34 = 128
-float_framebuffer34 = true
-alias34 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader35 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input35 = true
-filter_linear35 = true
-scale_type35 = absolute
-scale_x35 = 12
-scale_y35 = 12
-float_framebuffer35 = true
-alias35 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader36 = ../../../shaders/base/reflection.slang
-scale_type36 = viewport
-alias36 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader37 = ../../../shaders/base/combine-passes.slang
-alias37 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# PSP Parameters
-HSM_ASPECT_RATIO_MODE = 5
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-# DREZ Parameters
-SHARPEN = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp
deleted file mode 100644
index a00e96a4bc..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,318 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp
deleted file mode 100644
index de01e78600..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,318 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index c5ffeb0a50..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,322 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index c08f57c0f9..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,322 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/base/delinearize.slang
-scale_type18 = source
-float_framebuffer18 = "true"
-
-shader19 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-filter_linear19 = true
-float_framebuffer19 = "true"
-alias19 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp
deleted file mode 100644
index a431a619c7..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp
+++ /dev/null
@@ -1,283 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 1440
-scale_type_y0 = absolute
-scale_y0 = 1080
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp
deleted file mode 100644
index c3906bf45c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp
+++ /dev/null
@@ -1,283 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp
deleted file mode 100644
index 3ff8805448..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp
+++ /dev/null
@@ -1,286 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 8de4c51ff1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,283 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = viewport
-scale_y0 = 1.0
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index 0bc7f15572..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,287 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index d1d5f27f46..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,290 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-scale_type14 = source
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang
-scale_type15 = viewport
-scale_x15 = 1.0
-scale_y15 = 1.0
-filter_linear15 = true
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp
deleted file mode 100644
index 0651cdb4ef..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp
+++ /dev/null
@@ -1,360 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = GlowPass
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = BloomPass
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader26 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear26 = true
-scale_type26 = viewport
-float_framebuffer26 = true
-alias26 = "BR_LayersUnderCRTPass"
-
-shader27 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear27 = true
-scale_type27 = viewport
-float_framebuffer27 = true
-alias27 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader28 = ../../../shaders/base/linearize-crt.slang
-mipmap_input28 = true
-filter_linear28 = true
-scale_type28 = absolute
-# scale_x28 = 480
-# scale_y28 = 270
-# scale_x28 = 960
-# scale_y28 = 540
-scale_x28 = 800
-scale_y28 = 600
-float_framebuffer28 = true
-alias28 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader29 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input29 = true
-filter_linear29 = true
-float_framebuffer29 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader30 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear30 = true
-float_framebuffer30 = true
-alias30 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader31 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-scale_x31 = 128
-scale_y31 = 128
-float_framebuffer31 = true
-alias31 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader32 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-scale_x32 = 12
-scale_y32 = 12
-float_framebuffer32 = true
-alias32 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader33 = ../../../shaders/base/reflection.slang
-scale_type33 = viewport
-alias33 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader34 = ../../../shaders/base/combine-passes.slang
-alias34 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index 77daeb09bf..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,360 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = GlowPass
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = BloomPass
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader26 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear26 = true
-scale_type26 = viewport
-float_framebuffer26 = true
-alias26 = "BR_LayersUnderCRTPass"
-
-shader27 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear27 = true
-scale_type27 = viewport
-float_framebuffer27 = true
-alias27 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader28 = ../../../shaders/base/linearize-crt.slang
-mipmap_input28 = true
-filter_linear28 = true
-scale_type28 = absolute
-# scale_x28 = 480
-# scale_y28 = 270
-# scale_x28 = 960
-# scale_y28 = 540
-scale_x28 = 800
-scale_y28 = 600
-float_framebuffer28 = true
-alias28 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader29 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input29 = true
-filter_linear29 = true
-float_framebuffer29 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader30 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear30 = true
-float_framebuffer30 = true
-alias30 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader31 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-scale_x31 = 128
-scale_y31 = 128
-float_framebuffer31 = true
-alias31 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader32 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-scale_x32 = 12
-scale_y32 = 12
-float_framebuffer32 = true
-alias32 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader33 = ../../../shaders/base/reflection.slang
-scale_type33 = viewport
-alias33 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader34 = ../../../shaders/base/combine-passes.slang
-alias34 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index c073a46ffe..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,364 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = GlowPass
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = BloomPass
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader26 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear26 = true
-scale_type26 = viewport
-float_framebuffer26 = true
-alias26 = "BR_LayersUnderCRTPass"
-
-shader27 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear27 = true
-scale_type27 = viewport
-float_framebuffer27 = true
-alias27 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader28 = ../../../shaders/base/linearize-crt.slang
-mipmap_input28 = true
-filter_linear28 = true
-scale_type28 = absolute
-# scale_x28 = 480
-# scale_y28 = 270
-# scale_x28 = 960
-# scale_y28 = 540
-scale_x28 = 800
-scale_y28 = 600
-float_framebuffer28 = true
-alias28 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader29 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input29 = true
-filter_linear29 = true
-float_framebuffer29 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader30 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear30 = true
-float_framebuffer30 = true
-alias30 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader31 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-scale_x31 = 128
-scale_y31 = 128
-float_framebuffer31 = true
-alias31 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader32 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-scale_x32 = 12
-scale_y32 = 12
-float_framebuffer32 = true
-alias32 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader33 = ../../../shaders/base/reflection.slang
-scale_type33 = viewport
-alias33 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader34 = ../../../shaders/base/combine-passes.slang
-alias34 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index dac3008987..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,364 +0,0 @@
-shaders = 35
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 = ../../../shaders/base/stock.slang
-alias10 = "PrePass0"
-
-shader11 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear11 = false
-float_framebuffer11 = true
-scale_type_x11 = source
-scale_type_y11 = source
-scale_x11 = 4.0
-scale_y11 = 1.0
-frame_count_mod11 = 2
-alias11 = NPass1
-
-shader12 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer12 = true
-filter_linear12 = true
-scale_type12 = source
-scale_x12 = 0.5
-scale_y12 = 1.0
-
-shader13 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear13 = true
-scale_type13 = source
-scale_x13 = 1.0
-scale_y13 = 1.0
-
-shader14 =  ../../../shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
-filter_linear14 = true
-scale_type14 = source
-scale_x14 = 1.0
-scale_y14 = 1.0
-
-shader15 = ../../../shaders/base/stock.slang
-filter_linear15 = true
-scale_type15 = source
-scale_x15 = 1.0
-scale_y15 = 1.0
-alias15 = "PrePass"
-mipmap_input15 = true
-
-shader16 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 1.0
-mipmap_input16 = true
-alias16 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader17 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 1.0
-float_framebuffer17 = true
-alias17 = "LinearizePass"
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear18 = true
-scale_type_x18 = viewport
-scale_x18 = 1.0
-scale_type_y18 = source
-scale_y18 = 1.0
-float_framebuffer18 = true
-alias18 = Pass1
-
-shader19 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear19 = true
-scale_type_x19 = absolute
-scale_x19 = 640.0
-scale_type_y19 = source
-scale_y19 = 1.0 
-float_framebuffer19 = true
-
-shader20 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear20 = true
-scale_type_x20 = absolute
-scale_x20 = 640.0
-scale_type_y20 = absolute
-scale_y20 = 480.0
-float_framebuffer20 = true
-alias20 = GlowPass
-
-shader21 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear21 = true
-scale_type_x21 = absolute
-scale_x21 = 640.0
-scale_type_y21 = absolute
-scale_y21 = 480.0 
-float_framebuffer21 = true
-
-shader22 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear22 = true
-scale_type_x22 = absolute
-scale_x22 = 640.0
-scale_type_y22 = absolute
-scale_y22 = 480.0
-float_framebuffer22 = true
-alias22 = BloomPass
-
-shader23 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
-filter_linear23 = true
-scale_type23 = viewport
-scale_x23 = 1.0
-scale_y23 = 1.0
-float_framebuffer23 = true
-
-shader24 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear24 = true
-scale_type24 = viewport
-scale_x24 = 1.0
-scale_y24 = 1.0
-float_framebuffer24 = true
-alias24 = "CRTPass"
-
-shader25 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input25 = true
-scale_type25 = viewport
-float_framebuffer25 = true
-alias25 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader26 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear26 = true
-scale_type26 = viewport
-float_framebuffer26 = true
-alias26 = "BR_LayersUnderCRTPass"
-
-shader27 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear27 = true
-scale_type27 = viewport
-float_framebuffer27 = true
-alias27 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader28 = ../../../shaders/base/linearize-crt.slang
-mipmap_input28 = true
-filter_linear28 = true
-scale_type28 = absolute
-# scale_x28 = 480
-# scale_y28 = 270
-# scale_x28 = 960
-# scale_y28 = 540
-scale_x28 = 800
-scale_y28 = 600
-float_framebuffer28 = true
-alias28 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader29 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input29 = true
-filter_linear29 = true
-float_framebuffer29 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader30 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear30 = true
-float_framebuffer30 = true
-alias30 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader31 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input31 = true
-filter_linear31 = true
-scale_type31 = absolute
-scale_x31 = 128
-scale_y31 = 128
-float_framebuffer31 = true
-alias31 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader32 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input32 = true
-filter_linear32 = true
-scale_type32 = absolute
-scale_x32 = 12
-scale_y32 = 12
-float_framebuffer32 = true
-alias32 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader33 = ../../../shaders/base/reflection.slang
-scale_type33 = viewport
-alias33 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader34 = ../../../shaders/base/combine-passes.slang
-alias34 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-1080p.slangp
deleted file mode 100644
index 333655d354..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-1080p.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 1440
-scale_type_y0 = absolute
-scale_y0 = 1080
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-224p.slangp
deleted file mode 100644
index 5c4b52e9f5..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-224p.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 224
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-240p.slangp
deleted file mode 100644
index 03204704d6..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-240p.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp
deleted file mode 100644
index a5f1f7570d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 1600
-scale_type_y0 = absolute
-scale_y0 = 1920
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp
deleted file mode 100644
index dab2f2e2e1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 400
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-480p.slangp
deleted file mode 100644
index 8d2203f54e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp
deleted file mode 100644
index a81376a376..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 1280
-scale_type_y0 = absolute
-scale_y0 = 1920
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp
deleted file mode 100644
index fd7d6cf3b0..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 256
-scale_type_y0 = absolute
-scale_y0 = 384
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp
deleted file mode 100644
index 0b2a3555ca..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 480
-scale_type_y0 = absolute
-scale_y0 = 272
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp
deleted file mode 100644
index 6e1d0a7d07..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 960
-scale_type_y0 = absolute
-scale_y0 = 544
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-272.slangp
deleted file mode 100644
index 688919810a..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-272.slangp
+++ /dev/null
@@ -1,334 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 272
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# PSP Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-544.slangp
deleted file mode 100644
index 754f91c384..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-PSP_X-VIEWPORT_Y-544.slangp
+++ /dev/null
@@ -1,334 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 544
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# PSP Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 8058cf199c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,319 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = viewport
-scale_y0 = 1.0
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
deleted file mode 100644
index 4e8bb13f7b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-224p.slangp
+++ /dev/null
@@ -1,323 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 224
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
deleted file mode 100644
index a47d0a9bbd..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-240p.slangp
+++ /dev/null
@@ -1,323 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 240
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 29a57963b7..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,323 +0,0 @@
-shaders = 30
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = source
-scale_y14 = 1.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = GlowPass
-
-shader16 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear16 = true
-scale_type_x16 = absolute
-scale_x16 = 800.0
-scale_type_y16 = absolute
-scale_y16 = 600.0 
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear17 = true
-scale_type_x17 = source
-scale_x17 = 1.0
-scale_type_y17 = source
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = BloomPass
-
-shader18 = ../../../shaders/guest/hsm-crt-guest-advanced.slang
-filter_linear18 = true
-scale_type18 = viewport
-scale_x18 = 1.0
-scale_y18 = 1.0
-float_framebuffer18 = true
-
-shader19 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear19 = true
-scale_type19 = viewport
-scale_x19 = 1.0
-scale_y19 = 1.0
-float_framebuffer19 = true
-alias19 = "CRTPass"
-
-shader20 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input20 = true
-scale_type20 = viewport
-float_framebuffer20 = true
-alias20 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader21 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear21 = true
-scale_type21 = viewport
-float_framebuffer21 = true
-alias21 = "BR_LayersUnderCRTPass"
-
-shader22 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear22 = true
-scale_type22 = viewport
-float_framebuffer22 = true
-alias22 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../shaders/base/linearize-crt.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-# scale_x23 = 480
-# scale_y23 = 270
-# scale_x23 = 960
-# scale_y23 = 540
-scale_x23 = 800
-scale_y23 = 600
-float_framebuffer23 = true
-alias23 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader24 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input24 = true
-filter_linear24 = true
-float_framebuffer24 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader25 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear25 = true
-float_framebuffer25 = true
-alias25 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader26 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input26 = true
-filter_linear26 = true
-scale_type26 = absolute
-scale_x26 = 128
-scale_y26 = 128
-float_framebuffer26 = true
-alias26 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader27 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input27 = true
-filter_linear27 = true
-scale_type27 = absolute
-scale_x27 = 12
-scale_y27 = 12
-float_framebuffer27 = true
-alias27 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader28 = ../../../shaders/base/reflection.slang
-scale_type28 = viewport
-alias28 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader29 = ../../../shaders/base/combine-passes.slang
-alias29 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp
deleted file mode 100644
index 444202d15b..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,283 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 400
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 9c0701962c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,283 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 256
-scale_type_y0 = absolute
-scale_y0 = 384
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp
deleted file mode 100644
index 67df720a36..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp
+++ /dev/null
@@ -1,283 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 480
-scale_type_y0 = absolute
-scale_y0 = 272
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP_X-VIEWPORT_Y-272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP_X-VIEWPORT_Y-272.slangp
deleted file mode 100644
index 8b611b8a85..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__LCD-GRID__DREZ-PSP_X-VIEWPORT_Y-272.slangp
+++ /dev/null
@@ -1,287 +0,0 @@
-shaders = 26
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 272
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-shader6 = ../../../shaders/base/stock.slang
-alias6 = "PreCRTPass"
-
-shader7 = ../../../shaders/guest/hsm-afterglow0.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-alias7 = "AfterglowPass"
-
-shader8 = ../../../shaders/guest/hsm-pre-shaders-afterglow.slang
-filter_linear8 = true
-scale_type8 = source
-mipmap_input8 = true
-scale8 = 1.0
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader9 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-alias9 = "ColorCorrectPass"
-
-shader10 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = ../../../shaders/base/stock.slang
-filter_linear11 = true
-scale_type11 = source
-scale_x11 = 1.0
-scale_y11 = 1.0
-alias11 = "PrePass"
-mipmap_input11 = true
-
-shader12 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 1.0
-mipmap_input12 = true
-alias12 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader13 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-float_framebuffer13 = true
-alias13 = "LinearizePass"
-
-shader14 = ../../../shaders/base/delinearize.slang
-float_framebuffer14 = "true"
-
-shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
-filter_linear15 = "false"
-scale_type15 = "viewport"
-scale15 = "1.0"
-float_framebuffer15 = "true"
-alias15 = "CRTPass"
-
-shader16 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input16 = true
-scale_type16 = viewport
-float_framebuffer16 = true
-alias16 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader17 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear17 = true
-scale_type17 = viewport
-float_framebuffer17 = true
-alias17 = "BR_LayersUnderCRTPass"
-
-shader18 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader19 = ../../../shaders/base/linearize-crt.slang
-mipmap_input19 = true
-filter_linear19 = true
-scale_type19 = absolute
-# scale_x19 = 480
-# scale_y19 = 270
-# scale_x19 = 960
-# scale_y19 = 540
-scale_x19 = 800
-scale_y19 = 600
-float_framebuffer19 = true
-alias19 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader20 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input20 = true
-filter_linear20 = true
-float_framebuffer20 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader21 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear21 = true
-float_framebuffer21 = true
-alias21 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader22 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input22 = true
-filter_linear22 = true
-scale_type22 = absolute
-scale_x22 = 128
-scale_y22 = 128
-float_framebuffer22 = true
-alias22 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader23 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input23 = true
-filter_linear23 = true
-scale_type23 = absolute
-scale_x23 = 12
-scale_y23 = 12
-float_framebuffer23 = true
-alias23 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader24 = ../../../shaders/base/reflection.slang
-scale_type24 = viewport
-alias24 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader25 = ../../../shaders/base/combine-passes.slang
-alias25 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
-
-# LCD-GRID Parameters
-HSM_REFLECT_GLOBAL_AMOUNT = 20
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-1080p.slangp
deleted file mode 100644
index f987754641..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-1080p.slangp
+++ /dev/null
@@ -1,243 +0,0 @@
-shaders = 20
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 1440
-scale_type_y0 = absolute
-scale_y0 = 1080
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader11 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear11 = true
-scale_type11 = viewport
-float_framebuffer11 = true
-alias11 = "BR_LayersUnderCRTPass"
-
-shader12 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear12 = true
-scale_type12 = viewport
-float_framebuffer12 = true
-alias12 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader13 = ../../../shaders/base/linearize-crt.slang
-mipmap_input13 = true
-filter_linear13 = true
-scale_type13 = absolute
-# scale_x13 = 480
-# scale_y13 = 270
-# scale_x13 = 960
-# scale_y13 = 540
-scale_x13 = 800
-scale_y13 = 600
-float_framebuffer13 = true
-alias13 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader14 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input14 = true
-filter_linear14 = true
-float_framebuffer14 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader15 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear15 = true
-float_framebuffer15 = true
-alias15 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader16 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input16 = true
-filter_linear16 = true
-scale_type16 = absolute
-scale_x16 = 128
-scale_y16 = 128
-float_framebuffer16 = true
-alias16 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader17 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input17 = true
-filter_linear17 = true
-scale_type17 = absolute
-scale_x17 = 12
-scale_y17 = 12
-float_framebuffer17 = true
-alias17 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader18 = ../../../shaders/base/reflection.slang
-scale_type18 = viewport
-alias18 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader19 = ../../../shaders/base/combine-passes.slang
-alias19 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-480p.slangp
deleted file mode 100644
index 1a35fe45eb..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-480p.slangp
+++ /dev/null
@@ -1,243 +0,0 @@
-shaders = 20
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader11 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear11 = true
-scale_type11 = viewport
-float_framebuffer11 = true
-alias11 = "BR_LayersUnderCRTPass"
-
-shader12 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear12 = true
-scale_type12 = viewport
-float_framebuffer12 = true
-alias12 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader13 = ../../../shaders/base/linearize-crt.slang
-mipmap_input13 = true
-filter_linear13 = true
-scale_type13 = absolute
-# scale_x13 = 480
-# scale_y13 = 270
-# scale_x13 = 960
-# scale_y13 = 540
-scale_x13 = 800
-scale_y13 = 600
-float_framebuffer13 = true
-alias13 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader14 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input14 = true
-filter_linear14 = true
-float_framebuffer14 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader15 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear15 = true
-float_framebuffer15 = true
-alias15 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader16 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input16 = true
-filter_linear16 = true
-scale_type16 = absolute
-scale_x16 = 128
-scale_y16 = 128
-float_framebuffer16 = true
-alias16 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader17 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input17 = true
-filter_linear17 = true
-scale_type17 = absolute
-scale_x17 = 12
-scale_y17 = 12
-float_framebuffer17 = true
-alias17 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader18 = ../../../shaders/base/reflection.slang
-scale_type18 = viewport
-alias18 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader19 = ../../../shaders/base/combine-passes.slang
-alias19 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-VIEWPORT.slangp
deleted file mode 100644
index e6ba35787d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__3__STD__PASSTHROUGH__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,243 +0,0 @@
-shaders = 20
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = viewport
-scale_y0 = 1.0
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-all-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/base/text-std.slang
-filter_linear2 = false
-float_framebuffer2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = "TextPass"
-
-shader3 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 1
-scale_y3 = 1
-
-shader4 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer4 = "true"
-alias4 = "DeditherPass"
-
-shader5 = ../../../shaders/base/intro.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = "IntroPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader6 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = "ColorCorrectPass"
-
-shader7 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/linearize.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-float_framebuffer8 = true
-alias8 = "LinearizePass"
-
-shader9 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
-filter_linear9 = "false"
-scale_type9 = "viewport"
-scale9 = "1.0"
-float_framebuffer9 = "true"
-alias9 = "CRTPass"
-
-shader10 = ../../../shaders/base/post-crt-prep-image-layers.slang
-mipmap_input10 = true
-scale_type10 = viewport
-float_framebuffer10 = true
-alias10 = "PostCRTPass"
-
-# Bezel Generation & Composite of Image Layers ----------------------------------------------------------------
-
-shader11 = ../../../shaders/base/bezel-images-under-crt.slang
-filter_linear11 = true
-scale_type11 = viewport
-float_framebuffer11 = true
-alias11 = "BR_LayersUnderCRTPass"
-
-shader12 = ../../../shaders/base/bezel-images-over-crt.slang
-filter_linear12 = true
-scale_type12 = viewport
-float_framebuffer12 = true
-alias12 = "BR_LayersOverCRTPass"
-
-# Reduce Resolution  ----------------------------------------------------------------
-#      Reduce the resolution to a small static size regardless of final resolution
-#      Allows consistent look and faster at different final resolutions for blur
-#      Mipmap option allows downscaling without artifacts
-shader13 = ../../../shaders/base/linearize-crt.slang
-mipmap_input13 = true
-filter_linear13 = true
-scale_type13 = absolute
-# scale_x13 = 480
-# scale_y13 = 270
-# scale_x13 = 960
-# scale_y13 = 540
-scale_x13 = 800
-scale_y13 = 600
-float_framebuffer13 = true
-alias13 = "BR_MirrorLowResPass"
-
-# Add Blur for the Reflection (Horizontal) ----------------------------------------------------------------
-shader14 = ../../../shaders/base/blur-outside-screen-horiz.slang
-mipmap_input14 = true
-filter_linear14 = true
-float_framebuffer14 = true
-
-# Add Blur for the Reflection (Vertical) ----------------------------------------------------------------
-shader15 = ../../../shaders/base/blur-outside-screen-vert.slang
-filter_linear15 = true
-float_framebuffer15 = true
-alias15 = "BR_MirrorBlurredPass"
-
-# Reduce resolution ----------------------------------------------------------------
-# Reduced to a very small amount so we can create a blur which will create a glow from the screen
-#      Mipmap option allows smoother downscaling
-shader16 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input16 = true
-filter_linear16 = true
-scale_type16 = absolute
-scale_x16 = 128
-scale_y16 = 128
-float_framebuffer16 = true
-alias16 = "BR_MirrorReflectionDiffusedPass"
-
-# Add Diffused glow all around the screen ----------------------------------------------------------------
-#      Blurred so much that it's non directional
-#      Mipmap option allows downscaling without artifacts
-shader17 = ../../../../../blurs/shaders/royale/blur9x9.slang
-mipmap_input17 = true
-filter_linear17 = true
-scale_type17 = absolute
-scale_x17 = 12
-scale_y17 = 12
-float_framebuffer17 = true
-alias17 = "BR_MirrorFullscreenGlowPass"
-
-# Bezel Reflection ----------------------------------------------------------------
-shader18 = ../../../shaders/base/reflection.slang
-scale_type18 = viewport
-alias18 = "ReflectionPass"
-
-# Combine Passes ----------------------------------------------------------------
-shader19 = ../../../shaders/base/combine-passes.slang
-alias19 = "CombinePass"
-
-# Textures All
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-IntroImage = ../../../shaders/textures/IntroImage_MegaBezelLogo.png
-IntroImage_linear = true
-IntroImage_mipmap = 1
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-TubeDiffuseImage = ../../../shaders/textures/Tube_Diffuse_2390x1792.png
-TubeDiffuseImage_linear = true
-TubeDiffuseImage_mipmap = 1
-
-TubeColoredGelImage = ../../../shaders/textures/Colored_Gel_Rainbow.png
-TubeColoredGelImage_linear = true
-TubeColoredGelImage_mipmap = 1
-
-TubeShadowImage = ../../../shaders/textures/Tube_Shadow_1600x1200.png
-TubeShadowImage_linear = true
-TubeShadowImage_mipmap = 1
-
-TubeStaticReflectionImage = ../../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
-TubeStaticReflectionImage_linear = true
-TubeStaticReflectionImage_mipmap = 1
-
-ReflectionMaskImage = ../../../shaders/textures/Placeholder_White_16x16.png
-ReflectionMaskImage_linear = true
-ReflectionMaskImage_mipmap = 1
-
-FrameTextureImage = ../../../shaders/textures/FrameTexture_2800x2120.png
-FrameTextureImage_linear = true
-FrameTextureImage_mipmap = 1
-
-BackgroundImage = ../../../shaders/textures/BackgroundImage_Carbon_3840x2160.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage_linear = true
-CabinetGlassImage_mipmap = 1
-
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage_linear = true
-DeviceImage_mipmap = 1
-
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage_linear = true
-DeviceVertImage_mipmap = 1
-
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage_linear = true
-DeviceLEDImage_mipmap = 1
-
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage_linear = true
-DecalImage_mipmap = 1
-
-NightLightingImage = ../../../shaders/textures/NightLightingClose_1920x1080.png
-NightLightingImage_linear = true
-NightLightingImage_mipmap = 1
-
-NightLighting2Image = ../../../shaders/textures/NightLightingFar_1920x1080.png
-NightLighting2Image_linear = true
-NightLighting2Image_mipmap = 1
-
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage_linear = true
-LEDImage_mipmap = 1
-
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage_linear = true
-TopLayerImage_mipmap = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp
deleted file mode 100644
index a1d8d2cd8e..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,139 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = "PrePass"
-mipmap_input8 = true
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-
-shader11 = ../../../shaders/base/delinearize.slang
-scale_type11 = source
-float_framebuffer11 = "true"
-
-shader12 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type12 = viewport
-scale_x12 = 1.0
-scale_y12 = 1.0
-filter_linear12 = true
-float_framebuffer12 = "true"
-alias12 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader13 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input13 = true
-scale_type13 = viewport
-float_framebuffer13 = true
-alias13 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 4f448880d3..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,146 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = "PrePass"
-mipmap_input8 = true
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-
-shader11 = ../../../shaders/base/delinearize.slang
-scale_type11 = source
-float_framebuffer11 = "true"
-
-shader12 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type12 = viewport
-scale_x12 = 1.0
-scale_y12 = 1.0
-filter_linear12 = true
-float_framebuffer12 = "true"
-alias12 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader13 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input13 = true
-scale_type13 = viewport
-float_framebuffer13 = true
-alias13 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp
deleted file mode 100644
index 48959a2650..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp
+++ /dev/null
@@ -1,107 +0,0 @@
-shaders = 10
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/base/delinearize.slang
-scale_type7 = source
-float_framebuffer7 = "true"
-
-shader8 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type8 = viewport
-scale_x8 = 1.0
-scale_y8 = 1.0
-filter_linear8 = true
-float_framebuffer8 = "true"
-alias8 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader9 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input9 = true
-scale_type9 = viewport
-float_framebuffer9 = true
-alias9 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index f7d1b8a47c..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-MINI__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,114 +0,0 @@
-shaders = 10
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/base/delinearize.slang
-scale_type7 = source
-float_framebuffer7 = "true"
-
-shader8 = ../../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
-scale_type8 = viewport
-scale_x8 = 1.0
-scale_y8 = 1.0
-filter_linear8 = true
-float_framebuffer8 = "true"
-alias8 = "CRTPass"
-
-g_sat = 0.25
-g_lum = 0.15
-g_gamma_out = 2.45
-
-shader9 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input9 = true
-scale_type9 = viewport
-float_framebuffer9 = true
-alias9 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp
deleted file mode 100644
index bec6a1e097..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp
+++ /dev/null
@@ -1,181 +0,0 @@
-shaders = 19
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = "PrePass"
-mipmap_input8 = true
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear11 = true
-scale_type_x11 = viewport
-scale_x11 = 1.0
-scale_type_y11 = source
-scale_y11 = 1.0
-float_framebuffer11 = true
-alias11 = Pass1
-
-shader12 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear12 = true
-scale_type_x12 = absolute
-scale_x12 = 640.0
-scale_type_y12 = source
-scale_y12 = 1.0 
-float_framebuffer12 = true
-
-shader13 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear13 = true
-scale_type_x13 = absolute
-scale_x13 = 640.0
-scale_type_y13 = absolute
-scale_y13 = 480.0
-float_framebuffer13 = true
-alias13 = GlowPass
-
-shader14 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 640.0
-scale_type_y14 = absolute
-scale_y14 = 480.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 640.0
-scale_type_y15 = absolute
-scale_y15 = 480.0
-float_framebuffer15 = true
-alias15 = BloomPass
-
-shader16 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang
-filter_linear16 = true
-scale_type16 = viewport
-scale_x16 = 1.0
-scale_y16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear17 = true
-scale_type17 = viewport
-scale_x17 = 1.0
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = "CRTPass"
-
-shader18 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 73d0606b2f..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,185 +0,0 @@
-shaders = 19
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = viewport
-scale_y0 = 1.0
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = "PrePass"
-mipmap_input8 = true
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear11 = true
-scale_type_x11 = viewport
-scale_x11 = 1.0
-scale_type_y11 = source
-scale_y11 = 1.0
-float_framebuffer11 = true
-alias11 = Pass1
-
-shader12 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear12 = true
-scale_type_x12 = absolute
-scale_x12 = 640.0
-scale_type_y12 = source
-scale_y12 = 1.0 
-float_framebuffer12 = true
-
-shader13 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear13 = true
-scale_type_x13 = absolute
-scale_x13 = 640.0
-scale_type_y13 = absolute
-scale_y13 = 480.0
-float_framebuffer13 = true
-alias13 = GlowPass
-
-shader14 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 640.0
-scale_type_y14 = absolute
-scale_y14 = 480.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 640.0
-scale_type_y15 = absolute
-scale_y15 = 480.0
-float_framebuffer15 = true
-alias15 = BloomPass
-
-shader16 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang
-filter_linear16 = true
-scale_type16 = viewport
-scale_x16 = 1.0
-scale_y16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear17 = true
-scale_type17 = viewport
-scale_x17 = 1.0
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = "CRTPass"
-
-shader18 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index afc7a8da46..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV-NTSC__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,188 +0,0 @@
-shaders = 19
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-alias4 = "PrePass0"
-
-shader5 = ../../../shaders/guest/ntsc/hsm-ntsc-pass1.slang
-filter_linear5 = false
-float_framebuffer5 = true
-scale_type_x5 = source
-scale_type_y5 = source
-scale_x5 = 4.0
-scale_y5 = 1.0
-frame_count_mod5 = 2
-alias5 = NPass1
-
-shader6 = ../../../shaders/guest/ntsc/hsm-ntsc-pass2.slang
-float_framebuffer6 = true
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 0.5
-scale_y6 = 1.0
-
-shader7 = ../../../shaders/guest/ntsc/hsm-ntsc-pass3.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = ../../../shaders/base/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = "PrePass"
-mipmap_input8 = true
-
-shader9 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader10 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-float_framebuffer10 = true
-alias10 = "LinearizePass"
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
-filter_linear11 = true
-scale_type_x11 = viewport
-scale_x11 = 1.0
-scale_type_y11 = source
-scale_y11 = 1.0
-float_framebuffer11 = true
-alias11 = Pass1
-
-shader12 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear12 = true
-scale_type_x12 = absolute
-scale_x12 = 640.0
-scale_type_y12 = source
-scale_y12 = 1.0 
-float_framebuffer12 = true
-
-shader13 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear13 = true
-scale_type_x13 = absolute
-scale_x13 = 640.0
-scale_type_y13 = absolute
-scale_y13 = 480.0
-float_framebuffer13 = true
-alias13 = GlowPass
-
-shader14 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 640.0
-scale_type_y14 = absolute
-scale_y14 = 480.0 
-float_framebuffer14 = true
-
-shader15 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 640.0
-scale_type_y15 = absolute
-scale_y15 = 480.0
-float_framebuffer15 = true
-alias15 = BloomPass
-
-shader16 = ../../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang
-filter_linear16 = true
-scale_type16 = viewport
-scale_x16 = 1.0
-scale_y16 = 1.0
-float_framebuffer16 = true
-
-shader17 = ../../../shaders/guest/hsm-deconvergence.slang
-filter_linear17 = true
-scale_type17 = viewport
-scale_x17 = 1.0
-scale_y17 = 1.0
-float_framebuffer17 = true
-alias17 = "CRTPass"
-
-shader18 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input18 = true
-scale_type18 = viewport
-float_framebuffer18 = true
-alias18 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# GDV NTSC Parameters
-GAMMA_INPUT = 2.0
-gamma_out = 1.95
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ-480p.slangp
deleted file mode 100644
index 433e2cc340..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ-480p.slangp
+++ /dev/null
@@ -1,140 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear7 = true
-scale_type_x7 = absolute
-scale_x7 = 800.0
-scale_type_y7 = source
-scale_y7 = 1.0 
-float_framebuffer7 = true
-
-shader8 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear8 = true
-scale_type_x8 = absolute
-scale_x8 = 800.0
-scale_type_y8 = absolute
-scale_y8 = 600.0
-float_framebuffer8 = true
-alias8 = GlowPass
-
-shader9 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear9 = true
-scale_type_x9 = absolute
-scale_x9 = 800.0
-scale_type_y9 = absolute
-scale_y9 = 600.0 
-float_framebuffer9 = true
-
-shader10 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear10 = true
-scale_type_x10 = source
-scale_x10 = 1.0
-scale_type_y10 = source
-scale_y10 = 1.0
-float_framebuffer10 = true
-alias10 = BloomPass
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-potato.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale_x11 = 1.0
-scale_y11 = 1.0
-float_framebuffer11 = true
-
-shader12 = ../../../shaders/guest/hsm-deconvergence-potato.slang
-filter_linear12 = true
-scale_type12 = viewport
-scale_x12 = 1.0
-scale_y12 = 1.0
-float_framebuffer12 = true
-alias12 = "CRTPass"
-
-shader13 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input13 = true
-scale_type13 = viewport
-float_framebuffer13 = true
-alias13 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 832c9a58e2..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,140 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = viewport
-scale_y0 = 1.0
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear7 = true
-scale_type_x7 = absolute
-scale_x7 = 800.0
-scale_type_y7 = source
-scale_y7 = 1.0 
-float_framebuffer7 = true
-
-shader8 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear8 = true
-scale_type_x8 = absolute
-scale_x8 = 800.0
-scale_type_y8 = absolute
-scale_y8 = 600.0
-float_framebuffer8 = true
-alias8 = GlowPass
-
-shader9 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear9 = true
-scale_type_x9 = absolute
-scale_x9 = 800.0
-scale_type_y9 = absolute
-scale_y9 = 600.0 
-float_framebuffer9 = true
-
-shader10 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear10 = true
-scale_type_x10 = source
-scale_x10 = 1.0
-scale_type_y10 = source
-scale_y10 = 1.0
-float_framebuffer10 = true
-alias10 = BloomPass
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-potato.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale_x11 = 1.0
-scale_y11 = 1.0
-float_framebuffer11 = true
-
-shader12 = ../../../shaders/guest/hsm-deconvergence-potato.slang
-filter_linear12 = true
-scale_type12 = viewport
-scale_x12 = 1.0
-scale_y12 = 1.0
-float_framebuffer12 = true
-alias12 = "CRTPass"
-
-shader13 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input13 = true
-scale_type13 = viewport
-float_framebuffer13 = true
-alias13 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ_X-VIEWPORT_Y-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
deleted file mode 100644
index 99088eba52..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__GDV__DREZ_X-VIEWPORT_Y-480p.slangp
+++ /dev/null
@@ -1,147 +0,0 @@
-shaders = 14
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader3 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "ColorCorrectPass"
-
-shader4 = ../../../shaders/base/stock.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-alias4 = "PrePass"
-mipmap_input4 = true
-
-shader5 = ../../../shaders/guest/hsm-avg-lum.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-mipmap_input5 = true
-alias5 = "AvgLumPass"
-
-# Pass referenced by subsequent blurring passes and crt pass
-shader6 = ../../../shaders/guest/hsm-interlace-and-linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/hsm-gaussian_horizontal.slang
-filter_linear7 = true
-scale_type_x7 = absolute
-scale_x7 = 800.0
-scale_type_y7 = source
-scale_y7 = 1.0 
-float_framebuffer7 = true
-
-shader8 = ../../../shaders/guest/hsm-gaussian_vertical.slang
-filter_linear8 = true
-scale_type_x8 = absolute
-scale_x8 = 800.0
-scale_type_y8 = absolute
-scale_y8 = 600.0
-float_framebuffer8 = true
-alias8 = GlowPass
-
-shader9 = ../../../shaders/guest/hsm-bloom_horizontal.slang
-filter_linear9 = true
-scale_type_x9 = absolute
-scale_x9 = 800.0
-scale_type_y9 = absolute
-scale_y9 = 600.0 
-float_framebuffer9 = true
-
-shader10 = ../../../shaders/guest/hsm-bloom_vertical.slang
-filter_linear10 = true
-scale_type_x10 = source
-scale_x10 = 1.0
-scale_type_y10 = source
-scale_y10 = 1.0
-float_framebuffer10 = true
-alias10 = BloomPass
-
-shader11 = ../../../shaders/guest/hsm-crt-guest-advanced-potato.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale_x11 = 1.0
-scale_y11 = 1.0
-float_framebuffer11 = true
-
-shader12 = ../../../shaders/guest/hsm-deconvergence-potato.slang
-filter_linear12 = true
-scale_type12 = viewport
-scale_x12 = 1.0
-scale_y12 = 1.0
-float_framebuffer12 = true
-alias12 = "CRTPass"
-
-shader13 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input13 = true
-scale_type13 = viewport
-float_framebuffer13 = true
-alias13 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# DREZ Parameters
-SHARPEN = 0
-
-# Drez X Viewport Scale Parameters
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-1080p.slangp
deleted file mode 100644
index 79eb0e53aa..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-1080p.slangp
+++ /dev/null
@@ -1,97 +0,0 @@
-shaders = 9
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 1440
-scale_type_y0 = absolute
-scale_y0 = 1080
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-shader3 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer3 = "true"
-alias3 = "DeditherPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader4 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-alias4 = "ColorCorrectPass"
-
-shader5 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear5 = true
-scale_type5 = source
-scale_x5 = 1.0
-scale_y5 = 1.0
-
-shader6 = ../../../shaders/base/linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-potato.slang
-filter_linear7 = "false"
-scale_type7 = "viewport"
-scale7 = "1.0"
-float_framebuffer7 = "true"
-alias7 = "CRTPass"
-
-shader8 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input8 = true
-scale_type8 = viewport
-float_framebuffer8 = true
-alias8 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# PASSTHROUGH Parameters
-HSM_FXAA_ON = 0
-HSM_SCREEN_SCALE_GSHARP_MODE = 1
-HSM_CRT_CURVATURE_SCALE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-480p.slangp
deleted file mode 100644
index 5597f22ec1..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-480p.slangp
+++ /dev/null
@@ -1,97 +0,0 @@
-shaders = 9
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_x0 = 640
-scale_type_y0 = absolute
-scale_y0 = 480
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-shader3 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer3 = "true"
-alias3 = "DeditherPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader4 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-alias4 = "ColorCorrectPass"
-
-shader5 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear5 = true
-scale_type5 = source
-scale_x5 = 1.0
-scale_y5 = 1.0
-
-shader6 = ../../../shaders/base/linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-potato.slang
-filter_linear7 = "false"
-scale_type7 = "viewport"
-scale7 = "1.0"
-float_framebuffer7 = "true"
-alias7 = "CRTPass"
-
-shader8 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input8 = true
-scale_type8 = viewport
-float_framebuffer8 = true
-alias8 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# PASSTHROUGH Parameters
-HSM_FXAA_ON = 0
-HSM_SCREEN_SCALE_GSHARP_MODE = 1
-HSM_CRT_CURVATURE_SCALE = 0
diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-VIEWPORT.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-VIEWPORT.slangp
deleted file mode 100644
index 9cb2941c5d..0000000000
--- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/Root_Presets/MBZ__5__POTATO__PASSTHROUGH__DREZ-VIEWPORT.slangp
+++ /dev/null
@@ -1,97 +0,0 @@
-shaders = 9
-
-shader0 = ../../../shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
-filter_linear0 = false
-scale_type_x0 = viewport
-scale_x0 = 1.0
-scale_type_y0 = viewport
-scale_y0 = 1.0
-wrap_mode0 = "clamp_to_edge"
-alias0 = "DerezedPass"
-
-shader1 = ../../../shaders/base/cache-info-potato-params.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "InfoCachePass"
-
-shader2 = ../../../shaders/guest/extras/hsm-fetch-drez-output.slang
-filter_linear2 = false
-srgb_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 1
-scale_y2 = 1
-
-shader3 = ../../../shaders/fxaa/fxaa.slang
-float_framebuffer3 = "true"
-alias3 = "DeditherPass"
-
-# Color Correction with Dogway's awesome Grade shader
-# Grade is after Afterglow so that brightening the black level does not break the afterglow
-shader4 = ../../../shaders/dogway/hsm-grade.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-alias4 = "ColorCorrectPass"
-
-shader5 =  ../../../shaders/guest/hsm-custom-fast-sharpen.slang
-filter_linear5 = true
-scale_type5 = source
-scale_x5 = 1.0
-scale_y5 = 1.0
-
-shader6 = ../../../shaders/base/linearize.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-float_framebuffer6 = true
-alias6 = "LinearizePass"
-
-shader7 = ../../../shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-potato.slang
-filter_linear7 = "false"
-scale_type7 = "viewport"
-scale7 = "1.0"
-float_framebuffer7 = "true"
-alias7 = "CRTPass"
-
-shader8 = ../../../shaders/base/post-crt-prep-potato.slang
-mipmap_input8 = true
-scale_type8 = viewport
-float_framebuffer8 = true
-alias8 = "PostCRTPass"
-
-# Textures Potato
-# Define textures to be used by the different passes
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage"
-
-SamplerLUT1 = ../../../shaders/guest/lut/trinitron-lut.png
-SamplerLUT1_linear = true 
-SamplerLUT2 = ../../../shaders/guest/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true 
-SamplerLUT3 = ../../../shaders/guest/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = ../../../shaders/guest/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage_linear = false
-
-BackgroundImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background.png
-BackgroundImage_linear = true
-BackgroundImage_mipmap = 1
-
-BackgroundVertImage = ../../../shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
-BackgroundVertImage_linear = true
-BackgroundVertImage_mipmap = 1
-
-# Parameters
-HSM_ASPECT_RATIO_MODE = 1
-
-# Use for matching vanilla GDV-Advanced
-# HSM_ASPECT_RATIO_MODE = 6
-# HSM_CURVATURE_MODE = 0
-
-# PASSTHROUGH Parameters
-HSM_FXAA_ON = 0
-HSM_SCREEN_SCALE_GSHARP_MODE = 1
-HSM_CRT_CURVATURE_SCALE = 0
diff --git a/bezel/Mega_Bezel/Presets/Experimental/Guest Slotmask 2023-02.slangp b/bezel/Mega_Bezel/Presets/Experimental/Guest Slotmask 2023-02.slangp
deleted file mode 100644
index 5fece0f8fd..0000000000
--- a/bezel/Mega_Bezel/Presets/Experimental/Guest Slotmask 2023-02.slangp	
+++ /dev/null
@@ -1,52 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../resource/param_values/tube-effect/tube-effects.params"
-#reference "../../resource/param_values/light/basic__night.params"
-
-CS = 2.000000 
-TNTC = 1.000000 
-WP = -65.000000 
-wp_saturation = 1.200000 
-GAMMA_INPUT = 3.200000 
-m_glow = 1.000000 
-SIZEH = 12.000000 
-SIGMA_H = 3.499999
-SIZEV = 12.000000 
-SIGMA_V = 3.499999 
-SIGMA_VB = 0.750000 
-glow = 0.600000 
-bloom = 0.700000 
-bloom_dist = 2.000000 
-halation = -0.250000 
-gamma_c = 1.250000 
-brightboost = 1.400001 
-brightboost1 = 1.000000 
-gsl = -1.000000 
-scanline1 = 5.500000 
-scanline2 = 7.000000 
-beam_min = 1.100000 
-beam_max = 0.950000 
-beam_size = 0.750000 
-vertmask = -0.600000 
-scans = 1.150000 
-scan_falloff = 0.650000 
-spike = 1.400000 
-h_sharp = 3.500001 
-s_sharp = 0.700000 
-sth = 0.300000 
-warpX = 0.040000 
-warpY = 0.050000 
-csize = 0.115000 
-bsize1 = 0.300000 
-shadowMask = 9.000000 
-maskstr = 1.000000 
-mask_gamma = 2.399999 
-slotmask = 0.800000 
-slotmask1 = 1.000000 
-slotwidth = 3.000000 
-double_slot = 2.000000 
-mclip = 0.350000 
-gamma_out = 3.049999 
-decons = 0.800000 
-post_br = 0.950000
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-1.slangp b/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-1.slangp
deleted file mode 100644
index 9bb8cb9c2e..0000000000
--- a/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-1.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../resource/param_values/tube-effect/tube-effects.params"
-#reference "../../resource/param_values/light/basic__night.params"
-
-BP = "-20.000000"
-brightboost = "1.000000"
-brightboost1 = "1.000000"
-gsl = "-1.000000"
-scanline1 = "4.000000"
-scanline2 = "5.000000"
-scangamma = "0.500000"
-no_scanlines = "1.000000"
-h_sharp = "3.400002"
-s_sharp = "1.000000"
-shadowMask = "8.000000"
-maskstr = "0.750000"
-mcut = "1.150000"
-slotmask = "0.750000"
-slotmask1 = "1.000000"
-slotwidth = "3.000000"
-double_slot = "2.000000"
-smask_mit = 0
-
-GDV_DECONVERGENCE_ON = 1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-2.slangp b/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-2.slangp
deleted file mode 100644
index 093ce276b1..0000000000
--- a/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-2.slangp
+++ /dev/null
@@ -1,44 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../resource/param_values/tube-effect/tube-effects.params"
-#reference "../../resource/param_values/light/basic__night.params"
-
-SIGMA_HB = "0.400000"
-SIGMA_VB = "0.400000"
-bloom = "0.600000"
-halation = "-0.100000"
-gamma_c = "1.250000"
-brightboost = "1.000001"
-brightboost1 = "1.200000"
-scanline1 = "0.000000"
-scanline2 = "15.000000"
-beam_min = "1.250000"
-beam_max = "0.950000"
-beam_size = "0.000000"
-scans = "0.600000"
-scan_falloff = "0.650000"
-spike = "1.500000"
-h_sharp = "3.200002"
-sth = "0.300000"
-bsize1 = "0.000000"
-shadowMask = "6.000000"
-maskstr = "0.900000"
-mcut = "0.800000"
-maskboost = "1.500000"
-mask_layout = "1.000000"
-mask_gamma = "2.399999"
-slotmask = "0.800000"
-slotmask1 = "0.800000"
-slotwidth = "3.000000"
-double_slot = "2.000000"
-mclip = "0.250000"
-gamma_out = "2.200000"
-smask_mit = 0.8
-
-GDV_DECONVERGENCE_ON = 1
-deconrr = "1.000000"
-deconrb = "-1.000000"
-deconrry = "1.000000"
-deconrby = "-1.000000"
-decons = "0.800000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-3.slangp b/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-3.slangp
deleted file mode 100644
index 8590709c8b..0000000000
--- a/bezel/Mega_Bezel/Presets/Experimental/Guest-SlotMask-3.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../resource/param_values/tube-effect/tube-effects.params"
-#reference "../../resource/param_values/light/basic__night.params"
-
-bloom = "0.500000"
-mask_bloom = "0.250000"
-halation = "-0.100000"
-brightboost = "1.800000"
-scanline1 = "1.000000"
-scanline2 = "25.000000"
-beam_min = "3.499998"
-beam_max = "0.950000"
-scans = "1.250000"
-scan_falloff = "0.500000"
-h_sharp = "3.000001"
-s_sharp = "1.000000"
-shadowMask = "9.000000"
-maskstr = "1.000000"
-maskboost = "1.999999"
-mask_gamma = "2.500000"
-slotmask = "0.500000"
-slotmask1 = "0.500000"
-slotwidth = "3.000000"
-double_slot = "2.000000"
-smoothmask = "1.000000"
-smask_mit = 0.8
-
-GDV_DECONVERGENCE_ON = 1
-deconrry = "-1.000000"
-decons = "1.000001"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Experimental/Tube-Effects__Night__ADV_GuestAperture.slangp b/bezel/Mega_Bezel/Presets/Experimental/Tube-Effects__Night__ADV_GuestAperture.slangp
deleted file mode 100644
index 4408657ba0..0000000000
--- a/bezel/Mega_Bezel/Presets/Experimental/Tube-Effects__Night__ADV_GuestAperture.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../resource/param_values/tube-effect/tube-effects.params"
-#reference "../../resource/param_values/light/basic__night.params"
-
-mask_bloom = "0.700000"
-brightboost1 = "1.500000"
-scanline1 = "2.000000"
-scanline2 = "12.000000"
-beam_min = "3.499998"
-beam_size = "0.700000"
-scans = "1.699999"
-scan_falloff = "0.600000"
-h_sharp = "3.500001"
-s_sharp = "0.800000"
-shadowMask = "9.000000"
-maskstr = "1.000000"
-maskboost = "1.849999"
-mask_gamma = "1.699999"
-mclip = "0.000000"
-post_br = "1.100000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV-GLASS.slangp b/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV-GLASS.slangp
deleted file mode 100644
index 62c3e1c688..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV-GLASS.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp b/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp
deleted file mode 100644
index 17b5b908fc..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__1__ADV.slangp b/bezel/Mega_Bezel/Presets/MBZ__1__ADV.slangp
deleted file mode 100644
index cebd60d4f2..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__1__ADV.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__2__ADV-GLASS.slangp b/bezel/Mega_Bezel/Presets/MBZ__2__ADV-GLASS.slangp
deleted file mode 100644
index 7f5d7d6778..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__2__ADV-GLASS.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__2__ADV-NO-REFLECT.slangp b/bezel/Mega_Bezel/Presets/MBZ__2__ADV-NO-REFLECT.slangp
deleted file mode 100644
index 2c4521fd55..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__2__ADV-NO-REFLECT.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__3__STD-GLASS.slangp b/bezel/Mega_Bezel/Presets/MBZ__3__STD-GLASS.slangp
deleted file mode 100644
index 38862cec80..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__3__STD-GLASS.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__3__STD.slangp b/bezel/Mega_Bezel/Presets/MBZ__3__STD.slangp
deleted file mode 100644
index 78b6ad0047..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__3__STD.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__4__STD-NO-REFLECT.slangp b/bezel/Mega_Bezel/Presets/MBZ__4__STD-NO-REFLECT.slangp
deleted file mode 100644
index d5dec259aa..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__4__STD-NO-REFLECT.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/MBZ__5__POTATO.slangp b/bezel/Mega_Bezel/Presets/MBZ__5__POTATO.slangp
deleted file mode 100644
index 29d37b5a73..0000000000
--- a/bezel/Mega_Bezel/Presets/MBZ__5__POTATO.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Guest-Slotmask-4K.slangp b/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Guest-Slotmask-4K.slangp
deleted file mode 100644
index bfd47e26b8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Guest-Slotmask-4K.slangp
+++ /dev/null
@@ -1,44 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-g_grade_on = "0.000000"
-CS = "2.000000"
-TNTC = "1.000000"
-WP = "-75.000000"
-wp_saturation = "1.150000"
-SIZEHB = "3.000000"
-SIGMA_HB = "0.750000"
-SIZEVB = "3.000000"
-SIGMA_VB = "0.750000"
-bloom = "0.700000"
-halation = "0.100000"
-gamma_c = "1.360000"
-brightboost = "1.300001"
-brightboost1 = "1.250000"
-gsl = "-1.000000"
-scanline1 = "2.500000"
-scanline2 = "14.000000"
-beam_min = "1.800000"
-beam_max = "0.775000"
-beam_size = "0.750000"
-scans = "1.650000"
-scan_falloff = "0.650000"
-spike = "1.500000"
-h_sharp = "3.000002"
-s_sharp = "1.000000"
-sth = "0.300000"
-csize = "0.115000"
-bsize1 = "0.300000"
-warpX = "0.040000"
-warpY = "0.050000"
-shadowMask = "10.000000"
-maskstr = "1.000000"
-mask_gamma = "2.399999"
-slotmask = "1.000000"
-slotmask1 = "1.000000"
-slotwidth = "4.000000"
-double_slot = "2.000000"
-mclip = "0.350000"
-gamma_out = "2.200000"
-deconrry = "1.250000"
-deconrby = "-1.250000"
-decons = "1.400000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__SMOOTH-ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__SMOOTH-ADV__GDV.slangp
deleted file mode 100644
index c88cb07ba9..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__SMOOTH-ADV__GDV.slangp
+++ /dev/null
@@ -1,35 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "300.000000"
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "30.000000"
-
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = "300.000000"
-
-HSM_INTERLACE_TRIGGER_RES = "100.000000"
-
-HSM_FAKE_SCANLINE_OPACITY = "70.000000"
-HSM_FAKE_SCANLINE_RES = "216.000000"
-HSM_FAKE_SCANLINE_ROLL = "20.000000"
-
-SHARPEN = "0.300000"
-
-g_cntrst = "0.500000"
-
-GDV_AFTERGLOW_THRESHOLD = "7.5"
-# BP = "16"
-
-glow = "-0.300000"
-SIZEH = "7.000000"
-SIGMA_H = "2.300000"
-halation = "0.2"
-h_sharp = "3.000001"
-shadowMask = "6.000000"
-maskstr = "0.4"
-maskDark = "1.000000"
-
-GDV_DECONVERGENCE_ON = "1.000000"
-deconrr = "1.500000"
-deconrb = "-1.500000"
-deconrry = "1.500000"
-deconrby = "-1.500000"
-addnoised = "0.140000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__STD__GDV.slangp b/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__STD__GDV.slangp
deleted file mode 100644
index 0af702b1d0..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__STD__GDV.slangp
+++ /dev/null
@@ -1,34 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-# HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "33"
-# HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "33"
-
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "0.000000"
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "0.000000"
-
-HSM_INTERLACE_TRIGGER_RES = "100.000000"
-HSM_FAKE_SCANLINE_OPACITY = "70.000000"
-HSM_FAKE_SCANLINE_ROLL = "30.000000"
-
-SGPT_BLEND_OPTION = 0
-
-g_cntrst = "0.500000"
-
-GDV_AFTERGLOW_THRESHOLD = "7.5"
-# BP = "16"
-
-glow = "-0.300000"
-SIZEH = "7.000000"
-SIGMA_H = "2.300000"
-halation = "0.2"
-h_sharp = "3.000001"
-shadowMask = "6.000000"
-maskstr = "0.4"
-maskDark = "1.000000"
-
-GDV_DECONVERGENCE_ON = "1.000000"
-deconrr = "1.500000"
-deconrb = "-1.500000"
-deconrry = "1.500000"
-deconrby = "-1.500000"
-addnoised = "0.140000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Royale-Clone__ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Royale-Clone__ADV-GLASS__GDV.slangp
deleted file mode 100644
index 10a1a0a093..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Royale-Clone__ADV-GLASS__GDV.slangp
+++ /dev/null
@@ -1,42 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp"
-
-# Thanks to BendBombBoom from the Libretro forum for this great preset!
-
-g_grade_on = "1.000000"
-g_vignette = "1.000000"
-wp_temperature = "7000.000000"
-
-LUT_Size1 = "32.000000"
-LUT_Size2 = "32.000000"
-LUTLOW = "12.000000"
-interm = "4.000000"
-iscan = "0.100000"
-SIZEH = "10.000000"
-SIGMA_H = "2.400000"
-SIZEV = "1.000000"
-SIGMA_V = "0.500000"
-SIGMA_VB = "0.550000"
-bogus_brightness = "1.000000"
-glow = "0.010000"
-bloom = "1.000000"
-halation = "0.450000"
-brightboost = "2.999999"
-brightboost1 = "1.250000"
-bogus_scanline = "1.000000"
-scanline2 = "10.000000"
-beam_min = "1.799999"
-beam_max = "0.900000"
-s_sharp = "0.000000"
-smart_ei = "2.000000"
-shadowMask = "2.000000"
-maskDark = "0.400000"
-mcut = "1.550000"
-mask_gamma = "1.699999"
-slotmask = "0.900000"
-slotwidth = "3.000000"
-mclip = "0.700000"
-
-deconrr = "-0.500000"
-deconrg = "0.500000"
-decons = "0.250000"
-deconsmooth = "0.250000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Royale-Clone__ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Royale-Clone__ADV__GDV.slangp
deleted file mode 100644
index 54d8dfb78b..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Royale-Clone__ADV__GDV.slangp
+++ /dev/null
@@ -1,42 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-# Thanks to BendBombBoom from the Libretro forum for this great preset!
-
-g_grade_on = "1.000000"
-g_vignette = "1.000000"
-wp_temperature = "7000.000000"
-
-LUT_Size1 = "32.000000"
-LUT_Size2 = "32.000000"
-LUTLOW = "12.000000"
-interm = "4.000000"
-iscan = "0.100000"
-SIZEH = "10.000000"
-SIGMA_H = "2.400000"
-SIZEV = "1.000000"
-SIGMA_V = "0.500000"
-SIGMA_VB = "0.550000"
-bogus_brightness = "1.000000"
-glow = "0.010000"
-bloom = "1.000000"
-halation = "0.450000"
-brightboost = "2.999999"
-brightboost1 = "1.250000"
-bogus_scanline = "1.000000"
-scanline2 = "10.000000"
-beam_min = "1.799999"
-beam_max = "0.900000"
-s_sharp = "0.000000"
-smart_ei = "2.000000"
-shadowMask = "2.000000"
-maskDark = "0.400000"
-mcut = "1.550000"
-mask_gamma = "1.699999"
-slotmask = "0.900000"
-slotwidth = "3.000000"
-mclip = "0.700000"
-
-deconrr = "-0.500000"
-deconrg = "0.500000"
-decons = "0.250000"
-deconsmooth = "0.250000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV.slangp
deleted file mode 100644
index 5ecf1c6b00..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__DREZ-3DS-400x480.slangp
deleted file mode 100644
index 4f07285097..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__LCD-GRID.slangp
deleted file mode 100644
index 6965ea6ebb..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__LCD-GRID.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__LCD-GRID__DREZ-3DS-400x480.slangp
deleted file mode 100644
index ad5c617ba1..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__ADV__LCD-GRID__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__POTATO__GDV.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__POTATO__GDV.slangp
deleted file mode 100644
index cbe00e8aae..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__POTATO__GDV.slangp
+++ /dev/null
@@ -1,7 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
-
-BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-HSM_BG_OPACITY = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD-NO-REFLECT.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD-NO-REFLECT.slangp
deleted file mode 100644
index f1e4d3744e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD-NO-REFLECT.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp"
-
-# BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-# BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD-NO-REFLECT__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD-NO-REFLECT__LCD-GRID.slangp
deleted file mode 100644
index 98e706463f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD-NO-REFLECT__LCD-GRID.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp"
-
-# BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-# BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD.slangp
deleted file mode 100644
index 8a726d9852..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__DREZ-3DS-1600x1920.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__DREZ-3DS-1600x1920.slangp
deleted file mode 100644
index 03dbcd48e6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__DREZ-3DS-1600x1920.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__DREZ-3DS-400x480.slangp
deleted file mode 100644
index aca74ec39c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__LCD-GRID.slangp
deleted file mode 100644
index d9080dad41..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__LCD-GRID.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__LCD-GRID__DREZ-3DS-400x480.slangp
deleted file mode 100644
index d7db58ad27..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-3DS__STD__LCD-GRID__DREZ-3DS-400x480.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-3ds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV-NO-REFLECT.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV-NO-REFLECT.slangp
deleted file mode 100644
index 1841c7e4f6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV-NO-REFLECT.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
-
-# BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-# BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV.slangp
deleted file mode 100644
index 77c571983c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 940d77ca2c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__LCD-GRID.slangp
deleted file mode 100644
index 3fabec9e66..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__LCD-GRID.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds-lcd-scale.params"
-
-# BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-# BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__LCD-GRID__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__LCD-GRID__DREZ-NDS-256x384.slangp
deleted file mode 100644
index b361241f99..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__ADV__LCD-GRID__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds-lcd-scale.params"
-
-# BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-# BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__POTATO__GDV.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__POTATO__GDV.slangp
deleted file mode 100644
index ce9092994d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__POTATO__GDV.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
-
-HSM_BG_OPACITY = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD-NO-REFLECT.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD-NO-REFLECT.slangp
deleted file mode 100644
index 567a494465..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD-NO-REFLECT.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
-
-# BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-# BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD-NO-REFLECT__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD-NO-REFLECT__LCD-GRID.slangp
deleted file mode 100644
index 0f18b30075..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD-NO-REFLECT__LCD-GRID.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
-
-# BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-# BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD.slangp
deleted file mode 100644
index 418de6afdf..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__DREZ-NDS-1280x1920.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__DREZ-NDS-1280x1920.slangp
deleted file mode 100644
index a7fc4ba834..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__DREZ-NDS-1280x1920.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__DREZ-NDS-256x384.slangp
deleted file mode 100644
index 0fbfaeb5ff..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__DREZ-NDS-256x384.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__LCD-GRID.slangp
deleted file mode 100644
index 1c09d41ac5..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen-DS__STD__LCD-GRID.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp"
-
-#reference "../../../resource/param_values/dual-screen/dual-screen-nds.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen__STD.slangp
deleted file mode 100644
index c70dd7d6b7..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Dual-Screen/Dual-Screen__STD.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-HSM_DUALSCREEN_MODE = 1
-HSM_ASPECT_RATIO_EXPLICIT = 1.333
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/FBNEO-Vertical__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/FBNEO-Vertical__STD.slangp
deleted file mode 100644
index 5998175c7b..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/FBNEO-Vertical__STD.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-HSM_ROTATE_CORE_IMAGE = 1
-HSM_ASPECT_RATIO_MODE = 2
diff --git a/bezel/Mega_Bezel/Presets/Variations/Glass-BigBlur__ADV-GLASS.slangp b/bezel/Mega_Bezel/Presets/Variations/Glass-BigBlur__ADV-GLASS.slangp
deleted file mode 100644
index 7c413377bd..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Glass-BigBlur__ADV-GLASS.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp"
-
-HSM_SCREEN_REFLECTION_SCALE = "180.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Glass-Minimal-Bezel-Edge__ADV-GLASS.slangp b/bezel/Mega_Bezel/Presets/Variations/Glass-Minimal-Bezel-Edge__ADV-GLASS.slangp
deleted file mode 100644
index 1730989e90..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Glass-Minimal-Bezel-Edge__ADV-GLASS.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp"
-
-HSM_TUBE_BLACK_EDGE_THICKNESS = "-15.000000"
-HSM_BZL_INNER_EDGE_THICKNESS = "540.000000"
-HSM_BZL_INNER_EDGE_SHARPNESS = "20.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "1.480000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "100.000000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "13.000000"
-HSM_BG_OPACITY = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp
deleted file mode 100644
index b1904be6b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-
-#reference "../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../resource/param_values/lightgun/sinden-border-basic.params"
-
-HSM_CRT_CURVATURE_SCALE = 0
diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_1__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_1__ADV.slangp
deleted file mode 100644
index 0858f5010d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_1__ADV.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../../resource/param_values/lightgun/sinden-border-basic.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-GLASS.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-GLASS.slangp
deleted file mode 100644
index d36a7b3e1f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-GLASS.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp"
-
-#reference "../../../resource/param_values/lightgun/sinden-border-basic.params"
-
-HSM_REFLECT_SHOW_TUBE_FX_AMOUNT = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-SCREEN-ONLY.slangp
deleted file mode 100644
index f8670d08fd..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-SCREEN-ONLY.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp"
-
-#reference "../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../resource/param_values/lightgun/sinden-border-basic.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_3__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_3__STD.slangp
deleted file mode 100644
index 58174e99de..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_3__STD.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-#reference "../../../resource/param_values/lightgun/sinden-border-basic.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI.slangp
deleted file mode 100644
index 6742df7204..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp"
-
-#reference "../../../resource/param_values/lightgun/sinden-border-basic.params"
-
-HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI_No-BG.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI_No-BG.slangp
deleted file mode 100644
index 0060e9b46d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI_No-BG.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp"
-
-#reference "../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../resource/param_values/lightgun/sinden-border-basic.params"
-
-HSM_BG_OPACITY = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
deleted file mode 100644
index 14f867d79f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-hdr.slangp"
-
-hcrt_hdr = "1.000000"
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
deleted file mode 100644
index fb69c0c5a8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
deleted file mode 100644
index 8e66fa74d9..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
deleted file mode 100644
index 42da15aea7..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-default-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-default-hdr.slangp
deleted file mode 100644
index 5623e16ac4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-default-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-default-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-default-sdr.slangp
deleted file mode 100644
index 22824d0e62..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-default-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-gba-gbi-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-gba-gbi-hdr.slangp
deleted file mode 100644
index 812134213b..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-gba-gbi-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-hdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-gba-gbi-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-gba-gbi-sdr.slangp
deleted file mode 100644
index 4851cdff48..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-gba-gbi-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-sdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
deleted file mode 100644
index c71734162c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.000000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
deleted file mode 100644
index 67fc5ebc63..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
deleted file mode 100644
index 631fe15add..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
deleted file mode 100644
index 85513c1a8f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-hdr.slangp
deleted file mode 100644
index 8f76bab8c4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-sdr.slangp
deleted file mode 100644
index 122444328d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
deleted file mode 100644
index b5b6dec57c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
deleted file mode 100644
index 35671c01c6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-hdr.slangp
deleted file mode 100644
index e9295860be..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-sdr.slangp
deleted file mode 100644
index 9697126244..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
deleted file mode 100644
index 2cd6d68bfa..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
deleted file mode 100644
index ae5a9260b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.000000"
-hcrt_crt_resolution = "1.000000"
-hcrt_red_vertical_convergence = "0.100000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-hdr.slangp
deleted file mode 100644
index 0676f9234d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-sdr.slangp
deleted file mode 100644
index 35c2dd7c7e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-hdr.slangp
deleted file mode 100644
index ce286a9a99..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-sdr.slangp
deleted file mode 100644
index 4d011496f6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
deleted file mode 100644
index 63c8290638..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
deleted file mode 100644
index 53f3c803b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-hdr.slangp
deleted file mode 100644
index f45aa70285..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-hdr.slangp
deleted file mode 100644
index 04bd309954..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-sdr.slangp
deleted file mode 100644
index 6bdfeecd31..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-sdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-sdr.slangp
deleted file mode 100644
index 8954b418b1..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV-SCREEN-ONLY/shaders/crt-sony-megatron-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp"
-#reference "../../_params/megatron-sdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
deleted file mode 100644
index 14f867d79f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-hdr.slangp"
-
-hcrt_hdr = "1.000000"
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
deleted file mode 100644
index fb69c0c5a8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
deleted file mode 100644
index 8e66fa74d9..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
deleted file mode 100644
index 42da15aea7..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-default-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-default-hdr.slangp
deleted file mode 100644
index 5623e16ac4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-default-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-default-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-default-sdr.slangp
deleted file mode 100644
index 22824d0e62..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-default-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-gba-gbi-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-gba-gbi-hdr.slangp
deleted file mode 100644
index 812134213b..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-gba-gbi-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-hdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-gba-gbi-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-gba-gbi-sdr.slangp
deleted file mode 100644
index 4851cdff48..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-gba-gbi-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-sdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
deleted file mode 100644
index c71734162c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.000000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
deleted file mode 100644
index 67fc5ebc63..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
deleted file mode 100644
index 631fe15add..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
deleted file mode 100644
index 85513c1a8f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sammy-atomiswave-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sammy-atomiswave-hdr.slangp
deleted file mode 100644
index 8f76bab8c4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sammy-atomiswave-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sammy-atomiswave-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sammy-atomiswave-sdr.slangp
deleted file mode 100644
index 122444328d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sammy-atomiswave-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sega-virtua-fighter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
deleted file mode 100644
index b5b6dec57c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sega-virtua-fighter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
deleted file mode 100644
index 35671c01c6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-1910-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-1910-hdr.slangp
deleted file mode 100644
index e9295860be..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-1910-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-1910-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-1910-sdr.slangp
deleted file mode 100644
index 9697126244..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-1910-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-20L4-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
deleted file mode 100644
index 2cd6d68bfa..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-20L4-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
deleted file mode 100644
index ae5a9260b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.000000"
-hcrt_crt_resolution = "1.000000"
-hcrt_red_vertical_convergence = "0.100000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-2730-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-2730-hdr.slangp
deleted file mode 100644
index 0676f9234d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-2730-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-2730-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-2730-sdr.slangp
deleted file mode 100644
index 35c2dd7c7e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-sony-pvm-2730-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-toshiba-microfilter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-toshiba-microfilter-hdr.slangp
deleted file mode 100644
index ce286a9a99..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-toshiba-microfilter-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-toshiba-microfilter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-toshiba-microfilter-sdr.slangp
deleted file mode 100644
index 4d011496f6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-toshiba-microfilter-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-viewsonic-A90f+-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
deleted file mode 100644
index 63c8290638..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-viewsonic-A90f+-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
deleted file mode 100644
index 53f3c803b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-hdr.slangp
deleted file mode 100644
index 43576d45db..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-ntsc-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-ntsc-hdr.slangp
deleted file mode 100644
index 80ced2f17a..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-ntsc-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-ntsc-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-ntsc-sdr.slangp
deleted file mode 100644
index ef29d50d52..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-ntsc-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-sdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-sdr.slangp
deleted file mode 100644
index 7eb2b823d5..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/ADV/shaders/crt-sony-megatron-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp"
-#reference "../../_params/megatron-sdr.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
deleted file mode 100644
index 14f867d79f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-hdr.slangp"
-
-hcrt_hdr = "1.000000"
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
deleted file mode 100644
index fb69c0c5a8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
deleted file mode 100644
index 8e66fa74d9..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
deleted file mode 100644
index 42da15aea7..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-default-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-default-hdr.slangp
deleted file mode 100644
index 5623e16ac4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-default-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-default-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-default-sdr.slangp
deleted file mode 100644
index 22824d0e62..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-default-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-gba-gbi-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-gba-gbi-hdr.slangp
deleted file mode 100644
index 812134213b..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-gba-gbi-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-hdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-gba-gbi-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-gba-gbi-sdr.slangp
deleted file mode 100644
index 4851cdff48..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-gba-gbi-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-sdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
deleted file mode 100644
index c71734162c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.000000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
deleted file mode 100644
index 67fc5ebc63..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
deleted file mode 100644
index 631fe15add..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
deleted file mode 100644
index 85513c1a8f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-hdr.slangp
deleted file mode 100644
index 8f76bab8c4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-sdr.slangp
deleted file mode 100644
index 122444328d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sammy-atomiswave-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
deleted file mode 100644
index b5b6dec57c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
deleted file mode 100644
index 35671c01c6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-hdr.slangp
deleted file mode 100644
index e9295860be..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-sdr.slangp
deleted file mode 100644
index 9697126244..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-1910-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
deleted file mode 100644
index 2cd6d68bfa..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
deleted file mode 100644
index ae5a9260b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.000000"
-hcrt_crt_resolution = "1.000000"
-hcrt_red_vertical_convergence = "0.100000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-hdr.slangp
deleted file mode 100644
index 0676f9234d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-sdr.slangp
deleted file mode 100644
index 35c2dd7c7e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-sony-pvm-2730-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-hdr.slangp
deleted file mode 100644
index ce286a9a99..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-sdr.slangp
deleted file mode 100644
index 4d011496f6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-toshiba-microfilter-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
deleted file mode 100644
index 63c8290638..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
deleted file mode 100644
index 53f3c803b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-hdr.slangp
deleted file mode 100644
index f50f832e07..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-hdr.slangp
deleted file mode 100644
index c2e596bd79..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-sdr.slangp
deleted file mode 100644
index 9a34408ea2..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-ntsc-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-sdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-sdr.slangp
deleted file mode 100644
index 9ebfd7ffb5..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD-SCREEN-ONLY/shaders/crt-sony-megatron-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp"
-#reference "../../_params/megatron-sdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
deleted file mode 100644
index 14f867d79f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-hdr.slangp"
-
-hcrt_hdr = "1.000000"
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
deleted file mode 100644
index fb69c0c5a8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-aeg-CTV-4800-VT-sdr.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-#reference "shaders/crt-sony-megatron-ntsc-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
deleted file mode 100644
index 8e66fa74d9..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
deleted file mode 100644
index 42da15aea7..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-default-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-default-hdr.slangp
deleted file mode 100644
index 5623e16ac4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-default-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-default-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-default-sdr.slangp
deleted file mode 100644
index 22824d0e62..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-default-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-gba-gbi-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-gba-gbi-hdr.slangp
deleted file mode 100644
index 812134213b..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-gba-gbi-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-hdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-gba-gbi-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-gba-gbi-sdr.slangp
deleted file mode 100644
index 4851cdff48..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-gba-gbi-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-sdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
deleted file mode 100644
index c71734162c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.000000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
deleted file mode 100644
index 67fc5ebc63..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
deleted file mode 100644
index 631fe15add..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
deleted file mode 100644
index 85513c1a8f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sammy-atomiswave-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sammy-atomiswave-hdr.slangp
deleted file mode 100644
index 8f76bab8c4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sammy-atomiswave-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sammy-atomiswave-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sammy-atomiswave-sdr.slangp
deleted file mode 100644
index 122444328d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sammy-atomiswave-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sega-virtua-fighter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
deleted file mode 100644
index b5b6dec57c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sega-virtua-fighter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
deleted file mode 100644
index 35671c01c6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-1910-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-1910-hdr.slangp
deleted file mode 100644
index e9295860be..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-1910-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-1910-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-1910-sdr.slangp
deleted file mode 100644
index 9697126244..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-1910-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-20L4-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
deleted file mode 100644
index 2cd6d68bfa..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-20L4-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
deleted file mode 100644
index ae5a9260b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.000000"
-hcrt_crt_resolution = "1.000000"
-hcrt_red_vertical_convergence = "0.100000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-2730-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-2730-hdr.slangp
deleted file mode 100644
index 0676f9234d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-2730-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-2730-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-2730-sdr.slangp
deleted file mode 100644
index 35c2dd7c7e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-sony-pvm-2730-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-toshiba-microfilter-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-toshiba-microfilter-hdr.slangp
deleted file mode 100644
index ce286a9a99..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-toshiba-microfilter-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-toshiba-microfilter-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-toshiba-microfilter-sdr.slangp
deleted file mode 100644
index 4d011496f6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-toshiba-microfilter-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-viewsonic-A90f+-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
deleted file mode 100644
index 63c8290638..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-viewsonic-A90f+-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
deleted file mode 100644
index 53f3c803b4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-hdr.slangp
deleted file mode 100644
index ab2a254449..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-ntsc-hdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-ntsc-hdr.slangp
deleted file mode 100644
index da5d321b76..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-ntsc-hdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-hdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-ntsc-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-ntsc-sdr.slangp
deleted file mode 100644
index 280031f210..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-ntsc-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp"
-#reference "../../_params/megatron-sdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-sdr.slangp b/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-sdr.slangp
deleted file mode 100644
index cb780be64a..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/STD/shaders/crt-sony-megatron-sdr.slangp
+++ /dev/null
@@ -1,30 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
-#reference "../../../../Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp"
-#reference "../../_params/megatron-sdr.params"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-base.params b/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-base.params
deleted file mode 100644
index 3cb98fec57..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-base.params
+++ /dev/null
@@ -1,3 +0,0 @@
-HSM_INT_SCALE_MODE = "1.000000"
-HSM_CRT_CURVATURE_SCALE = "0.000000"
-g_grade_on = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-hdr.params b/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-hdr.params
deleted file mode 100644
index ffd37bb4ce..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-hdr.params
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference megatron-base.params
-
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "20.000000"
-hcrt_hdr = "1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-sdr.params b/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-sdr.params
deleted file mode 100644
index d863ea69ff..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Megatron/_params/megatron-sdr.params
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference megatron-base.params
-
-# HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "80.000000"
-hcrt_hdr = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/N64__SMOOTH-ADV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Variations/N64__SMOOTH-ADV__DREZ-480p.slangp
deleted file mode 100644
index 1df40585d8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/N64__SMOOTH-ADV__DREZ-480p.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-#reference "../Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp"
-
-BackgroundImage = ../../shaders/textures/HSM_Duimon_Super_Famicom_3840x2160.png
-
-HSM_FLIP_VIEWPORT_VERTICAL = "1.000000"
-HSM_ASPECT_RATIO_MODE = 2
-
-# HSM_CROP_MODE = "1.000000"
-# HSM_CROP_PERCENT_TOP = "7.0800000"
-# HSM_CROP_PERCENT_BOTTOM = "5.620000"
-# HSM_CROP_PERCENT_LEFT = "2.180000"
-# HSM_CROP_PERCENT_RIGHT = "2.700000"
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000"
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = "200.000000"
-
-GTU_ON = "1.000000"
-signalResolution = "480.000000"
-
-HSM_SCALEFX_ON = "1.000000"
-
-GDV_INTERLACE_MODE = "2.000000"
-shadowMask = "2.000000"
-
-HSM_BZL_COLOR_VALUE = "30.000000"
-HSM_AMBIENT_LIGHTING_OPACITY = "98.000000"
-
-HSM_BG_FILL_MODE = 1
diff --git a/bezel/Mega_Bezel/Presets/Variations/N64__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/N64__STD.slangp
deleted file mode 100644
index 2ec92e37e6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/N64__STD.slangp
+++ /dev/null
@@ -1,20 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-BackgroundImage = ../../shaders/textures/HSM_Duimon_Super_Famicom_3840x2160.png
-
-HSM_FLIP_VIEWPORT_VERTICAL = "1.000000"
-HSM_ASPECT_RATIO_MODE = 2
-
-# HSM_CROP_MODE = "1.000000"
-# HSM_CROP_PERCENT_TOP = "7.0800000"
-# HSM_CROP_PERCENT_BOTTOM = "5.620000"
-# HSM_CROP_PERCENT_LEFT = "2.180000"
-# HSM_CROP_PERCENT_RIGHT = "2.700000"
-
-GDV_INTERLACE_MODE = "2.000000"
-shadowMask = "2.000000"
-
-HSM_BZL_COLOR_VALUE = "30.000000"
-HSM_AMBIENT_LIGHTING_OPACITY = "98.000000"
-
-HSM_BG_FILL_MODE = 1
diff --git a/bezel/Mega_Bezel/Presets/Variations/NoScanlines__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/NoScanlines__ADV.slangp
deleted file mode 100644
index 3354ec1f47..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/NoScanlines__ADV.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-gamma_out = "1.800001"
-post_br = "0.950000"
-
-no_scanlines = "1.000000"
-
-SHARPSMOOTHER_ON = "1.000000"
-smoot = "0.300000"
-
-g_cntrst = "-0.400000"
-g_sat = "-0.100000"
diff --git a/bezel/Mega_Bezel/Presets/Variations/Reflect-Only__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Reflect-Only__ADV.slangp
deleted file mode 100644
index 9fa1b43888..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Reflect-Only__ADV.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp"
-
-#reference "../../resource/param_values/reflect/reflect-only.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Reflect-Only__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Reflect-Only__STD.slangp
deleted file mode 100644
index 5727b093cc..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Reflect-Only__STD.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp"
-
-#reference "../../resource/param_values/reflect/reflect-only.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__1__Antialias.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__1__Antialias.slangp
deleted file mode 100644
index 73d3b39c01..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__1__Antialias.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__1__Antialias__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__1__Antialias__NTSC.slangp
deleted file mode 100644
index 977bd9dcbe..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__1__Antialias__NTSC.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__2__Default.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__2__Default.slangp
deleted file mode 100644
index dbccafe0ad..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__2__Default.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/no-smooth-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__2__Default__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__2__Default__NTSC.slangp
deleted file mode 100644
index 4df170b472..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__2__Default__NTSC.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/no-smooth-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__3__Extra-Smooth.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__3__Extra-Smooth.slangp
deleted file mode 100644
index 24b2ece81e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__3__Extra-Smooth.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__3__Extra-Smooth__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__3__Extra-Smooth__NTSC.slangp
deleted file mode 100644
index 60aeea3b47..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__3__Extra-Smooth__NTSC.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__4__Super-Smooth.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__4__Super-Smooth.slangp
deleted file mode 100644
index 908dd1c41d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__4__Super-Smooth.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__4__Super-Smooth__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__4__Super-Smooth__NTSC.slangp
deleted file mode 100644
index c4bdef16ab..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_0__SMOOTH__4__Super-Smooth__NTSC.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY-SUPER-XBR.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY-SUPER-XBR.slangp
deleted file mode 100644
index 8d28295c29..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY-SUPER-XBR.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY-SUPER-XBR__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
deleted file mode 100644
index 0a66142fbe..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY.slangp
deleted file mode 100644
index 16dc1ed4e2..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY__NTSC.slangp
deleted file mode 100644
index 848302b2c8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_2__ADV-SCREEN-ONLY__NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY-SUPER-XBR.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY-SUPER-XBR.slangp
deleted file mode 100644
index 03e2759d97..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY-SUPER-XBR.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY-SUPER-XBR__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
deleted file mode 100644
index 35b885588f..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY.slangp
deleted file mode 100644
index e96b6bfceb..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY__NTSC.slangp
deleted file mode 100644
index 9434f9f472..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_4__STD-SCREEN-ONLY__NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO-SUPER-XBR.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO-SUPER-XBR.slangp
deleted file mode 100644
index 288e16d4c2..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO-SUPER-XBR.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO-SUPER-XBR__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO-SUPER-XBR__NTSC.slangp
deleted file mode 100644
index f9786c25a3..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO-SUPER-XBR__NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO.slangp
deleted file mode 100644
index 762296371d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO__NTSC.slangp
deleted file mode 100644
index 67aab934b5..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Default/_5__POTATO__NTSC.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__1__Antialias.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__1__Antialias.slangp
deleted file mode 100644
index 2bcb206af3..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__1__Antialias.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__1__Antialias__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__1__Antialias__NTSC.slangp
deleted file mode 100644
index ab58f7b6f9..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__1__Antialias__NTSC.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params"
-
-
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__2__Default.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__2__Default.slangp
deleted file mode 100644
index f2556dae92..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__2__Default.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/no-smooth-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__2__Default__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__2__Default__NTSC.slangp
deleted file mode 100644
index b35a764e77..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__2__Default__NTSC.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/no-smooth-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__3__Extra-Smooth.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__3__Extra-Smooth.slangp
deleted file mode 100644
index 4c9eaafd4b..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__3__Extra-Smooth.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__3__Extra-Smooth__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__3__Extra-Smooth__NTSC.slangp
deleted file mode 100644
index 0b4fbb2992..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__3__Extra-Smooth__NTSC.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__4__Super-Smooth.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__4__Super-Smooth.slangp
deleted file mode 100644
index 55f2f11d39..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__4__Super-Smooth.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__4__Super-Smooth__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__4__Super-Smooth__NTSC.slangp
deleted file mode 100644
index 3785351479..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_0__SMOOTH__4__Super-Smooth__NTSC.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth.params"
-#reference "../../../../resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY-SUPER-XBR.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY-SUPER-XBR.slangp
deleted file mode 100644
index da77f88867..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY-SUPER-XBR.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY-SUPER-XBR__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
deleted file mode 100644
index 18ca747b88..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY.slangp
deleted file mode 100644
index 76f88c5dd2..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY__NTSC.slangp
deleted file mode 100644
index c98a7e5099..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_2__ADV-SCREEN-ONLY__NTSC.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY-SUPER-XBR.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY-SUPER-XBR.slangp
deleted file mode 100644
index 1fb8bd908c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY-SUPER-XBR.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY-SUPER-XBR__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
deleted file mode 100644
index b5c122276a..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY-SUPER-XBR__NTSC.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY.slangp
deleted file mode 100644
index e0c42c92c4..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY__NTSC.slangp
deleted file mode 100644
index d1a9539c85..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_4__STD-SCREEN-ONLY__NTSC.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO-SUPER-XBR.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO-SUPER-XBR.slangp
deleted file mode 100644
index 0d3e4327ee..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO-SUPER-XBR.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO-SUPER-XBR__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO-SUPER-XBR__NTSC.slangp
deleted file mode 100644
index e39b15cf9e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO-SUPER-XBR__NTSC.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO.slangp
deleted file mode 100644
index 2d21f97952..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO__NTSC.slangp b/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO__NTSC.slangp
deleted file mode 100644
index a486069d2c..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Screen-Only/Max-Int-Scale/_5__POTATO__NTSC.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../../../Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp"
-#reference "../../../../resource/param_values/scale/max-int-scale.params"
-#reference "../../../../resource/param_values/base/set-all-textures-empty.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/SharpPixels__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/SharpPixels__STD.slangp
deleted file mode 100644
index 1ac65ccf0e..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/SharpPixels__STD.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-gamma_out = 1.8
-
-# HSM_CRT_CURVATURE_SCALE = "0.000000"
-no_scanlines = "1.000000"
-h_sharp = "15.000000"
-s_sharp = "1.500000"
-shadowMask = "-1.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Smoothed/ADV_1_No-Smoothing.slangp b/bezel/Mega_Bezel/Presets/Variations/Smoothed/ADV_1_No-Smoothing.slangp
deleted file mode 100644
index 0005eccb93..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Smoothed/ADV_1_No-Smoothing.slangp
+++ /dev/null
@@ -1,7 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../../resource/param_values/light/basic__night.params"
-
-#reference "../../../resource/param_values/smooth/no-smooth-crt-flavor.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_1_Antialias.slangp b/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_1_Antialias.slangp
deleted file mode 100644
index 2f1992baf0..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_1_Antialias.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-
-# This reference adds additional parameter values
-#reference "../../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../../resource/param_values/light/basic__night.params"
-
-#reference "../../../resource/param_values/smooth/smooth-adv-antialias.params"
-#reference "../../../resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_2_Default.slangp b/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_2_Default.slangp
deleted file mode 100644
index 519d0e106d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_2_Default.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-
-#reference "../../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../../resource/param_values/light/basic__night.params"
-
-#reference "../../../resource/param_values/smooth/no-smooth-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_3_Extra-Smooth.slangp b/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_3_Extra-Smooth.slangp
deleted file mode 100644
index 4e1eb7c014..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_3_Extra-Smooth.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-
-# This reference adds additional parameter values
-#reference "../../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../../resource/param_values/light/basic__night.params"
-
-#reference "../../../resource/param_values/smooth/smooth-adv-extra-smooth.params"
-#reference "../../../resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_4_Super-Smooth-Clear.slangp b/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_4_Super-Smooth-Clear.slangp
deleted file mode 100644
index 0b5ba64ef6..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_4_Super-Smooth-Clear.slangp
+++ /dev/null
@@ -1,14 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-
-# This reference adds additional parameter values
-#reference "../../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../../resource/param_values/light/basic__night.params"
-
-#reference "../../../resource/param_values/smooth/smooth-adv-super-smooth.params"
-#reference "../../../resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params"
-
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "0.000000"
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "0.000000"
-SHARPEN = "0.000000"
-shadowMask = "-1.000000"
-GDV_DECONVERGENCE_ON = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_4_Super-Smooth.slangp b/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_4_Super-Smooth.slangp
deleted file mode 100644
index b9a7599da8..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_4_Super-Smooth.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-
-# This reference adds additional parameter values
-#reference "../../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../../resource/param_values/light/basic__night.params"
-
-#reference "../../../resource/param_values/smooth/smooth-adv-super-smooth.params"
-#reference "../../../resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_5_Super-Smooth-Big-Scanlines.slangp b/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_5_Super-Smooth-Big-Scanlines.slangp
deleted file mode 100644
index dd8be7ca25..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Smoothed/SMOOTH-ADV_5_Super-Smooth-Big-Scanlines.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp"
-
-# This reference adds additional parameter values
-#reference "../../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../../resource/param_values/light/basic__night.params"
-
-#reference "../../../resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params"
-#reference "../../../resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines-crt-flavor.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Day__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Day__ADV.slangp
deleted file mode 100644
index c02bebabc3..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Day__ADV.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../resource/param_values/tube-effect/tube-effects.params"
-
diff --git a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Night__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Night__ADV.slangp
deleted file mode 100644
index dedfd88512..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Night__ADV.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-#reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp"
-
-#reference "../../resource/param_values/scene/mega-bezel-duimon-scene.params"
-#reference "../../resource/param_values/tube-effect/tube-effects.params"
-#reference "../../resource/param_values/light/basic__night.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Vector/Vector-BW-HighResMode__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Vector/Vector-BW-HighResMode__STD.slangp
deleted file mode 100644
index 22f916d23d..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Vector/Vector-BW-HighResMode__STD.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-# Thanks to SixWingedFreak from the Libretro forum for these settings
-#reference "../../../resource/param_values/crt/vector-bw-high-res-mode-gdv.params"
-
-HSM_ASPECT_RATIO_MODE = 2
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/Presets/Variations/Vector/Vector-Color-HighResMode__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Vector/Vector-Color-HighResMode__STD.slangp
deleted file mode 100644
index 7837db2920..0000000000
--- a/bezel/Mega_Bezel/Presets/Variations/Vector/Vector-Color-HighResMode__STD.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp"
-
-# Thanks to SixWingedFreak from the Libretro forum for these settings
-#reference "../../../resource/param_values/crt/vector-color-high-res-mode-gdv.params"
-
-HSM_ASPECT_RATIO_MODE = 2
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/README.md b/bezel/Mega_Bezel/README.md
deleted file mode 100644
index 8be511a27a..0000000000
--- a/bezel/Mega_Bezel/README.md
+++ /dev/null
@@ -1,1696 +0,0 @@
-------------------------------------------------------------------------------------------------------------
-Mega Bezel Shader Readme
-------------------------------------------------------------------------------------------------------------
-![Mega Bezel Logo](MegaBezelLogo.png)
-
-**Version V1.17.2_2024-05-18**
-----------------------------------------
-----------------------------------------
-
-This file is best viewed in a markdown editor/viewer. You can also view it here https://github.com/HyperspaceMadness/Mega_Bezel with correct formatting
-
-If you are wondering **"What is this thing?"** here's a little overview sharing our ideas around the project and some of the Mega Bezel features:
-[RetroArch – Introducing the Mega Bezel Reflection Shader – Libretro](https://www.libretro.com/index.php/retroarch-introducing-the-mega-bezel/)
-
-Find more conversation about the shader here on the Libretro forum:
-
-https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**!!!IMPORTANT!!! - Please be sure to read the INSTALLATION and RETROARCH SETUP instructions Below**
-----------------------------------------
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**Licensing**
-----------------------------------------
-
-The base Mega_Bezel package and included components licensing are GPLv3
-
-Community Collections/Packs are licensing is independent of this. Please consult each package details.
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**Latest Releases**
-----------------------------------------
-
-[Shader Package Approx. 12 MB](https://github.com/HyperspaceMadness/Mega_Bezel/releases)
-
-[Extra Examples Package]( https://github.com/HyperspaceMadness/HSM_Mega_Bezel_Examples/releases)
-
-**Github Repo**
-----------------------------------------
-https://github.com/HyperspaceMadness/Mega_Bezel
-
-**Intro**
-----------------------------------------
-
-This shader package is meant for you to experiment with and make your own creations if you like. Try adjusting the shader parameters to change the look, as most things are adjustable for personal taste. The base package is now part of the Libretro repo but there will also be updates coming periodically which may get a pre-release here before they go into the main repo.
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**Installation - VERY IMPORTANT, PLEASE READ**
-----------------------------------------
-
-***
-**INSTALLING THE BASE MEGA BEZEL PACKAGE**
-* **You MUST use Retroarch Version 1.9.8 or Later** (It will fail to load on earlier versions)
-* **If you want to use the default Mega Bezel included with Retroarch:**
-  * Use **Online Updater -> Update Slang Shaders** to update the shaders, the shaders will be added here `Retroarch/shaders/shaders_slang/bezel/Mega_Bezel`
-* **If you want to install from a zipped release from the link above:**
-  * If the `shaders/shaders_slang/bezel/Mega_Bezel` folder exists delete it
-  * Inside the .zip is a **Mega_Bezel** folder. Copy the Mega_Bezel folder into your `Retroarch/shaders/shaders_slang/bezel` folder (If the bezel folder isn't there you can create it)
-  * The final path to the Mega bezel should be `Retroarch/shaders/shaders_slang/bezel/Mega_Bezel`
-
-***
-**RETROARCH SETUP**
-  * Set video driver to **Vulkan** or GLCore if Vulkan is not available
-  * It will run in **GLCore** but seems faster in **Vulkan**
-  * **D3D IS NOT RECOMMENDED**. If it loads in D3D it has a VERY slow load time
-  * Restart Retroarch after changing the video driver
-* Open the **Settings** Menu and Set:
-  * **User Interface / Show Advanced Settings** to **ON**
-  * **Video / Scaling / Aspect Ratio** to **Full**
-    * This will match your monitor aspect aspect ratio
-  * **Video / Scaling / Integer Scale** to **OFF**
-  * **Video / Output / Video Rotation** to **Normal**
-  * **Core / Allow Rotation** to **OFF** -- **Important for FB Neo**
-  * For **FB Neo**
-    * Turn **vertical mode OFF** in **Quick Menu > Core Options** if it was previously turned on
-  * **Do all of this before loading content**
-* For **FB Neo**
-  * **If your game is vertical** set the Rotate CRT Tube parameter to 1. If it is now upside down set Flip Core Image Vertical and Horizontal to 1
-
-***
-**LOADING AND SAVING PRESETS**
-  * **Load a preset** in the shaders menu.
-      * The Mega Bezel shader presets are found in: `Retroarch/shaders/shaders_slang/bezel/Mega_Bezel/Presets`
-  * **IMPORTANT!!** When saving a preset make sure you have the **Simple Presets** feature set to **ON**
-    * This will save a preset with a reference to the preset you loaded plus whatever parameter changes you made
-    * This will keep your presets loading properly when the shader updates in the future
-
-***
-**EDITING PRESETS**
-  * You can then open this Simple Preset file and add other parameter adjustments or set textures as you see fit. E.G. add the following lines to change the background image:
-    * `BackgroundImage = "MyImage.jpg"`
-  * Or change the path indicated on the `#reference` line to point at a different base preset
-
-***
-**INSTALLING ADDITIONAL PRESET/GRAPHIC COLLECTIONS**
-  * Create a folder named `Mega_Bezel_Packs` in the root of the shaders folder, the final path of this should be `Retroarch/shaders/Mega_Bezel_Packs
-  * Place any of the additional collections inside this folder
-  * For example the final path to the examples pack should be `Retroarch/shaders/Mega_Bezel_Packs/HSM_Mega_Bezel_Examples`
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**Community Collections / Packs**
-----------------------------------------
-
-@Duimon: Awesome graphics and presets for the different historical consoles & computers::
-* [Releases · Duimon/Duimon-Mega-Bezel (github.com)](https://github.com/Duimon/Duimon-Mega-Bezel/releases/)
-* https://forums.libretro.com/t/duimon-reflection-shader-graphics-feedback-and-updates
-
-@TheNamec: Really amazing graphics for the Commodore & Amiga systems and PVMs:
-  * [Releases · TheNamec/megabezel-commodore-pack (github.com)](https://github.com/TheNamec/megabezel-commodore-pack/releases)
-  * https://forums.libretro.com/t/thenamec-mega-bezel-commodore-pack-announcement
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-The Mega Bezel is coded and maintained by HyperspaceMadness, but leverages some amazing work from the community.
-HyperspaceMadness@outlook.com
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**Acknowledgements**
-----------------------------------------
-***
-**THANKS TO THE SHADER WRITERS!**
-
-The Mega Bezel sits atop the shoulders of giants and uses a number of amazing shaders written by shader writers from the community:
-  * Guest.r (Guest-Advanced crt shader)
-  * EasyMode
-  * CGCW (LCD Grid)
-  * DariusG (GDV Mini)
-  * Dogway (Grade Color Correction)
-  * Hyllian (SGENDPT)
-  * Aliaspider (GTU)
-  * Sp00kyFox (MDAPT & ScaleFX)
-  * Trogglemonkey (Royale 3D Curvature)
-  * Flyguy (Text Shadertoy)
-  * Special thanks to Hunterk for porting a number of these and helping me with his expertise along the way!
-
-
-***
-**THANKS TO THE MEGA BEZEL GRAPHICS ARTISTS PUSHING THE FEATURES DURING DEVELOPMENT**
-
-The Mega Bezel would also not have gotten to this level of sophistication without some intense feedback from graphics experts pushing the features and finding the holes.
-
-  * @Duimon
-  * @TheNamec
-  * @Soqueroeu
-
-***
-**THANKS TO THE GRAPHICS ARTISTS WHO HAVE INSPIRED US**
-
-And of course I probably would never have started this without seeing the great overlays created previously
-  * @OrionsAngel
-  * @exodus123456
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**What does it do?**
-----------------------------------------
-
-  * Adds an auto-generated bezel around the screen with reflection
-  * Enable easier use of bezels and more "natural" presentation
-  * Ease of use for screen scaling and automatic aspect ratio with existing shaders
-  * Provide a consistent set of enhanced features wrapped around the core crt shaders
-  * Layering images to add artwork and visual effects
-
-----------------------------------------
-**How does it work?**
-----------------------------------------
-
-  * In general there is a background image which fills the screen, then the scaled down game screen with an automatically generated bezel image is drawn on top.
-  * The bezel and frame you see around the screen is auto generated and not part of the background image
-  * Additional Images can be layered on top to augment the look
-  * Most things can be changed to your taste with adjustment of the parameters, so try them out!
-
-----------------------------------------
-----------------------------------------
-**Choosing a Preset**
-----------------------------------------
-
-  * Presets are named/sorted by performance
-  * The most flexible and most resource hungry start with index 0.
-  * As the name's index number increases the performance of the preset improves but but flexibility decreases.
-  * The presets with the lowest performance requirements are:
-    * MBZ__3__STD__GDV-MINI - This has a Dynamic Bezel and Reflections
-    * MBZ__4__STD-NO-REFLECT__GDV-MINI - This Has a Dynamic Bezel but No Reflections
-    * MBZ__5__POTATO__GDV-MINI - This has no Dynamic Bezel and no Reflections
-----------------------------------------
-
-**Presets in Mega_Bezel / Presets**
-----------------------------------------
-
-- All in the root of the Presets folder use @guest.r's awesome Guest-Advanced CRT shader which is considered the default CRT shader for the Mega Bezel, the only exception to this is the POTATO preset which uses GDV-MINI for performance reasons. The following table is sorted by GPU performance and GPU RAM requirements
-
-|Category                        |Reflection  |Image Layers |Tube Fx  |Pre-CRT Chain   |Smooth Upscale
-|--------------------------------|------------|-------------|---------|----------------|---------------
-| MBZ__0__SMOOTH-ADV             | ✔          | ✔          | ✔       | ADV + ScaleFx  | 3X
-| MBZ__0__SMOOTH-ADV-NO-REFLECT  |            | ✔          | ✔       | ADV + ScaleFx  | 3X
-| MBZ__0__SMOOTH-ADV-SCREEN-ONLY |            |             | ✔       | ADV + ScaleFx | 3X
-| MBZ__1__ADV-SUPER-XBR          | ✔          | ✔          | ✔       | ADV + XBR     | 2X
-| MBZ__1__ADV                    | ✔          | ✔          | ✔       | ADV           |
-| MBZ__2__ADV-GLASS-SUPER-XBR    | ✔          |            | ✔        | ADV + XBR     | 2X
-| MBZ__2__ADV-GLASS              | ✔          |            | ✔        | ADV           |
-| MBZ__2__ADV-NO-REFLECT         |            | ✔          | ✔        | ADV           |
-| MBZ__2__ADV-SCREEN-ONLY        |            |             | ✔       | ADV           |
-| MBZ__3__STD-SUPER-XBR          | ✔          | ✔          | ✔       | STD + XBR     | 2X
-| MBZ__3__STD                    | ✔          | ✔          | ✔       | STD           |
-| MBZ__3__STD-GLASS-SUPER-XBR    | ✔          |            | ✔        | STD + XBR     | 2X
-| MBZ__3__STD-GLASS              | ✔          |            | ✔        | STD           |
-| MBZ__4__STD-NO-REFLECT         |            | ✔          | ✔        | STD           |
-| MBZ__4__STD-SCREEN-ONLY        |            |             | ✔       | STD           |
-| MBZ__5__POTATO-SUPER-XBR       |            | BG ONLY     |         | POTATO + XBR   | 2X
-| MBZ__5__POTATO                 |            | BG ONLY     |         | POTATO         |
-|
-
-----
-**Pre CRT Shader Chains**
-----------------------------------------
-----
-| Shader Behavior                        |SMOOTH-ADV   |ADV   |STD   |POTATO
-|----------------------------------------|-------------|------|------|-------
-| Reducing Core Resolution               | ✔           | ✔   | ✔   | ✔
-| Resolution Text                        | ✔           | ✔   | ✔   |
-| Intro Animation                        | ✔           | ✔   | ✔   |
-| De-Dithering                           | ✔           | ✔   |      |
-| Image Sharpening                       | ✔           | ✔   | ✔   |
-| Uprezed Edge Contour Smoothing         | ✔           |     |      |
-| Bandwidth Horizontal Blurring (GTU)    | ✔           | ✔   |     |
-| NTSC Signal Processing (NTSC Adaptive) | ✔           | ✔   | ✔   | ✔
-| Afterglow                              | ✔           | ✔   | ✔   | ✔
-| Color Signal Processing (Grade)        | ✔           | ✔   | ✔   | ✔
-| Interlacing & Downsample Blur          | ✔           | ✔   | ✔   | ✔
-| Sinden Lightgun Border                 | ✔           | ✔   | ✔   | ✔
-
-NTSC Processing is only included in NTSC Presets, and GTU Horizontal blurring isincluded in non-NTSC presets
-
-**Descriptions:**
-
-  * **POTATO Pre-CRT shader chain**
-    * Fewest passes, but still Includes Grade Color Correction
-  * **STD Pre-CRT shader chain**
-    * Includes Some Basic Processing before the CRT shader
-  * **ADV Pre-CRT shader chain**
-    * Includes STD chain and adds DeDithering & GTU
-  * **ADV Pre-CRT shader chain + ScaleFx Upres**
-    * Includes ADV Pre-CRT shader chain and ScaleFX
-    * Resolution is tripled in the middle of the chain for ScaleFX
-    * This requires increased GPU processing
-  * **SCREEN-ONLY**
-    * Includes whatever the category's Pre-CRT shader chain but removes the bezel, images and reflection
-  * **Glass**
-    * Presets which show a blurry reflection in the area around the screen
-  * **Image Layering**
-    * Layering of multiple images for background, CRT housing, LEDs etc
-    * Includes the Automatically Generated Bezel & Frame
-  * **Tube Effects**
-    * Tube Static Reflection Highlight
-    * Tube Diffuse Image & Shadow
-    * Tube Colored Gel
-    * All presets include Tube Effects except the Potato
-
-**Preset Folders in Mega_Bezel / Presets**
-
-  * **Base_CRT_Presets**
-    - Includes presets using different crt shaders for the screen
-    - Look here for the LCD preset
-
-  * **Base_CRT_Presets_DREZ**
-    * Presets which set the resolution at the beginning of the shader chain
-    * Good for reducing the resolution from the core to native res to use with a crt shader
-    * Helps working with cores which are outputting at increased internal resolution, e.g. 2x, 4k. When a large image comes from the core and is downscaled to ntive res this creates antialiasing, helping smooth out the jaggies
-
-
-**HSM Examples Package (Separate additional Package from Mega Bezel)**
-
-  * **Community_CRT_Variations**
-    - Presets with crt settings created by community members
-    - Thanks to some of our community members who's settings appear here including @BendBombBoom, @NesGuy, @Sonkun & @Cyberlab
-
-  * **Variations**
-    * These presets are simple presets referencing one of the presets in the Mega_Bezel folder
-    * They reference the original preset then have adjusted parameters or texture paths
-
-  * **Experimental**
-    * **Use at your own risk!**
-    * These presets are work in progress and are likely to be moved, renamed, dissappear or change behavior at any future release
-
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**Troubleshooting**
-----------------------------------------
----
-
- * **If you have difficulties loading the shader** try loading it with the imageviewer core
-    * **Steps**
-        * Add the imageviewer core to Retroarch with the online updater
-        * Open an image with this core
-        * Load the shader
-        * If the shader loads correctly then the shader is working.
-
-     * If Retroarch crashes this is usually the core resolution overwhelming the graphics card's resources. This more often happens when you are using a SMOOTH-ADV preset. Try a STD, or STD-DREZ preset to reduce the resolution used within the shader chain
-     * When the shader works in imageviewer, but doesn’t work when using a core, it is probably related to the core
-     * If you still have difficulties loading the shader with a specific core, try updating the core
-     * If you still have difficulties download a new separate version of Retroarch and try it there. Sometimes problems lurk in a random config file which is very hard to track down
- * **To see errors** coming from Retroarch you need to set up your logging settings:
-    * **Logging - Logging Verbosity - ON**
-      * **Frontend Logging - 0(Debug)**
-      * **Log to File - ON**
-      * **Restart Retroarch**
-      * **Load your shader**
-      * **Close Retroarch**
-      * These last steps allow you to have a short log for us to look at
-      * If you want to see the errors as they happen you can set Log to File to OFF and an additional console window will open when retroarch opens and show errors here
-
-
----
-**If the Screen is changing size unexpectedly**
-
-  * If the screen changes size when loading a game or switching between different parts of the game e.g. gameplay vs cinematic, this is because of the interaction between the different resolutions the core is outputting on different screens and the shader's integer scale or automatic aspect ratio settings.
-
-* **How to fix**
-
-  * **Make sure Integer Scale is OFF in the RetroArch Video Settings**
-  * **If BOTH the HEIGHT and WIDTH of the screen size are changing size**
-
-    * Set the Integer scale mode to OFF (0)
-  * **If ONLY the WIDTH of the screen is changing size** (the HEIGHT stays constant)
-    * Set the Aspect Ratio Type to Explicit (1) This will use the explicit aspect ratio number instead of guessing
-
-    * If this solves your issue please consider posting on the thread at the top of this document the issue you had so that we can improve the auto aspect ratio in the future
-
----
-**If the Screen is shown in a vertical aspect for a horizontal game:**
-
-  * Set The **[ Aspect Ratio ] / Orientation** to **Horizontal**
-
----
-**If you see artifacts on the game image like circles or interference patterns**
-  * These artifacts which look like round swirls or circles like tree trunk rings are called a Moiré patterns which happen when a high frequency pattern is sampled at a lower frequency - https://en.wikipedia.org/wiki/Moiré_pattern
-
-    * The base cause of the Moiré pattern is usually the curvature in combination with visible scanlines
-
-* **How to fix**
-    * Set **CRT Curvature Scale Multiplier** to 0, This will remove curvature from the game image but leave everything else the same
-    * Set **Integer Scale Mode** to 1 or 2
-    * Make the game screen larger with either **Viewport Zoom** or **Non-Integer Scale %**
-    * Use a higher resolution monitor if available
-
-----------------------------------------
-----------------------------------------
-----------------------------------------
-**Bug Reporting**
-----------------------------------------
-
-* When reporting a bug, it is VERY IMPORTANT to post images of the issue. This helps communicate the issue better & quicker, even if the issue seems simple.
-*  Please make sure you are using the latest version of the shader
-* Please include info about your setup
-  * Preset, Core, Core Internal Res 1x, 2x etc?, Monitor resolution, GPU
-*  If you are having any issues with the shader not loading or crashing please include a log. See the readme for how to get a log
-  * If loading the shader crashes Retroarch your core internal res is probably too high. Try native resolution or one of the DREZ presets which reduce the resolution in the first pass.
-
------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------
-----
-**Parameter Descriptions**
------------------------------------------------------------------------------------------------
-
------------------------------------------------------------------------------------------------
-**[ --- HSM MEGA BEZEL X.X.XXX 20XX-XX-XX --- ]:** - Title, Version, Date
-
-  * **Show Resolution Info** --- Show Resolution info from different aspects of the shader chain with onscreen text
-
------------------------------------------------------------------------------------------------
-**[ CRT BRIGHTNESS & GAMMA ]:**
-  * **Gamma In (Game Embedded Gamma - Gamma Space to Linear) Def 2.4** - The gamma adjustment applied to take the core image and bring it into linear color space. Gamma to Linear Space Decode
-  * **Gamma Out (Electron Gun Gamma - Linear to Gamma Space) Def 2.4** - The gamma adjustment applied to the CRT shader's linear color output to bring it back into a gamma corrected space. Also known as Linear to Gamma Space Encode
-  * **Post CRT Brightness** - Brightness adjustment on the CRT color output (Applied in Linear Color Space)
-  * **Post CRT Brightness Affects Grade Black Level** - As this value is reduced the brightness adjustment amount will be reduced on the black level. So if you set it to a low value there will be almost no increase in brightness on the areas which were black before the black level adjustment.
-
------------------------------------------------------------------------------------------------
-**[ GRAPHICS GLOBAL BRIGHTNESS ]:**
-  * **Graphics Brightness** - Brightness of all graphics and images which are not the CRT Shader
-  * **Graphics Gamma Adjust** - Gamma adjustment on all graphics and images which are not the CRT Shader to adjust brightness with a gamma curve
-
------------------------------------------------------------------------------------------------
-**[ AMBIENT LIGHTING ]:** - Usually used to apply night lighting on all graphics
-- **Ambient 1st Image Opacity**
-  - How much of the ambient lighting darkening effect is applied when using the first image
-- **Ambient 2nd Image Opacity**
-  - How much of the ambient lighting darkening effect is applied when using the second image
-* **Which Images to Use**
-  * **0 - BOTH** - Normal Mode, Use Both Images
-  * **1 - 1 ONLY** - Use the first image for both slots
-  * **2 - 2 ONLY** - Use the second image for both slots
-  * **3 - Swap** - Swap the Images
-
-
------------------------------------------------------------------------------------------------
-**[ SINDEN LIGHTGUN BORDER ]:**
-  * **Show Border** - Show the white border around the inner edge of the tube
-  * **Brightness** - How bright is the border
-  * **Thickness** - How Thick is the border
-  * **Compensate Empty Tube**
-    * **0 - Don't adjust the tube size and puts the white border on top of the CRT image**
-    * **1 - Adjust the tube to be wider so the white border is outside the CRT image**
-
-
------------------------------------------------------------------------------------------------
-**[ VIEWPORT ZOOM ]:**
-* **Viewport Zoom** --- Zoom in or out on everything
-* **Zoom CRT Mask** --- When this is on and we zoom in the crt phosphor mask will also scale in integer steps
-* **Viewport Position X**
-* **Viewport Position Y**
-
------------------------------------------------------------------------------------------------
-**[ FLIP & ROTATE ]:**
-
-* **Flip Viewport Vertical** --- Some cores flip the viewport (full monitor area), this flips it back
-* **Flip Viewport Horizontal**
-* **Flip Core Image Vertical** --- Some cores flip the core image, this flips it back
-* **Flip Core Image Horizontal**
-* **Rotate CRT Tube** --- Turns the tube 90 degrees counter counter-clockwise
-
------------------------------------------------------------------------------------------------
-**[ ASPECT RATIO ]:**
-
-* **Orientation** --- Should the aspect be tall or wide? This does not rotate the image.
-  * **0 - Auto** - Chooses vertical vs horizontal based on the core resolution
-  * **1 - Horizontal** - uses horizontal aspect
-  * **2 - Vertical** - uses vertical aspect
-
-* **Type**
-  * **0 - Auto** - Choose aspect ratio based on an educated guess about the core's resolution
-  * **1 - Explicit** - Use the aspect ratio from the **Explicit Aspect Ratio** parameter
-  * **2 - 4:3** - Almost all arcade games are 4:3
-  * **3 - 3:2**
-  * **4 - 16:9**
-  * **5 - PAR** - The aspect ratio of the core's pixel resolution
-  * **6 - Full** - The screen will scale to the full viewport
-
-  * **Explicit Aspect Ratio** - Ratio used when [Aspect Ratio] Type is set to Explicit or if Auto is chosen and no matching resolution can be found
-
------------------------------------------------------------------------------------------------
-**[ CRT SCREEN SCALING GENERAL ]:**
-
-- **Integer Scale Mode**
-  - **0 - OFF** Use Non-Integer Scale
-  - **1 - ShortAxis Integer Scale On** - for the viewport (monitor) in landscape mode this is the vertical axis, If the screen/tube aspect ratio is vertical then integer scale is used for both horizontal and vertical axes
-  - **2 - Integer Scale on both axes**
-
-- **Preset is for Monitor Portrait Mode (Smaller CRT Screen)**
-  - Turn on if this preset is to be used on monitor in Portrait mode, E.G. if your physical monitor is turned vertical
-
-**[ INTEGER SCALE ]:**
-
-- **Base Integer Scale Max Height %**
-  - The maximum screen height of the default integer scale when integer scale is on
-
-- **Integer Scale Multiple Offset**
-  - Adjusts the size of the screen by increasing the multiple of the core resolution (on both axes) when using integer scale, to make the screen larger or smaller
-
-- **Integer Scale Multiple Offset Long Axis**
-  - Adds an additional multiple offset but for only the long axis, with a horizontal aspect ratio this is the horizontal axis
-
-**[ NON-INTEGER SCALE PERCENT  ]:**
-
-- **Non-Integer Scale %**
-  - If integer scale isn't used, this sets the vertical size of the vertical percentage of the full viewport. The default is 82.97 which corresponds to an exact integer scale of 224p content
-
------------------------------------------------------------------------------------------------
-**[ NON INTEGER - PHYSICAL SIZES ]:**
-
-- **Use Physical Monitor and Tube Sizes for Non-Integer**
-  - Use these physical sizes instead of the integer scale percentage
-
-- **Your Monitor's Aspect Ratio**
-  - The aspect ratio of your physical monitor, most monitors are 1.77 which equates to 16:9
-
-- **Your Monitor's Size (Diagonal)**
-  - The size of your physical monitor
-
-- **Simulated Tube Size (Diagonal)**
-  - How big you want the crt screen to be on your monitor
-
-
------------------------------------------------------------------------------------------------
-**[ NON-INTEGER - AUTOMATIC SCREEN SCALE & PLACEMENT ]:**
-
-- **Use Image For Automatic Placement (Scale and Y Pos)**
-  - When on the placement image is inspected to find where to place and scale the screen image
-- **Auto Place Horizontal (X Pos)**
-  - 0 - OFF  Screen placed in the center
-  - 1 - ON Tries to place the screen in the center of the hole in the placement image
-- **Placement Image Mode: TRANSPARENCY : WHITE ON BLACK**
-  - What channel of the texture to look at to find the hole in the image, either the transparent part, or a white rectangle on top of a black background
-
------------------------------------------------------------------------------------------------
-**[ NON-INTEGER SCALE OFFSET ]:**
-
-- **Non-Integer Scale Offset**
-  - Additional scale offset added on top of the non-integer scale, including image placement scale
-
-
------------------------------------------------------------------------------------------------
-**[ SNAP NON-INTEGER TO INTEGER SCALE ]:**
-
-- **Snap to Closest Integer Scale**
-  - Takes the current Non-Integer scale and snaps to the closest integer scale within a tolerance
-- **Snap To Closest Integer Scale Tolerance**
-  - Tolerance of how far away from the current integer scale we will snap to an integer scale
-
-
------------------------------------------------------------------------------------------------
-**[ POSITION OFFSET ]:**
-
-- **Position X** - Moves the entire screen and frame left and right
-- **Position Y** - Moves the entire screen and frame up and down
-
-
------------------------------------------------------------------------------------------------
-**[ CROPPING CORE IMAGE ]:** ---
-Cropping removes parts of the game image at the edges of the screen which were never meant to be seen. Negative values can add more black area at the edges of the screen
-
-- **Crop Mode**
-  - **0 - OFF** No Cropping applied
-  - **1 - Crop Black Only** Only apply the cropping amount within the black areas of the core image
-  - **2 - Crop Any** Apply full crop amount
-- **Crop Zoom %** Add Cropping on all sides at once
-- **Crop Overscan Top**
-- **Crop Overscan Bottom**
-- **Crop Overscan Left**
-- **Crop Overscan Right**
-- **Black Threshold for 'CROP BLACK ONLY'** - The brightness threshold of the black area to be cropped
-
------------------------------------------------------------------------------------------------
-**[ DREZ DOWNSAMPLE FILTER - HYLLIAN - DREZ PRESETS ONLY ]:**
-- **DREZ Filter** - Filter to use in the DREZ downsampling pass
-  - 0 - B-Spline
-  - 1 - Bicubic
-  - 2 - Catmull-Rom
-  - 3 - Bicubic H
-
------------------------------------------------------------------------------------------------
-**[ SCANLINE DIRECTION ]:**
-
-- **Scanline Direction** - Direction of the scanlines
-  - 0 - Auto --- Chooses horizontal or vertical scanline direction based on aspect ratio
-  - 1 - Horizontal
-  - 2 - Vertical
-- **No-Scanline Mode**
-  - Guest Advanced Only, keeps scanline dynamics withoug the darkness between lines
-  - 0 - OFF
-  - 1 - ON
-
------------------------------------------------------------------------------------------------
-**[ CORE RES SAMPLING ]:**
-
-**Adjusting core res sampling changes how the CRT perceives the core resolution**
-  e.g. If you use a core with 4X internal resolution you can set core res sampling to 0.25 it be sampled as if it was at 1x resolution
-
-- **Scanline Direction Multiplier (X-Prescale for H Scanline)**
-  - Adjust the sampling in direction of the scanlines
-  - E.G. if the scanlines are horizontal this adjusts sampling along the horizontal axis
-  - 0 uses the upscaling ratio, so for a SMOOTH-ADV preset this ratio would be 300%, If there is no upscaling this ratio is 100%
-- **Scanline Dir Downsample Blur**
-  - Add blur along the scanline direction
-- **Opposite Direction Multiplier (Y Downsample for H Scanline)**
-  - Adjust the sampling in direction opposite of the scanlines
-  - E.G. if the scanlines are horizontal this adjusts sampling along the vertical axis
-  - 0 uses the upscaling ratio, so for a SMOOTH-ADV preset this ratio would be 300%, If there is no upscaling this ratio is 100%
-- **Opposite Dir Downsample Blur**
-  - Add blur along the opposite direction of the scanlines
-
------------------------------------------------------------------------------------------------
-**[ FAST SHARPEN - GUEST.R ]:**
-
-- **Sharpen Strength**
-- **Amount of Sharpening**
-- **Details Sharpened**
-
------------------------------------------------------------------------------------------------
-**[ INTERLACING From Guest.r :) ]:**
-
-- **Interlace and Fake Scanlines Trigger Res**
-  - Resolution where the shader should switch into its interlace or high res content mode.
-- **Interlacing Mode**
-  * Default is Mode 4 which gives a result with no scanlines and bilinear blending
-  - **-1 - No Scanlines**
-  - **0 - No Interlacing**
-  - **1-3 - Normal Interlacing Modes**
-  - **4-5 - Interpolation Interlacing Modes**
-- **Interlacing Effect Smoothness**
-- **Interlacing Scanline Effect**
-- **Interlacing (Scanline) Saturation**
-
------------------------------------------------------------------------------------------------
-**[ FAKE SCANLINES ]:**
-
-- **Show Fake Scanlines - OFF | ON | USE TRIGGER RES**
-- **Opacity**
-  - Opacity of scanlines added on top of the crt image.
-  - These scanlines are not tied to the core image resolution
-- **Scan Resolution**
-- **Scan Resolution Mode: AUTO (CORE RES) : EXPLICIT**
-- **Explicit Scan Resolution**
-- **Int Scale Scanlines**
-- **Rolling Scanlines**
-- **Scanline Curvature**
-
------------------------------------------------------------------------------------------------
-**[ CURVATURE ]:**
-    Applies tube curvature
-
-- **CURVATURE MODE**
-  - **0 - Turn Curvature Off**
-  - **1 - 2D** - Simplest and fastest curvature
-  - **2 - 2D-CYL** - Simplest and fastest curvature but for a cylindrical tube like a Trinitron
-  - **3 - 3D Sphere**  -  Geometric projection from the surface of a sphere to the viewport - Same as CRT-Royale
-  - **4 - 3D Sphere with adjusted corner mapping** --- Very similar to #1
-  - **5 - 3D Cylindrical Mapping** --- Vertically flat curvature like a Trinitron, e.g. PVM or BVM
-- **2D Curvature on Long Axis** - Curvature multiple on long axis, for a horizontal aspect ratio this is the horizontal axis
-- **2D Curvature on Short Axis** - Curvature multiple on short axis, for a horizontal aspect ratio this is the vertical axis
-- **3D Radius** - Radius for the sphere the 3D projection is done on, values from 1-4 then to be useful
-- **3D View Distance** - This is the distance of the virtual camera from the Sphere
-- **3D Tilt Angle Y** - Vertical Tilt, with split screen this will tilt both screens towards or away from the center
-- **CRT Curvature Scale Multiplier** - This allows reducing the curvature of the crt image to reduce Moire artifacts or just give a flat look while the bezel and black edge stays the same
-
------------------------------------------------------------------------------------------------
-**[ ANTI-FLICKER ]:**
-
-Blend parts of the image which flicker on/off repeatedly between frames often used for Character's Shadow, giving a blended result.
-
-- **Anti-Flicker ON** --- Turn the effect ON / OFF
-- **Luma Difference Threshold**
-  - Brightness difference required before the colors will be blended
-
------------------------------------------------------------------------------------------------
-**[ GRAPHICS CACHE ]:**
-
-  * **Cache Graphics**
-    * **0: OFF** - Graphics Layering and Bezel Generation are regenerated every frame
-    * **1: ON** - Graphics & Bezel are generated once and cached for subsequent frames. The cache auto updates when changes in parameters are detected
-  * **Cache Update Indicator**
-    * **0: OFF** - Never show the red dot indicator on screen when the cache updates
-    * **1: ON** - Appears whenever the graphics are regenerated and cache is updated, when caching is off or if the cache is auto-updated
-    * **2: ONLY WHEN CACHE OFF** - Indicator does not appear on auto-update, It only appears when caching is off
-
-
------------------------------------------------------------------------------------------------
-**[ A/B SPLITSCREEN COMPARE ]:**
-
-- **Show:  CRT SHADER | ORIGINAL**
-  - Switch between showing the raw game image or the complete CRT image
-- **Compare Area:  LEFT | RIGHT | TOP | BOTTOM**
-  - Which part of the screen should we show the comparison image
-- **Splitscreen Position**
-  - Shift the split in the middle of the screen towards the one side or the other
-- **Freeze CRT Tube (Freeze Left, New changes on Right)**
-  - Freeze an image of the CRT tube at the current time on one side of the screen, while the area on the other side keeps updating to user changes
-- **Freeze Graphics (Freeze Left, New changes on Right)**
-  - Freeze an image of the Graphics at the current time ion one side of the screen, while the area on the other side keeps updating to user changes
-
-
-- **[ SHOW PASS (For Debugging) ]:**
-
-Shows the results at different stages of the shader chain
-
-- **Show Pass Index**
-    * **0: END** - Result of the final pass
-    * **1: REFLECTION** - Shows te Reflection pass (includes final image of the tube)
-    * **2: TUBE** - Shows the pass with the tube effects applied, E.G. vignette, diffuse, static reflection
-    * **3: CRT** - The CRT effect only
-    * **4: INTERLACE** - The stage before the CRT which has interlacing effects added
-    * **5: COLOR CORRECT & UPSCALE** - Color Correct, and upscaling like ScaleFx or SuperXBR are applied here
-    * **6: DEDITHER** - ADV passes only, at this point dithering should be blended together
-    * **7: DREZ** - DREZ passes only, shows result after the downsampling pass
-    * **8: CORE** - This is the initial input into the shader pipeline
-    * **9: LAYERS TOP** - Just the pass which composites all the layers which are in front of the CRT tube
-    * **10: LAYERS BOTTOM** - Just the pass which composites all the layers which are behind the CRT tube
-- **Apply Screen Scale & Curvature to Unscaled Passes**
-    * **0: Show exact output of the chosen pass**
-    * **1: Apply scale and curvature to the output of the chosen pass so it is easier to directly compare between earlier and later passes**
-- **Show Alpha Channel**
-    Show the alpha channel of the pass. E.G. the alpha channel of the Layers Bottom pass is the reflection mask
-
------------------------------------------------------------------------------------------------
-**[ SCREEN VIGNETTE ]:**
-
-- **Use Vignette**
-  - Fade out the game screen as we move away from the center of the screen
-- **Amount (Strength)** - Overall Darkness
-- **Corner Amount (Power)** - Darkeness towards the edges
-- **Show Vignette in Reflection** - Darken the reflection or not
-
-
------------------------------------------------------------------------------------------------
-**[ MONOCHROME ]:** --- Have the screen act as if it is a monochrome CRT
-
-- **Monochrome Color:**
-  - 0: OFF
-  - 1: BLACK & WHITE
-  - 2: AMBER
-  - 3: GREEN
-- **Monochrome Gamma**
-- **Monochrome Hue Offset**
-- **Monochrome Saturation**
-
-
------------------------------------------------------------------------------------------------
-**[ TUBE ASPECT & EMPTY SPACE ]:**
-
-- **Tube Aspect** - Default is 2: Explicit
-  - 0 - EVEN - If there is empty tube space added it will be added evenly on all sides. If there is no empty space then the aspect ratio will match the screen aspect.
-  - 1 - SCREEN - Have the tube keep the same aspect of the game screen as empty space is added
-  - 2 - EXPLICIT - Sets the explicit aspect ratio of the tube
-- **Explicit Tube Aspect**
-  - Aspect used when Tube Aspect is set to Explicit
-- **Empty Tube Thickness**
-  - Amount of Empty tube around the game image
-- **Empty Tube Thicknes X Scale**
-  - Amount of Empty tube around the game image horizontally
-- **Screen (Game Image) Corner Radius Scale**
-  - How round are the corners of the CRT image on top of empty area of the tube
-
-
------------------------------------------------------------------------------------------------
-**[ TUBE DIFFUSE IMAGE ]:**
-
-The color/texture of the tube which appears behind the CRT image
-- **Tube Diffuse Color**
-  - 0: Black - Game image is shown over 100% black
-  - 1: Image - Shows an grayish image of crt tube with lighting
-  - 2: Transparent - See through the CRT tube to the background
-- **Colorize On** - Colorize the image
-- **Hue Offset**
-- **Saturation**
-- **Brightness**
-- **Gamma Adjust**
-- **Ambient Lighting Multiplier**
-  - A multiplier on the amount of global ambient lighting applied
-- **Scale**
-- **Scale X**
-
------------------------------------------------------------------------------------------------
-**[ TUBE SHADOW IMAGE ]:**
-
-Adds a shadow on top of the tube diffuse image and colored gel
-- **Tube Shadow Image - OFF | ON**
-  - Apply a shadow on the top of the tube diffuse coloring
-- **Opacity**
-  - Opacity of the shadow, and how dark the shadow is
-- **Position X**
-- **Position Y**
-- **Scale X**
-- **Scale Y** - Scales shadow from the top of the tube
-- **Curvature Scale** - How much curvature is applied to the shadow, more curvature has the effect of making it look like the light is higher relative to the tube/bezel
-
-
------------------------------------------------------------------------------------------------
-**[ CRT ON TUBE DIFFUSE BLENDING ]:**
-
-- **Tube Opacity**
-  - Opacity of the tube, with opacity of 0 you will see through to the background, good for things like Tron's Deadly Discs
-- **CRT On Tube Diffuse Blend Mode** - How to apply the CRT (Game Image) on top of the tube
-  - 0: OFF - Don't apply the game image
-  - 1: ADD - Apply the game image additively this is the normal behavior
-  - 2: Multiply - Darken the tube diffuse image with the game image
-- **CRT On Tube Diffuse Blend Amount** - Opacity or how much of the image to apply to the tube
-
------------------------------------------------------------------------------------------------
-**[ TUBE COLORED GEL IMAGE ]:**
-    Colored effect added on top of the CRT image to tint it
-
-- **Use Tube Colored Gel** - Apply the image or not
-- **Dual Screen Visibility** - Which screens to show the colored Gel
-  - 0: Both Screens
-  - 1: Only the First Screen
-  - 2: Only the Second Screen
-- **Multiply Blend Amount** - Image applied like a colored gel in photography
-  - Used to make vector games which output black and white colored, E.G Battlezone
-- **Additive Blend Amount** - Image applied as a brightening of the tube area
-  - Used to add color to the screen as if it was the gel being diffusely lit from outside the monitor
-- **Normal Blend Amount** - Used for the more opaque parts of a gel image like for the Vectrex
-- **Normal Blend Transparency Threshold** - Adjusts at what transparency of the image the area should be appear fully transparent
-- **Normal Multiply by Tube Diffuse Shading** - Darken the gel with the tube diffuse image, allows you to add shading to the gel image
-- **Normal Blend Brightness** - Brightness for these more opaque parts
-- **Ambient Lighting Multiplier** - How much of the global ambient lighting to apply
-- **Ambient 2nd Image Lighting Multiplier** - How much of the global 2nd ambient lighting to apply
-- **Scale** - Scale the colored gel image
-- **Flip Horizontal** - Flip the colored gel image Horizontally
-- **Flip Vertical** - Flip the colored gel image Vertically
-- **Show CRT on Top of Colored Gel Normal** - Put the CRT image on top of the gel image so it is not color shifted or obscured.
-
------------------------------------------------------------------------------------------------
-**[ TUBE STATIC REFLECTION IMAGE  ]:**
-- **Use Tube Static Reflection Image - OFF | ON** --- Apply the effect or not
-- **Opacity** --- This is the shine on the tube which imitates reflection from the environment
-- **Dual Screen Visibility** --- Which screen the static reflection is shown
-  - 0: Both Screens**
-  - 1: Only the First Screen
-  - 2: Only the Second Screen
-- **Ambient Lighting Multiplier** --- How much of the global ambient lighting image to apply, default is 100
-- **Ambient 2nd Image Lighting Multiplier** --- How much of the global 2nd ambient lighting image to apply, default is 0
-- **Scale** --- Scales the tube reflection image from the center of the tube
-- **Shadow Opacity** --- How much of the shadow should appear on the static reflection image
-
-
------------------------------------------------------------------------------------------------
-**[ SCREEN BLACK EDGE ]:**
-
-- **Global Corner Radius** --- Global radius of all corners before their own multipliers are applied
-- **Black Edge Corner Radius Scale** --- the roundness of the corner of the screen area
-- **Black Edge Sharpness** --- Blends the edge of the game screen image to black, lower values will fade the edge
-- **Black Edge Curvature Scale Multiplier** --- How much the black edge will follow the screen curvature
-- **Black Edge Thickness** --- How thick the black edge is on the edge of the tube
-  - Set this to 0 or less to remove the black edge
-- **Black Edge Thickness X Scale** --- Scale the thickness on the left and right edge
-
-
------------------------------------------------------------------------------------------------
-**[ DUAL SCREEN ]:**
-
-- **Dual Screen Mode**
-  - 0 - OFF - Single Screen
-  - 1 - VERTICAL - Split into 2 screens one on the top and one on the bottom
-  - 2 - HORIZONTAL - Split into 2 screens one on the left and one on the right
-
-- **Core Image Split Mode**
-  - 0 - AUTO - Split in the same direction as the dual screen mode
-  - 1 - VERTICAL
-  - 2 - HORIZONTAL
-- **Core Image Split Offset**
-  - Adjusts where we split the core image into two
-  - This is an offset in pixels from the center
-   the screen
-  - Value in Pixels
-- **Viewport Split Offset**
-  - Sets where the viewport split placed. The split defines the area where one screen or the other appears
-  - Value is a percentage from the center of the screen
-- **Scale Screens from Center of Split**
-  - 0 - OFF - The screens will scale their center
-  - 1 - ON - The screens will scale from the split position rather than from their own centers
-- **Position Offset Between Screens**
-  - Positive values move screens apart
-  - Negative values move screens closer to each other
-- **2nd Screen Aspect Ratio Mode**
-  - 0 - Use the same Aspect ratio as the first Screen
-  - 1 - PAR (Uses the square pixel aspect of the bottom screen's resolution)
-- **2nd Screen Use Independent Scale** - Don't affect the second screen with the scale of the first
-- **2nd Screen Scale Offset** - Increase or Decrease scale of second screen
-- **2nd Screen Pos X** - Move the second screen Horizontally
-- **2nd Screen Pos Y** - Move the second screen Vertically
-- **2nd Screen Crop Zoom %** - Crop on all sides at once
-- **2nd Screen Crop Overscan Top**
-- **2nd Screen Crop Overscan Bottom**
-- **2nd Screen Crop Overscan Left**
-- **2nd Screen Crop Overscan Right**
-
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION POSITION & SCALE ]:**
-
-- **Screen Reflection Scale**
-  - Scales the reflection from the center
-  - With a larger scale, the image from the screen will appear without mirroring, like the Big Blur preset
-- **Screen Reflection Pos X**
-  - Shift the reflection left or right
-- **Screen Reflection Pos Y**
-  - Shift the reflection up or down
-
-
------------------------------------------------------------------------------------------------
-**[ AMBIENT LIGHTING IMAGE 1 ]:**
-
-- **Hue**
-  - Shift the hue of the color of the image
-- **Saturation**
-  - How saturated the ambient lighting is
-- **Value**
-  - How dark or bright the ambient lighting is
-- **Contrast**
-  - Contrast in the ambient lighting
-- **Scale Aspect**
-  - **MATCH VIEWPORT** - Stretch the width of the image to the full viewport
-  - **USE TEXURE ASPECT** - The base aspect of the image will match the image file aspect
-- **Scale With Zoom**
-  - **OFF** Don't scale the ambient lighting with the viewport Zoom
-  - **ON** Scale with the viewport Zoom
-- **Scale Offset**
-  - Scale the lighting image in both directions
-- **Scale Offset X**
-  - Scale the lighting image in the horizontal direction
-- **Rotate**
-  - Rotate the lighting image
-- **Mirror Horizontal**
-  - Flip the ambient lighting left to right
-- **Position X**
-  - Move the image left and right
-- **Position Y**
-  - Move the image up and down
-
-
------------------------------------------------------------------------------------------------
-**[ AMBIENT LIGHTING IMAGE 2 ]:** - Has the same parameters as Ambient Image 1
-
-
------------------------------------------------------------------------------------------------
-**[ BEZEL INDEPENDENT SCALE & CURVATURE ]:**
-
-- **Use Independent Scale & Curvature**
-  - Scale the bezel independent of the screen
-- **Independent Scale**
-  - Scale of the bezel when scale from image is not used
-  - Base scale for the bezel default is 82.97 which is the same as the default screen size
-- **Use Independent Curvature** --- Define curvature separately from the screen
-- **Independent Curvature X** --- Horizontal curvature for the bezel when independent
-- **Independent Curvature Y** --- Vertical curvature for the bezel when independent
-
-
------------------------------------------------------------------------------------------------
-**[ BEZEL GENERAL ]:**
-
-- **Opacity**
-  - At 100 the bezel is fully visible
-
-- **Blend Mode**
-  - **0 - Off**
-  - **1 - Normal Blending**
-  - **2 - Additive Blending** - Added on as added with a projector
-  - **3 - Multiply Blending** - Image is applied by darkening the under layer
-
-- **Width**
-  - Thickness of the bezel on the sides of the tube, default is 125
-
-- **Height**
-  - Thickness of the bezel on the top and bottom of the tube, default is 100
-
-- **Scale Offset**
-  - Scale offset of the Bezel & Frame from its default position
-
-- **Inner Curvature Scale Multiplier**
-  - How much the bezel's curvature follows the tube curvature
-
-- **Inner Corner Radius Scale** - Def 50
-  - Roundness of the inner corner of the bezel, it is a multiplier of the roundness of the screen corner
-  - 100 gives you the same roundness as the screen corner
-
-- **Inner Edge Thickness**
-  - Thickness of edge of inner, default 100
-
-- **Inner Edge Sharpness** - Def 90
-
-- **Outer Corner Radius Scale** - Def 100
-  - Roundness of the inner corner of the bezel, it is a multiplier of the roundness of the screen corner
-  - 100 gives you the same roundness as the screen corner
-
-- **Outer Curvature Scale**
-  - Amount of curvature on the outside of the bezel it is a multiplier of the roundness of the screen corner
-  - Default is 0 which gives a straight edge of the outside of the bezel
-
-- **Outer Edge Position Y**
-  - This moves the outer edge of the bezel and the frame up and down
-
-- **Noise**
-  - Noise or speckles in the color, default is 30
-
-- **Opacity of Shadow from Bezel on Tube**
-  - How much of a darkness from the bezel onto the illuminated screen
-  - Only visible when the black ring around the screen is reduced so that the bezel is almost on top of the screen
-
-
------------------------------------------------------------------------------------------------
-**[ BEZEL BRIGHTNESS ]:**
-
-- **Base Brightness**
-  - Brightness of the bezel, the default is 30 so only 30% brightness
-
-- **Top Multiplier**
-  - An adjustment over the base brightness for the top
-
-- **Bottom Multiplier**
-  - An adjustment over the base brightness for the bottom
-
-- **Sides Multiplier**
-  - An adjustment over the base brightness for both sides
-
-- **Left Side Multiplier**
-  - An adjustment over the base brightness for the left side
-
-- **Right Side Multiplier**
-  - An adjustment over the base brightness for the right side
-
-- **Highlight**
-  - The highlight or shininess in the middle of the bezel
-
-
-
------------------------------------------------------------------------------------------------
-**[ BEZEL COLOR ]:**
-
-- **Hue**
-  - The hue or "color" of the bezel E.G. Blue vs Orange
-- **Saturation**
-  - How saturated or strong the color is
-- **Value/Brightness**
-  - The brightness of the color, default is 10 which is 10%
-
-
------------------------------------------------------------------------------------------------
-**[ FRAME COLOR ]:**
-
-- **Use Inependent Frame Color**
-  - 0 by default, when turned on it uses a different color than the bezel color
-- **Hue**
-  - The hue or "color" of the bezel and frame E.G. Blue vs Orange
-- **Saturation**
-  - How saturated or strong the color is
-- **Value/Brightness**
-  - The brightness of the color, default is 10 which is 10%
-
-
------------------------------------------------------------------------------------------------
-**[ FRAME GENERAL ]:**
-
-- **Opacity**
-  - Opacity of the frame default is 100 which means it is fully visible
-- **Texture Overlay Opacity (Highlight)**
-  - Opacity of the texture applied on top of base color of the frame
-  - The default texture is a white highlight and so adds a highlight effect to the frame giving it a bit more dimension
-- **Texture Overlay Blend Mode** - Default is 2 so it is additive
-  - **0 - Off**
-  - **1 - Normal Blending**
-  - **2 - Additive Blending** - Added on as added with a projector
-  - **3 - Multiply Blending** - Applied by darkening what is underneath
-- **Noise**
-  - Noise or speckles in the color, default is 30
-- **Inner Edge Thickness**
-  - Thickness of the inner edge of the frame
-- **Inner Corner Radius Scale**
-  - Roundness of the inner corner,
-- **Frame Thickness**
-  - Base thickness of the frame
-- **Frame Thickness Scale X**
-  - Adjusts the frame thickness of frame at the left and right
-- **Frame Outer Pos Y**
-  - Shift the outside of the frame up and down which can make the top of the frame larger than the bottom or vice versa
-- **Frame Outer Curvature Scale**
-  - Curvature of the outside of the frame, at 100 it will match the curvature of the inside of the frame
-- **Outer Corner Radius**
-  - Roundness of the frame outer corner
-- **Outer Edge Thickness**
-  - Thickness of the shading on the outer edge
-- **Outer Edge Shading**
-  - Controls the darkness of the shading on the outer edge
-- **Shadow Opacity**
-  - Controls the darkness of the shadow under and around the frame
-- **Shadow Width**
-  - Controls how wide the shadow is around the frame
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION ]:**
-
-- **Global Amount**
-  - Overall multiplier on the amount of reflection shown
-- **Global Gamma Adjust**
-  - Gamma adjustment on the reflection, allows you to reduce the amount of reflection in dark areas, or reduce contrast in the reflections
-- **Direct Reflection**
-  - Amount of the most detailed reflection shown
-- **Diffused Reflection**
-  - Amount of a very blurry and diffused reflection shown, helps blend between the main reflection to make a more natural effect
-- **FullScreen Glow**
-  - Amount of a very diffused reflection shown which mimics lighting from the overall brightness of the screen
-- **FullScreen Glow Gamma**
-  - Adjust the gamma of the full screen glow, this has the effect of controlling how bright the screen needs to be to see the fullscreen glow effect
-- **Bezel Inner Edge Amount**
-  - How much reflection on the small inner edge right at the outside of the tube
-- **Bezel Inner Edge Fullscreen Glow**
-  - Same as above but a non-directional glow from all over the screen
-- **Frame Inner Edge Amount**
-- **Frame Inner Edge Sharpness**
-  - How soft or sharp the reflection is at the inner edge of the frame
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION FADE ]:**
-
-- **Fade Amount**
-  - At 100 the reflection fades out as it comes away from the screen, at 0 the reflection does not fade and is full strength everywhere
-- **Radial Fade Width**
-  - The distance away from the sides of the screen where the reflection to completely fades out
-- **Radial Fade Height**
-  - The distance away from the top and bottom of the screen where the reflection to completely fades out
-- **Lateral Outer Fade Position**
-  - When the reflection fades out towards the corners, for example on the bottom bezel the reflection fades out towards the left and right. The position where the fade starts.
-- **Lateral Outer Fade Distance**
-  - For the lateral fade the distance for it to fade out
-
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION CORNER ]:**
-
-- **Corner Fade**
-  - How much should the corner fade out
-- **Corner Fade Distance**
-  - The distance from the corner where the reflection fully fades out
-- **Corner Inner Spread**
-  - How much the inner corner reflection spreads out
-- **Corner Outer Spread**
-  - How much the outer corner reflection spreads out
-- **Corner Rotation Offset Top**
-  - Adjust the rotation of the highlight in the top corners
-- **Corner Rotation Offset Bottom**
-  - Adjust the rotation of the highlight in the bottom corners
-- **Corner Spread Falloff**
-  - Controls the profile of the falloff, small values make falloff faster near the center.
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION BLUR ]:**
-
-- **Blur Samples - 0 for OFF**
-  - Default is 12
-- **Min Blur**
-  - What is the least amount of blur in the reflection this is nearest the screen
-- **Max Blur**
-  - The highest amount of blur in the reflection, this is the farther away from the screen
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION NOISE ]:**
-
-- **Noise Amount**
-  - How much noise seen in the reflection, gives the effect of the scattered reflection of a slightly textured surface
-- **Noise Samples (0 for OFF)**
-  - How many samples taken for the effect, more samples the smoother the effect, fewer samples makes the surface look more like it has little bumps in it
-- **Sample Distance**
-  - What is the farthest distance away from the point being drawn where the scattered sample come from
-
-
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION MASK IMAGE - Only in Image Layer Presets ]:**
-
-- **Reflection Image Mask Amount**
-  - How much the image darkens the reflection
-- **Follow Layer**
-  - Which layer should the image mask match, Default is 4, Following the Device
-  - **0 - FULL**
-  - **1 - TUBE**
-  - **2 - BEZEL**
-  - **3 - BG**
-  - **4 - DEVICE**
-  - **5 - DECAL**
-  - **6 - CAB**
-  - **7 - TOP**
-- **Follow Mode**
-  - Should the image follow exactly
-  - **0 - FOLLOW SCALE & POS** - Follows only position and orientation
-  - **1 - FOLLOW EXACTLY** - Follows curvature and split mode
-- **Mask Brightness** - Brighten's the mask which brightens the reflection
-- **Mask Black Level** - Increases the black level so that the darker areas of the maskbecome  darker, can help increase contrast
-- **Mipmapping Blend Bias (Affects Sharpness)** - Makes the effect of the mask blurrier or sharper
-
------------------------------------------------------------------------------------------------
-**[ REFLECTION GLASS ]:**
-
-- **Glass Border ON (For Glass Preset)**
-  - Changes the appearance of the reflection to look like the glass effect, this is here for technical reasons, not very useful to change interactively
-- **Glass Reflection Vignette**
-  - Adds a vignette over the entire viewport to darken the areas as it goes towards the edges used to darken the reflection in the glass preset
-- **Glass Reflection Vignette Size**
-
-
-
------------------------------------------------------------------------------------------------
-## **POTATO Presets Only**
-
------------------------------------------------------------------------------------------------
-**[ POTATO BACKGROUND IMAGE LAYER ]:**
-
-- **Background Blend Mode** - Default is Additive
-
-  - **OFF** - Image is not applied
-  - **NORMAL**
-  - **ADD** - Adds the image as if it is being projected on top
-  - **MULTIPLY** - Image is applied as if it was a colored plastic film
-
-- **Opacity**
-
-- **Brightness**
-
-- **Show Background**
-
-  - **0 - UNDER SCREEN** - Background is applied under the screen and Since the default blend mode is additive this gives a backdrop effect. E.G. Tron's Deadly Discs
-  - **1 - OVER SCREEN** - Background is applied on top of the screen
-
-
-
------------------------------------------------------------------------------------------------
-## **GLASS Presets Only**
-
------------------------------------------------------------------------------------------------
-**[ GLASS BACKGROUND IMAGE ]:**
-
-- **Background Image Opacity**
-
-- **Background Blend Mode** - Default is Additive
-
-  - **Off** - Image is not applied
-
-  - **Normal**
-
-  - **Additive** adds the image as if it is being projected on top
-
-  - **Multiply** applies as if it was a colored plastic film
-
-
------------------------------------------------------------------------------------------------
-**[ LAYER ORDER ]:**
-
-Layer order adjusts the order in which the layers are composited or "layered" on top of each other, the index 0 is the bottom or base layer. If two layers are given the same index they fall back to being composited in the order seen here.
-
-- **Background Image**
-- **Viewport Vignette**
-- **LED Image**
-- **Device Image**
-- **Device LED Image**
-- **CRT Screen**
-- **Decal Image**
-- **Cabinet Glass Image**
-- **Top Image**
-
------------------------------------------------------------------------------------------------
-**[ CUTOUT ]:**
-
-Used to cut a rectangular area from the layers, for example cutting out the hole in the bezel art
-
-- **Scale Mode**
-  - Controls if this layer's scaling follows another layer
-  - **0 - Full** - Scale to the viewport
-  - **1 - Tube** - Follow the Tube Scaling
-  - **2 - Bezel** - Follow the Bezel Scaling
-  - **3 - Background** - Follow the Background Image Scaling
-  - **4 - Bezel Image** - Follow the Bezel Image Scaling
-  - **5 - Decal Image** - Follow the Decal Image Scaling
-- **Scale**
-  - Scales cutout in both directions
-- **Scale X**
-  - Scales cutout horizontally
-- **Position Y**
-  - Moves the cutout vertically
-- **Corner Radius - Def 0**
-  - Rounds the corner of the cutout
-
------------------------------------------------------------------------------------------------
-**[ MASK DEBUG ]:**
-
-- **Mask** - Show the mask as a semi transparent color for the:
-
-  - **-1 - Cut Out**
-  - **0 - ALL** - Whole viewport
-  - **1 - Screen** - Illuminated area of the tube
-  - **2 - Tube**
-  - **2 - Bezel and Inward** - Bezel and inward
-  - **3 - Bezel**
-  - **4 - Bezel +** - Bezel and outward
-  - **5 - Frame**
-  - **6 - Frame +** - Frame and outward
-  - **7 - Background**  - Outside the frame
-
-
-
-## ***Common Layer Parameters***
-
-	*Many parameters which repeated from layer to layer, their description is shown here*
-
-- ***Opacity***
-  - *Opacity multiplier of the layer being applied. 0 means we will not see the layer because it is fully transparent*
-
-- ***Colorize On*** - Turns on the Colorization
-- ***Hue*** - The hue adjustement, eg more blue vs red
-- ***Saturation***
-- ***Brightness***
-  - *Adjust Brightness of the Layer, 100 is no change*
-- ***Gamma***
-
-- ***Ambient Lighting Multiplier***
-  - How much of the global ambient lighting to add to the layer
-
-- ***Apply Ambient Lighting in ADD Blend Mode***
-    - By default when a layer is in ADD mode ambient lighting is not applied to the image, this works well for things like LEDs
-    - When **Apply Ambient Lighting in ADD Blend Mode** is set to 1 the ambient lighting will be applied when in ADD blend mode
-
-- ***Blend Mode*** *- How the image is applied to the layer underneath Default is 1: Normal Blending*
-
-  - ***0 - Off*** *- The layer is not shown*
-  - ***1 - Normal Blending***
-  - ***2 - Additive Blending*** *- Applied additively to brighten what's underneath*
-  - ***3 - Multiply Blending*** *- Applied to as a darkening of what is underneath*
-
-- ***Source Matte Color***
-  - *Controls how the image transparency is interpreted based on the matte color used when the image was stored (what color the image is blended with in the transparent area).*
-  - *Used to remove white fringing on the edges around transparent areas.*
-  - ***0 - Black***
-    - *The color in the transparent area was black*. Technically this is called Premultiplied alpha.
-  - ***1 - White***
-    - *The color in the transparent area was white, Use this if you see white fringing on the edges of the transparency where there should be none.*
-  - ***2 - None***
-    - *The image was not blended with any matte color, the only transparency info is in the alpha channel*
-
-- **Mask** - Mask the layer with the area inside the:
-  - ***0 - ALL*** *- Whole viewport*
-  - ***1 - Screen*** *- Illuminated area of the tube*
-  - ***2 - Tube*** *- Inside the tube
-  - ***2 - Bezel and Inward*** *- Bezel and inward*
-  - ***3 - Bezel*** *- Bezel
-  - ***4 - Bezel +*** *- Bezel and outward*
-  - ***5 - Frame*** *- Frame
-  - ***6 - Frame +*** *- Frame and outward*
-  - ***7 - Background***  *- Outside the frame*
-
-- ***Cutout Mask***
-  - ***0 - OFF*** *- Don't cut out any area of the layer*
-  - ***1 - ON*** *- Make the area of the layer INSIDE the cutout mask transparent*
-  - ***2 - Invert*** *- Make the area of the layer OUTSIDE the cutout mask transparent*
-
-- ***Dual Screen Visibility*** - Where to show this image
-  - ***0 - Show on Both Screens***
-  - ***1 - Show only on Screen 1***
-  - ***2 - Show only on Screen 2***
-
-- ***Follow Layer***
-  - *Controls if this layer follows another layer's scaling*
-  - ***Full / Fullscreen*** *- Scale to the viewport*
-  - ***Tube*** *- Follow the Tube Scaling*
-  - ***Bezel*** *- Follow the Bezel Scaling*
-  - ***Background*** *- Follow the Background Image Scaling*
-  - ***Bezel Image*** *- Follow the Bezel Image Scaling*
-  - ***Decal Image*** *- Follow the Decal Image Scaling*
-  - ***Top Extra Image*** *- Follow the Top Extra Image Scaling*
-
-- ***Follow Mode***
-  - *Controls if this layer follows another layer's scaling*
-  - ***Follow Scale and Pos*** *- Follow Scale and Position, ignore split*
-  - ***Follow Exactly*** *- Match the layer exactly including split*
-
-- ***Follow Full also follows Zoom***
-  - When the layer Follow Layer is in **FULL** mode this controls if the layer should scale with the global zoom or not, this defaults to ON
-
-- ***Image Fill Mode***
-  - **0 - USE TEXURE ASPECT** --- Keeps the aspect of the teture
-  - **1 - SPLIT HORIZONTAL** --- Splits the image in the center and slide it out towards the sides to match the required aspect
-  - **2 - STRETCH** --- Stretch the image across the whole area to match the required aspect
-
-- ***Split Mode Preserve Center %*** --- Preserves a part of the center of the graphic when split is used
-  - One usage is to have a logo in the center of the bottom of the monitor graphic and reserve space for this
-
-- ***Split Mode Repeat Width %*** --- Width of repeating texture in exposed area
-  - When this is 0 repeat is off
-
-- **Scale** --- *Scales image layer equally in both directions*
-- **Scale X** --- *Scales image layer horizontally*
-- **Position X** --- *Moves the image layer horizontally*
-- **Position Y** --- *Moves the image layer vertically*
-- **Mipmapping Blend Bias** --- *Adjusts the sharpness of the image*
-
-
-
------------------------------------------------------------------------------------------------
-**[ BACKGROUND LAYER ]:**
-
-- **Opacity**
-- **Colorize On**
-- **Hue Offset**
-- **Saturation**
-- **Brightness**
-- **Gamma Adjust**
-- **Ambient Lighting Multiplier**
-- **Ambient Lighting in ADD Mode**
-- **Blend Mode**
-- **Source Matte Color**
-- **Mask**
-- **Cutout Mask**
-- **Dual Screen Visibility**
-
-**[ BACKGROUND SCALE & FOLLOW ]:**
-
-- **Follow Layer**
-  - **0 - FullScreen**
-  - **1 - Tube**
-  - **2 - Bezel**
-- **Follow Layer**
-- **Follow Full also follows Zoom**
-- **Image Fill Mode**
-- **Split Mode Preserve Center %**
-- **Scale**
-- **Scale X**
-- **Position X**
-- **Position Y**
-- **Mirror Wrap**
-  - When ON the image is wrapped when we draw out of the texture bounds
-- **Mipmapping Blend Bias**
-
------------------------------------------------------------------------------------------------
-**[ VIEWPORT VIGNETTE LAYER ]:**
-
-- **Opacity**
-- **Mask**
-- **Cutout Mask**
-- **Follow Layer**
-  - **0 - Full**
-  - **1 - Background**
-  - **2 - Tube**
-  - **3 - Bezel**
-- **Scale**
-- **Scale X**
-- **Position Y**
-
------------------------------------------------------------------------------------------------
-**[ LED LAYER ]:**
-
-- **Opacity**
-- **Colorize On**
-- **Hue Offset**
-- **Saturation**
-- **Brightness**
-- **Gamma Adjust**
-- **Ambient Lighting Multiplier**
-- **Ambient Lighting in ADD Mode**
-- **Blend Mode**
-- **Source Matte Color**
-- **Mask**
-- **Cutout Mask**
-- **Dual Screen Visibility**
-
-**[ LED SCALE & FOLLOW ]:**
-
-- **Follow Layer**
-  - **0 - FullScreen**
-  - **1 - Tube**
-  - **2 - Bezel**
-  - **3 - BG**
-  - **4 - Device**
-- **Follow Mode**
-- **Follow Full also follows Zoom**
-- **Image Fill Mode**
-- **Split Mode Preserve Center %**
-- **Scale**
-- **Scale X**
-- **Position X**
-- **Position Y**
-- **Mipmapping Blend Bias**
-
------------------------------------------------------------------------------------------------
-**[ DEVICE IMAGE LAYER ]:**
-
-- **Opacity**
-- **Colorize On**
-- **Hue Offset**
-- **Saturation**
-- **Brightness**
-- **Gamma Adjust**
-- **Ambient Lighting Multiplier**
-- **Ambient Lighting in ADD Mode**
-- **Blend Mode**
-- **Source Matte Color**
-- **Mask**
-- **Cutout Mask**
-- **Dual Screen Visibility**
-
-**[ DEVICE SCALE & FOLLOW ]:**
-
-- **Follow Layer**
-  - **0 - FullScreen**
-  - **1 - Tube**
-  - **2 - Bezel**
-  - **3 - BG**
-- **Follow Mode**
-- **Follow Full also follows Zoom**
-- **Image Fill Mode**
-- **Split Mode Preserve Center %**
-- **Scale**
-- **Scale X**
-- **Position X**
-- **Position Y**
-- **Mipmapping Blend Bias**
-
------------------------------------------------------------------------------------------------
-**[ DECAL LAYER ]:**
-
-- **Opacity**
-- **Colorize On**
-- **Hue Offset**
-- **Saturation**
-- **Brightness**
-- **Gamma Adjust**
-- **Ambient Lighting Multiplier**
-- **Ambient Lighting in ADD Mode**
-- **Blend Mode**
-- **Source Matte Color**
-- **Mask**
-- **Cutout Mask**
-- **Dual Screen Visibility**
-
-**[ DECAL SCALE & FOLLOW ]:**
-
-- **Follow Layer**
-  - **0 - FullScreen**
-  - **1 - Tube**
-  - **2 - Bezel**
-  - **3 - BG**
-  - **4 - Device**
-- **Follow Mode**
-- **Follow Full also follows Zoom**
-- **Image Fill Mode**
-- **Split Mode Preserve Center %**
-- **Scale**
-- **Scale X**
-- **Position X**
-- **Position Y**
-- **Mipmapping Blend Bias**
-
------------------------------------------------------------------------------------------------
-**[ CABINET GLASS LAYER ]:**
-
-- **Opacity**
-- **Colorize On**
-- **Hue Offset**
-- **Saturation**
-- **Brightness**
-- **Gamma Adjust**
-- **Ambient Lighting Multiplier**
-- **Ambient Lighting in ADD Mode**
-- **Blend Mode**
-- **Source Matte Color**
-- **Mask**
-- **Cutout Mask**
-- **Dual Screen Visibility**
-
-**[ CABINET GLASS SCALE & FOLLOW ]:**
-
-- **Follow Layer**
-  - **0 - FullScreen**
-  - **1 - Tube**
-  - **2 - Bezel**
-  - **3 - BG**
-  - **4 - Device**
-  - **5 - Decal**
-- **Follow Mode**
-- **Follow Full also follows Zoom**
-- **Image Fill Mode**
-- **Split Mode Preserve Center %**
-- **Scale**
-- **Scale X**
-- **Position X**
-- **Position Y**
-- **Mipmapping Blend Bias**
-
-
-
------------------------------------------------------------------------------------------------
-**[ TOP EXTRA LAYER ]:**
-
-- **Opacity**
-- **Colorize On**
-- **Hue Offset**
-- **Saturation**
-- **Brightness**
-- **Gamma Adjust**
-- **Ambient Lighting Multiplier**
-- **Ambient Lighting in ADD Mode**
-- **Blend Mode**
-- **Source Matte Color**
-- **Mask**
-- **Cutout Mask**
-- **Dual Screen Visibility**
-
-**[ TOP SCALE & FOLLOW ]:**
-
-- **Follow Layer**
-  - **0 - FullScreen**
-  - **1 - Tube**
-  - **2 - Bezel**
-  - **3 - BG**
-  - **4 - Device**
-  - **5 - Decal**
-- **Follow Mode**
-- **Follow Full also follows Zoom**
-- **Image Fill Mode**
-- **Split Mode Preserve Center %**
-- **Scale**
-- **Scale X**
-- **Position X**
-- **Position Y**
-- **Mirror Wrap**
-  - When drawing past the edges of the texture use mirror wrapping
-- **Mipmapping Blend Bias**
-
-
------------------------------------------------------------------------------------------------
-**[ INTRO SEQUENCE ]:**
-
-	Animation sequence which plays when the content starts up, animation times are in frames. The frame rate for most games 60 fps
-
-- **Show Intro**
-  - 0 - OFF
-  - 1 - When Content Loads
-  - 2 - Repeat
-- **Speed**
-  - Overall speed of the entire intro. 1 is full speed
-
------------------------------------------------------------------------------------------------
-**[ INTRO LOGO ]:**
-
-- **Logo Blend Mode**
-  - 0 - Off
-  - 1 - Normal Blending
-  - 2 - Additive Blending - Added on as added with a projector
-  - 3 - Multiply Blending - Image is applied by darkening the under layer
-- **Logo Over Solid Color**
-  - 0 - Off - The Logo is layered under the solid color
-  - 1 - ON - The Logo is layered over the solid color
-- **Logo Height (0 for exact resolution)**
-- **Logo Res X**
-  - X Resolution of the logo image
-- **Logo Res Y**
-  - Y Resolution of the logo image
-- **Logo Placement **
-  - 0 - Middle
-  - 1 - Top Left
-  - 2 - Top Right
-  - 3 - Bottom Left
-  - 4 - Bottom Right
-- **Logo Wait Before Start Frames**
-  - How many frames before it starts to fade in
-- **Logo Fade In Frames**
-  - How many frames to fade in
-- **Logo Hold Frames**
-  - How many frames to hold the image at full opacity before the fade out starts
-- **Logo Fade Out Frames**
-  - How many frames to fade out
-
------------------------------------------------------------------------------------------------
-**[ INTRO SOLID COLOR ]:**
-
-- **Solid Color Blend Mode**
-  - 0 - Off
-  - 1 - Normal Blending
-  - 2 - Additive Blending - Added on as added with a projector
-  - 3 - Multiply Blending - Image is applied by darkening the under layer
-- **Solid Color Hue**
-- **Solid Color Saturation**
-- **Solid Color Value**
-- **Solid Color Hold Frames**
-  - How many frames to hold the solid color
-- **Solid Color Fade Out Frames**
-  - How many frames to fade out
-
-  **[ INTRO STATIC NOISE ]:**
-
-- **Static Noise Blend Mode**
-  - **0 - Off**
-  - **1 - Normal Blending**
-  - **2 - Additive Blending** - Added on as added with a projector
-  - **3 - Multiply Blending** - Image is applied by darkening the under layer
-- **Static Noise Hold Frames**
-  - How many frames to hold the static noise
-- **Static Noise Fade Out Frames**
-  - How many frames to fade out
-
------------------------------------------------------------------------------------------------
-**[ INTRO SOLID BLACK ]:**
-
-- **Solid Black Hold Frames**
-  - How many frames to hold the solid black before the fade out starts
-- **Solid Black Fade Out Frames**
-  - How many frames to fade out
-
------------------------------------------------------------------------------------------------
-**[ --- SMOOTHING - SCALEFX ---- ]:**
-
-**ScaleFX ON** applies a shape smoothing on the core image and creates a higher resolution smoothed image
-  - After you turn this on you must increase **Core Res Sampling**, or **Downsample Blur** in the next section to see a difference
-  - ScaleFX only works well when the it's input is the native res from the core
-  To see the contour smoothing coming from **ScaleFX** either **Core Res Sampling**, or **Downsample Blur** must be increased from their default value.
diff --git a/bezel/Mega_Bezel/resource/docs/all-parameters.params b/bezel/Mega_Bezel/resource/docs/all-parameters.params
deleted file mode 100644
index 9cca7178ae..0000000000
--- a/bezel/Mega_Bezel/resource/docs/all-parameters.params
+++ /dev/null
@@ -1,276 +0,0 @@
-
-HSM_RESOLUTION_DEBUG_ON = 0
-
-//---------------------------------------------------------------------------------------------------
-//    CRT BRIGHTNESS & GAMMA
-//---------------------------------------------------------------------------------------------------
-
-GAMMA_INPUT = 2.4
-gamma_out = 2.4
-post_br = 1
-post_br_affect_black_level = 100
-
-//---------------------------------------------------------------------------------------------------
-//    Global Graphics Caching
-//---------------------------------------------------------------------------------------------------
-HSM_CACHE_GRAPHICS_ON = 1
-HSM_CACHE_UPDATE_INDICATOR_MODE = 2
-
-//---------------------------------------------------------------------------------------------------
-//    Global Graphics Brightness
-//---------------------------------------------------------------------------------------------------
-HSM_GLOBAL_GRAPHICS_BRIGHTNESS = 100
-HSM_STATIC_LAYERS_GAMMA = 1
-
-//---------------------------------------------------------------------------------------------------
-//    AMBIENT LIGHTING AKA NIGHTLIGHTING 
-//---------------------------------------------------------------------------------------------------
-HSM_AMBIENT_LIGHTING_OPACITY = 0
-HSM_AMBIENT1_OPACITY = 100
-HSM_AMBIENT2_OPACITY = 100
-HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE = 0
-
-//---------------------------------------------------------------------------------------------------
-//    Zoom & Pan
-//---------------------------------------------------------------------------------------------------
-HSM_VIEWPORT_ZOOM = 100
-HSM_VIEWPORT_ZOOM_MASK = 0
-HSM_VIEWPORT_POSITION_X = 0
-HSM_VIEWPORT_POSITION_Y = 0
-
-//---------------------------------------------------------------------------------------------------
-//    FLIP & ROTATE
-//---------------------------------------------------------------------------------------------------
-HSM_FLIP_VIEWPORT_VERTICAL = 0
-HSM_FLIP_VIEWPORT_HORIZONTAL = 0
-HSM_FLIP_CORE_VERTICAL = 0
-HSM_FLIP_CORE_HORIZONTAL = 0
-HSM_ROTATE_CORE_IMAGE = 0
-
-//---------------------------------------------------------------------------------------------------
-//    ASPECT RATIO
-//---------------------------------------------------------------------------------------------------
-HSM_ASPECT_RATIO_ORIENTATION = 0
-HSM_ASPECT_RATIO_MODE = 0
-HSM_ASPECT_RATIO_EXPLICIT = 0
-
-//---------------------------------------------------------------------------------------------------
-//    CRT SCREEN SCALING GENERAL
-//---------------------------------------------------------------------------------------------------
-HSM_INT_SCALE_MODE = 0
-HSM_VERTICAL_PRESET = 0
-
-//---------------------------------------------------------------------------------------------------
-//    INTEGER SCALE
-//---------------------------------------------------------------------------------------------------
-HSM_INT_SCALE_MAX_HEIGHT = 89
-HSM_INT_SCALE_MULTIPLE_OFFSET = 0
-HSM_INT_SCALE_MULTIPLE_OFFSET_LONG = 0
-
-//---------------------------------------------------------------------------------------------------
-//    NON-INTEGER SCALE PERCENT
-//---------------------------------------------------------------------------------------------------
-HSM_NON_INTEGER_SCALE = 82.97
-
-//---------------------------------------------------------------------------------------------------
-//    NON-INTEGER - PHYSICAL SIZES
-//---------------------------------------------------------------------------------------------------
-HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER = 0
-HSM_PHYSICAL_MONITOR_ASPECT_RATIO = 1.77
-HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE = 27
-HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE = 18.1
-
-//---------------------------------------------------------------------------------------------------
-//    NON-INTEGER - AUTOMATIC SCREEN SCALE & PLACEMENT
-//---------------------------------------------------------------------------------------------------
-HSM_USE_IMAGE_FOR_PLACEMENT = 0
-HSM_PLACEMENT_IMAGE_USE_HORIZONTAL = 0
-HSM_PLACEMENT_IMAGE_MODE = 0
-
-//---------------------------------------------------------------------------------------------------
-//    NON-INTEGER SCALE OFFSET
-//---------------------------------------------------------------------------------------------------
-HSM_NON_INTEGER_SCALE_OFFSET = 100
-
-//---------------------------------------------------------------------------------------------------
-//    SNAP NON-INTEGER TO CLOSEST INTEGER SCALE
-//---------------------------------------------------------------------------------------------------
-HSM_USE_SNAP_TO_CLOSEST_INT_SCALE = 0
-HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE = 20
-
-//---------------------------------------------------------------------------------------------------
-//    POSITION OFFSET
-//---------------------------------------------------------------------------------------------------
-HSM_SCREEN_POSITION_X = 0
-HSM_SCREEN_POSITION_Y = 0
-
-//---------------------------------------------------------------------------------------------------
-//    CROPPING CORE IMAGE
-//---------------------------------------------------------------------------------------------------
-HSM_CROP_MODE = 2
-HSM_CROP_PERCENT_ZOOM = 0
-HSM_CROP_PERCENT_TOP = 0
-HSM_CROP_PERCENT_BOTTOM = 0
-HSM_CROP_PERCENT_LEFT = 0
-HSM_CROP_PERCENT_RIGHT = 0
-HSM_CROP_BLACK_THRESHOLD = 0
-
-//---------------------------------------------------------------------------------------------------
-//    SCANLINE DIRECTION
-//---------------------------------------------------------------------------------------------------
-HSM_SCANLINE_DIRECTION = 0
-
-//---------------------------------------------------------------------------------------------------
-//    DREZ DOWNSAMPLE FILTER - HYLLIAN - DREZ PRESETS ONLY
-//---------------------------------------------------------------------------------------------------
-C_FILTER_MODE = 0
-
-//---------------------------------------------------------------------------------------------------
-//    CORE RES SAMPLING
-//---------------------------------------------------------------------------------------------------
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0
-HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR = 0
-
-//---------------------------------------------------------------------------------------------------
-//    FAST SHARPEN - GUEST.R
-//---------------------------------------------------------------------------------------------------
-SHARPEN = 0
-CONTR = 0.05
-DETAILS = 1
-
-//---------------------------------------------------------------------------------------------------
-//    INTERLACING From Guest.r
-//---------------------------------------------------------------------------------------------------
-HSM_INTERLACE_TRIGGER_RES = 650
-HSM_INTERLACE_MODE = 4
-HSM_INTERLACE_EFFECT_SMOOTHNESS_INTERS = 0
-HSM_INTERLACE_SCANLINE_EFFECT = 20
-icans = 0.25
-
-//---------------------------------------------------------------------------------------------------
-//    FAKE SCANLINES
-//---------------------------------------------------------------------------------------------------
-HSM_FAKE_SCANLINE_MODE = 2
-HSM_FAKE_SCANLINE_OPACITY = 70
-HSM_FAKE_SCANLINE_RES_MODE = 1
-HSM_FAKE_SCANLINE_RES = 240
-HSM_FAKE_SCANLINE_INT_SCALE = 1
-HSM_FAKE_SCANLINE_ROLL = 0
-HSM_FAKE_SCANLINE_CURVATURE = 0
-
-//---------------------------------------------------------------------------------------------------
-//    CURVATURE
-//---------------------------------------------------------------------------------------------------
-HSM_CURVATURE_MODE = 1
-HSM_CURVATURE_2D_SCALE_LONG_AXIS = 100
-HSM_CURVATURE_2D_SCALE_SHORT_AXIS = 100
-HSM_CURVATURE_3D_RADIUS = 200
-HSM_CURVATURE_3D_VIEW_DIST = 150
-HSM_CURVATURE_3D_TILT_ANGLE_X = 0
-HSM_CURVATURE_3D_TILT_ANGLE_Y = 0
-HSM_CRT_CURVATURE_SCALE = 100
-
-//---------------------------------------------------------------------------------------------------
-//    ANTI-FLICKER
-//---------------------------------------------------------------------------------------------------
-HSM_ANTI_FLICKER_ON = 0
-HSM_ANTI_FLICKER_THRESHOLD = 25
-
-//---------------------------------------------------------------------------------------------------
-//    A/B SPLITSCREEN COMPARE
-//---------------------------------------------------------------------------------------------------
-HSM_AB_COMPARE_SHOW_MODE = 0
-HSM_AB_COMPARE_AREA = 0
-HSM_AB_COMPARE_SPLIT_POSITION = 50
-HSM_AB_COMPARE_FREEZE_CRT_TUBE = 0
-HSM_AB_COMPARE_FREEZE_GRAPHICS = 0
-
-//---------------------------------------------------------------------------------------------------
-//    SCREEN VIGNETTE
-//---------------------------------------------------------------------------------------------------
-HSM_SCREEN_VIGNETTE_ON = 1
-HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE = 0
-HSM_SCREEN_VIGNETTE_STRENGTH = 40
-HSM_SCREEN_VIGNETTE_POWER = 26
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = 100
-
-//---------------------------------------------------------------------------------------------------
-//    MONOCHROME
-//---------------------------------------------------------------------------------------------------
-HSM_MONOCHROME_MODE = 0
-HSM_MONOCHROME_BRIGHTNESS = 100
-HSM_MONOCHROME_GAMMA = 1
-HSM_MONOCHROME_HUE_OFFSET = 0
-HSM_MONOCHROME_SATURATION = 100
-HSM_MONOCHROME_DUALSCREEN_VIS_MODE = 0
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE DIFFUSE IMAGE
-//---------------------------------------------------------------------------------------------------
-HSM_TUBE_DIFFUSE_MODE = 0
-HSM_TUBE_DIFFUSE_IMAGE_AMOUNT = 100
-HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE = 0
-HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON = 0
-HSM_TUBE_DIFFUSE_IMAGE_HUE = 0
-HSM_TUBE_DIFFUSE_IMAGE_SATURATION = 100
-HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS = 20
-HSM_TUBE_DIFFUSE_IMAGE_GAMMA = 1
-HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING = 100
-HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING = 0
-HSM_TUBE_DIFFUSE_IMAGE_SCALE = 140
-HSM_TUBE_DIFFUSE_IMAGE_SCALE_X = 100
-HSM_TUBE_DIFFUSE_IMAGE_ROTATION = 0
-HSM_TUBE_DIFFUSE_FORCE_ASPECT = 1
-HSM_TUBE_EXPLICIT_ASPECT = 1.33
-HSM_TUBE_EMPTY_THICKNESS = 0
-HSM_TUBE_EMPTY_THICKNESS_X_SCALE = 100
-HSM_SCREEN_CORNER_RADIUS_SCALE = 100
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE SHADOW IMAGE
-//---------------------------------------------------------------------------------------------------
-HSM_TUBE_SHADOW_IMAGE_ON = 1
-HSM_TUBE_SHADOW_IMAGE_OPACITY = 60
-HSM_TUBE_SHADOW_IMAGE_POS_X = 0
-HSM_TUBE_SHADOW_IMAGE_POS_Y = 0
-HSM_TUBE_SHADOW_IMAGE_SCALE_X = 122
-HSM_TUBE_SHADOW_IMAGE_SCALE_Y = 130
-HSM_TUBE_SHADOW_CURVATURE_SCALE = 300
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE GLASS STATIC REFLECTION IMAGE
-//---------------------------------------------------------------------------------------------------
-
-HSM_TUBE_STATIC_REFLECTION_IMAGE_ON = 0
-HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE = 0
-HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = 16
-HSM_TUBE_STATIC_OPACITY_DIFFUSE_MULTIPLY = 25
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bezel/Mega_Bezel/resource/param_values/base/auto-settings.params b/bezel/Mega_Bezel/resource/param_values/base/auto-settings.params
deleted file mode 100644
index 9622200290..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/base/auto-settings.params
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "../tube-rotation/$CORE-REQ-ROT$.params"
-#reference "../core-defaults/video-driver_core/$VID-DRV$_$CORE$.params"
-#reference "../core-defaults/core/$CORE$.params"
diff --git a/bezel/Mega_Bezel/resource/param_values/base/set-all-textures-empty.params b/bezel/Mega_Bezel/resource/param_values/base/set-all-textures-empty.params
deleted file mode 100644
index 766677bc16..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/base/set-all-textures-empty.params
+++ /dev/null
@@ -1,24 +0,0 @@
-
-IntroImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-ScreenPlacementImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-
-NightLightingImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-NightLighting2Image = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-
-TubeDiffuseImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TubeColoredGelImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TubeShadowImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TubeStaticReflectionImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-
-// ReflectionMaskImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-FrameTextureImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-
-BackgroundImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-BackgroundVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-LEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceVertImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DeviceLEDImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-DecalImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-CabinetGlassImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
-TopLayerImage = ../../../shaders/textures/Placeholder_Transparent_16x16.png
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/color-correction/sega-luma-fix.params b/bezel/Mega_Bezel/resource/param_values/color-correction/sega-luma-fix.params
deleted file mode 100644
index dfcc2006e2..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/color-correction/sega-luma-fix.params
+++ /dev/null
@@ -1 +0,0 @@
-g_lum_fix = 1.0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/$CORE$.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/$CORE$.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Atari800.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Atari800.params
deleted file mode 100644
index bbe763009d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Atari800.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle PSX HW.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle PSX HW.params
deleted file mode 100644
index 0896a15e76..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle PSX HW.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _ps1.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle PSX.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle PSX.params
deleted file mode 100644
index 0896a15e76..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle PSX.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _ps1.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle Saturn.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle Saturn.params
deleted file mode 100644
index 49cb442bb2..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Beetle Saturn.params	
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference _sega.params
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/BlastEm.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/BlastEm.params
deleted file mode 100644
index 49cb442bb2..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/BlastEm.params
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference _sega.params
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Flycast.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Flycast.params
deleted file mode 100644
index 6ce7f8f8c3..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Flycast.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _sega.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Gearsystem.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Gearsystem.params
deleted file mode 100644
index 6ce7f8f8c3..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Gearsystem.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _sega.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Genesis Plus GX Wide.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Genesis Plus GX Wide.params
deleted file mode 100644
index 6ce7f8f8c3..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Genesis Plus GX Wide.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _sega.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Genesis Plus GX.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Genesis Plus GX.params
deleted file mode 100644
index 6a53713729..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Genesis Plus GX.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _sega.params
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Kronos.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Kronos.params
deleted file mode 100644
index 49cb442bb2..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Kronos.params
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference _sega.params
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/LRPS2.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/LRPS2.params
deleted file mode 100644
index 927314bf00..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/LRPS2.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _ps2.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/PCSX ReARMed.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/PCSX ReARMed.params
deleted file mode 100644
index 0896a15e76..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/PCSX ReARMed.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _ps1.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/PicoDrive.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/PicoDrive.params
deleted file mode 100644
index 6ce7f8f8c3..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/PicoDrive.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _sega.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/ProSystem.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/ProSystem.params
deleted file mode 100644
index bbe763009d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/ProSystem.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/SMS Plus GX.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/SMS Plus GX.params
deleted file mode 100644
index 6ce7f8f8c3..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/SMS Plus GX.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _sega.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Stella 2014.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Stella 2014.params
deleted file mode 100644
index 8737bb53ef..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Stella 2014.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _atari2600.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Stella.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Stella.params
deleted file mode 100644
index 8737bb53ef..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Stella.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _atari2600.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/SwanStation.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/SwanStation.params
deleted file mode 100644
index 0896a15e76..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/SwanStation.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _ps1.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/YabaSanshiro.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/YabaSanshiro.params
deleted file mode 100644
index 49cb442bb2..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/YabaSanshiro.params
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference _sega.params
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Yabause.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Yabause.params
deleted file mode 100644
index 49cb442bb2..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/Yabause.params
+++ /dev/null
@@ -1,2 +0,0 @@
-#reference _sega.params
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_atari2600.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_atari2600.params
deleted file mode 100644
index bbe763009d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_atari2600.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_horizontal-16-9.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_horizontal-16-9.params
deleted file mode 100644
index 52f3b809a4..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_horizontal-16-9.params
+++ /dev/null
@@ -1,2 +0,0 @@
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 4
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_horizontal-4-3.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_horizontal-4-3.params
deleted file mode 100644
index 2655d0a689..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_horizontal-4-3.params
+++ /dev/null
@@ -1,2 +0,0 @@
-HSM_ASPECT_RATIO_ORIENTATION = 1
-HSM_ASPECT_RATIO_MODE = 2
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_ps1.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_ps1.params
deleted file mode 100644
index bbe763009d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_ps1.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_ps2.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_ps2.params
deleted file mode 100644
index bbe763009d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_ps2.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference _horizontal-4-3.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_sega.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_sega.params
deleted file mode 100644
index 109f297095..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/_sega.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference ../../color-correction/sega-luma-fix.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/bsnes-hd beta.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/core/bsnes-hd beta.params
deleted file mode 100644
index a5bf8dcd36..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/core/bsnes-hd beta.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference _horizontal-16-9.params
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/$VID-DRV$_$CORE$.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/$VID-DRV$_$CORE$.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Beetle PSX HW.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Beetle PSX HW.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Beetle PSX HW.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Boom3.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Boom3.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Boom3.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Citra.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Citra.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Citra.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Citra2018.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Citra2018.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Citra2018.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Dolphin.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Dolphin.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Dolphin.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_DuckStation.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_DuckStation.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_DuckStation.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Flycast.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Flycast.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Flycast.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Kronos.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Kronos.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Kronos.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_LRPS2 (alpha).params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_LRPS2 (alpha).params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_LRPS2 (alpha).params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Mupen64Plus-Next.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Mupen64Plus-Next.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_Mupen64Plus-Next.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_PPSSPP.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_PPSSPP.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_PPSSPP.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_ParaLLEl N64.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_ParaLLEl N64.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_ParaLLEl N64.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_SwanStation.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_SwanStation.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_SwanStation.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_TyrQuake copy.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_TyrQuake copy.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_TyrQuake copy.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_TyrQuake.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_TyrQuake.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_TyrQuake.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_YabaSanshiro.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_YabaSanshiro.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_YabaSanshiro.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_image display.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_image display.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_vecx.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_vecx.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_vecx.params
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_vitaQuake 2.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_vitaQuake 2.params
deleted file mode 100644
index 8220f7d23d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/glcore_vitaQuake 2.params	
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../viewport-flip/verticalflipped.params"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/vulkan_image display.params b/bezel/Mega_Bezel/resource/param_values/core-defaults/video-driver_core/vulkan_image display.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/crt/vector-bw-high-res-mode-gdv.params b/bezel/Mega_Bezel/resource/param_values/crt/vector-bw-high-res-mode-gdv.params
deleted file mode 100644
index 841a23f782..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/crt/vector-bw-high-res-mode-gdv.params
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "vector-color-high-res-mode-gdv.params"
-
-shadowMask = "-1.000"
-glow = "0.150000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/crt/vector-color-high-res-mode-gdv.params b/bezel/Mega_Bezel/resource/param_values/crt/vector-color-high-res-mode-gdv.params
deleted file mode 100644
index a91c65945f..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/crt/vector-color-high-res-mode-gdv.params
+++ /dev/null
@@ -1,55 +0,0 @@
-// Thanks to SixWingedFreak from the Libretro forum for these settings
-post_br = "1.700000"
-post_br_affect_black_level = "0.000000"
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "33.000000"
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "33.000000"
-g_lift = "0.030000"
-pre_bb = "2.000000"
-g_gamma_in = "2.800000"
-g_gamma_out = "2.200000"
-g_signal_type = "0.000000"
-g_crtgamut = "-1.000000"
-g_space_out = "-1.000000"
-g_cntrst = "0.300000"
-g_mid = "0.200000"
-g_lift = "0.010000"
-wp_temperature = "6504.000000"
-glow = "-0.150000"
-SIZEH = "40.000000"
-SIGMA_H = "10.000000"
-SIZEV = "40.000000"
-SIGMA_V = "10.000000"
-bloom = "0.000000"
-halation = "0.400000"
-blendMode = "0.000000"
-brightboost = "2.000000"
-scanline1 = "4.000000"
-scanline2 = "4.000000"
-beam_min = "1.100000"
-vertmask = "-0.500000"
-scangamma = "2.000000"
-h_sharp = "3.000000"
-shadowMask = "6.000000"
-maskstr = "0.400000"
-maskDark = "1.000000"
-slotmask = "0.500000"
-slotmask1 = "0.900000"
-slotwidth = "3.000000"
-double_slot = "2.000000"
-
-barspeed = "5.000000"
-barintensity = "0.080000"
-
-HSM_INTERLACE_TRIGGER_RES = 0
-HSM_FAKE_SCANLINE_OPACITY = 0
-HSM_BZL_HIGHLIGHT = 0.4
-HSM_REFLECT_BLUR_MIN = 0
-HSM_REFLECT_BLUR_MAX = 40
-HSM_REFLECT_GLOBAL_AMOUNT = 140
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = 1.2
-HSM_REFLECT_DIRECT_AMOUNT = "100.000000"
-HSM_REFLECT_DIFFUSED_AMOUNT = 0
-HSM_REFLECT_FULLSCREEN_GLOW = 300
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = 1.6
-
-HSM_INTRO_WHEN_TO_SHOW = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-3ds.params b/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-3ds.params
deleted file mode 100644
index 1a322d9c39..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-3ds.params
+++ /dev/null
@@ -1,21 +0,0 @@
-// HSM_FLIP_VIEWPORT_VERTICAL = 1
-HSM_ASPECT_RATIO_MODE = 5
-HSM_INT_SCALE_MODE = 0
-HSM_NON_INTEGER_SCALE = 88.888
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-HSM_2ND_SCREEN_ASPECT_RATIO_MODE = 1
-HSM_2ND_SCREEN_CROP_PERCENT_LEFT = "10"
-HSM_2ND_SCREEN_CROP_PERCENT_RIGHT = "10"
-HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS = "-2.8"
-
-HSM_CURVATURE_MODE = 0
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-HSM_SCREEN_VIGNETTE_ON = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-nds-lcd-scale.params b/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-nds-lcd-scale.params
deleted file mode 100644
index a9f783e464..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-nds-lcd-scale.params
+++ /dev/null
@@ -1,15 +0,0 @@
-HSM_ASPECT_RATIO_MODE = 5
-HSM_INT_SCALE_MODE = 0
-HSM_NON_INTEGER_SCALE = 71.17
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-
-HSM_CURVATURE_MODE = 0
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
-
-HSM_SCREEN_VIGNETTE_ON = "0.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-nds.params b/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-nds.params
deleted file mode 100644
index 3ebdb3daa1..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/dual-screen/dual-screen-nds.params
+++ /dev/null
@@ -1,14 +0,0 @@
-HSM_ASPECT_RATIO_MODE = 5
-
-HSM_INT_SCALE_MODE = 0
-HSM_INT_SCALE_BORDER_MIN_HEIGHT = 10
-
-HSM_DUALSCREEN_MODE = 1
-
-HSM_CURVATURE_MODE = 0
-
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_THICKNESS = 50
-HSM_BZL_WIDTH = 160
-HSM_BZL_HEIGHT = 150
-HSM_FRM_THICKNESS = 100
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/light/basic__night.params b/bezel/Mega_Bezel/resource/param_values/light/basic__night.params
deleted file mode 100644
index a57fdf5e0d..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/light/basic__night.params
+++ /dev/null
@@ -1 +0,0 @@
-HSM_AMBIENT_LIGHTING_OPACITY = 98
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/lightgun/sinden-border-basic.params b/bezel/Mega_Bezel/resource/param_values/lightgun/sinden-border-basic.params
deleted file mode 100644
index f942efa1d0..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/lightgun/sinden-border-basic.params
+++ /dev/null
@@ -1,6 +0,0 @@
-// Parameters
-HSM_SINDEN_BORDER_ON = "1.000000"
-// HSM_SINDEN_BORDER_BRIGHTNESS = "70.000000"
-HSM_SINDEN_BORDER_THICKNESS = "3.000000"
-HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION = "1.000000"
-HSM_REFLECT_SHOW_TUBE_FX_AMOUNT = 30
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/reflect/reflect-only.params b/bezel/Mega_Bezel/resource/param_values/reflect/reflect-only.params
deleted file mode 100644
index 801e1dc5ae..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/reflect/reflect-only.params
+++ /dev/null
@@ -1,38 +0,0 @@
-#reference "../base/set-all-textures-empty.params"
-
-// Parameters
-HSM_BZL_WIDTH = "350.000000"
-HSM_BZL_HEIGHT = "200.000000"
-HSM_BG_OPACITY = "0.000000"
-
-HSM_TUBE_BLACK_EDGE_SHARPNESS = "70.0000"
-HSM_TUBE_BLACK_EDGE_THICKNESS = 100
-HSM_GLASS_BORDER_ON = "0.000000"
-HSM_BZL_INNER_EDGE_THICKNESS = 110
-HSM_BZL_INNER_EDGE_SHARPNESS = 95
-HSM_BZL_INNER_CORNER_RADIUS_SCALE = "60.000000"
-HSM_BZL_INNER_EDGE_SHADOW = "70.000000"
-HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT = 0
-HSM_REFLECT_GLOBAL_AMOUNT = "40.00000"
-HSM_REFLECT_GLOBAL_GAMMA_ADJUST = "1.200000"
-HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = "130.0000"
-HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = "40.0000"
-HSM_REFLECT_FULLSCREEN_GLOW = "75.000000"
-HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = "3.00000"
-HSM_REFLECT_FADE_AMOUNT = "100.0000"
-HSM_REFLECT_RADIAL_FADE_WIDTH = "100.000000"
-HSM_REFLECT_RADIAL_FADE_HEIGHT = "100.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = "-18.000000"
-HSM_REFLECT_LATERAL_OUTER_FADE_DISTANCE = "30.000000"
-HSM_REFLECT_CORNER_FADE = "10.000000"
-HSM_REFLECT_BLUR_MIN = "0.0000"
-HSM_REFLECT_BLUR_MAX = "40.000000"
-HSM_REFLECT_BLUR_FALLOFF_DISTANCE = "500.000000"
-HSM_REFLECT_NOISE_AMOUNT = "50.000000"
-HSM_REFLECT_NOISE_SAMPLES = "1.000000"
-HSM_REFLECT_NOISE_SAMPLE_DISTANCE = "100.0000"
-HSM_SCREEN_VIGNETTE_STRENGTH = "40.000000"
-HSM_SCREEN_VIGNETTE_POWER = "26.000000"
-HSM_SCREEN_VIGNETTE_IN_REFLECTION = "100.000000"
-
-g_vignette = "0.0"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/scale/max-int-scale.params b/bezel/Mega_Bezel/resource/param_values/scale/max-int-scale.params
deleted file mode 100644
index b10e2ebc0e..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/scale/max-int-scale.params
+++ /dev/null
@@ -1,13 +0,0 @@
-// Parameters
-HSM_ASPECT_RATIO_MODE = 0
-HSM_INT_SCALE_MODE = 1
-HSM_INT_SCALE_MAX_HEIGHT = 115
-HSM_CURVATURE_MODE = 0
-HSM_GLOBAL_CORNER_RADIUS = 4
-HSM_TUBE_BLACK_EDGE_SHARPNESS = 90
-HSM_SCREEN_VIGNETTE_ON = 0
-HSM_BG_OPACITY = 0
-HSM_BZL_OPACITY = 0
-HSM_FRM_OPACITY = 0
-
-
diff --git a/bezel/Mega_Bezel/resource/param_values/scene/mega-bezel-duimon-scene.params b/bezel/Mega_Bezel/resource/param_values/scene/mega-bezel-duimon-scene.params
deleted file mode 100644
index bdbebb56bd..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/scene/mega-bezel-duimon-scene.params
+++ /dev/null
@@ -1,6 +0,0 @@
-BackgroundImage = ../../../shaders/textures/HSM_Duimon_Super_Famicom_3840x2160.png
-BackgroundVertImage = ../../../shaders/textures/HSM_Duimon_Super_Famicom_3840x2160.png
-
-HSM_BG_FILL_MODE = 1
-
-HSM_BZL_COLOR_VALUE = 30
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/no-smooth-crt-flavor.params b/bezel/Mega_Bezel/resource/param_values/smooth/no-smooth-crt-flavor.params
deleted file mode 100644
index 5aa675f140..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/no-smooth-crt-flavor.params
+++ /dev/null
@@ -1,20 +0,0 @@
-// Lottes mask, a bit like a slot mask effect
-shadowMask = 2
-
-gsl = "0.000000"
-
-wp_temperature = 7400
-g_lum = "0.10"
-g_lift = "0.100000"
-
-gamma_out = "2.00000"
-
-GDV_DECONVERGENCE_ON = "1.000000"
-
-SHARPSMOOTHER_ON = "1"
-max_w = "0.08"
-
-HSM_INTERLACE_TRIGGER_RES = "800.000000"
-
-SGPT_BLEND_OPTION = 1
-
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params
deleted file mode 100644
index 90dcba8328..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias-crt-flavor.params
+++ /dev/null
@@ -1,13 +0,0 @@
-// Lottes mask, a bit like a slot mask effect
-shadowMask = 2
-
-gsl = "0.000000"
-
-wp_temperature = 7400
-g_lum = "0.10"
-g_lift = "0.100000"
-
-gamma_out = "2.00000"
-
-GDV_DECONVERGENCE_ON = "1.000000"
-
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias.params
deleted file mode 100644
index cc0d9ad22e..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias.params
+++ /dev/null
@@ -1,13 +0,0 @@
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "100.000000"
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = "100.000000"
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "33"
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "33"
-
-SHARPEN = "2"
-CONTR = "0.25"
-SHARPSMOOTHER_ON = "1"
-max_w = "0.08"
-
-HSM_INTERLACE_TRIGGER_RES = "800.000000"
-
-SGPT_BLEND_OPTION = 1
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params
deleted file mode 100644
index cab4c87ee9..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth-crt-flavor.params
+++ /dev/null
@@ -1,16 +0,0 @@
-// Lottes mask, a bit like a slot mask effect
-shadowMask = 1
-
-gsl = "0.000000"
-
-wp_temperature = 7400
-g_lum = "0.15"
-g_sat = "0.05"
-g_lift = "0.100000"
-
-gamma_out = "2.00000"
-
-GDV_DECONVERGENCE_ON = "1.000000"
-
-// HSM_CRT_CURVATURE_SCALE = 0
-
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth.params
deleted file mode 100644
index beb2f1b107..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth.params
+++ /dev/null
@@ -1,13 +0,0 @@
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "600.000000"
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = "125.000000"
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "15"
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "15"
-
-SHARPEN = "2"
-CONTR = "0.25"
-SHARPSMOOTHER_ON = "1"
-max_w = "0.08"
-
-HSM_INTERLACE_TRIGGER_RES = "800.000000"
-
-SGPT_BLEND_OPTION = 1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines-crt-flavor.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines-crt-flavor.params
deleted file mode 100644
index 1d5589e1df..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines-crt-flavor.params
+++ /dev/null
@@ -1,21 +0,0 @@
-// Lottes mask, a bit like a slot mask effect
-shadowMask = 2
-
-wp_temperature = 7400
-g_lum = "0.15"
-g_lift = "0.200000"
-g_sat = "0.10"
-
-gamma_out = "2.40000"
-
-mask_bloom = "0.200000"
-maskDark = "0.300000"
-slotmask1 = "1.000000"
-
-gamma_c = "0.750000"
-
-GDV_DECONVERGENCE_ON = "1.000000"
-
-HSM_FAKE_SCANLINE_MODE = "1.000000"
-HSM_FAKE_SCANLINE_OPACITY = "100.000000"
-HSM_FAKE_SCANLINE_RES = "176.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params
deleted file mode 100644
index fd596facb4..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params
+++ /dev/null
@@ -1,14 +0,0 @@
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "600.000000"
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = "600.000000"
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "15"
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "15"
-
-SHARPEN = "2"
-CONTR = "0.25"
-SHARPSMOOTHER_ON = "1"
-max_w = "0.08"
-
-no_scanlines = 1
-HSM_INTERLACE_MODE = -1
-HSM_INTERLACE_TRIGGER_RES = "800.000000"
-SGPT_BLEND_OPTION = 1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params
deleted file mode 100644
index eb5a229f89..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-crt-flavor.params
+++ /dev/null
@@ -1,21 +0,0 @@
-// Lottes mask, a bit like a slot mask effect
-shadowMask = 2
-
-wp_temperature = 7400
-g_lum = "0.15"
-g_lift = "0.200000"
-g_sat = "0.10"
-
-gamma_out = "2.40000"
-
-mask_bloom = "0.200000"
-maskDark = "0.300000"
-slotmask1 = "1.000000"
-
-gamma_c = "0.750000"
-
-GDV_DECONVERGENCE_ON = "1.000000"
-
-HSM_FAKE_SCANLINE_MODE = "1.000000"
-HSM_FAKE_SCANLINE_OPACITY = "30.000000"
-HSM_FAKE_SCANLINE_RES = "320.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth.params
deleted file mode 100644
index fd596facb4..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth.params
+++ /dev/null
@@ -1,14 +0,0 @@
-HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "600.000000"
-HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = "600.000000"
-HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = "15"
-HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = "15"
-
-SHARPEN = "2"
-CONTR = "0.25"
-SHARPSMOOTHER_ON = "1"
-max_w = "0.08"
-
-no_scanlines = 1
-HSM_INTERLACE_MODE = -1
-HSM_INTERLACE_TRIGGER_RES = "800.000000"
-SGPT_BLEND_OPTION = 1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-aspect-orientation/$CORE-ASPECT-ORIENT$.params b/bezel/Mega_Bezel/resource/param_values/tube-aspect-orientation/$CORE-ASPECT-ORIENT$.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-aspect-orientation/CORE-ASPECT-ORIENT-HORZ.params b/bezel/Mega_Bezel/resource/param_values/tube-aspect-orientation/CORE-ASPECT-ORIENT-HORZ.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-aspect-orientation/CORE-ASPECT-ORIENT-VERT.params b/bezel/Mega_Bezel/resource/param_values/tube-aspect-orientation/CORE-ASPECT-ORIENT-VERT.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-effect/tube-effects.params b/bezel/Mega_Bezel/resource/param_values/tube-effect/tube-effects.params
deleted file mode 100644
index bebb63cfed..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/tube-effect/tube-effects.params
+++ /dev/null
@@ -1,10 +0,0 @@
-HSM_TUBE_DIFFUSE_MODE = 1
-HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS = 15
-
-HSM_TUBE_STATIC_REFLECTION_IMAGE_ON = 1
-HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = "15.000000"
-HSM_TUBE_STATIC_BLACK_LEVEL = "5.500000"
-HSM_TUBE_STATIC_AMBIENT_LIGHTING = "60.000000"
-HSM_TUBE_STATIC_SCALE = "120.000000"
-HSM_TUBE_STATIC_POS_X = "10.000000"
-HSM_TUBE_STATIC_POS_Y = "10.000000"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-rotation/$CORE-REQ-ROT$.params b/bezel/Mega_Bezel/resource/param_values/tube-rotation/$CORE-REQ-ROT$.params
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-0.params b/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-0.params
deleted file mode 100644
index a2534aeed5..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-0.params
+++ /dev/null
@@ -1 +0,0 @@
-HSM_ROTATE_CORE_IMAGE = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-180.params b/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-180.params
deleted file mode 100644
index 2e7a14b821..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-180.params
+++ /dev/null
@@ -1,2 +0,0 @@
-HSM_FLIP_CORE_VERTICAL = 1
-HSM_FLIP_CORE_HORIZONTAL = 1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-270.params b/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-270.params
deleted file mode 100644
index ed0fc8b9df..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-270.params
+++ /dev/null
@@ -1 +0,0 @@
-HSM_ROTATE_CORE_IMAGE = -1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-90.params b/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-90.params
deleted file mode 100644
index 79db1d6a5b..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/tube-rotation/CORE-REQ-ROT-90.params
+++ /dev/null
@@ -1 +0,0 @@
-HSM_ROTATE_CORE_IMAGE = 1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/viewport-flip/verticalflipped.params b/bezel/Mega_Bezel/resource/param_values/viewport-flip/verticalflipped.params
deleted file mode 100644
index 23b8aaf596..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/viewport-flip/verticalflipped.params
+++ /dev/null
@@ -1 +0,0 @@
-HSM_FLIP_VIEWPORT_VERTICAL = 1
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/param_values/viewport-flip/verticalnoflip.params b/bezel/Mega_Bezel/resource/param_values/viewport-flip/verticalnoflip.params
deleted file mode 100644
index 492a489d41..0000000000
--- a/bezel/Mega_Bezel/resource/param_values/viewport-flip/verticalnoflip.params
+++ /dev/null
@@ -1 +0,0 @@
-HSM_FLIP_VIEWPORT_VERTICAL = 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-00-Content-Dir.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-00-Content-Dir.slangp
deleted file mode 100644
index 807899b560..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-00-Content-Dir.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-00_$CONTENT-DIR$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-01-Core.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-01-Core.slangp
deleted file mode 100644
index 7f54b81700..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-01-Core.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-01_$CORE$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-02-Game.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-02-Game.slangp
deleted file mode 100644
index 220b57a7cc..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-02-Game.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-02_$GAME$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-03-VideoDriver.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-03-VideoDriver.slangp
deleted file mode 100644
index e234c2a7f0..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-03-VideoDriver.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-03_$VID-DRV$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-04-CoreRequestedRotation.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-04-CoreRequestedRotation.slangp
deleted file mode 100644
index 7b916c3f02..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-04-CoreRequestedRotation.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-04_$CORE-REQ-ROT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-05-VideoAllowCoreRotation.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-05-VideoAllowCoreRotation.slangp
deleted file mode 100644
index c6517439ec..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-05-VideoAllowCoreRotation.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-05_$VID-ALLOW-CORE-ROT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-06-VideoUserRotation.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-06-VideoUserRotation.slangp
deleted file mode 100644
index fa166740e9..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-06-VideoUserRotation.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-06_$VID-USER-ROT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-07-VideoFinalRotation.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-07-VideoFinalRotation.slangp
deleted file mode 100644
index ca9e1386d8..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-07-VideoFinalRotation.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-07_$VID-FINAL-ROT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-08-ScreenOrientation.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-08-ScreenOrientation.slangp
deleted file mode 100644
index a7e652c481..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-08-ScreenOrientation.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-08_$SCREEN-ORIENT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-09-ViewportAspectOrientation.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-09-ViewportAspectOrientation.slangp
deleted file mode 100644
index 6e6e8e811d..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-09-ViewportAspectOrientation.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-09_$VIEW-ASPECT-ORIENT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-10-CoreAspectOrientation.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-10-CoreAspectOrientation.slangp
deleted file mode 100644
index 1ade36eddf..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-10-CoreAspectOrientation.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-10_$CORE-ASPECT-ORIENT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-11-PresetDir.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-11-PresetDir.slangp
deleted file mode 100644
index 4d183fd000..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-11-PresetDir.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-11_$PRESET-DIR$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-12-PresetName.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-12-PresetName.slangp
deleted file mode 100644
index 065e40a602..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-12-PresetName.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-12_$PRESET$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-13-VideoDriverPresetExtension.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-13-VideoDriverPresetExtension.slangp
deleted file mode 100644
index 2a90a2edc0..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-13-VideoDriverPresetExtension.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-13_$VID-DRV-PRESET-EXT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-14-VideoDriverShaderExtension.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/Preset-14-VideoDriverShaderExtension.slangp
deleted file mode 100644
index b2d9237299..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Preset-14-VideoDriverShaderExtension.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-# This preset tests that the first subset of wildcards is working 
-
-#reference "referenced-presets/Ref-14_$VID-DRV-SHADER-EXT$_.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/Readme.md b/bezel/Mega_Bezel/resource/wildcard-examples/Readme.md
deleted file mode 100644
index 2347912dd9..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/Readme.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Wildcard Path Replacement
-
-When a simple preset loads, text wildcards which are found in paths inside the presets will be replaced with values coming from the current RetroArch context. The replacement will be executed on both texture paths and reference paths.
-
-This would allow you to do things like have one preset which could be used with the entire list of images from the Bezel Project
-
----
-Example:
-
-  `/shaders/MyBackground_$VID-DRV$_$CORE$.png`
-
-would be replaced with
-
-   `/shaders/MyBackground_glcore_YabaSanshiro.png`
-
-If no file found at the new path with the replacements, we revert to the original path
-
-   `/shaders/MyBackground_$VID-DRV$_$CORE$.png`
-
------
-
-## Possible wildcards/tokens to be replaced:
----
-`$CONTENT-DIR$`   -> Content Directory of the game rom
-
-`$CORE$`       -> Core name
-
-`$GAME$`       -> Game file's name, E.G. ROM name
-
-`$VID-DRV$`   -> Video Driver: Currently active driver, possible replacement values:
- * `glcore`
- * `gl`
- * `vulkan`
- * `d3d11`
- * `d3d9_hlsl`
- * `N/A`
-
-
-`$VID-DRV-SHADER-EXT$`   -> Video Driver Shader File Extension: The extension of shaders type supported by the current video driver:
- * `cg`
- * `glsl`
- * `slang`
-
-
-`$VID-DRV-PRESET-EXT$`   -> Video Driver Preset File Extension: The extension of shaders type supported by the current video driver:
- * `cgp`
- * `glslp`
- * `slangp`
-
-
-`$CORE-REQ-ROT$`   -> Core Requested Rotation: Rotation the core is requesting, possible replacement values:
- * `CORE-REQ-ROT-0`
- * `CORE-REQ-ROT-90`
- * `CORE-REQ-ROT-180`
- * `CORE-REQ-ROT-270`
-
-
-`$VID-ALLOW-CORE-ROT$`   -> Video Allow Core Rotation: Reflects Retroarch's setting allowing the core requested rotation to affect the final rotation:
- * `VID-ALLOW-CORE-ROT-OFF`
- * `VID-ALLOW-CORE-ROT-ON`
-
-
-`$VID-USER-ROT$`   -> Video User Rotation: Rotation the core is requesting, possible replacement values, does not affect the UI:
- * `VID-USER-ROT-0`
- * `VID-USER-ROT-90`
- * `VID-USER-ROT-180`
- * `VID-USER-ROT-270`
-
-
-`$VID-FINAL-ROT$`   -> Video Final Rotation: Rotation which is the sum of the user rotation and the core rotation if it has been allowed, does not affect the UI:
- * `VID-FINAL-ROT-0`
- * `VID-FINAL-ROT-90`
- * `VID-FINAL-ROT-180`
- * `VID-FINAL-ROT-270`
- 
-
-`$SCREEN-ORIENT$`   -> Screen Orientation: User adjusted screen orientation, will change windows from landscape to portrait, including the Retroarch UI:
- * `SCREEN-ORIENT-0`
- * `SCREEN-ORIENT-90`
- * `SCREEN-ORIENT-180`
- * `SCREEN-ORIENT-270`
-
-
-`$VIEW-ASPECT-ORIENT$`   -> Viewport Aspect Orientation: Orientation of the aspect ratio of the RetroArch viewport
- * `VIEW-ASPECT-ORIENT-HORZ`
- * `VIEW-ASPECT-ORIENT-VERT`
-
-
-`$CORE-ASPECT-ORIENT$`   -> Core Aspect Orientation: Orientation of the aspect ratio requested by the core
- * `CORE-ASPECT-ORIENT-HORZ`
- * `CORE-ASPECT-ORIENT-VERT`
-
-
-`$PRESET_DIR$`  -> Preset directory's name
-
-`$PRESET$`     -> Preset's name
-
-If no wildcards are found within the path, or the path after replacing the wildcards does not exist on disk, the path returned will be unaffected.
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/example-content/Example-Image.png b/bezel/Mega_Bezel/resource/wildcard-examples/example-content/Example-Image.png
deleted file mode 100644
index 5099a75d65..0000000000
Binary files a/bezel/Mega_Bezel/resource/wildcard-examples/example-content/Example-Image.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-00_$CONTENT-DIR$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-00_$CONTENT-DIR$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-00_$CONTENT-DIR$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-00_example-content_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-00_example-content_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-00_example-content_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-01_$CORE$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-01_$CORE$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-01_$CORE$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-01_image display_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-01_image display_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-01_image display_.slangp	
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-02_$GAME$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-02_$GAME$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-02_$GAME$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-02_Example-Image_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-02_Example-Image_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-02_Example-Image_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-03_$VID-DRV$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-03_$VID-DRV$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-03_$VID-DRV$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-03_glcore_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-03_glcore_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-03_glcore_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-04_$CORE-REQ-ROT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-04_$CORE-REQ-ROT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-04_$CORE-REQ-ROT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-04_CORE-REQ-ROT-0_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-04_CORE-REQ-ROT-0_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-04_CORE-REQ-ROT-0_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-05_$VID-ALLOW-CORE-ROT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-05_$VID-ALLOW-CORE-ROT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-05_$VID-ALLOW-CORE-ROT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-05_VID-ALLOW-CORE-ROT-OFF_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-05_VID-ALLOW-CORE-ROT-OFF_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-05_VID-ALLOW-CORE-ROT-OFF_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-06_$VID-USER-ROT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-06_$VID-USER-ROT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-06_$VID-USER-ROT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-06_VID-USER-ROT-0_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-06_VID-USER-ROT-0_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-06_VID-USER-ROT-0_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-07_$VID-FINAL-ROT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-07_$VID-FINAL-ROT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-07_$VID-FINAL-ROT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-07_VID-FINAL-ROT-0_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-07_VID-FINAL-ROT-0_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-07_VID-FINAL-ROT-0_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-08_$SCREEN-ORIENT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-08_$SCREEN-ORIENT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-08_$SCREEN-ORIENT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-08_SCREEN-ORIENT-0_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-08_SCREEN-ORIENT-0_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-08_SCREEN-ORIENT-0_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-09_$VIEW-ASPECT-ORIENT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-09_$VIEW-ASPECT-ORIENT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-09_$VIEW-ASPECT-ORIENT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-09_VIEW-ASPECT-ORIENT-HORZ_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-09_VIEW-ASPECT-ORIENT-HORZ_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-09_VIEW-ASPECT-ORIENT-HORZ_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-10_$CORE-ASPECT-ORIENT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-10_$CORE-ASPECT-ORIENT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-10_$CORE-ASPECT-ORIENT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-10_CORE-ASPECT-ORIENT-HORZ_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-10_CORE-ASPECT-ORIENT-HORZ_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-10_CORE-ASPECT-ORIENT-HORZ_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-11_$PRESET-DIR$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-11_$PRESET-DIR$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-11_$PRESET-DIR$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-11_wildcard-examples_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-11_wildcard-examples_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-11_wildcard-examples_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-12_$PRESET$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-12_$PRESET$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-12_$PRESET$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-12_Preset-12-PresetName_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-12_Preset-12-PresetName_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-12_Preset-12-PresetName_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-13_$VID-DRV-PRESET-EXT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-13_$VID-DRV-PRESET-EXT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-13_$VID-DRV-PRESET-EXT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-13_slangp_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-13_slangp_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-13_slangp_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-14_$VID-DRV-SHADER-EXT$_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-14_$VID-DRV-SHADER-EXT$_.slangp
deleted file mode 100644
index 1ba8bda4b4..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-14_$VID-DRV-SHADER-EXT$_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Fallback-Background.png"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-14_slang_.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-14_slang_.slangp
deleted file mode 100644
index fee8eff001..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-14_slang_.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "Ref-Base.slangp"
-
-BackgroundImage = "textures/Wildcard-Success-Background.png"
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-Base.slangp b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-Base.slangp
deleted file mode 100644
index d9ebf29939..0000000000
--- a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/Ref-Base.slangp
+++ /dev/null
@@ -1 +0,0 @@
-#reference "../../../Presets/MBZ__5__POTATO.slangp"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/textures/Wildcard-Fallback-Background.png b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/textures/Wildcard-Fallback-Background.png
deleted file mode 100644
index df3d88004c..0000000000
Binary files a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/textures/Wildcard-Fallback-Background.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/textures/Wildcard-Success-Background.png b/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/textures/Wildcard-Success-Background.png
deleted file mode 100644
index e78322232d..0000000000
Binary files a/bezel/Mega_Bezel/resource/wildcard-examples/referenced-presets/textures/Wildcard-Success-Background.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/ShaderTodo.txt b/bezel/Mega_Bezel/shaders/ShaderTodo.txt
deleted file mode 100644
index 09eb577a4f..0000000000
--- a/bezel/Mega_Bezel/shaders/ShaderTodo.txt
+++ /dev/null
@@ -1,252 +0,0 @@
-![Mega_Bezel_Logo|512x256, 75%](upload://6PNkvcMF9Go9Wnk6OJXfYR1opXI.png)
-
-Mega Bezel is updated to V1.17.2_2024-05-18
-
-Changes:
-  * Fixed Paths
-  * Removed presets which are set to fail
-
-----------------------------------------------------
---- TODO  ---------------------------------------
-----------------------------------------------------
-
-  * Create Independent DREZ shader for main repo
-  * Create presets for drez-smooth-adv-gdv-ntsc but without ntsc
-  * Update Smooth presets to have a Hires Scanlines option, and possibly horizontal source sampling for antialias look
-  * Use parameters to control Text instead of custom text for each family
-    * Get from Cache
-  * Check why intro options are not working
-  * Check Banding on Highlight on glass presets
-  * Check Brightness on Megatron Glass Presets
-  * Fix Megatron to not put mask outside screen
-  * Can't show Resolution Text in Potato right now
-  * Investigate "dip" in reflection at the edge of the bezel
-  * Passthrough Preset (No CRT Shader)
-  * HD Preset
-  * Look at Retro V2 for alternate LCD shader
-  * Python file to create full presets from a folder
-  * Add Curvature to EasyMode for lasly
-  * Rotate Image Layers with Parameters
-  * Update Megatron
-  * Add AbsoluteMax as a scaling type
-  * Add readme for Signal Noise
-  * Add readme for Overscan and Raster Bloom
-  * Check difference between old and new NTSC
-  * Check out duplicate params in NTSC
-  * Check out independent bezel scale and reflection, reflection is not following the bezel
-  * Check brighter reflection in new NTSC
-
-
-  * Update Dual Screen to use params files
-  * Swap out // for # in base presets
-  * Add ability to have layers appear on top of the bezel but below the reflection
-    * One way to do this would be to have a CRT/Reflection layer offset which forces layers below to be composited on top of the bezel
-  * Fix CRT Blend Amount
-  * Adjustable softness of bezel outer edge for reflection
-  * Adjustable Bezel Curvature per side?
-  * Revisit Tate Mode / Vertical Scanline and Rotate CRT artifacts
-    * Fast Sharpen & Sharp Smoother currently work on x axis, should be relative to scanline direction
-    * Get GTU to respect scanline direction
-    * NTSC is causing blurriness when using FB Neo and Rotate CRT - Test Game Batrider
-      * We need to know what orientation the game is in the first place to do this
-    * When in interlacing mode for vertical opposite mult should do something
-  * Use brightness values of sides to control static corner highlight
-  * Fix Megatron Reflection
-  * Create 4K Royale Preset
-
-  * Add .params #reference to with all parameters commented out
-  * We should have a middle pass which has the device behind the CRT tube
-
-  * Replacement:
-    * [flip]
-    * [shaders]
-----------------------------------------------------
---- Examples  --------------------------------------
-----------------------------------------------------
-Recent Performance 2022-09-18
-Spec RTX-2060, at 4K:
-  240p image
-    ADV 175
-    XBR-ADV 170
-    POTATO 422
-    POTATO-XBR 390
-
-  2K image
-    ADV 105
-    XBR-ADV 66
-
-  4K image
-    ADV 48
-    XBR-ADV Crashed
-
-
-----------------------------------------------------
---- Post V1  ---------------------------------------
-----------------------------------------------------
-  * Auto Rotate
-  * Guess White/Black Matting?
-  * Auto Shadow for image Layers above screen
-  * Mega Back Light a la philips Hue/Ambient
-  * Night light single glow - Place Glows
-  * Fix Corner Shading
-
-  * Double Bezel
-  * Swap option for Blurry vs Sharp Tube Reflection
-  * Do some OrionsAngel Arcade Presets
-  * Add Rewind Effect?
-  * Rotate Dual Screen
-  * LCD behavior when reaching resolution limit?
-  * Shadow from Cutout?
-  * Large Slotmask Bitmap Mask
-  * Hyllian Sync Version?
-
-  * Black frames in Mupen64Plus-Next using parallel RDP, seen in Perfect Dark
-    * Original scaling mode to deal with black final viewport in Parallel RDP in both mupen and Parallel cores.
-
-Scene Dynamic Lighting
-  * Reflection from screen on additional elements
-    * Side Panels, Speaker Panel, Table
-    * Masking of main and additional reflection
-    * Colored Mask to define areas
-      * Up      rgb(128,  255,  128)
-      * Down    rgb(128,  0,    128)
-      * Left    rgb(0,    128,  128)
-      * Right   rgb(255,  128,  128)
-      * Center  rgb(128,  128,  255)
-  * Bounce lighting from screen to room back to the scene
-    * Masking behind devices
-  * Sprite sheet for arcade Lighting loop
-  * Sprite sheets for left and right machine attract mode loops
-  * Split Normal vs Additive in layers
-
-  * More Reflection from closer to middle of screen on bezel
-
-  * Additional Screens driven by Sprite Sheets
-
-  * Night Lighting - Modulate Range on top of Hue & Value
-
-----------------------------------------------------
---- Independent Shader Stuff for Main Repo  --------
-----------------------------------------------------
-  * Add Test_Max_Resources to Repo
-  * Make Resolution text shader it's own pass for Repo
-    * Show Original Res, Previous Pass Res, Next Pass Res, Viewport
-    * Move Resolution Debug to be top justified
-
-  * Gameboy
-    * Fix DMG Shader or make new one
-    * Fix Low Contrast Issue
-    * Multiple palettes including Custom for Gameboy
-    * Add Gameboy Palettes https://www.deviantart.com/thewolfbunny/gallery/69987002/game-boy-palettes
-
-  * Independent Bezel Scaling not the same as non-int scale
-    * Why? Maybe only in Portrait Res?
-  * Outer reflection corner radius should be independent when in independent mode
-  * See why very inner edge seems not affected by reflection mask
-
-  * Startup Animation - Sprite Sheet
-
-  * Frame Shading
-    * Shading on frame interior edge?
-    * Frame Inner edge static lighter line
-    * Frame Interior Edge thickness
-    * Fix shading with rounded outer corner
-    * Frame shadow should follow corner radius
-
-  * When reflection is off still see inner bezel edge reflection
-  * Put Torridgristle LUT back in for blue skys?
-
-Documentation
-  Troubleshooting
-    New install of retroarch
-    Turn all overlays off
-    I have rings, wavy distortions (Moire)
-
-Moire
-  The Waves you are seeing are called a Moire effect, it’s the same effect you see through a screen door sometimes.
-  It is caused by using a crt shader with scanlines and tube curvature and made worse when the resolution is limited. It is a thorny problem , and sometimes hard to get rid of at 1080, it is much less of a problem at 4k.
-  Things which can help/fix the problem
-    Reducing strength of scanlines,
-    Reducing or curvature or setting it to 0 will definitely fix it.
-    If you keep using curvature using Integer scale in the shader parameters can sometimes help.
-
-    If making own presets reference from crt-Base presets
-
-Old Megabezel https://github.com/HyperspaceMadness/shaders_slang/tree/adf6dc3c0f09db11ebf4fbcf85098ac8232acfcc
-
-
-
-
-----------------------------------------------------
---- Retroarch Features -----------------------------
-----------------------------------------------------
-
-  * Add Core Provided Aspect as Uniform
-  * Add Rotation as Uniforms
-  * Replace Text, for shader type, game & core, content directory
-    * core_name
-    * game_name
-    * [shadertype], [gamename], [corename], [contentdirectory]
-    * Check textures and use default if not found
-
-
-  * Append (Prepend) Shader Preset - to add a shader preset to the beginning of the chain
-  * Fix edit shader in UI - Changes are currently lost or need to apply twice
-  * Fix loss of current parameter values when retroarch goes from full screen to window
-  * Fix saving with same name with different capitalization creates self reference
-  * Shaders folder as a path token, e.g. "[shaders]/shaders_slang/" [shaders_dir]?
-  * Hide Parameters
-
-  * Stop Reloading Shader multiple times on Save (Keep optional param)
-
-  * Choose Textures in UI
-    * Shader Textures in Sub Menu - Add ability to set texture overrides in retroarch UI
-    * Shader Passes in Sub Menu
-
-  * Dropdowns for indexed parameters?
-  * Multiple references in one file for adding passes and parameter overrides
-  * Edit Multiple References in UI vs Shader Passes, Discreetly change between Simple and Full
-
-  * Onscreen Display of current shader preset
-  * Reload Last Preset
-
-  * Next/Previous Shader does not work well if shader was loaded as Game preset
-    * Sometimes uses different directories, probably related to shader_path in live shader rather than originally loaded preset
-
-  * Pass Scaling Types
-    * Original scaling Type
-    * MaxAbsolute scaling type?
-      * If res is lower don't scale if larger scale to this res, good for PSX Upscaling
-      * Would avoid people crashing with internal resolution multiple
-
-  * Add "Timer" uniform variable vec4(total-count, count-since-shader-load, oscillator[1,0,1,0,1,...], [unknown/undefined])
-    * Unknown could be frames since direction change, good for rewind effect
-
-  * Check for alias used multiple times appears as semantic error now
-  * global.x is semantic error if x not in global
-  * GIF support
-
-Questions for Survey
-
-What kind of intro would you like as default in the Mega Bezel?
-Snow Only
-Snow + CH 04
-Snow + Mega Bezel Logo
-
-
-* Old Perf Numbers before Caching
-*  Performance of Base presets at 3840x2160 on Nvidia RTX2060:
-  *  ADVANCED -                      78 FPS  -  No comparable old preset
-  *  GLASS -                        150 FPS  -  Old Glass Preset        128 FPS
-  *  STANDARD -                     135 FPS  -  Old Full Preset         140 FPS
-  *  STANDARD-HD-CORE -             105 FPS
-  *  BASIC-BORDER-WITH-REFLECTION - 175 FPS  -  Old Reflect Only Preset 165 FPS
-  *  BASIC-BORDER -                 295 FPS  -  Old Screen Scale Preset 370 FPS
-
-*  Performance on HD-CORE E.G. 1920x1080:
-  *  ADVANCED -                     60 FPS
-  *  ADVANCED-HD-CORE -             70 FPS
-  *  STANDARD -                     85 FPS
-  *  STANDARD-HD-CORE -             100 FPS
-  *  BASIC-BORDER-WITH-REFLECTION - 126 FPS
-  *  BASIC-BORDER                 - 180 FPS
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/add-negative-crop-area.slang b/bezel/Mega_Bezel/shaders/base/add-negative-crop-area.slang
deleted file mode 100644
index f458650bb7..0000000000
--- a/bezel/Mega_Bezel/shaders/base/add-negative-crop-area.slang
+++ /dev/null
@@ -1,56 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   float NEGATIVE_CROP_EXPAND_MULTIPLIER = global.OutputSize.y / global.SourceSize.y;
-   float MAX_NEGATIVE_CROP = ((1 - (1 / NEGATIVE_CROP_EXPAND_MULTIPLIER)) / 2);
-
-   FragColor = vec4(texture(Source, (vTexCoord - 0.5) / (1 - 2 * MAX_NEGATIVE_CROP) + 0.5).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/add-params-all.slang b/bezel/Mega_Bezel/shaders/base/add-params-all.slang
deleted file mode 100644
index a379d5e036..0000000000
--- a/bezel/Mega_Bezel/shaders/base/add-params-all.slang
+++ /dev/null
@@ -1,4 +0,0 @@
-#version 450
-
-#include "common/globals-and-all-params.inc"
-#include "stock.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/add-params-glass.slang b/bezel/Mega_Bezel/shaders/base/add-params-glass.slang
deleted file mode 100644
index 2a48996541..0000000000
--- a/bezel/Mega_Bezel/shaders/base/add-params-glass.slang
+++ /dev/null
@@ -1,4 +0,0 @@
-#version 450
-
-#include "common/globals-and-glass-params.inc"
-#include "stock.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/add-params-no-reflect.slang b/bezel/Mega_Bezel/shaders/base/add-params-no-reflect.slang
deleted file mode 100644
index de307f941d..0000000000
--- a/bezel/Mega_Bezel/shaders/base/add-params-no-reflect.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-
-#include "common/globals-and-image-layers-params.inc"
-#include "stock.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/add-params-potato.slang b/bezel/Mega_Bezel/shaders/base/add-params-potato.slang
deleted file mode 100644
index 3e2b50fa25..0000000000
--- a/bezel/Mega_Bezel/shaders/base/add-params-potato.slang
+++ /dev/null
@@ -1,4 +0,0 @@
-#version 450
-
-#include "common/globals-and-potato-params.inc"
-#include "stock.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/bezel-images-over-crt.slang b/bezel/Mega_Bezel/shaders/base/bezel-images-over-crt.slang
deleted file mode 100644
index 0768ea0150..0000000000
--- a/bezel/Mega_Bezel/shaders/base/bezel-images-over-crt.slang
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 450
-
-#define LAYERS_OVER_CRT
-
-/////////////// IMPORTS ///////////////
-#include "common/globals-and-image-layers-params.inc"
-#include "common/common-functions.inc"
-#include "bezel-images.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/bezel-images-under-crt.slang b/bezel/Mega_Bezel/shaders/base/bezel-images-under-crt.slang
deleted file mode 100644
index d391c87204..0000000000
--- a/bezel/Mega_Bezel/shaders/base/bezel-images-under-crt.slang
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 450
-
-#define LAYERS_UNDER_CRT
-
-/////////////// IMPORTS ///////////////
-#include "common/globals-and-image-layers-params.inc"
-#include "common/common-functions.inc"
-#include "bezel-images.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/bezel-images.inc b/bezel/Mega_Bezel/shaders/base/bezel-images.inc
deleted file mode 100644
index 64324dc972..0000000000
--- a/bezel/Mega_Bezel/shaders/base/bezel-images.inc
+++ /dev/null
@@ -1,1328 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-/////////////// IMPORTS ///////////////
-#include "common/common-functions-bezel.inc"
-
-// Removed because BackgroundImageSize returns vec4(0,0,0,0), this happens with all user defined textures
-// layout(push_constant) uniform Push
-// {
-// 	vec4 BackgroundImageSize;
-// } params;
-
-/////////////// DEFINES ///////////////
-
-#define MASK_MODE_ALL 0
-#define MASK_MODE_SCREEN 1
-#define MASK_MODE_TUBE 2
-#define MASK_MODE_INSIDE_BEZEL 3
-#define MASK_MODE_BEZEL 4
-#define MASK_MODE_OUTSIDE_TUBE 5
-#define MASK_MODE_FRAME 6
-#define MASK_MODE_OUTSIDE_BEZEL 7
-#define MASK_MODE_OUTSIDE_FRAME 8
-
-#define CUTOUT_MODE_OFF 0
-#define CUTOUT_MODE_INSIDE 1
-#define CUTOUT_MODE_OUTSIDE 2
-
-float FILL_MODE_KEEP_TEXTURE_ASPECT = 0;
-float FILL_MODE_SPLIT = 1;
-float FILL_MODE_STRETCH = 2;
-
-float USE_INHERITED_COORD_OFF = 0;
-float USE_INHERITED_COORD_ON = 1;
-
-vec2 VIEWPORT_COORD = vec2(0.5);
-
-/////////////// Helper Functions ///////////////
-
-// Return the mask for the specific mode
-float GetMask(float mask_mode)
-{
-	float mask = 	(mask_mode == MASK_MODE_ALL) ? 1 :
-					(mask_mode == MASK_MODE_SCREEN) ? TUBE_DIFFUSE_MASK :
-					(mask_mode == MASK_MODE_TUBE) ? TUBE_MASK :
-					(mask_mode == MASK_MODE_INSIDE_BEZEL) ? INSIDE_BEZEL_MASK :
-					(mask_mode == MASK_MODE_BEZEL) ? BEZEL_MASK :
-					(mask_mode == MASK_MODE_OUTSIDE_TUBE) ? OUTSIDE_TUBE_MASK_FOR_IMAGE :
-					(mask_mode == MASK_MODE_FRAME) ? FRAME_MASK :
-					(mask_mode == MASK_MODE_OUTSIDE_BEZEL) ? OUTSIDE_BEZEL_MASK :
-					(mask_mode == MASK_MODE_OUTSIDE_FRAME) ? OUTSIDE_FRAME_MASK : 0.5;
-	return mask;
-}
-
-// Assumes Opacity is already encoded in alpha
-vec4 BlendModeMaskLayerMix(vec4 color_under, vec4 color_over, float blend_mode, float mask_mode, float cutout_mode, float dualscreen_mode, float layer_opacity)
-{
-	if ( blend_mode == 0 || (dualscreen_mode != SHOW_ON_DUALSCREEN_MODE_BOTH && dualscreen_mode != SCREEN_INDEX) )
-		return color_under;
-	
-	float cutout_mask = 1;
-	if (cutout_mode == CUTOUT_MODE_INSIDE)
-		cutout_mask = CUTOUT_MASK;
-	if (cutout_mode == CUTOUT_MODE_OUTSIDE)
-		cutout_mask = 1 - CUTOUT_MASK;
-
-	if (blend_mode == BLEND_MODE_OFF)
-		return color_under;
-	
-	color_over.a *= layer_opacity * GetMask(mask_mode) * cutout_mask;
-
-	vec4 out_color = vec4(0);
-
-	if (blend_mode == BLEND_MODE_NORMAL)
-	{
-		color_over.rgb *= color_over.a;
-		out_color = HSM_PreMultAlphaBlend(color_under, color_over);
-	}
-	else
-	{
-		vec4 blend_color = color_under; 
-		if (blend_mode == BLEND_MODE_ADD)  	 		blend_color.rgb = color_under.rgb + color_over.rgb ;
-		if (blend_mode == BLEND_MODE_MULTIPLY)  	blend_color.rgb = color_under.rgb * color_over.rgb ;
-
-		out_color = vec4(clamp(mix(color_under.rgb, blend_color.rgb, color_over.a), 0, 1), color_under.a);
-	}
-	return out_color;
-}
-
-vec2 HSM_GetLayerCoord(vec2 in_viewport_coord, float layer_to_follow, float follow_mode, inout vec2 out_placement_scale)
-{
-	vec2 flat_coord = vec2(0.5);
-	vec2 curved_coord = vec2(0.5);
-	vec2 out_coord = vec2(0.5);
-
-	if (layer_to_follow == FOLLOW_LAYER_VIEWPORT)
-	{
-		flat_coord = in_viewport_coord;
-		curved_coord = in_viewport_coord;
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_TUBE_DIFFUSE)
-	{
-		flat_coord = TUBE_DIFFUSE_COORD;
-		curved_coord = TUBE_DIFFUSE_CURVED_COORD;
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_BEZEL_OUTSIDE)
-	{
-		flat_coord = BEZEL_OUTSIDE_COORD;
-		curved_coord = BEZEL_OUTSIDE_CURVED_COORD;
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_BG)
-	{
-		flat_coord = BACKGROUND_COORD;
-		curved_coord = BACKGROUND_CURVED_COORD;
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_DEVICE)
-	{
-		flat_coord = DEVICE_COORD;
-		curved_coord = DEVICE_CURVED_COORD;
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_DECAL)
-	{
-		flat_coord = DECAL_COORD;
-		curved_coord = DECAL_CURVED_COORD;
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_CAB_GLASS)
-	{
-		flat_coord = CAB_GLASS_COORD;
-		curved_coord = CAB_GLASS_CURVED_COORD;
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_TOP)
-	{
-		flat_coord = TOP_IMAGE_COORD;
-		curved_coord = TOP_IMAGE_CURVED_COORD;
-	}
-
-	out_coord = follow_mode == FOLLOW_MODE_EXACT ? curved_coord : flat_coord;
-
-	return  out_coord;
-}
-
-// Takes a viewport coordinate and gives a new coordinate scaled by the specific scale mode
-// Takes into account the default sizes of each scale mode
-vec2 HSM_GetScaledCoord(vec2 in_viewport_coord,
-						vec2 in_viewport_coord_unscaled,
-						float texture_aspect_mode,
-						float explicit_texture_aspect,
-						vec2 offset_pos,
-						vec2 offset_scale,
-						float layer_to_follow,
-						float follow_mode,
-						float scale_full_with_zoom,
-						float image_fill_mode,
-						float split_preserve_center,
-						float split_repeat_width,
-						bool apply_default_scale_offset,
-						// float image_rotation_mode,
-						// float explicit_image_rotation,
-						inout vec2 out_placement_coord,
-						inout vec2 out_placement_scale)
-{
-	float texture_aspect = HSM_GetAspectRatioFromMode(texture_aspect_mode, explicit_texture_aspect);
-
-	/*
-	bool is_rotated = false;
-	// float image_rotation_mode = 1; // Modes, 0: explicit, 1: Rotate To Vertical Core Aspect, 2: Rotate To Vertical Viewport Aspect
-	// // vert core aspect rotation, vert vertical aspect rotation
-	// // rotate with tube ?
-	float explicit_image_rotation = 0;
-	float image_rotation = explicit_image_rotation;
-
-	// if (image_rotation_mode == 1.0)
-	// 	image_rotation = SCREEN_ASPECT < 1 ? 1 : 0;
-	
-	if (min(abs(image_rotation), 1) > 0.5)
-	{
-		texture_aspect = 1 / texture_aspect;
-		offset_pos = vec2(offset_pos.y, -offset_pos.x);
-		offset_scale = offset_scale.yx;
-		is_rotated = true;
-	}
-	*/
-
-	vec2 inherited_coord = in_viewport_coord / 0.5;
-	vec2 inherited_placement_coord = in_viewport_coord / 0.5;
-	vec2 inherited_final_coord = in_viewport_coord / 0.5;
-	vec2 inherited_scale = vec2(0.5);
-	vec2 default_offset_scale = vec2(0.5);
-
-	if (layer_to_follow == FOLLOW_LAYER_VIEWPORT)
-	{
-		if (scale_full_with_zoom > 0.5)	
-		{
-			inherited_coord = in_viewport_coord;
-			inherited_placement_coord = in_viewport_coord;
-		}
-		else
-		{
-			inherited_coord = in_viewport_coord_unscaled;
-			inherited_placement_coord = in_viewport_coord_unscaled;
-		}
-
-		inherited_final_coord = inherited_coord;
-
-		inherited_scale = vec2(1, 1);
-		default_offset_scale = vec2(1);
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_TUBE_DIFFUSE)
-	{
-/*
-		if (is_rotated)
-		{
-			inherited_coord = TUBE_DIFFUSE_COORD;
-			inherited_placement_coord = TUBE_DIFFUSE_COORD;
-			inherited_final_coord = TUBE_DIFFUSE_CURVED_COORD;
-
-			inherited_scale = TUBE_DIFFUSE_SCALE;
-
-			default_offset_scale = vec2(1) / DEFAULT_UNCORRECTED_SCREEN_SCALE.y;
-			default_offset_scale.x *= texture_aspect / (1 / DEFAULT_SCREEN_ASPECT);
-		}
-		else
-		{
-*/
-			inherited_coord = TUBE_DIFFUSE_COORD;
-			inherited_placement_coord = TUBE_DIFFUSE_COORD;
-			inherited_final_coord = TUBE_DIFFUSE_CURVED_COORD;
-
-			inherited_scale = TUBE_DIFFUSE_SCALE;
-
-			default_offset_scale = vec2(1) / (DEFAULT_UNCORRECTED_SCREEN_SCALE.y);
-			default_offset_scale.x *= texture_aspect / DEFAULT_SCREEN_ASPECT;
-		// }
-
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_BEZEL_OUTSIDE)
-	{
-/*
-		if (is_rotated)
-		{
-			inherited_coord = BEZEL_OUTSIDE_COORD;
-			inherited_placement_coord = BEZEL_OUTSIDE_COORD;
-
-			inherited_scale = BEZEL_OUTSIDE_SCALE;
-			inherited_final_coord = BEZEL_OUTSIDE_CURVED_COORD;
-
-			default_offset_scale = vec2(1) / DEFAULT_UNCORRECTED_BEZEL_SCALE.y;
-			default_offset_scale.x *= texture_aspect / (1 / DEFAULT_BEZEL_ASPECT);
-		}
-		else
-		{
-*/
-			inherited_coord = BEZEL_OUTSIDE_COORD;
-			inherited_placement_coord = BEZEL_OUTSIDE_COORD;
-
-			inherited_scale = BEZEL_OUTSIDE_SCALE;
-			inherited_final_coord = BEZEL_OUTSIDE_CURVED_COORD;
-
-			default_offset_scale = vec2(1) / (DEFAULT_UNCORRECTED_BEZEL_SCALE.y);
-			default_offset_scale.x *= texture_aspect / DEFAULT_SCREEN_ASPECT;
-		// }
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_BG)
-	{
-		inherited_coord = BACKGROUND_COORD;
-		inherited_placement_coord = BACKGROUND_COORD;
-		inherited_final_coord = BACKGROUND_CURVED_COORD;
-
-		inherited_scale = BACKGROUND_SCALE;
-		default_offset_scale = vec2(1);
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_DEVICE)
-	{
-		inherited_coord = DEVICE_COORD;
-		inherited_placement_coord = DEVICE_COORD;
-		inherited_final_coord = DEVICE_CURVED_COORD;
-
-		inherited_scale = DEVICE_SCALE;
-		default_offset_scale = vec2(1);
-	}
-	else if (layer_to_follow == FOLLOW_LAYER_DECAL)
-	{
-		inherited_coord = DECAL_COORD;
-		inherited_placement_coord = DECAL_COORD;
-		inherited_final_coord = DECAL_CURVED_COORD;
-
-		inherited_scale = DECAL_SCALE;
-		default_offset_scale = vec2(1);
-	}
-
-	//--------------------------------
-	// RETURN if we want to use the exact same coordinate of the layer we follow
-	//--------------------------------
-	if (follow_mode == FOLLOW_MODE_EXACT)
-	{
-		out_placement_coord = HSM_AddPosScaleToCoord(inherited_placement_coord, offset_pos, offset_scale);
-		out_placement_scale = inherited_scale * offset_scale;
-		return HSM_AddPosScaleToCoord(inherited_final_coord, offset_pos, offset_scale);
-	}
-
-	if (apply_default_scale_offset)
-	{
-		offset_scale *= default_offset_scale;
-	}
-
-	float output_aspect = global.OutputSize.x / global.OutputSize.y;
-	float inherited_aspect = (inherited_scale.x / inherited_scale.y) * (default_offset_scale.x / default_offset_scale.y) * output_aspect;
-	
-	// Find the aspect difference so the image can be shown without distortion
-	// This is before the user edited scale offset
-	float inherited_aspect_difference = texture_aspect / inherited_aspect;
-
-	// Get the overall scale for the placement of the texture (No Split/Fill Yet)
-	out_placement_scale = inherited_scale;
-	if ( image_fill_mode == FILL_MODE_KEEP_TEXTURE_ASPECT )
-		out_placement_scale.x *= inherited_aspect_difference;
-	out_placement_scale = out_placement_scale * offset_scale;
-
-	// inherited_coord = out_placement_coord;
-	out_placement_coord = HSM_AddPosScaleToCoord(inherited_placement_coord, offset_pos, out_placement_scale / inherited_scale);
-
-	vec2 out_coord = vec2(0.5);
-
-	vec2 drawing_scale = out_placement_scale;
-	float slide_x = 0;
-
-	if ( image_fill_mode == FILL_MODE_SPLIT )
-	{
-		float abs_ctr_coord_x = abs(out_placement_coord.x - 0.5);
-		// Correct the aspect so it matches the texture and is never stretched
-		float placement_aspect = out_placement_scale.x / out_placement_scale.y * output_aspect;
-		float placement_aspect_difference = texture_aspect / placement_aspect;
-		drawing_scale.x *= placement_aspect_difference;
-
-		float center_width = split_preserve_center * placement_aspect_difference;
-		if ( abs_ctr_coord_x > center_width)
-		{
-			slide_x = ((placement_aspect - texture_aspect) / placement_aspect) / 2.0;
-		}
-
-		float repeat_width = split_repeat_width * placement_aspect_difference;
-		if (abs_ctr_coord_x > center_width && 
-			abs_ctr_coord_x < center_width + slide_x && 
-			repeat_width > 0)
-		{
-			if (clamp(split_repeat_width - 0.001, 0, 1) == 0)
-				slide_x = (abs_ctr_coord_x - center_width);
-			else
-				slide_x = (abs_ctr_coord_x - 0.001 - center_width) - mod(clamp(abs_ctr_coord_x - 0.01 - center_width, 0, 1), repeat_width);
-		}
-
-		if ( out_placement_coord.x < 0.5 )
-			slide_x *= -1;
-		inherited_coord.x -= slide_x;
-	}
-
-	// The inherited_coord is already the coord from the inherited space
-	// We only need to apply an offset from this
-	out_coord = HSM_AddPosScaleToCoord(inherited_coord, offset_pos, drawing_scale / inherited_scale);
-
-/*
-	if (is_rotated)
-		out_coord = HSM_RotateCoordinate(out_coord, image_rotation);
-*/
-
-	return out_coord;
-}
-
-//TODO remove this and replace with simpler calls
-float GetFade(float current_position, float corner_position, float fade_distance)
-{
-	return smoothstep(corner_position + fade_distance / 2, corner_position - fade_distance / 2, current_position);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 6) out vec2 vTexCoord;
-layout(location = 7) out vec2 UNFLIPPED_VIEWPORT_COORD;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-
-	UNFLIPPED_VIEWPORT_COORD = vTexCoord;
-
-	VIEWPORT_COORD = vTexCoord * 1.0001;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage fragment
-
-layout(location = 6) in vec2 vTexCoord;
-layout(location = 7) in vec2 UNFLIPPED_VIEWPORT_COORD;
-layout(location = 8) in vec3 BEZEL_FRAME_ORIGINAL_COLOR_RGB;
-
-layout(location = 0) out vec4 FragColor;
-
-// Pass Framebuffer Textures
-layout(set = 0, binding = 1)  uniform sampler2D InfoCachePass;
-
-layout(set = 0, binding = 2)  uniform sampler2D BackgroundImage;
-layout(set = 0, binding = 3)  uniform sampler2D BackgroundVertImage;
-layout(set = 0, binding = 4)  uniform sampler2D NightLightingImage;
-layout(set = 0, binding = 5)  uniform sampler2D NightLighting2Image;
-
-layout(set = 0, binding = 6)  uniform sampler2D LEDImage;
-layout(set = 0, binding = 7)  uniform sampler2D FrameTextureImage;
-layout(set = 0, binding = 8)  uniform sampler2D DeviceImage;
-layout(set = 0, binding = 9) uniform sampler2D DeviceVertImage;
-layout(set = 0, binding = 10) uniform sampler2D DeviceLEDImage;
-layout(set = 0, binding = 11) uniform sampler2D DecalImage;
-layout(set = 0, binding = 12) uniform sampler2D CabinetGlassImage;
-layout(set = 0, binding = 13) uniform sampler2D TopLayerImage;
-layout(set = 0, binding = 14) uniform sampler2D ReflectionMaskImage;
-
-#ifdef LAYERS_OVER_CRT
-layout(set = 0, binding = 15) uniform sampler2D BR_LayersOverCRTPassFeedback;
-#define PassFeedback BR_LayersOverCRTPassFeedback
-#else
-layout(set = 0, binding = 15) uniform sampler2D BR_LayersUnderCRTPassFeedback;
-#define PassFeedback BR_LayersUnderCRTPassFeedback
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	if (HSM_AB_COMPARE_FREEZE_GRAPHICS == 1 && HSM_GetIsInABCompareArea(vTexCoord))
-	{
-		FragColor = texture(PassFeedback, vTexCoord);
-		return;
-	}
-
-	VIEWPORT_UNSCALED_COORD = HSM_GetViewportCoordWithFlip(vTexCoord);
-	VIEWPORT_COORD = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec4 feedback_color_test = texture(PassFeedback, vec2(0,0));
-	if (HSM_CACHE_GRAPHICS_ON > 0.5 && feedback_color_test.a < 0 && !CACHE_INFO_CHANGED)
-	{
-		FragColor = texture(PassFeedback, UNFLIPPED_VIEWPORT_COORD);
-		return;
-	}
-
-	// AMBIENT LIGHTING IMAGES
-	vec4 ambient_image = vec4(1);
-	vec4 ambient2_image = vec4(1);
-	HSM_Fill_Ambient_Images(VIEWPORT_COORD, VIEWPORT_UNSCALED_COORD, TUBE_DIFFUSE_COORD, TUBE_DIFFUSE_SCALE, HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE, NightLightingImage, NightLighting2Image, ambient_image, ambient2_image);
-
-	TUBE_DIFFUSE_CURVED_COORD = HSM_GetCurvedCoord(SCREEN_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, TUBE_DIFFUSE_ASPECT);
-
-	// TODO this should probably just use TUBE_COORD
-	// TODO should probably use TUBE_ASPECT
-	vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-	vec2 tube_curved_coord_ctr = tube_curved_coord - 0.5;
-	vec2 edge_mask_coord = tube_curved_coord_ctr * (1 - (HSM_BZL_INNER_EDGE_THICKNESS / vec2(TUBE_DIFFUSE_ASPECT, 1))) + 0.5;
-
-	float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0)
-		bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * DEFAULT_SCREEN_CORNER_RADIUS;
-	
-	float edge_mask =  HSM_GetCornerMask(edge_mask_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, HSM_BZL_INNER_EDGE_SHARPNESS);
-
-	TUBE_MASK = HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-
-	// Shrink the mask by 0.001 to clip off outer edge
-	TUBE_DIFFUSE_MASK = HSM_GetCornerMask(((TUBE_DIFFUSE_CURVED_COORD - 0.5) * 1.001) + 0.5, TUBE_DIFFUSE_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE, HSM_TUBE_BLACK_EDGE_SHARPNESS);
-
-	//----------------------------------------------------
-	//  Calculate Outside mapping Coords
-	//----------------------------------------------------
-
-	/* This first big chunk is to get a mapping of the space outside of the screen which is continuous
-	This is more complicated than you would expect because since we are using curved coordinates 
-	there are discontinuities outside the normal screen corners, e.g. where x > 1 and y > 1
-	So instead of trying to use the coordinates from the screen/tube we use a larger space 
-	and subtract the screen space to see how far we are outside of the sreen
-	*/
-
-	// Additional scale to be applied to the tube scale to create an expanded mapping area 
-	float outermap_scale = 2.3;
-
-	// Get a range width from the outer tube edge to the outer edge of the outermap
-	float outermap_range = 0.5 * outermap_scale * 0.7;
-	vec2 outermap_screen_size_from_center = vec2(0.5, 0.5);
-	vec2 outermap_warped_outside_screen_vector = (tube_curved_coord_ctr - clamp(tube_curved_coord_ctr, -0.490, 0.490)) * vec2(1 / TUBE_DIFFUSE_ASPECT, 1);
-	float output_aspect = global.OutputSize.x / global.OutputSize.y;
-	float outside_ratio_warped = clamp(length(outermap_warped_outside_screen_vector) / outermap_range, 0, 1);
-	vec2 outermap_screen_corner_ctr_coord = vec2(0.5, -0.5);
-
-	// Get a coordinate offset so it is centered around the corner
-	vec2 outermap_coord_warped_ctr_at_screen_corner = abs(tube_curved_coord_ctr) - vec2(0.5);
-
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						TUBE_DIFFUSE_ASPECT, 
-						true,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-
-	OUTSIDE_BEZEL_MASK = 1 - HSM_GetCornerMask(BEZEL_OUTSIDE_CURVED_COORD, TUBE_DIFFUSE_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_BZL_OUTER_CORNER_RADIUS_SCALE, 0.9);
-
-	// Get color for the frame area outside of the bezel
-	vec2 frame_outside_coord_ctr = FRAME_OUTSIDE_CURVED_COORD - 0.5;
-	float SHADOW_OUTSIDE_FRAME_MASK = 1 - HSM_GetCornerMask(frame_outside_coord_ctr * 1.01 + 0.5, TUBE_DIFFUSE_ASPECT, HSM_FRM_OUTER_CORNER_RADIUS, 1);
-	OUTSIDE_FRAME_MASK = 1 - HSM_GetCornerMask(frame_outside_coord_ctr + 0.5, TUBE_DIFFUSE_ASPECT, HSM_FRM_OUTER_CORNER_RADIUS, 1);
-	OUTSIDE_FRAME_MASK_FOR_IMAGE = 1 - HSM_GetCornerMask(frame_outside_coord_ctr * 0.999 + 0.5, TUBE_DIFFUSE_ASPECT, HSM_FRM_OUTER_CORNER_RADIUS, 1);
-	// Get masks for shadows, from frame as well as sides and top and bottom of viewport
-	INSIDE_BEZEL_MASK = 1 - OUTSIDE_BEZEL_MASK;
-	BEZEL_MASK = INSIDE_BEZEL_MASK * (1 - TUBE_MASK);
-	FRAME_MASK = OUTSIDE_BEZEL_MASK * (1 - OUTSIDE_FRAME_MASK);
-
-#ifdef LAYERS_UNDER_CRT
-	//----------------------------------------------------
-	//  Calculate Corner Highlight Mask
-	//----------------------------------------------------
-	const float pi = 3.1415;
-
-	// Get amount to shift the point at the outer corner to match the overall position offset
-	vec2 pos_shift_offset = vec2(0, HSM_BZL_OUTER_POSITION_Y) * TUBE_DIFFUSE_SCALE.y / outermap_scale;
-	pos_shift_offset *= tube_curved_coord.y > 0.5 ? 1 : -1;
-
-	// Get the direction vector from the inner corner of the bezel pointing at the outer corner 
-	vec2 corner_crease_dir = (outermap_screen_corner_ctr_coord + pos_shift_offset) / vec2(HSM_BZL_HEIGHT + 1, HSM_BZL_WIDTH + 1) - (outermap_screen_corner_ctr_coord) ;
-	corner_crease_dir *= vec2(TUBE_DIFFUSE_ASPECT, 1);
-
-	float aspect_corner_length_scale_offset = TUBE_DIFFUSE_ASPECT > 1 ? 0.9 : 1.5;
-	float corner_crease_length = length(corner_crease_dir * aspect_corner_length_scale_offset);
-
-	// A hack to adjust the angle offset, because without it the corner angle isn't pointing exactly at the corner
-	// This offset is the opposite direction for vertical and horizontal aspect ratio
-	float corner_rotation_offset = (SCREEN_COORD.y < 0.5) ? -HSM_REFLECT_CORNER_ROTATION_OFFSET_TOP : -HSM_REFLECT_CORNER_ROTATION_OFFSET_BOTTOM;
-
-	if (HSM_CURVATURE_MODE == 0)
-		// If we are using a 3d Curvature no offset is necessary
-		corner_rotation_offset += (TUBE_DIFFUSE_ASPECT > 1) ? 2 : 3;
-
-	// Convert direction vector to an angle so we can rotate the corner crease direction
-	float corner_angle_degrees = atan(corner_crease_dir.y / corner_crease_dir.x) / (2 * pi) * 360;
-
-	corner_angle_degrees += corner_rotation_offset;
-	float corner_angle_radians = corner_angle_degrees / 360 * 2 * pi;
-	corner_crease_dir = vec2(cos(corner_angle_radians), sin(corner_angle_radians));
-
-	// Get the distance perpendicular to the crease direction so we can use it to fade later
-	float distance_from_crease = HHLP_GetDistanceToLine(outermap_coord_warped_ctr_at_screen_corner.x, outermap_coord_warped_ctr_at_screen_corner.y, 1, corner_crease_dir.y / corner_crease_dir.x, 0 );
-
-	float fade_out_to_corner = HHLP_QuadraticBezier(clamp(length(outermap_warped_outside_screen_vector) / (corner_crease_length * 2), 0, 1), vec2(0.5, HSM_REFLECT_CORNER_SPREAD_FALLOFF / 100));
-
-	float corner_fade_width_inner = HSM_REFLECT_CORNER_INNER_SPREAD * (TUBE_DIFFUSE_SCALE.x + TUBE_DIFFUSE_SCALE.y) * bezel_corner_radius / 10 / 250 * 1.2;
-	float corner_fade_width_outer = HSM_REFLECT_CORNER_OUTER_SPREAD * (TUBE_DIFFUSE_SCALE.x + TUBE_DIFFUSE_SCALE.y) * HSM_GLOBAL_CORNER_RADIUS * HSM_BZL_OUTER_CORNER_RADIUS_SCALE / 10 / 250 * 1.6;
-	float corner_fade_width = (corner_fade_width_inner + fade_out_to_corner * (corner_fade_width_outer - corner_fade_width_inner));
-
-	// Get a vector perpendicular to the crease that we can shift the crease to blend between bottom/top and sides
-	vec2 corner_crease_perp_dir = normalize(vec2(corner_crease_dir.y, corner_crease_dir.x));
-	vec2 corner_coord_shifted = outermap_coord_warped_ctr_at_screen_corner - corner_crease_perp_dir * corner_fade_width / 2;
-	vec2 corner_crease_dir_shifted = corner_crease_dir - corner_crease_perp_dir * corner_fade_width / 2;
-
-	// Get the distance to this shifted crease
-	float distance_from_crease_shifted = HHLP_GetDistanceToLine(corner_coord_shifted.x, corner_coord_shifted.y, 1, corner_crease_dir_shifted.y / corner_crease_dir_shifted.x, 0 );
-
-	float top_half_mask = smoothstep(0.55, 0.5, tube_curved_coord.y);
-	float left_half_mask = smoothstep(0.55, 0.5, tube_curved_coord.x);
-
-	// Get a mask which transitions between sides and top/bottom at the corner crease  
-	float top_bottom_vs_sides_mask = dot(normalize(corner_coord_shifted), normalize(corner_crease_dir_shifted)) > 0 ? 1 - smoothstep(0, corner_fade_width / 2, distance_from_crease_shifted) : 1;
-
-	// Masks isolating specific parts
-	float sides_mask = 1 - top_bottom_vs_sides_mask;
-	float top_mask = top_half_mask * top_bottom_vs_sides_mask;
-	float bottom_mask = (1 -top_half_mask) * top_bottom_vs_sides_mask;
-
-	float corner_mask = smoothstep(corner_fade_width / 2, 0, distance_from_crease);
-
-	float top_corner_mask = corner_mask * top_half_mask;
-	float bottom_corner_mask = corner_mask * (1 - top_half_mask);
-
-	float frame_inner_edge_mask = (HSM_FRM_INNER_EDGE_THICKNESS == 0) ? 0 : 1 - HSM_GetCornerMask(	(BEZEL_OUTSIDE_CURVED_COORD - 0.5) * (1 + (HSM_FRM_INNER_EDGE_THICKNESS / vec2(TUBE_DIFFUSE_ASPECT, 1))) + 0.5, 
-																										TUBE_DIFFUSE_ASPECT, 
-																										HSM_BZL_OUTER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS, 
-																										0.9);
-	float outside_tube_mask_wider = 1 - HSM_GetCornerMask(tube_curved_coord_ctr * 0.996 + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.9);
-	float tube_shadow_mask = HSM_GetCornerMask(tube_curved_coord_ctr + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0);
-	float tube_edge_shadow_mult = HSM_BZL_INNER_EDGE_SHADOW * (tube_shadow_mask) + (1 - HSM_BZL_INNER_EDGE_SHADOW);
-
-	float edge_highlight_mask = 0;
-
-	// ----------------------------------------------------
-	// Generated Bezel
-	// ----------------------------------------------------
-
-	/* This first bit is to get a mapping of the space outside of the screen which is continuous
-	This is more complicated than you would expect because since we are using curved coordinates 
-	there are discontinuities outside the normal screen corners, e.g. where x > 1 and y > 1
-	So instead of trying to use the coordinates from the screen/tube we use a larger space 
-	and subtract the screen space to see how far we are outside of the sreen
-	*/
-
-	float hmbz_bezel_highlight_edge = 0.9;
-	float hmbz_bezel_highlight_top = 0.2;
-	float hmbz_bezel_highlight_bottom = 0.3;
-	float hmbz_bezel_highlight_sides = 0.2;
-	
-	float hmbz_bezel_highlight_falloff_speed = 0.5;
-	float hmbz_bezel_highlight_width = 0.25;
-
-	float hmbz_bezel_edge_highlight_width = 0.8;
-	
-	float hmbz_bezel_brightness_frame_outer_edge = 0.0;
-	float hmbz_brightness_shadow = 0;
-	float hmbz_frame_brightness = 100;
-
-	// Not sure why we need linearize this but it seems to have a smoother range this way
-	vec3 base_color = HSM_Linearize(vec4(HSM_HSVtoRGB(vec3(HSM_BZL_COLOR_HUE, HSM_BZL_COLOR_SATURATION, HSM_BZL_COLOR_VALUE)), 1), DEFAULT_SRGB_GAMMA).rgb;
-	float noise_mask = clamp(fract(sin(dot(tube_curved_coord_ctr + vec2(0.5, 0.5) + 1, vec2(12.9898, 78.233))) * 43758.5453), 0, 1);
-	vec3 base_color_with_noise = mix(base_color, 1.5 * base_color * noise_mask, HSM_BZL_NOISE);
-	vec3 top_color = HSM_BZL_BRIGHTNESS_MULT_TOP * HSM_BZL_BRIGHTNESS * base_color_with_noise;
-	vec3 bottom_color = HSM_BZL_BRIGHTNESS_MULT_BOTTOM * HSM_BZL_BRIGHTNESS * base_color_with_noise;
-	vec3 sides_color = mix(HSM_BZL_BRIGHTNESS_MULT_SIDES * HSM_BZL_BRIGHTNESS_MULT_SIDE_RIGHT * HSM_BZL_BRIGHTNESS * base_color_with_noise,
-							HSM_BZL_BRIGHTNESS_MULT_SIDES * HSM_BZL_BRIGHTNESS_MULT_SIDE_LEFT * HSM_BZL_BRIGHTNESS * base_color_with_noise,
-							left_half_mask);
-
-	vec3 frame_base_color = base_color;
-	vec3 frame_base_color_with_noise = base_color_with_noise;
-	if (HSM_FRM_USE_INDEPENDENT_COLOR > 0)
-	{
-		frame_base_color = HSM_Linearize(vec4(HSM_HSVtoRGB(vec3(HSM_FRM_COLOR_HUE, HSM_FRM_COLOR_SATURATION, HSM_FRM_COLOR_VALUE)), 1), DEFAULT_SRGB_GAMMA).rgb;
-		frame_base_color_with_noise = mix(frame_base_color, 1.5 * frame_base_color * noise_mask, HSM_FRM_NOISE);
-	}
-
-	vec3 frame_color = hmbz_frame_brightness / 100 * mix(frame_base_color, 1.5 * frame_base_color * noise_mask, 0.6 * HSM_FRM_NOISE);
-	vec3 outside_frame_color = hmbz_brightness_shadow * base_color_with_noise;
-
-	vec3 bezel_diffuse_color = mix(sides_color, top_color, top_mask);
-	bezel_diffuse_color = mix(bezel_diffuse_color, bottom_color, bottom_mask);
-
-	float top_center_highlight_mask 	= hmbz_bezel_highlight_top * top_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.5, hmbz_bezel_highlight_falloff_speed));
-	float bottom_center_highlight_mask 	= hmbz_bezel_highlight_bottom * bottom_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.5, hmbz_bezel_highlight_falloff_speed));
-	float sides_highlight_mask 			= hmbz_bezel_highlight_sides * sides_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_highlight_width, 0, abs(tube_curved_coord_ctr.y)), vec2(0.5, hmbz_bezel_highlight_falloff_speed));
-
-	float edge_top_center_highlight_mask 		= hmbz_bezel_highlight_top * top_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.8, 0));
-	float edge_bottom_center_highlight_mask 	= hmbz_bezel_highlight_bottom * bottom_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.8, 0));
-	float edge_sides_highlight_mask 			= hmbz_bezel_highlight_sides * sides_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.y)), vec2(0.8, 0));
-
-	edge_highlight_mask = hmbz_bezel_highlight_edge * edge_mask * (edge_top_center_highlight_mask + edge_bottom_center_highlight_mask + edge_sides_highlight_mask);
-	edge_highlight_mask *= HSM_BZL_INNER_EDGE_HIGHLIGHT;
-
-	// Combine all the individual highlights into one mask
-	float combined_highlight_mask = (1 + 2.5 * HSM_BZL_NOISE) * (1 - noise_mask * 2.5 * HSM_BZL_NOISE) * (top_center_highlight_mask + bottom_center_highlight_mask + sides_highlight_mask);
-	float bezel_highlight_multiplier = HSM_BZL_HIGHLIGHT * combined_highlight_mask + HSM_BZL_HIGHLIGHT * edge_highlight_mask;
-	vec3 bezel_color = bezel_diffuse_color * (1 + 15 * bezel_highlight_multiplier) + 1 * bezel_highlight_multiplier;
-
-	// Add the inner edge highlight on top of the bezel color which has it's own highlight
-	float inner_edge_highlight_multiplier = HSM_FRM_INNER_EDGE_HIGHLIGHT + HSM_BZL_HIGHLIGHT * 10 * HSM_FRM_INNER_EDGE_HIGHLIGHT;
-	vec3 frame_inner_edge_color = frame_base_color * (1 + 15 * inner_edge_highlight_multiplier) +	0.5 * inner_edge_highlight_multiplier;
-
-	bezel_color = mix(bezel_color, frame_inner_edge_color, frame_inner_edge_mask);
-
-	float dist_inside_outer_edge = min(0.50 - abs(frame_outside_coord_ctr.x), 0.50 - abs(frame_outside_coord_ctr.y));
-	float frame_outer_edge_width = HSM_FRM_OUTER_EDGE_THICKNESS;
-	vec3 frame_diffuse_color = mix(frame_color, 0.2 * frame_color, HSM_FRM_OUTER_EDGE_SHADING * smoothstep(frame_outer_edge_width, 0, dist_inside_outer_edge));
-
-	if (HSM_FRM_TEXTURE_OPACITY > 0)
-	{
-		// TODO need to do Mipmapping sample?
-		vec4 frame_texture_color = HSM_Linearize(texture(FrameTextureImage, FRAME_OUTSIDE_CURVED_COORD), DEFAULT_SRGB_GAMMA);
-		frame_diffuse_color = HSM_BlendModeLayerMix(vec4(frame_diffuse_color, 1), frame_texture_color, HSM_FRM_TEXTURE_BLEND_MODE, HSM_FRM_TEXTURE_OPACITY).rgb;
-	}
-
-	// Composite in color from outside the bezel
-	vec3 bezel_and_frame_rgb = mix(bezel_color, frame_diffuse_color, OUTSIDE_BEZEL_MASK);
-
-	// Get masks on side of frame to multiply together to get a shadow around the frame
-	// Get vector from the screen edge outward
-	float frame_edge = 0.495;
-	float dist_outside_frame = length(clamp(abs(frame_outside_coord_ctr * 1.01) - frame_edge, 0, 1) * vec2(TUBE_DIFFUSE_ASPECT, 1));
-
-	vec4 frame_shadow_layer = vec4(0);
-	if (HSM_FRM_OPACITY > 0.001)
-		frame_shadow_layer.a = SHADOW_OUTSIDE_FRAME_MASK * HHLP_QuadraticBezier(smoothstep(HSM_FRM_SHADOW_WIDTH, 0, dist_outside_frame), vec2(1, 0));
-
-	//----------------------------------------------------
-	// Generated Bezel
-	//----------------------------------------------------
-
-	vec4 bezel_layer = vec4(0);
-	vec4 frame_layer = vec4(0);
-
-	if (HSM_BZL_OPACITY > 0 || HSM_FRM_OPACITY > 0)
-	{
-		// Create image of bezel & frame with outside of frame transparent
-		vec4 bezel_and_frame_rgba = vec4(bezel_and_frame_rgb, 1);
-
-		// Cut out Tube Area
-		if (HSM_STATIC_LAYERS_GAMMA != 1)
-			bezel_and_frame_rgba = HSM_ApplyGamma(bezel_and_frame_rgba, HSM_STATIC_LAYERS_GAMMA);
-
-		bezel_and_frame_rgba.rgb = ApplyAmbientImages(bezel_and_frame_rgba.rgb,
-															ambient_image.rgb,
-															ambient2_image.rgb,
-															HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER,
-															HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER,
-															1,
-															HSM_BZL_BLEND_MODE,
-															HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-
-		// Contract the tube mask to leave a little extra black ring at the edge of the bezel
-		// otherwise this will show slivers of the background otherwise
-		float tube_mask_contracted = HSM_GetCornerMask((tube_curved_coord - 0.5) * 1.004 + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-		float FRAME_AND_BEZEL_MASK = (1 - tube_mask_contracted) * (1 - OUTSIDE_FRAME_MASK);
-
-		if (HSM_BZL_OPACITY > 0 || HSM_FRM_OPACITY > 0)
-			bezel_layer = clamp(bezel_and_frame_rgba * FRAME_AND_BEZEL_MASK, 0, 1);
-
-		frame_shadow_layer *= HSM_FRM_SHADOW_OPACITY;
-
-		if (HSM_FRM_SHADOW_OPACITY > 0)
-			bezel_layer = BlendModeMaskLayerMix(frame_shadow_layer,
-													bezel_layer, 
-													BLEND_MODE_NORMAL, 
-													MASK_MODE_ALL,
-													0, 
-													SHOW_ON_DUALSCREEN_MODE_BOTH,
-													1);
-
-
-		float bezel_opacity_mult = HSM_BZL_OPACITY + OUTSIDE_BEZEL_MASK * (1 - HSM_BZL_OPACITY);
-		float frame_opacity_mult = HSM_FRM_OPACITY + (1 - OUTSIDE_BEZEL_MASK) * (1 - HSM_FRM_OPACITY);
-
-		bezel_layer *= bezel_opacity_mult * frame_opacity_mult;
-	}
-
-	float TUBE_MASK_EXPAND = HSM_GetCornerMask((tube_curved_coord - 0.5) * 0.997 + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-	
-	// vec4 tube_bg_layer = vec4(0, 0, 0, TUBE_MASK_EXPAND * HSM_GetTubeOpacity());
-	vec4 tube_bg_layer = vec4(0, 0, 0, 0);
-
-// end of ifndef LAYERS_UNDER_CRT
-#endif
-
-	//-----------------------------------------------------------------------------------------
-	// Background
-	//-----------------------------------------------------------------------------------------
-	bool bg_use_vert_image = SCREEN_ASPECT < 1 && textureSize(BackgroundVertImage, 0).y > 16 ? true : false; 
-	vec2 bg_size = bg_use_vert_image ? textureSize(BackgroundVertImage, 0) : textureSize(BackgroundImage, 0);
-	BACKGROUND_CURVED_COORD = HSM_GetScaledCoord(VIEWPORT_COORD,
-												VIEWPORT_UNSCALED_COORD,
-												TEXTURE_ASPECT_MODE_EXPLICIT,
-												bg_size.x / bg_size.y,
-												vec2(HSM_BG_POS_X, HSM_BG_POS_Y),
-												vec2(HSM_BG_SCALE * HSM_BG_SCALE_X, HSM_BG_SCALE),
-												HSM_BG_FOLLOW_LAYER,
-												HSM_BG_FOLLOW_MODE,
-												HSM_BG_FOLLOW_FULL_USES_ZOOM,
-												HSM_BG_FILL_MODE,
-												HSM_BG_SPLIT_PRESERVE_CENTER,
-												HSM_BG_SPLIT_REPEAT_WIDTH,
-												true,
-												BACKGROUND_COORD,
-												BACKGROUND_SCALE);
-
-	// Tile Wrap the background
-	if (HSM_BG_WRAP_MODE == 1)
-		BACKGROUND_CURVED_COORD = mod(BACKGROUND_CURVED_COORD, 1.0);
-	
-	// Mirror Wrap the bBackground
-	if (HSM_BG_WRAP_MODE == 2)
-		BACKGROUND_CURVED_COORD = HSM_GetMirrorWrapCoord(BACKGROUND_CURVED_COORD);
-
-	vec4 bg_image = vec4(0);
-	if (HSM_BG_OPACITY > 0 && bg_size.y > 16)
-	{
-		if (bg_use_vert_image)
-			bg_image = HSM_GetMipmappedTexSample(BackgroundVertImage, BACKGROUND_CURVED_COORD, BACKGROUND_SCALE, HSM_BG_MIPMAPPING_BLEND_BIAS);
-		else
-			bg_image = HSM_GetMipmappedTexSample(BackgroundImage, BACKGROUND_CURVED_COORD, BACKGROUND_SCALE, HSM_BG_MIPMAPPING_BLEND_BIAS);
-
-		// Premultiply Alpha
-		bg_image = HSM_GetPreMultipliedColorLinear(bg_image, HSM_BG_SOURCE_MATTE_TYPE, DEFAULT_SRGB_GAMMA);
-
-		// HSV Adjustments
-		bg_image.rgb = HSM_ApplyHSVAdjustment(bg_image.rgb, HSM_BG_HUE, HSM_BG_SATURATION, HSM_BG_BRIGHTNESS, HSM_BG_COLORIZE_ON, HSM_BG_GAMMA);
-
-		if (HSM_STATIC_LAYERS_GAMMA != 1)
-			bg_image = HSM_ApplyGamma(bg_image, HSM_STATIC_LAYERS_GAMMA);
-
-		bg_image.rgb = ApplyAmbientImages(bg_image.rgb, 
-												ambient_image.rgb,
-												ambient2_image.rgb,
-												HSM_BG_AMBIENT_LIGHTING_MULTIPLIER,
-												HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER,
-												HSM_BG_APPLY_AMBIENT_IN_ADD_MODE,
-												HSM_BG_BLEND_MODE,
-												HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-	}
-
-	//----------------------------------------------------
-	// Device Image
-	//----------------------------------------------------
-	bool device_use_vert_image = SCREEN_ASPECT < 1 && textureSize(DeviceVertImage, 0).y > 16 ? true : false; 
-	vec2 device_size = device_use_vert_image ? textureSize(DeviceVertImage, 0) : textureSize(DeviceImage, 0);
-	DEVICE_CURVED_COORD = HSM_GetScaledCoord(VIEWPORT_COORD,
-											VIEWPORT_UNSCALED_COORD,
-											TEXTURE_ASPECT_MODE_EXPLICIT,
-											device_size.x / device_size.y,
-											vec2(HSM_DEVICE_POS_X, HSM_DEVICE_POS_Y),
-											vec2(HSM_DEVICE_SCALE * HSM_DEVICE_SCALE_X, HSM_DEVICE_SCALE),
-											HSM_DEVICE_FOLLOW_LAYER,
-											HSM_DEVICE_FOLLOW_MODE,
-											HSM_DEVICE_FOLLOW_FULL_USES_ZOOM,
-											HSM_DEVICE_FILL_MODE,
-											HSM_DEVICE_SPLIT_PRESERVE_CENTER,
-											HSM_DEVICE_SPLIT_REPEAT_WIDTH,
-											true,
-											DEVICE_COORD,
-											DEVICE_SCALE);
-
-	vec4 device_image = vec4(0);
-	if (HSM_DEVICE_OPACITY > 0 && device_size.y > 16)
-	{
-		device_image = device_use_vert_image ? 	HSM_GetMipmappedTexSample(DeviceVertImage, DEVICE_CURVED_COORD, DEVICE_SCALE, HSM_DEVICE_MIPMAPPING_BLEND_BIAS) :
-												HSM_GetMipmappedTexSample(DeviceImage, DEVICE_CURVED_COORD, DEVICE_SCALE, HSM_DEVICE_MIPMAPPING_BLEND_BIAS);
-
-		// Premultiply Alpha
-		device_image = HSM_GetPreMultipliedColorLinear(device_image, HSM_DEVICE_SOURCE_MATTE_TYPE, DEFAULT_SRGB_GAMMA);
-
-		// HSV Adjustments
-		device_image.rgb = HSM_ApplyHSVAdjustment(device_image.rgb, HSM_DEVICE_HUE, HSM_DEVICE_SATURATION, HSM_DEVICE_BRIGHTNESS, HSM_DEVICE_COLORIZE_ON, HSM_DEVICE_GAMMA);
-
-		if (HSM_STATIC_LAYERS_GAMMA != 1)
-			device_image = HSM_ApplyGamma(device_image, HSM_STATIC_LAYERS_GAMMA);
-
-		device_image.rgb = ApplyAmbientImages(device_image.rgb, 
-													ambient_image.rgb,
-													ambient2_image.rgb,
-													HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER,
-													HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER,
-													HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE,
-													HSM_DEVICE_BLEND_MODE,
-													HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-	}
-
-	//----------------------------------------------------
-	// DeviceLED Image
-	//----------------------------------------------------
-	vec2 deviceled_size = textureSize(DeviceLEDImage, 0);
-	DEVICELED_CURVED_COORD = HSM_GetScaledCoord(VIEWPORT_COORD,
-											VIEWPORT_UNSCALED_COORD,
-											TEXTURE_ASPECT_MODE_EXPLICIT,
-											deviceled_size.x / deviceled_size.y,
-											vec2(HSM_DEVICELED_POS_X, HSM_DEVICELED_POS_Y),
-											vec2(HSM_DEVICELED_SCALE * HSM_DEVICELED_SCALE_X, HSM_DEVICELED_SCALE),
-											HSM_DEVICELED_FOLLOW_LAYER,
-											HSM_DEVICELED_FOLLOW_MODE,
-											HSM_DEVICELED_FOLLOW_FULL_USES_ZOOM,
-											HSM_DEVICELED_FILL_MODE,
-											HSM_DEVICELED_SPLIT_PRESERVE_CENTER,
-											HSM_DEVICELED_SPLIT_REPEAT_WIDTH,
-											true,
-											DEVICELED_COORD,
-											DEVICELED_SCALE);
-
-	vec4 deviceled_image = vec4(0);
-	if (HSM_DEVICELED_OPACITY > 0 && deviceled_size.y > 16)
-	{
-		deviceled_image = HSM_GetMipmappedTexSample(DeviceLEDImage, DEVICELED_CURVED_COORD, DEVICELED_SCALE, HSM_DEVICELED_MIPMAPPING_BLEND_BIAS);
-
-		// Premultiply Alpha
-		deviceled_image = HSM_GetPreMultipliedColorLinear(deviceled_image, HSM_DEVICELED_SOURCE_MATTE_TYPE, DEFAULT_SRGB_GAMMA);
-
-		// HSV Adjustments
-		deviceled_image.rgb = HSM_ApplyHSVAdjustment(deviceled_image.rgb, HSM_DEVICELED_HUE, HSM_DEVICELED_SATURATION, HSM_DEVICELED_BRIGHTNESS, HSM_DEVICELED_COLORIZE_ON, HSM_DEVICELED_GAMMA);
-
-		if (HSM_STATIC_LAYERS_GAMMA != 1)
-			deviceled_image = HSM_ApplyGamma(deviceled_image, HSM_STATIC_LAYERS_GAMMA);
-
-		deviceled_image.rgb = ApplyAmbientImages(deviceled_image.rgb, 
-													ambient_image.rgb,
-													ambient2_image.rgb,
-													HSM_DEVICELED_AMBIENT_LIGHTING_MULTIPLIER,
-													HSM_DEVICELED_AMBIENT2_LIGHTING_MULTIPLIER,
-													HSM_DEVICELED_APPLY_AMBIENT_IN_ADD_MODE,
-													HSM_DEVICELED_BLEND_MODE,
-													HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-	}
-
-	//----------------------------------------------------
-	// LED Image
-	//----------------------------------------------------
-	vec4 led_image = vec4(0);
-	if (HSM_LED_OPACITY > 0)
-	{
-		vec2 led_size = textureSize(LEDImage, 0);
-		LED_CURVED_COORD = HSM_GetScaledCoord(VIEWPORT_COORD,
-											VIEWPORT_UNSCALED_COORD,
-											TEXTURE_ASPECT_MODE_EXPLICIT,
-											led_size.x / led_size.y, 
-											vec2(HSM_LED_POS_X, HSM_LED_POS_Y), 
-											vec2(HSM_LED_SCALE * HSM_LED_SCALE_X, HSM_LED_SCALE),
-											HSM_LED_FOLLOW_LAYER,
-											HSM_LED_FOLLOW_MODE,
-											HSM_LED_FOLLOW_FULL_USES_ZOOM,
-											HSM_LED_FILL_MODE,
-											HSM_LED_SPLIT_PRESERVE_CENTER,
-											HSM_LED_SPLIT_REPEAT_WIDTH,
-											true,
-											LED_COORD,
-											LED_SCALE);
-
-		if (HSM_LED_OPACITY > 0 && led_size.y > 16)
-		{
-			led_image = HSM_GetMipmappedTexSample(LEDImage, LED_CURVED_COORD, LED_SCALE, HSM_LED_MIPMAPPING_BLEND_BIAS);
-
-			// Premultiply Alpha
-			led_image = HSM_GetPreMultipliedColorLinear(led_image, HSM_LED_SOURCE_MATTE_TYPE, DEFAULT_SRGB_GAMMA);
-
-			// HSV Adjustments
-			led_image.rgb = HSM_ApplyHSVAdjustment(led_image.rgb, HSM_LED_HUE, HSM_LED_SATURATION, HSM_LED_BRIGHTNESS, HSM_LED_COLORIZE_ON, HSM_LED_GAMMA);
-
-			// STATIC GAMMA
-			if (HSM_STATIC_LAYERS_GAMMA != 1)
-				led_image = HSM_ApplyGamma(led_image, HSM_STATIC_LAYERS_GAMMA);
-
-			led_image.rgb = ApplyAmbientImages(led_image.rgb, 
-													ambient_image.rgb,
-													ambient2_image.rgb,
-													HSM_LED_AMBIENT_LIGHTING_MULTIPLIER,
-													HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER,
-													HSM_LED_APPLY_AMBIENT_IN_ADD_MODE,
-													HSM_LED_BLEND_MODE,
-													HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-		}
-	}
-
-	//----------------------------------------------------
-	// Decal Image
-	//----------------------------------------------------
-	vec2 decal_size = textureSize(DecalImage, 0);
-	DECAL_CURVED_COORD = HSM_GetScaledCoord(VIEWPORT_COORD,
-											VIEWPORT_UNSCALED_COORD,
-											TEXTURE_ASPECT_MODE_EXPLICIT,
-											decal_size.x / decal_size.y,
-											vec2(HSM_DECAL_POS_X, HSM_DECAL_POS_Y), 
-											vec2(HSM_DECAL_SCALE * HSM_DECAL_SCALE_X, HSM_DECAL_SCALE),
-											HSM_DECAL_FOLLOW_LAYER,
-											HSM_DECAL_FOLLOW_MODE,
-											HSM_DECAL_FOLLOW_FULL_USES_ZOOM,
-											HSM_DECAL_FILL_MODE,
-											HSM_DECAL_SPLIT_PRESERVE_CENTER,
-											HSM_DECAL_SPLIT_REPEAT_WIDTH,
-											true,
-											DECAL_COORD,
-											DECAL_SCALE);
-	vec4 decal_image = vec4(0);
-	if (HSM_DECAL_OPACITY > 0 && decal_size.y > 16)
-	{
-		decal_image = HSM_GetMipmappedTexSample(DecalImage, DECAL_CURVED_COORD, DECAL_SCALE, HSM_DECAL_MIPMAPPING_BLEND_BIAS);
-		
-		// Premultiply Alpha
-		decal_image = HSM_GetPreMultipliedColorLinear(decal_image, HSM_DECAL_SOURCE_MATTE_TYPE, DEFAULT_SRGB_GAMMA);
-
-		// HSV Adjustments
-		decal_image.rgb = HSM_ApplyHSVAdjustment(decal_image.rgb, HSM_DECAL_HUE, HSM_DECAL_SATURATION, HSM_DECAL_BRIGHTNESS, HSM_DECAL_COLORIZE_ON, HSM_DECAL_GAMMA);
-
-		// STATIC GAMMA
-		if (HSM_STATIC_LAYERS_GAMMA != 1)
-			decal_image = HSM_ApplyGamma(decal_image, HSM_STATIC_LAYERS_GAMMA);
-
-		decal_image.rgb = ApplyAmbientImages(decal_image.rgb, 
-												ambient_image.rgb,
-												ambient2_image.rgb,
-												HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER,
-												HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER,
-												HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE,
-												HSM_DECAL_BLEND_MODE,
-												HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-	}
-
-//----------------------------------------------------
-//  ADV Get Additional Layers and Composite 
-//----------------------------------------------------
-	vec2 top_size = textureSize(TopLayerImage, 0);
-	TOP_IMAGE_CURVED_COORD = HSM_GetScaledCoord(VIEWPORT_COORD,
-												VIEWPORT_UNSCALED_COORD,
-												TEXTURE_ASPECT_MODE_EXPLICIT,
-												top_size.x / top_size.y,
-												vec2(HSM_TOP_POS_X, HSM_TOP_POS_Y), 
-												vec2(HSM_TOP_SCALE * HSM_TOP_SCALE_X, HSM_TOP_SCALE),
-												HSM_TOP_FOLLOW_LAYER,
-												HSM_TOP_FOLLOW_MODE,
-												HSM_TOP_FOLLOW_FULL_USES_ZOOM,
-												HSM_TOP_FILL_MODE,
-												HSM_TOP_SPLIT_PRESERVE_CENTER,
-												HSM_TOP_SPLIT_REPEAT_WIDTH,
-												true,
-												TOP_IMAGE_COORD,
-												TOP_IMAGE_SCALE);
-
-	if (HSM_TOP_MIRROR_WRAP == 1)
-		TOP_IMAGE_CURVED_COORD = HSM_GetMirrorWrapCoord(TOP_IMAGE_CURVED_COORD);
-
-	vec4 top_image = vec4(0);
-	if (HSM_TOP_OPACITY > 0 && top_size.y > 16)
-	{
-		// Get the top image color and masking values if needed
-		top_image = HSM_GetMipmappedTexSample(TopLayerImage, TOP_IMAGE_CURVED_COORD, TOP_IMAGE_SCALE, HSM_TOP_MIPMAPPING_BLEND_BIAS);
-
-		// Premultiply Alpha
-		top_image = HSM_GetPreMultipliedColorLinear(top_image, HSM_TOP_SOURCE_MATTE_TYPE, DEFAULT_SRGB_GAMMA);
-
-		// HSV Adjustments
-		top_image.rgb = HSM_ApplyHSVAdjustment(top_image.rgb, HSM_TOP_HUE, HSM_TOP_SATURATION, HSM_TOP_BRIGHTNESS, HSM_TOP_COLORIZE_ON, HSM_TOP_GAMMA);
-
-		// STATIC GAMMA
-		if (HSM_STATIC_LAYERS_GAMMA != 1)
-			top_image = HSM_ApplyGamma(top_image, HSM_STATIC_LAYERS_GAMMA);
-
-		top_image.rgb = ApplyAmbientImages(top_image.rgb, 
-											ambient_image.rgb,
-											ambient2_image.rgb,
-											HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER,
-											HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER,
-											HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE,
-											HSM_TOP_BLEND_MODE,
-											HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-	}
-
-	//----------------------------------------------------
-	// Cabinet Glass Image
-	//----------------------------------------------------
-	vec4 cab_glass_image = vec4(0);
-
-	if (HSM_CAB_GLASS_OPACITY > 0)
-	{
-
-
-		vec2 cab_glass_size = textureSize(CabinetGlassImage, 0);
-		CAB_GLASS_CURVED_COORD = HSM_GetScaledCoord(VIEWPORT_COORD,
-													VIEWPORT_UNSCALED_COORD,
-													TEXTURE_ASPECT_MODE_EXPLICIT,
-													cab_glass_size.x / cab_glass_size.y,
-													vec2(HSM_CAB_GLASS_POS_X, HSM_CAB_GLASS_POS_Y), 
-													vec2(HSM_CAB_GLASS_SCALE * HSM_CAB_GLASS_SCALE_X, HSM_CAB_GLASS_SCALE),
-													HSM_CAB_GLASS_FOLLOW_LAYER,
-													HSM_CAB_GLASS_FOLLOW_MODE,
-													HSM_CAB_GLASS_FOLLOW_FULL_USES_ZOOM,
-													HSM_CAB_GLASS_FILL_MODE,
-													HSM_CAB_GLASS_SPLIT_PRESERVE_CENTER,
-													HSM_CAB_GLASS_SPLIT_REPEAT_WIDTH,
-													true,
-													CAB_GLASS_COORD,
-													CAB_GLASS_SCALE);
-
-		if (HSM_CAB_GLASS_OPACITY > 0 && cab_glass_size.y > 16)
-		{
-			// Sample Texture
-			cab_glass_image = HSM_GetMipmappedTexSample(CabinetGlassImage, CAB_GLASS_CURVED_COORD, CAB_GLASS_SCALE, HSM_CAB_GLASS_MIPMAPPING_BLEND_BIAS);
-
-			// Premultiply Alpha
-			cab_glass_image = HSM_GetPreMultipliedColorLinear(cab_glass_image, HSM_CAB_GLASS_SOURCE_MATTE_TYPE, DEFAULT_SRGB_GAMMA);
-
-			// HSV Adjustments
-			cab_glass_image.rgb = HSM_ApplyHSVAdjustment(cab_glass_image.rgb, HSM_CAB_GLASS_HUE, HSM_CAB_GLASS_SATURATION, HSM_CAB_GLASS_BRIGHTNESS, HSM_CAB_GLASS_COLORIZE_ON, HSM_CAB_GLASS_GAMMA);
-
-			// STATIC GAMMA
-			if (HSM_STATIC_LAYERS_GAMMA != 1)
-				cab_glass_image = HSM_ApplyGamma(cab_glass_image, HSM_STATIC_LAYERS_GAMMA);
-
-			cab_glass_image.rgb = ApplyAmbientImages(cab_glass_image.rgb, 
-														ambient_image.rgb,
-														ambient2_image.rgb,
-														HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER,
-														HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER,
-														HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE,
-														HSM_CAB_GLASS_BLEND_MODE,
-														HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE);
-		}
-	}
-
-
-	//-----------------------------------------------------------------------------------------
-	// CUTOUT MASK
-	//-----------------------------------------------------------------------------------------
-	CUTOUT_MASK = 1;
-
-	vec2 temp_scale = vec2(0.5);
-	vec2 temp_coord = vec2(0.5);
-
-	vec2 cutout_base_scale_offset = vec2(0.5);
-
-	if ( HSM_CUTOUT_FOLLOW_LAYER == FOLLOW_LAYER_VIEWPORT )
-		cutout_base_scale_offset *= vec2(DEFAULT_UNCORRECTED_BEZEL_SCALE.y * TUBE_DIFFUSE_ASPECT / output_aspect, DEFAULT_BEZEL_SCALE.y);
-
-	vec2 cutout_coord = HSM_GetScaledCoord(VIEWPORT_COORD,
-											VIEWPORT_UNSCALED_COORD,
-										  	HSM_CUTOUT_ASPECT_MODE,
-											HSM_CUTOUT_EXPLICIT_ASPECT,
-											vec2(HSM_CUTOUT_POS_X, HSM_CUTOUT_POS_Y),
-											vec2(vec2(HSM_CUTOUT_SCALE * HSM_CUTOUT_SCALE_X, HSM_CUTOUT_SCALE) * cutout_base_scale_offset),
-											HSM_CUTOUT_FOLLOW_LAYER,
-											FOLLOW_MODE_SCALE_AND_POS,
-											HSM_CUTOUT_FOLLOW_FULL_USES_ZOOM,
-											FILL_MODE_STRETCH,
-											0,
-											0,
-											false,
-											temp_coord,
-											temp_scale);
-	
-	CUTOUT_MASK = 1 - HSM_GetCornerMask(cutout_coord, TUBE_DIFFUSE_ASPECT, HSM_CUTOUT_CORNER_RADIUS, 0.8);
-
-	//-----------------------------------------------------------------------------------------
-	// Full Viewport Vignette
-	//-----------------------------------------------------------------------------------------
-	vec4 vignette_layer = vec4(0);
-	if (HSM_VIEWPORT_VIGNETTE_OPACITY > 0)
-	{
-		vec2 vignette_coord = HSM_GetScaledCoord(VIEWPORT_COORD,
-												VIEWPORT_UNSCALED_COORD,
-												TEXTURE_ASPECT_MODE_VIEWPORT,
-												1,
-												vec2(HSM_VIEWPORT_VIGNETTE_POS_X, HSM_VIEWPORT_VIGNETTE_POS_Y), 
-												vec2(vec2(HSM_VIEWPORT_VIGNETTE_SCALE * HSM_VIEWPORT_VIGNETTE_SCALE_X, HSM_VIEWPORT_VIGNETTE_SCALE)), 
-												HSM_VIEWPORT_VIGNETTE_FOLLOW_LAYER,
-												FOLLOW_MODE_SCALE_AND_POS,
-												FOLLOW_LAYER_VIEWPORT,
-												FILL_MODE_STRETCH,
-												0,
-												0,
-												false,
-												temp_coord,
-												temp_scale);
-
-		vignette_layer.a += 0.75 * HHLP_QuadraticBezier(1 - HSM_GetVignetteFactor(vignette_coord, HSM_VIEWPORT_VIGNETTE_OPACITY, 1), vec2(1, 0.5));
-	}
-
-
-	//-----------------------------------------------------------------------------------------
-	// COMPOSITE ALL LAYERS
-	//-----------------------------------------------------------------------------------------
-
-	vec4 frag_color_linear = vec4(0);
-
-	int start_layer = 0;
-	int end_layer = int(MAX_LAYER_ORDER);
-
-#ifdef LAYERS_OVER_CRT
-	start_layer = int(HSM_CRT_LAYER_ORDER);
-	end_layer = int(MAX_LAYER_ORDER);
-#else
-	start_layer = 0;
-	end_layer = int(HSM_CRT_LAYER_ORDER - 1);
-#endif
-
-	OUTSIDE_TUBE_MASK_FOR_IMAGE = 1 - HSM_GetCornerMask(tube_curved_coord_ctr * 1.003 + 0.5, TUBE_DIFFUSE_ASPECT, HSM_FRM_OUTER_CORNER_RADIUS, 1);
-
-	for(int i=start_layer; i <= end_layer; i++)
-	{
-		// BACKGROUND
-		if (HSM_BG_LAYER_ORDER == i)
-			frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-													bg_image, 
-													HSM_BG_BLEND_MODE, 
-													HSM_BG_MASK_MODE, 
-													HSM_BG_CUTOUT_MODE,
-													HSM_BG_DUALSCREEN_VIS_MODE,
-													HSM_BG_OPACITY);
-
-		// VIGNETTE
-		if (HSM_VIEWPORT_VIGNETTE_LAYER_ORDER == i)
-			frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-													vignette_layer, 
-													BLEND_MODE_NORMAL, 
-													HSM_VIEWPORT_VIGNETTE_MASK_MODE, 
-													HSM_VIEWPORT_VIGNETTE_CUTOUT_MODE,
-													SHOW_ON_DUALSCREEN_MODE_BOTH,
-													HSM_VIEWPORT_VIGNETTE_OPACITY);
-		// LED IMAGE
-		if (HSM_LED_LAYER_ORDER == i && HSM_LED_OPACITY > 0)
-				frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-														led_image, 
-														HSM_LED_BLEND_MODE, 
-														HSM_LED_MASK_MODE, 
-														HSM_LED_CUTOUT_MODE, 
-														HSM_LED_DUALSCREEN_VIS_MODE,
-														HSM_LED_OPACITY);
-
-		// DEVICE IMAGE
-		if (HSM_DEVICE_LAYER_ORDER == i && HSM_DEVICE_OPACITY > 0)
-				frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-														device_image, 
-														HSM_DEVICE_BLEND_MODE, 
-														HSM_DEVICE_MASK_MODE, 
-														HSM_DEVICE_CUTOUT_MODE, 
-														HSM_DEVICE_DUALSCREEN_VIS_MODE,
-														HSM_DEVICE_OPACITY);
-
-		// DEVICELED IMAGE
-		if (HSM_DEVICELED_LAYER_ORDER == i && HSM_DEVICELED_OPACITY > 0)
-				frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-														deviceled_image, 
-														HSM_DEVICELED_BLEND_MODE, 
-														HSM_DEVICELED_MASK_MODE, 
-														HSM_DEVICELED_CUTOUT_MODE, 
-														HSM_DEVICELED_DUALSCREEN_VIS_MODE,
-														HSM_DEVICELED_OPACITY);
-
-		// DECAL IMAGE
-		if (HSM_DECAL_LAYER_ORDER == i && HSM_DECAL_OPACITY > 0)
-				frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-														decal_image, 
-														HSM_DECAL_BLEND_MODE, 
-														HSM_DECAL_MASK_MODE, 
-														HSM_DECAL_CUTOUT_MODE, 
-														HSM_DECAL_DUALSCREEN_VIS_MODE,
-														HSM_DECAL_OPACITY);
-
-		// CABINET GLASS
-		if (HSM_CAB_GLASS_LAYER_ORDER == i && HSM_CAB_GLASS_OPACITY > 0)
-				frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-														cab_glass_image, 
-														HSM_CAB_GLASS_BLEND_MODE, 
-														HSM_CAB_GLASS_MASK_MODE, 
-														HSM_CAB_GLASS_CUTOUT_MODE, 
-														HSM_CAB_GLASS_DUALSCREEN_VIS_MODE,
-														HSM_CAB_GLASS_OPACITY);
-
-
-		// Top Layer
-		if (HSM_TOP_LAYER_ORDER == i && HSM_TOP_OPACITY > 0)
-				frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-														top_image, 
-														HSM_TOP_BLEND_MODE, 
-														HSM_TOP_MASK_MODE, 
-														HSM_TOP_CUTOUT_MODE, 
-														HSM_TOP_DUALSCREEN_VIS_MODE,
-														HSM_TOP_OPACITY);
-	}
-
-#ifdef LAYERS_UNDER_CRT
-
-	// Add background behind tube
-	frag_color_linear = HSM_PreMultAlphaBlend(frag_color_linear, tube_bg_layer);
-	// GENERATED BEZEL LAYER
-	if (HSM_BZL_OPACITY > 0 || HSM_FRM_OPACITY > 0)
-		frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, 
-												bezel_layer, 
-												HSM_BZL_BLEND_MODE, 
-												MASK_MODE_ALL, 
-												0, 
-												SHOW_ON_DUALSCREEN_MODE_BOTH,
-												1);
-#endif
-
-	//-----------------------------------------------------------------------------------------
-	// MASK DEBUG DISPLAY
-	//-----------------------------------------------------------------------------------------
-	// Show a red overlay on the screen showing the mask for each mask mode
-	if (HSM_LAYERING_DEBUG_MASK_MODE != -1)
-	{
-		float debug_mask = 1;
-		if (HSM_LAYERING_DEBUG_MASK_MODE == -2)
-			debug_mask = CUTOUT_MASK;
-		else
-			debug_mask = GetMask(HSM_LAYERING_DEBUG_MASK_MODE);
-
-		frag_color_linear = HSM_PreMultAlphaBlend(frag_color_linear, vec4(1, 0, 0, 1) * 0.15 * debug_mask);
-		frag_color_linear = HSM_PreMultAlphaBlend(frag_color_linear, vec4(0.05, 0.05, 0.05, 1) * 0.15 * (1 - debug_mask));
-		frag_color_linear = clamp(frag_color_linear, 0, 1);
-	}
-
-	#ifdef LAYERS_UNDER_CRT
-	// Store reflection mask in the alpha channel
-	// Usually used to show the uneven brightness of a bumpy surface
-	if (HSM_REFLECT_MASK_IMAGE_AMOUNT > 0)
-	{
-		vec2 reflect_mask_scale = vec2(0.5);
-		vec2 reflect_mask_coord = HSM_GetLayerCoord(VIEWPORT_COORD, HSM_REFLECT_MASK_FOLLOW_LAYER, HSM_REFLECT_MASK_FOLLOW_MODE, reflect_mask_scale);
-		float reflect_mask = HSM_GetMipmappedTexSample(ReflectionMaskImage, reflect_mask_coord, reflect_mask_scale, HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS).r;
-		reflect_mask = clamp(HSM_REFLECT_MASK_BLACK_LEVEL * (reflect_mask - 1) + 1, 0, 1);
-		reflect_mask *= HSM_REFLECT_MASK_BRIGHTNESS;
-
-		frag_color_linear.a = HSM_REFLECT_MASK_IMAGE_AMOUNT * reflect_mask + (1 - HSM_REFLECT_MASK_IMAGE_AMOUNT);
-	}
-	else
-		frag_color_linear.a = 1;
-
-	#endif
-
-	FragColor = frag_color_linear;
-
-	// If we have calculated an image then set -1 as a flag to show that we have
-	if (UNFLIPPED_VIEWPORT_COORD.x < (2 / global.OutputSize.x) && UNFLIPPED_VIEWPORT_COORD.y < (2 / global.OutputSize.y))
-		FragColor.a = -1;
-
-	return;
-}
diff --git a/bezel/Mega_Bezel/shaders/base/blur-outside-screen-horiz.slang b/bezel/Mega_Bezel/shaders/base/blur-outside-screen-horiz.slang
deleted file mode 100644
index 5e2863e98c..0000000000
--- a/bezel/Mega_Bezel/shaders/base/blur-outside-screen-horiz.slang
+++ /dev/null
@@ -1,30 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2021 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-// #define VERTICAL_BLUR
-
-// Import Screen Scale Functions and global structure
-#include "blur-outside-screen.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/blur-outside-screen-vert.slang b/bezel/Mega_Bezel/shaders/base/blur-outside-screen-vert.slang
deleted file mode 100644
index 30ff22466b..0000000000
--- a/bezel/Mega_Bezel/shaders/base/blur-outside-screen-vert.slang
+++ /dev/null
@@ -1,31 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2021 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#define VERTICAL_BLUR
-
-// Import Screen Scale Functions and global structure
-#include "blur-outside-screen.inc"
-
diff --git a/bezel/Mega_Bezel/shaders/base/blur-outside-screen.inc b/bezel/Mega_Bezel/shaders/base/blur-outside-screen.inc
deleted file mode 100644
index 2b93bb2776..0000000000
--- a/bezel/Mega_Bezel/shaders/base/blur-outside-screen.inc
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-#include "common/globals-and-reflection-params.inc"
-#include "common/common-functions.inc"
-#include "common/common-functions-bezel.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 VIEWPORT_COORD;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord * 1.0001;
-	VIEWPORT_COORD = vTexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 VIEWPORT_COORD;
-
-layout(location = 0) out vec4 FragColor;
-
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D BR_MirrorLowResPass;
-
-layout(set = 0, binding = 4) uniform sampler2D InfoCachePass;
-
-float clamp_0_1(float in_value)
-{
-	return clamp(in_value, 0, 1);
-}
-
-void main()
-{
-	if (HSM_REFLECT_BLUR_NUM_SAMPLES > 0)
-	{
-		vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-		HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-		vec2 tube_curved_coord_ctr = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1) - 0.5;
-
-		//----------------------------------------------------
-		//  Calculate Outside mapping Coords
-		//----------------------------------------------------
-
-		/* This first big chunk is to get a mapping of the space outside of the screen which is continuous
-		This is more complicated than you would expect because since we are using curved coordinates 
-		there are discontinuities outside the normal screen corners, e.g. where x > 1 and y > 1
-		So instead of trying to use the coordinates from the screen/tube we use a larger space 
-		and subtract the screen space to see how far we are outside of the sreen
-		*/
-
-		// Additional scale to be applied to the tube scale to create an expanded mapping area 
-		vec2 outermap_scale = vec2(1, 1) * (1.3 + 1);
-
-		// Get a range width from the outer tube edge to the outer edge of the outermap
-		float outermap_range = 0.5 * (outermap_scale.y) * 0.7;
-		vec2 outermap_warped_coord_ctr = tube_curved_coord_ctr;
-		vec2 outermap_warped_outside_screen_vector = outermap_warped_coord_ctr - clamp(outermap_warped_coord_ctr, -0.490, 0.490);
-		float outside_ratio_warped = clamp(length(outermap_warped_outside_screen_vector) / outermap_range, 0, 1);
-
-		float hbl_sharpness_falloff_distance = 7 * HSM_REFLECT_BLUR_FALLOFF_DISTANCE;
-		if (HSM_GLASS_BORDER_ON == 1)
-			hbl_sharpness_falloff_distance = 20;
-
-		float blur_ratio = clamp_0_1(outside_ratio_warped / (hbl_sharpness_falloff_distance / 100));
-		float blur_midpoint = 0.12;
-		float hbl_sharpness_falloff_speed = 1;
-		blur_ratio = HHLP_QuadraticBezier (clamp_0_1(blur_ratio - blur_midpoint), vec2(0.05, hbl_sharpness_falloff_speed));
-
-
-		blur_ratio = HSM_REFLECT_BLUR_MIN + blur_ratio * (HSM_REFLECT_BLUR_MAX - HSM_REFLECT_BLUR_MIN);
-
-		vec3 col = vec3(0.0);
-		
-		#ifdef VERTICAL_BLUR
-			float dx = 0;
-			float dy = global.SourceSize.w;
-		#else
-			float dx = global.SourceSize.z;
-			float dy = 0;
-		#endif
-
-		// This bizarre bit is to try to take the non linear nature of the blur falloff value and make it into a more linear behavior
-		float last_blur_ratio_blend_point = 0.6;
-
-		float max_blur_range = 7;
-		float min_blur_range = 10;
-		float blur_falloff = (  0.5 +
-								max_blur_range * smoothstep(1, last_blur_ratio_blend_point, blur_ratio) +
-								min_blur_range * smoothstep(last_blur_ratio_blend_point, 0, blur_ratio)
-								) / 100;
-
-		float blend_with_unblurred = smoothstep(-0.3, 0.3, HHLP_QuadraticBezier(blur_ratio, vec2(0.5, 0.5)));
-
-		float k_total = 0.;
-		for (float i = -HSM_REFLECT_BLUR_NUM_SAMPLES; i <= HSM_REFLECT_BLUR_NUM_SAMPLES; i++)
-		{
-			float k = exp(-blur_falloff * (i) * (i));
-			k_total += k;
-			
-			vec2 sample_coord = vTexCoord + vec2(float(i) * dx, float(i) * dy);
-			vec4 sampled_color = texture(Source, sample_coord);
-			
-			col += k * sampled_color.rgb;
-		}
-		vec4 blurred_color = vec4(col / k_total, 1.0);
-
-		vec4 unblurred_color = texture(BR_MirrorLowResPass, vTexCoord);
-		FragColor = mix(unblurred_color, blurred_color, blend_with_unblurred);
-	}
-	else
-	{
-		FragColor = texture(Source, vTexCoord);
-	}
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/cache-info-all-params.slang b/bezel/Mega_Bezel/shaders/base/cache-info-all-params.slang
deleted file mode 100644
index a5587df510..0000000000
--- a/bezel/Mega_Bezel/shaders/base/cache-info-all-params.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-all-params.inc"
-#include "common/common-functions.inc"
-#include "cache-info.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/cache-info-glass-params.slang b/bezel/Mega_Bezel/shaders/base/cache-info-glass-params.slang
deleted file mode 100644
index 684dd6ff95..0000000000
--- a/bezel/Mega_Bezel/shaders/base/cache-info-glass-params.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-glass-params.inc"
-#include "common/common-functions.inc"
-#include "cache-info.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/cache-info-no-reflect-params.slang b/bezel/Mega_Bezel/shaders/base/cache-info-no-reflect-params.slang
deleted file mode 100644
index e62a962d0c..0000000000
--- a/bezel/Mega_Bezel/shaders/base/cache-info-no-reflect-params.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-
-#include "common/globals-and-image-layers-params.inc"
-#include "common/common-functions.inc"
-#include "cache-info.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/cache-info-potato-params.slang b/bezel/Mega_Bezel/shaders/base/cache-info-potato-params.slang
deleted file mode 100644
index aef6551eae..0000000000
--- a/bezel/Mega_Bezel/shaders/base/cache-info-potato-params.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-potato-params.inc"
-#include "common/common-functions.inc"
-#include "cache-info.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/cache-info-screen-scale-params.slang b/bezel/Mega_Bezel/shaders/base/cache-info-screen-scale-params.slang
deleted file mode 100644
index 6908cdefca..0000000000
--- a/bezel/Mega_Bezel/shaders/base/cache-info-screen-scale-params.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-screen-scale-params.inc"
-#include "common/common-functions.inc"
-#include "cache-info.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/cache-info.inc b/bezel/Mega_Bezel/shaders/base/cache-info.inc
deleted file mode 100644
index a822a4d1ba..0000000000
--- a/bezel/Mega_Bezel/shaders/base/cache-info.inc
+++ /dev/null
@@ -1,1368 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-#pragma format R32G32B32A32_SFLOAT
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-layout(set = 0, binding = 2) uniform sampler2D InfoCachePassFeedback;
-layout(set = 0, binding = 3) uniform sampler2D ScreenPlacementImage;
-
-// Get the original size with split area added
-vec2 HSM_GetScreenCorePreppedSize(float screen_index)
-{
-	vec2 core_prepped_size = global.DerezedPassSize.xy;
-
-	if (HSM_DUALSCREEN_MODE > 0)
-		if (HSM_GetCoreImageSplitDirection() == 1)
-			core_prepped_size.y *= 0.5;
-		else
-			core_prepped_size.x *= 0.5;
-
-	return core_prepped_size;
-}
-
-vec2 HSM_GetRotatedScreenCorePreppedSize(float screen_index)
-{
-	vec2 original_size = HSM_GetScreenCorePreppedSize(screen_index);
-	return abs(HSM_ROTATE_CORE_IMAGE) * original_size.yx + (1 - abs(HSM_ROTATE_CORE_IMAGE)) * original_size.xy;
-}
-
-vec2 HSM_GetRotatedScreenDerezedSize()
-{
-	vec2 pass_size = global.DerezedPassSize.xy;
-
-	if (HSM_DUALSCREEN_MODE > 0)
-		if (HSM_GetCoreImageSplitDirection() == 1)
-			pass_size.y *= 0.5;
-		else
-			pass_size.x *= 0.5;
-
-	return abs(HSM_ROTATE_CORE_IMAGE) * pass_size.yx + (1 - abs(HSM_ROTATE_CORE_IMAGE)) * pass_size.xy;
-}
-
-float HSM_GetUseVerticalScanlines(float screen_aspect)
-{
-	float auto_use_vert_scanlines = screen_aspect < 1 ? 1 : 0;
-	float out_scanline_direction = 0;
-	
-	if (HSM_SCANLINE_DIRECTION < 1)
-		out_scanline_direction = screen_aspect < 1 ? 1 : 0;
-	else if (HSM_SCANLINE_DIRECTION > 1.5)
-		out_scanline_direction = 1;
-
-	return out_scanline_direction;
-}
-
-vec2 HSM_GetScreenScaleWithEdgeHeight(vec2 edge_thickness, vec2 screen_scale)
-// Edge thickness is a 0 to 1 percentage of the screen height
-{
-	float output_aspect_ratio = global.FinalViewportSize.x / global.FinalViewportSize.y;
-	
-	float aspect_ratio = screen_scale.x / screen_scale.y;
-	
-	vec2 edge_width_height_as_scale = vec2(0, 0);
-	edge_width_height_as_scale.x = 1 + (edge_thickness.x / screen_scale.y) / aspect_ratio / output_aspect_ratio;
-	edge_width_height_as_scale.y = 1 + edge_thickness.y / screen_scale.y;
-
-	return screen_scale * edge_width_height_as_scale;
-}
-
-// Same as the HSM_GetScreenScale, but adds the width of the black edge
-// Used for adding thickness around the screen like the black edge
-vec2 HSM_GetTubeScale(vec2 screen_scale, float image_placement_screen_height, vec2 edge_thickness)
-{
-	// Add switch for independent scale
-	if (HSM_BZL_USE_INDEPENDENT_SCALE == 1)
-	{
-		if (HSM_USE_IMAGE_FOR_PLACEMENT > 0.5)
-			screen_scale = screen_scale / screen_scale.y * image_placement_screen_height * HSM_BZL_INDEPENDENT_SCALE / DEFAULT_SCREEN_HEIGHT;
-		else
-			screen_scale = screen_scale / screen_scale.y * HSM_BZL_INDEPENDENT_SCALE;
-	}
-
-	float normalized_screen_height = screen_scale.y / DEFAULT_UNCORRECTED_SCREEN_SCALE.y;
-	return HSM_GetScreenScaleWithEdgeHeight(edge_thickness * vec2(1.2 / 100.0 * normalized_screen_height), screen_scale * HSM_BZL_SCALE_OFFSET);
-}
-
-// TODO need to get the screen scale before integer scale so we can derive automatic scanlines from it
-// HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE
-vec2 HSM_GetScreenScale(float screen_aspect, float screen_height_from_image, vec2 cropped_size)
-{
-	if (HSM_ASPECT_RATIO_MODE > 5.5)
-	{
-		return vec2(1, 1);
-	}
-	else
-	{
-		float output_aspect_ratio = global.FinalViewportSize.x / global.FinalViewportSize.y;
-
-		bool viewport_is_vertical = (global.FinalViewportSize.x < global.FinalViewportSize.y);
-
-		float vertical_preset_scale_mult = HSM_VERTICAL_PRESET > 0.5 || viewport_is_vertical ? DEFAULT_SCREEN_HEIGHT_PORTRAIT_MULTIPLIER : 1;
-		float screen_height = HSM_NON_INTEGER_SCALE * vertical_preset_scale_mult;
-
-		if (HSM_DUALSCREEN_MODE > 0)
-			screen_height *= 0.5;
-
-		if (HSM_INT_SCALE_MODE == 0)
-		{
-			if (HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER == 1)
-			{
-				float monitor_aspect_with_rotation = HSM_VERTICAL_PRESET > 0.5 || viewport_is_vertical ? 1 / HSM_PHYSICAL_MONITOR_ASPECT_RATIO : HSM_PHYSICAL_MONITOR_ASPECT_RATIO;
-				float monitor_height = HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE / sqrt(monitor_aspect_with_rotation * monitor_aspect_with_rotation + 1);
-				float sim_screen_height = HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE / sqrt(screen_aspect * screen_aspect + 1);
-
-				screen_height = 0.012 + sim_screen_height / monitor_height;
-			}
-
-			if (HSM_USE_IMAGE_FOR_PLACEMENT == 1)
-				screen_height = screen_height_from_image;
-
-			screen_height *= HSM_NON_INTEGER_SCALE_OFFSET;
-
-			// If the integer tolerance is greater than zero see if we can snap to the nearest integer multiple
-			if (HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE > 0)
-			{
-				float integer_scale_multiple_vert = screen_height * global.FinalViewportSize.y / cropped_size.y;
-				float int_scale_remainder = fract(integer_scale_multiple_vert);
-				int_scale_remainder = (int_scale_remainder < 1 - int_scale_remainder) ? int_scale_remainder : 1 - int_scale_remainder;
-				float remainder_percent_of_screen_height = (int_scale_remainder * cropped_size.y) / (screen_height * global.FinalViewportSize.y);
-				if (remainder_percent_of_screen_height < HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE)
-				{
-					integer_scale_multiple_vert = round(integer_scale_multiple_vert);
-					screen_height = integer_scale_multiple_vert * cropped_size.y / global.FinalViewportSize.y;
-				}
-			}
-
-			return vec2(screen_aspect / output_aspect_ratio, 1) * screen_height;
-		}
-
-		// Get the maximum height that the integer scale needs to fit into
-		float viewport_res_y_without_border = global.FinalViewportSize.y - (1 - HSM_INT_SCALE_MAX_HEIGHT) * global.FinalViewportSize.y;
-		float viewport_res_x_without_border = global.FinalViewportSize.x - (1 - HSM_INT_SCALE_MAX_HEIGHT) * global.FinalViewportSize.x;
-
-		if (HSM_DUALSCREEN_MODE == 1)
-			viewport_res_y_without_border = global.FinalViewportSize.y / 2 - 0.5 * (1 - HSM_INT_SCALE_MAX_HEIGHT) * global.FinalViewportSize.y;
-
-		if (HSM_DUALSCREEN_MODE == 2)
-			viewport_res_x_without_border *= global.FinalViewportSize.x / 2 - 0.5 * (1 - HSM_INT_SCALE_MAX_HEIGHT) * global.FinalViewportSize.x;
-
-		// If the viewport is taller than it is wide then get the height from the corresponding available width
-		if (viewport_is_vertical) viewport_res_y_without_border = viewport_res_x_without_border / screen_aspect;
-
-		// If the screen is too high
-		if ((viewport_res_y_without_border * screen_aspect) > global.FinalViewportSize.x)
-		{
-			viewport_res_y_without_border = (1 - 2 * (1 - HSM_INT_SCALE_MAX_HEIGHT)) * global.FinalViewportSize.x / screen_aspect; 
-		}
-
-		float integer_scale_multiple_vert = clamp(floor(viewport_res_y_without_border / cropped_size.y) + HSM_INT_SCALE_MULTIPLE_OFFSET, 1, 100);
-		float integer_scale_vert = integer_scale_multiple_vert * cropped_size.y / global.FinalViewportSize.y;
-
-		// Get the horizontal scale from the vertical scale and aspect ratio
-		float integer_scale_horz_from_aspect = screen_aspect / output_aspect_ratio * integer_scale_vert;
-
-		// Get the scale as a multiple of the original x-size
-		float integer_scale_multiple_horz = integer_scale_horz_from_aspect * global.FinalViewportSize.x / cropped_size.x;
-
-		// If we are using vertical scanlines or integer scale is set to both directions make the horizontal multiple an integer
-		float final_int_scale_mode = HSM_INT_SCALE_MODE;
-		if (HSM_INT_SCALE_MODE > 0.5)
-		{
-			if (HSM_GetUseVerticalScanlines(screen_aspect) == 1 || HSM_INT_SCALE_MODE == 2)
-			{
-				integer_scale_multiple_horz = round(integer_scale_multiple_horz);
-				final_int_scale_mode = 2;
-			}
-		}
-
-		float both_axes = clamp((final_int_scale_mode - 1) * 10000, 0, 1);
-		integer_scale_multiple_vert += both_axes * abs(clamp((screen_aspect - 1) * 10000, -1, 0)) * HSM_INT_SCALE_MULTIPLE_OFFSET_LONG;
-		integer_scale_multiple_horz += both_axes * abs(clamp((screen_aspect - 1) * 10000,  0, 1)) * HSM_INT_SCALE_MULTIPLE_OFFSET_LONG;
-
-		integer_scale_vert = integer_scale_multiple_vert * cropped_size.y / global.FinalViewportSize.y;
-		float integer_scale_horz = integer_scale_multiple_horz * cropped_size.x / global.FinalViewportSize.x;
-
-		return vec2(integer_scale_horz, integer_scale_vert);
-	}
-}
-
-vec2 HSM_GetScreenScaleFor2ndScreen(vec2 screen_scale, float screen_aspect)
-{
-	vec2 out_screen_scale = screen_scale;
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-
-	if (HSM_2ND_SCREEN_INDEPENDENT_SCALE == 1)
-		out_screen_scale = DEFAULT_UNCORRECTED_SCREEN_SCALE.y * 0.5 * vec2(screen_aspect / output_aspect, 1);
-	else
-		out_screen_scale = screen_scale.y * vec2(screen_aspect / output_aspect, 1);
-
-	out_screen_scale *= HSM_2ND_SCREEN_SCALE_OFFSET;
-
-	return out_screen_scale;
-}
-
-float HSM_GetIsCorePreppedSizeVertical(float screen_index)
-{
-	vec2 rotated_original_size = HSM_GetRotatedScreenCorePreppedSize(screen_index);
-	float aspect_ratio = rotated_original_size.x / rotated_original_size.y;
-	return aspect_ratio < 1 ? 1 : 0;
-}
-
-vec2 HSM_GetResMult(float use_vert_scanlines)
-{
-	vec2 sampling_mult = vec2(HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR, HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR);
-	
-	if (use_vert_scanlines == 1 && HSM_ROTATE_CORE_IMAGE == 0 || use_vert_scanlines == 0 && abs(HSM_ROTATE_CORE_IMAGE) == 1)
-		sampling_mult = sampling_mult.yx;
-
-	return sampling_mult;
-}
-
-bool HSM_ResolutionIsEqual(vec2 in_res, vec2 match_res)
-{
-	return (in_res == match_res);
-}
-
-// if return_rough_aspect is on we only get a rough aspect which doesn't 
-// require the cropped_size (which implicates the use_vertical_scanlines)
-float HSM_GetScreenAspect(float screen_index, vec2 cropped_size)
-{
-	vec2 original_size = HSM_GetRotatedCoreOriginalSize();
-	vec2 rotated_original_size = HSM_GetRotatedCoreOriginalSize();
-	float core_aspect_ratio = rotated_original_size.x / rotated_original_size.y;
-	float core_aspect_horizontal = (core_aspect_ratio < 1) ? 1 / core_aspect_ratio : core_aspect_ratio;
-	float horizontal_aspect = 0;
-
-	vec2 atari_lynx_res = 					vec2(160, 102);
-	vec2 atari_2600_res = 					vec2(160, 228);
-	vec2 atari_2600_crop_res = 				vec2(152, 228);
-	vec2 nintendo_gameboy_advance_res = 	vec2(240, 160);
-	vec2 nintendo_gameboy_res = 			vec2(160, 144);
-	vec2 nintendo_ds_res = 					vec2(256, 192);
-	vec2 nintendo_ds_top_bottom_res = 		vec2(256, 384);
-	vec2 nintendo_ds_side_by_side_res = 	vec2(512, 192);
-	vec2 nintendo_3ds_top_res = 			vec2(400, 240);
-	vec2 nintendo_3ds_bottom_res = 			vec2(320, 240);
-	vec2 nintendo_3ds_top_bottom_res = 		vec2(400, 480);
-	vec2 nintendo_3ds_side_by_side_res = 	vec2(720, 240);
-	vec2 sega_saturn_fmv_res = 				vec2(352, 480);
-	vec2 sony_psp = 						vec2(480, 272);
-	vec2 sony_ps_fmv_res = 					vec2(320, 480);
-	vec2 sony_ps_fmv_res_2 = 				vec2(512, 480);
-
-	// This should handle some PS games with weird resolutions like Tekken and Driver 
-	float sony_ps_height = 448;
-	
-	if (HSM_ASPECT_RATIO_MODE == 0)
-	{
-		// If the vertical res is larger than 580 is is probably a modern square pixel resolution
-		// 576 seems to be PAL vertical resolution used sometimes
- 		if (original_size.y > 580) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(sony_psp, 						original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_gameboy_advance_res, 	original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_gameboy_res, 			original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_ds_res, 				original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_ds_top_bottom_res, 		original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_ds_side_by_side_res, 	original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_3ds_top_res, 			original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_3ds_bottom_res, 		original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_3ds_top_bottom_res, 	original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(nintendo_3ds_side_by_side_res, 	original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(atari_lynx_res, 					original_size)) horizontal_aspect = core_aspect_horizontal;
-		else if (HSM_ResolutionIsEqual(atari_2600_res, 					original_size)) horizontal_aspect = 1.333;
-		else if (HSM_ResolutionIsEqual(atari_2600_crop_res, 			original_size)) horizontal_aspect = 1.333;
-		else if (HSM_ResolutionIsEqual(sony_ps_fmv_res, 				original_size)) horizontal_aspect = 1.333;
-		else if (HSM_ResolutionIsEqual(sony_ps_fmv_res_2, 				original_size)) horizontal_aspect = 1.333;
-		else if (original_size.y == sony_ps_height) 									horizontal_aspect = 1.333;
-		// Fall back to the explicit ratio
-		else horizontal_aspect = HSM_ASPECT_RATIO_EXPLICIT;
-	}
-	else 
-		if (HSM_ASPECT_RATIO_MODE == 1) horizontal_aspect = HSM_ASPECT_RATIO_EXPLICIT;
-		else if (HSM_ASPECT_RATIO_MODE == 2) horizontal_aspect = 1.3333;
-		else if (HSM_ASPECT_RATIO_MODE == 3) horizontal_aspect = 1.5;
-		else if (HSM_ASPECT_RATIO_MODE == 4) horizontal_aspect = 1.7777;
-		else if (HSM_ASPECT_RATIO_MODE == 5) horizontal_aspect = cropped_size.x / cropped_size.y;
-		else if (HSM_ASPECT_RATIO_MODE == 6) horizontal_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-		else horizontal_aspect = 1.333;
-
-	// Find what the vertical aspect would be, either the current horizontal_aspect (if it's already vertical)
-	// Or changing the horizontal aspect to vertical by taking the reciprocal
-	float vertical_aspect = 1 / horizontal_aspect;
-	float final_orientation = HSM_ASPECT_RATIO_ORIENTATION;
-
-	if (HSM_ASPECT_RATIO_ORIENTATION < 0.5)
-	{
-		// Catch for Atari 2600 - Stella Emulator which would otherwise show up as a vertical aspect ratio
-		if (
-				HSM_ResolutionIsEqual(atari_2600_res, original_size) || 
-		   		HSM_ResolutionIsEqual(atari_2600_crop_res, original_size) ||
-		   		HSM_ResolutionIsEqual(sega_saturn_fmv_res, original_size) ||
-				HSM_ResolutionIsEqual(sony_ps_fmv_res, original_size) ||
-				HSM_ResolutionIsEqual(sony_ps_fmv_res_2, original_size) ||
-				original_size.y == sony_ps_height
-		   ) 
-		{
-		   final_orientation = 1;
-		}
-		else
-		{
-			final_orientation = (HSM_GetIsCorePreppedSizeVertical(screen_index) > 0.5) ? 2 : 1;
-		}
-	}
-	
-	float final_aspect_ratio = (final_orientation < 1.5) ? horizontal_aspect : vertical_aspect;
-
-	return final_aspect_ratio;
-}
-
-int HSM_IsCoordIn2DRange(vec2 in_coord, vec4 in_2d_range)
-{
-	return (in_coord.x > in_2d_range.x && 
-			in_coord.y > in_2d_range.y && 
-			in_coord.x < in_2d_range.z && 
-			in_coord.y < in_2d_range.w ) ? 1 : 0;
-}
-
-// HSM_CROP_BLACK_ONLY
-vec4 HSM_GetBlackOnlyCropInPixels(sampler2D in_sampler_2D, vec2 sample_start_pixel_coord, vec2 window_size, float num_samples, vec4 max_crop)
-{
-	// HSM_GetTexSampleFromSampleStartAndSize(sampler2D in_sampler, vec2 in_screen_coord, vec2 sample_start_pixel_coord, vec2 window_size)
-
-	// Working except Bottom and Right edges jump back and forth and are not very accurate
-
-	vec4 tex_sample = vec4(0);
-	float brightness = 0;
-	float test_crop = 0;
-
-	float crop_left_px = max_crop.x;
-	float crop_top_px = max_crop.y;
-	float crop_right_px = max_crop.z;
-	float crop_bottom_px = max_crop.w;
-
-	// Should use as many samples as crop pixels
-	float final_crop_left_px = crop_left_px;
-	test_crop = crop_left_px;
-	for (int i=0; i < crop_left_px; i++)
-	{
-		tex_sample = HSM_GetTexSampleFromSampleStartAndSize(in_sampler_2D, vec2((test_crop - 0.5) / window_size.x, 0.5), sample_start_pixel_coord, window_size);
-		brightness = tex_sample.r + tex_sample.g + tex_sample.b;
-		if (brightness > HSM_CROP_BLACK_THRESHOLD)
-		{
-			final_crop_left_px = min(final_crop_left_px, test_crop);
-		}
-		test_crop -= 1;
-	}
-	final_crop_left_px -= 1;
-
-	float final_crop_top_px = crop_top_px;
-	test_crop = crop_top_px;
-	for (int i=0; i < crop_top_px; i++)
-	{
-		tex_sample = HSM_GetTexSampleFromSampleStartAndSize(in_sampler_2D, vec2(0.5, (test_crop - 0.5) / window_size.y), sample_start_pixel_coord, window_size);
-		brightness = tex_sample.r + tex_sample.g + tex_sample.b;
-		if (brightness > HSM_CROP_BLACK_THRESHOLD)
-		{
-			final_crop_top_px = test_crop;
-		}
-		test_crop -= 1;
-	}
-	final_crop_top_px -= 1;
-
-	float final_crop_right_px = crop_right_px;
-	test_crop = crop_right_px;
-	for (int i=0; i < crop_right_px; i++)
-	{
-		tex_sample = HSM_GetTexSampleFromSampleStartAndSize(in_sampler_2D, vec2((window_size.x - test_crop + 0.5) / window_size.x, 0.5), sample_start_pixel_coord, window_size);
-		brightness = tex_sample.r + tex_sample.g + tex_sample.b;
-		if (brightness > HSM_CROP_BLACK_THRESHOLD)
-		{
-			final_crop_right_px = test_crop;
-		}
-		test_crop -= 1;
-	}
-	final_crop_right_px -= 2;
-
-	float final_crop_bottom_px = crop_bottom_px;
-	test_crop = crop_bottom_px;
-	for (int i=0; i < crop_bottom_px; i++)
-	{
-		tex_sample = HSM_GetTexSampleFromSampleStartAndSize(in_sampler_2D, vec2(0.5, (window_size.y - test_crop + 0.5) / window_size.y), sample_start_pixel_coord, window_size);
-		brightness = tex_sample.r + tex_sample.g + tex_sample.b;
-		if (brightness > 0)
-		{
-			final_crop_bottom_px = test_crop;
-		}
-		test_crop -= 1;
-	}
-	final_crop_bottom_px -= 2;
-
-	return clamp(vec4(final_crop_left_px, final_crop_top_px, final_crop_right_px, final_crop_bottom_px), 0, 512);
-}
-
-void HSM_GetCroppedRotatedSizeAndPixelSampleAreaStart(float screen_index, sampler2D original_pass, inout vec2 cropped_rotated_size, inout vec2 cropped_sample_area_start)
-{
-	screen_index = HSM_GetSwappedScreenIndex(screen_index);
-	vec2 rotated_negative_crop_added_size = HSM_GetRotatedDerezedSize();
-
-	float default_crop_left_px = floor(MAX_NEGATIVE_CROP * rotated_negative_crop_added_size.x);
-	float default_crop_top_px = floor(MAX_NEGATIVE_CROP * rotated_negative_crop_added_size.y);
-	float default_crop_right_px = floor(MAX_NEGATIVE_CROP * rotated_negative_crop_added_size.x);
-	float default_crop_bottom_px = floor(MAX_NEGATIVE_CROP * rotated_negative_crop_added_size.y);
-
-	float zoom_crop_left_px = floor(HSM_CROP_PERCENT_ZOOM * rotated_negative_crop_added_size.x);
-	float zoom_crop_top_px = floor(HSM_CROP_PERCENT_ZOOM * rotated_negative_crop_added_size.y);
-	float zoom_crop_right_px = floor(HSM_CROP_PERCENT_ZOOM * rotated_negative_crop_added_size.x);
-	float zoom_crop_bottom_px = floor(HSM_CROP_PERCENT_ZOOM * rotated_negative_crop_added_size.y);
-
-	float crop_left_px = floor(HSM_CROP_PERCENT_LEFT * rotated_negative_crop_added_size.x);
-	float crop_top_px = floor(HSM_CROP_PERCENT_TOP * rotated_negative_crop_added_size.y);
-	float crop_right_px = floor(HSM_CROP_PERCENT_RIGHT * rotated_negative_crop_added_size.x);
-	float crop_bottom_px = floor(HSM_CROP_PERCENT_BOTTOM * rotated_negative_crop_added_size.y);
-
-	float final_crop_left_px = 0;
-	float final_crop_top_px = 0;
-	float final_crop_right_px = 0;
-	float final_crop_bottom_px = 0;
-
-	if (HSM_DUALSCREEN_MODE > 0)
-	{
-		float zoom_crop = 0;
-		if (screen_index == 2)
-		{
-			crop_left_px = floor(HSM_2ND_SCREEN_CROP_PERCENT_LEFT * rotated_negative_crop_added_size.x);
-			crop_top_px = floor(HSM_2ND_SCREEN_CROP_PERCENT_TOP * rotated_negative_crop_added_size.y);
-			crop_right_px = floor(HSM_2ND_SCREEN_CROP_PERCENT_RIGHT * rotated_negative_crop_added_size.x);
-			crop_bottom_px = floor(HSM_2ND_SCREEN_CROP_PERCENT_BOTTOM * rotated_negative_crop_added_size.y);
-			zoom_crop = HSM_2ND_SCREEN_CROP_PERCENT_ZOOM;
-
-			if (HSM_GetCoreImageSplitDirection() == 1)
-			{
-				default_crop_top_px = floor(rotated_negative_crop_added_size.y * (0.5 - HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET));
-				crop_top_px = floor(crop_top_px / 2);
-				crop_bottom_px = floor(crop_bottom_px / 2);
-			}
-			else
-			{
-				default_crop_left_px = floor(rotated_negative_crop_added_size.x * (0.5 - HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET));
-				crop_left_px = floor(crop_left_px / 2);
-				crop_right_px = floor(crop_right_px / 2);
-			}
-		}
-		else
-		{
-			zoom_crop = HSM_CROP_PERCENT_ZOOM;
-			if (HSM_GetCoreImageSplitDirection() == 1)
-			{
-				default_crop_bottom_px = floor(rotated_negative_crop_added_size.y * (0.5 + HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET));
-				crop_top_px = floor(crop_top_px / 2);
-				crop_bottom_px = floor(crop_bottom_px / 2);
-			}
-			else
-			{
-				default_crop_right_px = floor(rotated_negative_crop_added_size.x * (0.5 + HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET));
-				crop_left_px = floor(crop_left_px / 2);
-				crop_right_px = floor(crop_right_px / 2);
-			}	
-		}
-
-		vec2 base_cropped_size = rotated_negative_crop_added_size - vec2(final_crop_left_px + final_crop_right_px, final_crop_top_px + final_crop_bottom_px);
-
-		if (HSM_GetCoreImageSplitDirection() == 1)
-		{
-			zoom_crop_top_px = floor(base_cropped_size.x * zoom_crop / 2);
-		}
-		else
-		{
-			zoom_crop_left_px = floor(base_cropped_size.y * zoom_crop / 2);
-		}
-
-		zoom_crop_right_px = zoom_crop_left_px;
-		zoom_crop_bottom_px = zoom_crop_top_px;
-
-		// TODO currently overwriting split screen
-		final_crop_top_px += default_crop_top_px + crop_top_px + zoom_crop_top_px;
-		final_crop_left_px += default_crop_left_px + crop_left_px + zoom_crop_left_px;
-		final_crop_right_px += default_crop_right_px + crop_right_px + zoom_crop_right_px;
-		final_crop_bottom_px += default_crop_bottom_px + crop_bottom_px + zoom_crop_bottom_px;
-	}
-	else
-	{
-		// No Cropping
-		if (HSM_CROP_MODE == 0)
-		{
-			final_crop_left_px = default_crop_left_px;
-			final_crop_top_px = default_crop_top_px;
-			final_crop_right_px = default_crop_right_px;
-			final_crop_bottom_px = default_crop_bottom_px;
-		}
-		// Crop Only Black
-		else if (HSM_CROP_MODE == 1)
-		{
-			// vec4 max_crop = vec4(crop_left_px + zoom_crop_left_px, crop_top_px + zoom_crop_top_px, crop_right_px + zoom_crop_right_px, crop_bottom_px + zoom_crop_bottom_px);
-			vec4 max_crop = vec4(default_crop_left_px + crop_left_px + zoom_crop_left_px, default_crop_top_px + crop_top_px + zoom_crop_top_px, default_crop_right_px + crop_right_px + zoom_crop_right_px, default_crop_bottom_px + crop_bottom_px + zoom_crop_bottom_px);
-
-			// Start and window where we are going to test for the black area
-			// vec2 black_sample_start_coord_px = vec2(default_crop_left_px, default_crop_top_px);
-			// vec2 black_sample_window = rotated_negative_crop_added_size - vec2(default_crop_left_px + default_crop_right_px, default_crop_top_px + default_crop_bottom_px);
-
-			vec2 black_sample_start_coord_px = vec2(0);
-			vec2 black_sample_window = rotated_negative_crop_added_size;
-
-			vec4 cropping = HSM_GetBlackOnlyCropInPixels(original_pass, black_sample_start_coord_px, black_sample_window, 100, max_crop);
-
-			final_crop_left_px = cropping.x;
-			final_crop_top_px = cropping.y;
-			final_crop_right_px = cropping.z;
-			final_crop_bottom_px = cropping.w;
-		}
-		else
-		{
-			final_crop_top_px = default_crop_top_px + crop_top_px + zoom_crop_top_px;
-			final_crop_left_px = default_crop_left_px + crop_left_px + zoom_crop_left_px;
-			final_crop_bottom_px = default_crop_bottom_px + crop_bottom_px + zoom_crop_bottom_px;
-			final_crop_right_px = default_crop_right_px + crop_right_px + zoom_crop_right_px;
-		}
-
-	}
- 
-	// Make sure we don't actually negatively crop
-	final_crop_top_px = clamp(final_crop_top_px, 0, 20000);
-	final_crop_bottom_px = clamp(final_crop_bottom_px, 0, 20000);
-	final_crop_left_px = clamp(final_crop_left_px, 0, 20000);
-	final_crop_right_px = clamp(final_crop_right_px, 0, 20000);
-
-	cropped_rotated_size = rotated_negative_crop_added_size - vec2(final_crop_left_px + final_crop_right_px, final_crop_top_px + final_crop_bottom_px);
-	cropped_sample_area_start = vec2(final_crop_left_px, final_crop_top_px);
-}
-
-vec2 HSM_GetCroppedRotatedSizeWithResMult(vec2 cropped_rotated_size, vec2 sampling_mult)
-{
-	sampling_mult = abs(HSM_ROTATE_CORE_IMAGE) == 1 ? sampling_mult.yx : sampling_mult.xy;
-	return ceil(cropped_rotated_size * sampling_mult.xy);
-}
-
-float HSM_GetParameterSum()
-{
-	float out_sum = (0
-					+ global.FinalViewportSize.x
-					+ global.FinalViewportSize.y
-
-					+ HSM_GLOBAL_GRAPHICS_BRIGHTNESS * 100
-					+ HSM_STATIC_LAYERS_GAMMA
-
-					+ HSM_SINDEN_BORDER_ON
-					+ HSM_SINDEN_BORDER_THICKNESS
-					+ HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION
-
-					+ HSM_CACHE_GRAPHICS_ON
-					
-					// Night Lighting
-					+ HSM_AMBIENT_LIGHTING_OPACITY * 100
-					+ HSM_AMBIENT1_OPACITY * 100
-					+ HSM_AMBIENT2_OPACITY * 100
-					+ HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE
-
-					//    Zoom & Pan
-					+ HSM_VIEWPORT_ZOOM * 100
-					+ HSM_VIEWPORT_POSITION_X * 1000
-					+ HSM_VIEWPORT_POSITION_Y * 1000
-
-					//    FLIP & ROTATE
-					+ HSM_FLIP_VIEWPORT_VERTICAL
-					+ HSM_FLIP_VIEWPORT_HORIZONTAL
-					// + HSM_FLIP_CORE_VERTICAL
-					// + HSM_FLIP_CORE_HORIZONTAL
-					+ HSM_ROTATE_CORE_IMAGE
-
-					//    ASPECT RATIO
-					+ HSM_ASPECT_RATIO_ORIENTATION
-					+ HSM_ASPECT_RATIO_MODE
-					+ HSM_ASPECT_RATIO_EXPLICIT
-
-					//    SCALING
-					+ HSM_INT_SCALE_MODE
-					+ HSM_VERTICAL_PRESET
-
-					// Integer Scale
-					+ HSM_INT_SCALE_MAX_HEIGHT
-					+ HSM_INT_SCALE_MULTIPLE_OFFSET
-					+ HSM_INT_SCALE_MULTIPLE_OFFSET_LONG
-
-					// Non Integer Scale
-					+ HSM_NON_INTEGER_SCALE
-
-					+ HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER
-					+ HSM_PHYSICAL_MONITOR_ASPECT_RATIO
-					+ HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE
-					+ HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE
-
-					//    Extended Scale
-					+ HSM_USE_IMAGE_FOR_PLACEMENT
-					+ HSM_PLACEMENT_IMAGE_USE_HORIZONTAL
-					+ HSM_PLACEMENT_IMAGE_MODE
-
-					// Non Integer Scale Offset
-					+ HSM_NON_INTEGER_SCALE_OFFSET * 100
-
-					// Snap to Integer Scale
-					+ HSM_USE_SNAP_TO_CLOSEST_INT_SCALE
-					+ HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE
-
-					//    Position
-					+ HSM_SCREEN_POSITION_X * 1000
-					+ HSM_SCREEN_POSITION_Y * 1000
-
-					//    CROPPING
-					+ HSM_CROP_MODE
-					+ HSM_CROP_PERCENT_ZOOM * 100
-					+ HSM_CROP_PERCENT_TOP * 100
-					+ HSM_CROP_PERCENT_BOTTOM * 100
-					+ HSM_CROP_PERCENT_LEFT * 100
-					+ HSM_CROP_PERCENT_RIGHT * 100
-					+ HSM_CROP_BLACK_THRESHOLD * 100
-
-					// + HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR
-					// + HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR
-
-					//    CURVATURE
-					+ HSM_CURVATURE_MODE
-					+ HSM_CURVATURE_2D_SCALE_LONG_AXIS * 100
-					+ HSM_CURVATURE_2D_SCALE_SHORT_AXIS * 100
-					+ HSM_CURVATURE_3D_RADIUS * 100
-					+ HSM_CURVATURE_3D_VIEW_DIST * 100
-					+ HSM_CURVATURE_3D_TILT_ANGLE_X * 100
-					+ HSM_CURVATURE_3D_TILT_ANGLE_Y * 100
-
-					// + HSM_AB_COMPARE_SHOW_MODE
-					+ HSM_AB_COMPARE_AREA
-					+ HSM_AB_COMPARE_SPLIT_POSITION
-					+ HSM_AB_COMPARE_FREEZE_GRAPHICS
-
-					// //    TUBE DIFFUSE
-					// + HSM_TUBE_OPACITY
-					// + HSM_TUBE_DIFFUSE_MODE
-					// + HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE
-					// + HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON
-					// + HSM_TUBE_DIFFUSE_IMAGE_HUE
-					// + HSM_TUBE_DIFFUSE_IMAGE_SATURATION
-					// + HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS
-					// + HSM_TUBE_DIFFUSE_IMAGE_GAMMA
-					+ HSM_TUBE_DIFFUSE_FORCE_ASPECT
-					+ HSM_TUBE_EXPLICIT_ASPECT
-					+ HSM_TUBE_EMPTY_THICKNESS
-					+ HSM_TUBE_EMPTY_THICKNESS_X_SCALE
-
-					// SCREEN BLACK EDGE
-					+ HSM_GLOBAL_CORNER_RADIUS
-					+ HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE * 100
-					+ HSM_TUBE_BLACK_EDGE_SHARPNESS * 100
-					+ HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE * 100
-					+ HSM_TUBE_BLACK_EDGE_THICKNESS * 100
-					+ HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE * 100
-
-					// //    DUAL SCREEN
-					+ HSM_DUALSCREEN_MODE
-					+ HSM_DUALSCREEN_CORE_IMAGE_SPLIT_MODE
-					+ HSM_DUALSCREEN_CORE_IMAGE_SWAP_SCREENS
-					+ HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET * 1000
-					+ HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION * 1000
-					+ HSM_DUALSCREEN_SHIFT_POSITION_WITH_SCALE
-					+ HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS * 1000
-					+ HSM_2ND_SCREEN_ASPECT_RATIO_MODE
-					+ HSM_2ND_SCREEN_INDEPENDENT_SCALE
-					+ HSM_2ND_SCREEN_SCALE_OFFSET * 100
-					+ HSM_2ND_SCREEN_POS_X * 1000
-					+ HSM_2ND_SCREEN_POS_Y * 1000
-					+ HSM_2ND_SCREEN_CROP_PERCENT_ZOOM * 100
-					+ HSM_2ND_SCREEN_CROP_PERCENT_TOP * 100
-					+ HSM_2ND_SCREEN_CROP_PERCENT_BOTTOM * 100
-					+ HSM_2ND_SCREEN_CROP_PERCENT_LEFT * 100
-					+ HSM_2ND_SCREEN_CROP_PERCENT_RIGHT * 100
-
-					// AMBIENT LIGHTING 1
-					+ HSM_AMBIENT1_HUE * 360
-					+ HSM_AMBIENT1_SATURATION * 100
-					+ HSM_AMBIENT1_VALUE * 100
-					+ HSM_AMBIENT1_CONTRAST
-					+ HSM_AMBIENT1_SCALE_INHERIT_MODE
-					+ HSM_AMBIENT1_SCALE * 100
-					+ HSM_AMBIENT1_SCALE_X * 100
-					+ HSM_AMBIENT1_ROTATE
-					+ HSM_AMBIENT1_MIRROR_HORZ
-					+ HSM_AMBIENT1_POS_INHERIT_MODE
-					+ HSM_AMBIENT1_POSITION_X * 1000
-					+ HSM_AMBIENT1_POSITION_Y * 1000
-					+ HSM_AMBIENT1_DITHERING_SAMPLES
-
-					// AMBIENT LIGHTING 2
-					+ HSM_AMBIENT2_HUE * 360
-					+ HSM_AMBIENT2_SATURATION * 100
-					+ HSM_AMBIENT2_VALUE * 100
-					+ HSM_AMBIENT2_CONTRAST
-					+ HSM_AMBIENT2_SCALE_INHERIT_MODE
-					+ HSM_AMBIENT2_SCALE * 100
-					+ HSM_AMBIENT2_SCALE_X * 100
-					+ HSM_AMBIENT2_ROTATE
-					+ HSM_AMBIENT2_MIRROR_HORZ
-					+ HSM_AMBIENT2_POS_INHERIT_MODE
-					+ HSM_AMBIENT2_POSITION_X * 1000
-					+ HSM_AMBIENT2_POSITION_Y * 1000
-
-					//    BEZEL INDEPENDENT SCALE
-					+ HSM_BZL_USE_INDEPENDENT_SCALE
-					+ HSM_BZL_INDEPENDENT_SCALE * 100
-					+ HSM_BZL_USE_INDEPENDENT_CURVATURE
-					+ HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS * 100
-					+ HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS * 100
-
-					//    BEZEL GENERAL
-					+ HSM_BZL_OPACITY * 100
-					+ HSM_BZL_BLEND_MODE
-					+ HSM_BZL_WIDTH /  0.0008624
-					+ HSM_BZL_HEIGHT / 0.0008732
-					+ HSM_BZL_SCALE_OFFSET * 100
-					+ HSM_BZL_INNER_CURVATURE_SCALE * 100
-					+ HSM_BZL_INNER_CORNER_RADIUS_SCALE * 100
-
-#ifdef HAS_BEZEL_PARAMS
-
-					// Reflection Image Mask
-					+ HSM_REFLECT_MASK_IMAGE_AMOUNT
-					+ HSM_REFLECT_MASK_FOLLOW_LAYER
-					+ HSM_REFLECT_MASK_FOLLOW_MODE
-					+ HSM_REFLECT_MASK_BRIGHTNESS * 100
-					+ HSM_REFLECT_MASK_BLACK_LEVEL
-
-					//	Bezel Params not in Screen Scale
-					+ HSM_BZL_INNER_EDGE_THICKNESS / 0.00007
-					+ HSM_BZL_INNER_EDGE_SHARPNESS * 100
-					+ HSM_BZL_OUTER_POSITION_Y * 2000
-					+ HSM_BZL_OUTER_CURVATURE_SCALE * 100
-					+ HSM_BZL_OUTER_CORNER_RADIUS_SCALE * 100
-					+ HSM_BZL_BRIGHTNESS * 100
-					+ HSM_BZL_BRIGHTNESS_MULT_TOP * 100
-					+ HSM_BZL_BRIGHTNESS_MULT_BOTTOM * 100
-					+ HSM_BZL_BRIGHTNESS_MULT_SIDES * 100
-					+ HSM_BZL_BRIGHTNESS_MULT_SIDE_LEFT * 100
-					+ HSM_BZL_BRIGHTNESS_MULT_SIDE_RIGHT * 100
-					+ HSM_BZL_HIGHLIGHT * 100
-					+ HSM_BZL_INNER_EDGE_HIGHLIGHT * 100
-					+ HSM_BZL_NOISE * 100
-					+ HSM_BZL_INNER_EDGE_SHADOW * 100
-
-					// Bezel Color
-					+ HSM_BZL_COLOR_HUE * 360
-					+ HSM_BZL_COLOR_SATURATION * 100
-					+ HSM_BZL_COLOR_VALUE * 100
-					+ HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER * 100
-
-					// Frame Color
-					+ HSM_FRM_USE_INDEPENDENT_COLOR
-					+ HSM_FRM_COLOR_HUE * 360
-					+ HSM_FRM_COLOR_SATURATION * 100
-					+ HSM_FRM_COLOR_VALUE * 100
-
-					// Generated Frame
-					+ HSM_FRM_OPACITY * 100
-					+ HSM_FRM_BLEND_MODE
-					+ HSM_FRM_TEXTURE_OPACITY * 100
-					+ HSM_FRM_TEXTURE_BLEND_MODE
-					+ HSM_FRM_NOISE * 100
-					+ HSM_FRM_INNER_EDGE_THICKNESS / 0.00003
-					+ HSM_FRM_INNER_EDGE_HIGHLIGHT * 1000
-					+ HSM_FRM_THICKNESS / 0.0007
-					+ HSM_FRM_THICKNESS_SCALE_X * 100
-					+ HSM_FRM_OUTER_POS_Y * 100
-					+ HSM_FRM_OUTER_CURVATURE_SCALE * 100
-					+ HSM_FRM_OUTER_CORNER_RADIUS
-					+ HSM_FRM_OUTER_EDGE_THICKNESS / 0.00006
-					+ HSM_FRM_OUTER_EDGE_SHADING * 100
-					+ HSM_FRM_SHADOW_OPACITY * 100
-					+ HSM_FRM_SHADOW_WIDTH * 1000
-
-					// Corner
-					+ HSM_REFLECT_CORNER_FADE * 100
-					+ HSM_REFLECT_CORNER_FADE_DISTANCE * 100
-					+ HSM_REFLECT_CORNER_INNER_SPREAD * 100
-					+ HSM_REFLECT_CORNER_OUTER_SPREAD * 100
-					+ HSM_REFLECT_CORNER_ROTATION_OFFSET_TOP
-					+ HSM_REFLECT_CORNER_ROTATION_OFFSET_BOTTOM
-					+ HSM_REFLECT_CORNER_SPREAD_FALLOFF
-#endif
-
-#ifdef HAS_IMAGE_LAYER_PARAMS
-
-					// Layer Order
-					+ HSM_BG_LAYER_ORDER
-					+ HSM_VIEWPORT_VIGNETTE_LAYER_ORDER
-					+ HSM_CRT_LAYER_ORDER
-					+ HSM_DEVICE_LAYER_ORDER
-					+ HSM_DEVICELED_LAYER_ORDER
-					+ HSM_CAB_GLASS_LAYER_ORDER
-					+ HSM_DECAL_LAYER_ORDER
-					+ HSM_LED_LAYER_ORDER
-					+ HSM_TOP_LAYER_ORDER
-
-					// Background
-					+ HSM_BG_OPACITY
-					+ HSM_BG_COLORIZE_ON
-					+ HSM_BG_HUE * 360
-					+ HSM_BG_SATURATION * 100
-					+ HSM_BG_BRIGHTNESS * 100
-					+ HSM_BG_GAMMA
-					+ HSM_BG_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER * 100
-					+ HSM_BG_APPLY_AMBIENT_IN_ADD_MODE
-					+ HSM_BG_BLEND_MODE
-					+ HSM_BG_SOURCE_MATTE_TYPE
-					+ HSM_BG_MASK_MODE
-					+ HSM_BG_CUTOUT_MODE
-					+ HSM_BG_DUALSCREEN_VIS_MODE
-					+ HSM_BG_FOLLOW_LAYER
-					+ HSM_BG_FOLLOW_MODE
-					+ HSM_BG_FOLLOW_FULL_USES_ZOOM
-					+ HSM_BG_FILL_MODE
-					+ HSM_BG_SPLIT_PRESERVE_CENTER * 1000
-					+ HSM_BG_SPLIT_REPEAT_WIDTH * 1000
-					+ HSM_BG_SCALE * 100
-					+ HSM_BG_SCALE_X * 100
-					+ HSM_BG_POS_X * 100
-					+ HSM_BG_POS_Y * 100
-					+ HSM_BG_WRAP_MODE
-					+ HSM_BG_MIPMAPPING_BLEND_BIAS
-
-					// Background Vignette
-					+ HSM_VIEWPORT_VIGNETTE_OPACITY * 100
-					+ HSM_VIEWPORT_VIGNETTE_MASK_MODE
-					+ HSM_VIEWPORT_VIGNETTE_CUTOUT_MODE
-					+ HSM_VIEWPORT_VIGNETTE_FOLLOW_LAYER
-					+ HSM_VIEWPORT_VIGNETTE_SCALE * 100
-					+ HSM_VIEWPORT_VIGNETTE_SCALE_X * 100
-					+ HSM_VIEWPORT_VIGNETTE_POS_X * 100
-					+ HSM_VIEWPORT_VIGNETTE_POS_Y * 100
-
-					// Cutout
-					+ HSM_CUTOUT_ASPECT_MODE
-					+ HSM_CUTOUT_EXPLICIT_ASPECT
-					+ HSM_CUTOUT_FOLLOW_LAYER
-					+ HSM_CUTOUT_FOLLOW_FULL_USES_ZOOM
-					+ HSM_CUTOUT_SCALE * 100
-					+ HSM_CUTOUT_SCALE_X * 100
-					+ HSM_CUTOUT_POS_X * 400
-					+ HSM_CUTOUT_POS_Y * 400
-					+ HSM_CUTOUT_CORNER_RADIUS
-
-					// LED
-					+ HSM_LED_OPACITY * 100
-					+ HSM_LED_COLORIZE_ON
-					+ HSM_LED_HUE * 360
-					+ HSM_LED_SATURATION * 100
-					+ HSM_LED_BRIGHTNESS * 100
-					+ HSM_LED_GAMMA
-					+ HSM_LED_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER * 100
-					+ HSM_LED_APPLY_AMBIENT_IN_ADD_MODE
-					+ HSM_LED_BLEND_MODE
-					+ HSM_LED_SOURCE_MATTE_TYPE
-					+ HSM_LED_MASK_MODE
-					+ HSM_LED_CUTOUT_MODE
-					+ HSM_LED_DUALSCREEN_VIS_MODE
-					+ HSM_LED_FOLLOW_LAYER
-					+ HSM_LED_FOLLOW_MODE
-					+ HSM_LED_FOLLOW_FULL_USES_ZOOM
-					+ HSM_LED_FILL_MODE
-					+ HSM_LED_SPLIT_PRESERVE_CENTER * 1000
-					+ HSM_LED_SPLIT_REPEAT_WIDTH * 1000
-					+ HSM_LED_SCALE * 100
-					+ HSM_LED_SCALE_X * 100
-					+ HSM_LED_POS_X * 100
-					+ HSM_LED_POS_Y * 100
-					+ HSM_LED_MIPMAPPING_BLEND_BIAS
-
-					// Device
-					+ HSM_DEVICE_OPACITY * 100
-					+ HSM_DEVICE_COLORIZE_ON
-					+ HSM_DEVICE_HUE * 360
-					+ HSM_DEVICE_SATURATION * 100
-					+ HSM_DEVICE_BRIGHTNESS * 100
-					+ HSM_DEVICE_GAMMA
-					+ HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER * 100
-					+ HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE
-					+ HSM_DEVICE_BLEND_MODE
-					+ HSM_DEVICE_SOURCE_MATTE_TYPE
-					+ HSM_DEVICE_MASK_MODE
-					+ HSM_DEVICE_CUTOUT_MODE
-					+ HSM_DEVICE_DUALSCREEN_VIS_MODE
-					+ HSM_DEVICE_FOLLOW_LAYER
-					+ HSM_DEVICE_FOLLOW_MODE
-					+ HSM_DEVICE_FOLLOW_FULL_USES_ZOOM
-					+ HSM_DEVICE_FILL_MODE
-					+ HSM_DEVICE_SPLIT_PRESERVE_CENTER * 1000
-					+ HSM_DEVICE_SPLIT_REPEAT_WIDTH * 1000
-					+ HSM_DEVICE_SCALE * 100
-					+ HSM_DEVICE_SCALE_X * 100
-					+ HSM_DEVICE_POS_X * 100
-					+ HSM_DEVICE_POS_Y * 100
-					+ HSM_DEVICE_MIPMAPPING_BLEND_BIAS
-
-					// Device LED
-					+ HSM_DEVICELED_OPACITY * 100
-					+ HSM_DEVICELED_COLORIZE_ON
-					+ HSM_DEVICELED_HUE * 360
-					+ HSM_DEVICELED_SATURATION * 100
-					+ HSM_DEVICELED_BRIGHTNESS * 100
-					+ HSM_DEVICELED_GAMMA
-					+ HSM_DEVICELED_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_DEVICELED_AMBIENT2_LIGHTING_MULTIPLIER * 100
-					+ HSM_DEVICELED_APPLY_AMBIENT_IN_ADD_MODE
-					+ HSM_DEVICELED_BLEND_MODE
-					+ HSM_DEVICELED_SOURCE_MATTE_TYPE
-					+ HSM_DEVICELED_MASK_MODE
-					+ HSM_DEVICELED_CUTOUT_MODE
-					+ HSM_DEVICELED_DUALSCREEN_VIS_MODE
-					+ HSM_DEVICELED_FOLLOW_LAYER
-					+ HSM_DEVICELED_FOLLOW_MODE
-					+ HSM_DEVICELED_FOLLOW_FULL_USES_ZOOM
-					+ HSM_DEVICELED_FILL_MODE
-					+ HSM_DEVICELED_SPLIT_PRESERVE_CENTER * 1000
-					+ HSM_DEVICELED_SPLIT_REPEAT_WIDTH * 1000
-					+ HSM_DEVICELED_SCALE * 100
-					+ HSM_DEVICELED_SCALE_X * 100
-					+ HSM_DEVICELED_POS_X * 100
-					+ HSM_DEVICELED_POS_Y * 100
-					+ HSM_DEVICELED_MIPMAPPING_BLEND_BIAS
-
-					// Decal
-					+ HSM_DECAL_OPACITY * 100
-					+ HSM_DECAL_COLORIZE_ON
-					+ HSM_DECAL_HUE * 360
-					+ HSM_DECAL_SATURATION * 100
-					+ HSM_DECAL_BRIGHTNESS * 100
-					+ HSM_DECAL_GAMMA
-					+ HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER * 100
-					+ HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE
-					+ HSM_DECAL_BLEND_MODE
-					+ HSM_DECAL_SOURCE_MATTE_TYPE
-					+ HSM_DECAL_MASK_MODE
-					+ HSM_DECAL_CUTOUT_MODE
-					+ HSM_DECAL_DUALSCREEN_VIS_MODE
-					+ HSM_DECAL_FOLLOW_LAYER
-					+ HSM_DECAL_FOLLOW_MODE
-					+ HSM_DECAL_FOLLOW_FULL_USES_ZOOM
-					+ HSM_DECAL_FILL_MODE
-					+ HSM_DECAL_SPLIT_PRESERVE_CENTER * 1000
-					+ HSM_DECAL_SPLIT_REPEAT_WIDTH * 1000
-					+ HSM_DECAL_SCALE * 100
-					+ HSM_DECAL_SCALE_X * 100
-					+ HSM_DECAL_POS_X * 100
-					+ HSM_DECAL_POS_Y * 100
-					+ HSM_DECAL_MIPMAPPING_BLEND_BIAS
-
-					// // Cab Glass
-					+ HSM_CAB_GLASS_OPACITY * 100
-					+ HSM_CAB_GLASS_COLORIZE_ON
-					+ HSM_CAB_GLASS_HUE * 360
-					+ HSM_CAB_GLASS_SATURATION * 100
-					+ HSM_CAB_GLASS_BRIGHTNESS * 100
-					+ HSM_CAB_GLASS_GAMMA
-					+ HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER * 100
-					+ HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE
-					+ HSM_CAB_GLASS_BLEND_MODE
-					+ HSM_CAB_GLASS_SOURCE_MATTE_TYPE
-					+ HSM_CAB_GLASS_MASK_MODE
-					+ HSM_CAB_GLASS_CUTOUT_MODE
-					+ HSM_CAB_GLASS_DUALSCREEN_VIS_MODE
-					+ HSM_CAB_GLASS_FOLLOW_LAYER
-					+ HSM_CAB_GLASS_FOLLOW_MODE
-					+ HSM_CAB_GLASS_FOLLOW_FULL_USES_ZOOM
-					+ HSM_CAB_GLASS_FILL_MODE
-					+ HSM_CAB_GLASS_SPLIT_PRESERVE_CENTER * 1000
-					+ HSM_CAB_GLASS_SPLIT_REPEAT_WIDTH * 1000
-					+ HSM_CAB_GLASS_SCALE * 100
-					+ HSM_CAB_GLASS_SCALE_X * 100
-					+ HSM_CAB_GLASS_POS_X * 100
-					+ HSM_CAB_GLASS_POS_Y * 100
-					+ HSM_CAB_GLASS_MIPMAPPING_BLEND_BIAS
-
-					// Top Image
-					+ HSM_TOP_OPACITY * 100
-					+ HSM_TOP_COLORIZE_ON
-					+ HSM_TOP_HUE * 360
-					+ HSM_TOP_SATURATION * 100
-					+ HSM_TOP_BRIGHTNESS * 100
-					+ HSM_TOP_GAMMA
-					+ HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER * 100
-					+ HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER * 100
-					+ HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE
-					+ HSM_TOP_BLEND_MODE
-					+ HSM_TOP_SOURCE_MATTE_TYPE
-					+ HSM_TOP_MASK_MODE
-					+ HSM_TOP_CUTOUT_MODE
-					+ HSM_TOP_DUALSCREEN_VIS_MODE
-					+ HSM_TOP_FOLLOW_LAYER
-					+ HSM_TOP_FOLLOW_MODE
-					+ HSM_TOP_FOLLOW_FULL_USES_ZOOM
-					+ HSM_TOP_FILL_MODE
-					+ HSM_TOP_SPLIT_PRESERVE_CENTER * 1000
-					+ HSM_TOP_SPLIT_REPEAT_WIDTH * 1000
-					+ HSM_TOP_SCALE * 100
-					+ HSM_TOP_SCALE_X * 100
-					+ HSM_TOP_POS_X * 100
-					+ HSM_TOP_POS_Y * 100
-					+ HSM_TOP_MIRROR_WRAP
-					+ HSM_TOP_MIPMAPPING_BLEND_BIAS
-
-					+ HSM_RENDER_SIMPLE_MODE
-					+ HSM_LAYERING_DEBUG_MASK_MODE
-#endif
-
-					);
-	return out_sum;
-}
-
-vec2 GetScreenSizeWithZoom(vec2 screen_scale)
-{
-	vec2 screen_size = global.FinalViewportSize.xy * screen_scale * HSM_VIEWPORT_ZOOM;
-	// Round this so we get proper integers
-
-	// TODO try + eps and floor
-	screen_size = vec2(ceil(screen_size.x), ceil(screen_size.y));
-	return screen_size;
-}
-
-vec4 HSM_GetColorForScreenInfoCache(vec2 viewport_coord, sampler2D feedback_pass, sampler2D original_pass, sampler2D screen_placement_image)
-{
-	NEGATIVE_CROP_EXPAND_MULTIPLIER = global.DerezedPassSize.y / global.DerezedPassSize.y;
-	MAX_NEGATIVE_CROP = ((1 - (1 / NEGATIVE_CROP_EXPAND_MULTIPLIER)) / 2);
-
-	vec4 out_color = vec4(0);
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-	vec2 rotated_derezed_size = HSM_GetRotatedScreenDerezedSize();
-	vec2 cropped_rotated_size = vec2(100);
-	vec2 cropped_sample_area_start_pixel_coord = vec2(100);
-	HSM_GetCroppedRotatedSizeAndPixelSampleAreaStart(1, original_pass, cropped_rotated_size, cropped_sample_area_start_pixel_coord);
-	// vec2 cropped_unrotated_size = abs(HSM_ROTATE_CORE_IMAGE) > 0.5 ? cropped_rotated_size.yx : cropped_rotated_size.xy;
-
-	float screen_aspect = HSM_GetScreenAspect(1, cropped_rotated_size);
-	float use_vertical_scanlines = HSM_GetUseVerticalScanlines(screen_aspect);
-	vec2 sampling_dir_mult = HSM_GetResMult(use_vertical_scanlines);
-	vec2 cropped_rotated_size_with_res_mult = HSM_GetCroppedRotatedSizeWithResMult(cropped_rotated_size, sampling_dir_mult);
-	// vec2 cropped_unrotated_size_with_res_mult = abs(HSM_ROTATE_CORE_IMAGE) > 0.5 ? cropped_rotated_size_with_res_mult.yx : cropped_rotated_size_with_res_mult.xy;
-
-	// First Screen
-	vec3 screen_pos_and_height = HSM_GetScreenPlacementAndHeight(screen_placement_image, 60);
-	vec2 screen_scale = HSM_GetScreenScale(screen_aspect, screen_pos_and_height.z, cropped_rotated_size);
-	vec2 screen_size = GetScreenSizeWithZoom(screen_scale);
-
-	// Adjust tube empty thickness for Sinden lightgun bright edge border if needed
-	float tube_sinden_border_thickness =  HSM_SINDEN_BORDER_ON > 0.5 && HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION > 0.5 ? 0.6 * HSM_SINDEN_BORDER_THICKNESS * 60 : 0;
-
-	vec2 tube_diffuse_scale = HSM_GetTubeScale(screen_scale, screen_pos_and_height.z, vec2(HSM_TUBE_EMPTY_THICKNESS * HSM_TUBE_EMPTY_THICKNESS_X_SCALE + tube_sinden_border_thickness, HSM_TUBE_EMPTY_THICKNESS + screen_aspect * tube_sinden_border_thickness));	
-	float tube_diffuse_aspect = tube_diffuse_scale.x / tube_diffuse_scale.y * output_aspect;
-
-	// TODO need to adjust height in screen_pos_and_height with the tube extra thickness
-
-	if (HSM_TUBE_DIFFUSE_FORCE_ASPECT > 0)
-	{
-		if ( HSM_TUBE_DIFFUSE_FORCE_ASPECT == 1)
-			tube_diffuse_aspect = screen_aspect;
-		if ( HSM_TUBE_DIFFUSE_FORCE_ASPECT == 2)
-			tube_diffuse_aspect = screen_aspect > 1 ? HSM_TUBE_EXPLICIT_ASPECT : 1.0 / HSM_TUBE_EXPLICIT_ASPECT;
-
-		tube_diffuse_scale = vec2( tube_diffuse_scale.y * tube_diffuse_aspect / output_aspect, tube_diffuse_scale.y );
-	}
-
-	vec2 tube_scale = HSM_GetTubeScale(tube_diffuse_scale, screen_pos_and_height.z, vec2(HSM_TUBE_BLACK_EDGE_THICKNESS * HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE, HSM_TUBE_BLACK_EDGE_THICKNESS));	
-
-	vec2 pos_offset = HSM_GetScreenPositionOffset(screen_pos_and_height.xy, screen_scale, 1);
-
-	vec2 rotated_core_preppezd_size = HSM_GetRotatedScreenCorePreppedSize(1);
-
-	vec2 cropped_size_2nd_screen = vec2(100);
-	vec2 sample_area_start_pixel_coord_2nd_screen = vec2(100);
-	HSM_GetCroppedRotatedSizeAndPixelSampleAreaStart(2, original_pass, cropped_size_2nd_screen, sample_area_start_pixel_coord_2nd_screen);
-	float screen_aspect_2nd_screen = HSM_2ND_SCREEN_ASPECT_RATIO_MODE == 1 ? cropped_size_2nd_screen.x/cropped_size_2nd_screen.y : screen_aspect;
-	vec2 screen_scale_2nd_screen = HSM_GetScreenScaleFor2ndScreen(screen_scale, screen_aspect_2nd_screen);
-	vec2 screen_size_2nd_screen = GetScreenSizeWithZoom(screen_scale_2nd_screen);
-	vec2 cropped_size_with_res_mult_2nd_screen = HSM_GetCroppedRotatedSizeWithResMult(cropped_size_2nd_screen, sampling_dir_mult);
-
-	vec2 tube_diffuse_scale_2nd_screen = 	HSM_GetTubeScale(screen_scale_2nd_screen, 		DEFAULT_UNCORRECTED_SCREEN_SCALE.y, vec2(HSM_TUBE_EMPTY_THICKNESS * HSM_TUBE_EMPTY_THICKNESS_X_SCALE, 			HSM_TUBE_EMPTY_THICKNESS));	
-	vec2 tube_scale_2nd_screen = 			HSM_GetTubeScale(tube_diffuse_scale_2nd_screen, DEFAULT_UNCORRECTED_SCREEN_SCALE.y, vec2(HSM_TUBE_BLACK_EDGE_THICKNESS * HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE, HSM_TUBE_BLACK_EDGE_THICKNESS));	
-	float tube_aspect_2nd_screen = tube_scale_2nd_screen.x / tube_scale_2nd_screen.y * output_aspect;
-
-	// TODO need to add tube diffuse aspect to cache data
-
-	vec2 pos_offset_2nd_screen = HSM_GetScreenPositionOffset(vec2(0.5, 0.5), screen_scale_2nd_screen, 2);
-
-	vec4 sample_2d_range = vec4(0);
-	float parameter_sum = HSM_GetParameterSum();
-
-	// Sample 1, 1
-	// r AVERAGE_LUMA
-	sample_2d_range = HSM_GetCacheSampleRange(1, 1);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = sampling_dir_mult;
-		out_color.a = HSM_GetAverageLuma(original_pass, global.DerezedPassSize.xy);
-	}
-
-	// Sample 2, 1
-	// r SCREEN_ASPECT
-	// ba SCREEN_SCALE
-	sample_2d_range = HSM_GetCacheSampleRange(2, 1);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{ 
-		out_color.r = screen_aspect;
-		out_color.ba = screen_scale;
-	}
-
-	// Sample 3, 1
-	// rg TUBE_SCALE 
-	// ba SCREEN_POS_OFFSET
-	sample_2d_range = HSM_GetCacheSampleRange(3, 1);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = tube_scale;
-		out_color.ba = pos_offset;
-	}
-
-	// Sample 4, 1
-	// rg CROPPED_ROTATED_SIZE_WITH_RES_MULT
-	sample_2d_range = HSM_GetCacheSampleRange(4, 1);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = cropped_rotated_size_with_res_mult;
-		out_color.ba = HSM_GetRotatedDerezedSize();
-	}
-
-	// Sample 1, 2
-	// rg CROPPED_ROTATED_SIZE
-	// ba SAMPLE_AREA_START_PIXEL_COORD
-	sample_2d_range = HSM_GetCacheSampleRange(1, 2);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = cropped_rotated_size;
-		out_color.ba = cropped_sample_area_start_pixel_coord;
-	}
-
-	// // Sample 5, 1
-	// // rg CROPPED_UNROTATED_SIZE
-	// sample_2d_range = HSM_GetCacheSampleRange(5, 1);
-	// if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	// {
-	// 	out_color.rg = cropped_unrotated_size;
-	// 	out_color.ba = cropped_unrotated_size_with_res_mult;
-	// }
-
-// TODO Need to add unrotated sizes
-
-	// Sample 2, 2
-	// r SCREEN_ASPECT_2ND_SCREEN
-	// g PARAMETER_SUM_SCREEN_SCALE
-	// ba SCREEN_SCALE_2ND_SCREEN
-	sample_2d_range = HSM_GetCacheSampleRange(2, 2);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.r = screen_aspect_2nd_screen;
-		out_color.gb = screen_scale_2nd_screen;
-	}
-
-	// Sample 3, 2
-	// rg TUBE_SCALE
-	// ba SCREEN_POS_OFFSET
-	sample_2d_range = HSM_GetCacheSampleRange(3, 2);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = tube_scale_2nd_screen;
-		out_color.ba = pos_offset_2nd_screen;
-	}
-
-	// Sample 4, 2
-	// rg CROPPED_ROTATED_SIZE_WITH_RES_MULT 2nd screen
-	sample_2d_range = HSM_GetCacheSampleRange(4, 2);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = cropped_size_with_res_mult_2nd_screen;
-	}
-
-	// Sample 1, 3
-	// rg CROPPED_ROTATED_SIZE 2nd screen
-	// ba SAMPLE_AREA_START_PIXEL_COORD 2nd screen
-	sample_2d_range = HSM_GetCacheSampleRange(1, 3);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = cropped_size_2nd_screen;
-		out_color.ba = sample_area_start_pixel_coord_2nd_screen;
-	}
-
-	// Sample 2, 3
-	// rg CORE_SIZE
-	sample_2d_range = HSM_GetCacheSampleRange(2, 3);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = global.OriginalSize.xy;
-		out_color.ba = HSM_GetRotatedCoreOriginalSize();
-	}
-
-	// Sample 3, 3
-	// rg VIEWPORT_SCALE
-	// ba VIEWPORT_POS
-	sample_2d_range = HSM_GetCacheSampleRange(3, 3);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = vec2(HSM_VIEWPORT_ZOOM, HSM_VIEWPORT_ZOOM);
-		out_color.ba = vec2(HSM_VIEWPORT_POSITION_X, HSM_VIEWPORT_POSITION_Y);
-	}
-
-	// Sample 4, 3
-	// rg SCREEN_SCALE_2ND_SCREEN
-	// ba SCREEN_POS_OFFSET_2ND_SCREEN
-	sample_2d_range = HSM_GetCacheSampleRange(4, 3);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = screen_scale_2nd_screen;
-		out_color.ba = pos_offset_2nd_screen;
-	}
-
-	// Sample 1, 4
-	sample_2d_range = HSM_GetCacheSampleRange(1, 4);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.r = parameter_sum;
-
-		vec2 sample_coord = HSM_GetCacheSampleCoord(1, 4);
-		vec4 texture_sample = texture(feedback_pass, sample_coord);
-
-		float last_frame = floor(texture_sample.g);
-		out_color.g = last_frame + global.FrameDirection * 1;
-		out_color.ba = rotated_derezed_size;
-	}
-
-	// Sample 2, 4
-	// r = NEGATIVE_CROP_EXPAND_MULTIPLIER
-	// g = MAX_NEGATIVE_CROP;
-	sample_2d_range = HSM_GetCacheSampleRange(2, 4);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.r = NEGATIVE_CROP_EXPAND_MULTIPLIER;
-		out_color.g = MAX_NEGATIVE_CROP;
-		out_color.b = use_vertical_scanlines;
-	}
-
-	// TODO need to add TUBE_DIFFUSE_ASPECT & deal with 2nd Screen
-	// Sample 3, 4
-	// rg TUBE_DIFFUSE_SCALE
-	// ba TUBE_DIFFUSE_SCALE_2ND_SCREEN
-	sample_2d_range = HSM_GetCacheSampleRange(3, 4);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = tube_diffuse_scale;
-		out_color.ba = tube_diffuse_scale_2nd_screen;
-	}
-
-	// Sample 4, 4
-	// rg SCREEN_SIZE
-	// ba SCREEN_SIZE_2ND_SCREEN
-	sample_2d_range = HSM_GetCacheSampleRange(4, 4);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.rg = screen_size;
-		out_color.ba = screen_size_2nd_screen;
-	}
-
-
-	vec2 sample_coord = vec2(0); 
-	vec4 texture_sample = vec4(0); 
-
-	// Check the difference in parameter sum values to see if the cache has changed
-	// Sample 1, 4 Feedback
-	// r parameter_sum_feedback
-	sample_coord = HSM_GetCacheSampleCoord(1, 4);
-	texture_sample = texture(feedback_pass, sample_coord);
-	float parameter_sum_feedback = texture_sample.r;
-
-	//-----------------------------------------------------
-	// Screen 1 resolution
-	float res_mult_size_sum = cropped_rotated_size_with_res_mult.x + cropped_rotated_size_with_res_mult.y;
-
-	// Sample 4, 1 Feedback
-	// rg parameter_sum_feedback
-	sample_coord = HSM_GetCacheSampleCoord(4, 1);
-	texture_sample = texture(feedback_pass, sample_coord);
-	CROPPED_ROTATED_SIZE_WITH_RES_MULT_FEEDBACK = texture_sample.rg;
-	float res_mult_size_sum_feedback = CROPPED_ROTATED_SIZE_WITH_RES_MULT_FEEDBACK.x + CROPPED_ROTATED_SIZE_WITH_RES_MULT_FEEDBACK.y;
-
-	//-----------------------------------------------------
-	// Screen 2 resolution
-	// r res_mult_size2_sum
-	float res_mult_size2_sum = cropped_size_with_res_mult_2nd_screen.x + cropped_size_with_res_mult_2nd_screen.y;
-
-	sample_coord = HSM_GetCacheSampleCoord(4, 2);
-	texture_sample = texture(feedback_pass, sample_coord);
-	CROPPED_ROTATED_SIZE_WITH_RES_MULT_FEEDBACK = texture_sample.rg;
-	float res_mult_size2_sum_feedback = CROPPED_ROTATED_SIZE_WITH_RES_MULT_FEEDBACK.x + CROPPED_ROTATED_SIZE_WITH_RES_MULT_FEEDBACK.y;
-
-	// Need to check croped sample resolutions of both screens
-	bool cache_changed = res_mult_size_sum != res_mult_size_sum_feedback || 
-						 res_mult_size2_sum != res_mult_size2_sum_feedback ||
-						 abs((parameter_sum) - (parameter_sum_feedback)) > 0.0000001 ? true : false ||
-						 HSM_CACHE_GRAPHICS_ON < 0.5;
-
-	//-----------------------------------------------------
-	// Store if the cache has changed since last frame
-	// Sample 8, 8
-	// r CACHE_INFO_CHANGED
-	sample_2d_range = HSM_GetCacheSampleRange(8, 8);
-	if (HSM_IsCoordIn2DRange(viewport_coord, sample_2d_range) == 1)
-	{
-		out_color.r = cache_changed ? 1 : 0;
-	}
-
-	return out_color;
-}
-
-void main()
-{
-   FragColor = HSM_GetColorForScreenInfoCache(vTexCoord, InfoCachePassFeedback, Source, ScreenPlacementImage);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/combine-passes-hdr.slang b/bezel/Mega_Bezel/shaders/base/combine-passes-hdr.slang
deleted file mode 100644
index e539a58b53..0000000000
--- a/bezel/Mega_Bezel/shaders/base/combine-passes-hdr.slang
+++ /dev/null
@@ -1,9 +0,0 @@
-#version 450
-
-#define IS_HDR_PRESET
-#pragma format A2B10G10R10_UNORM_PACK32
-#include "../megatron/include/parameters-hdr-color.h"
-#include "../megatron/include/gamma_correct.h"
-#include "../megatron/include/inverse_tonemap.h"
-
-#include "combine-passes.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/combine-passes-no-reflect-hdr.slang b/bezel/Mega_Bezel/shaders/base/combine-passes-no-reflect-hdr.slang
deleted file mode 100644
index a016af15aa..0000000000
--- a/bezel/Mega_Bezel/shaders/base/combine-passes-no-reflect-hdr.slang
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-#define IS_HDR_PRESET
-
-#include "../megatron/include/parameters-hdr-color.h"
-#include "../megatron/include/gamma_correct.h"
-#include "../megatron/include/inverse_tonemap.h"
-
-#pragma format A2B10G10R10_UNORM_PACK32
-
-#include "combine-passes.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/combine-passes-no-reflect.slang b/bezel/Mega_Bezel/shaders/base/combine-passes-no-reflect.slang
deleted file mode 100644
index 320e41a50f..0000000000
--- a/bezel/Mega_Bezel/shaders/base/combine-passes-no-reflect.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-
-#include "combine-passes.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/combine-passes.inc b/bezel/Mega_Bezel/shaders/base/combine-passes.inc
deleted file mode 100644
index 865c40d0ea..0000000000
--- a/bezel/Mega_Bezel/shaders/base/combine-passes.inc
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-/////////////// IMPORTS ///////////////
-#include "common/globals-and-image-layers-params.inc"
-#include "common/common-functions.inc"
-#include "common/common-functions-bezel.inc"
-
-#define RENDER_SIMPLE_MODE_NONE 0
-#define RENDER_SIMPLE_MODE_BLACK_SCREEN 1
-#define RENDER_SIMPLE_MODE_BLACK_SCREEN_AND_BG 2
-#define RENDER_SIMPLE_MODE_PINK_MASK 3
-#define RENDER_SIMPLE_MODE_BLACK_WHITE_MASK 4
-
-#define RENDER_SIMPLE_MASK_TYPE_SCREEN 0
-#define RENDER_SIMPLE_MASK_TYPE_TUBE 1
-#define RENDER_SIMPLE_MASK_TYPE_BEZEL_AND_FRAME 2
-#define RENDER_SIMPLE_MASK_TYPE_BEZEL 3
-#define RENDER_SIMPLE_MASK_TYPE_FRAME 4
-
-vec2 UNFLIPPED_VIEWPORT_COORD = vec2(0.5);
-vec2 FLIPPED_VIEWPORT_COORD = vec2(0.5);
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 6) out vec2 vTexCoord;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-
-	// Not sure why we need linearize this but it seems to have a smoother range this way
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage fragment
-
-layout(location = 6) in vec2 vTexCoord;
-
-layout(location = 0) out vec4 FragColor;
-
-// Pass Framebuffer Textures
-layout(set = 0, binding = 1) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 2) uniform sampler2D Original;
-layout(set = 0, binding = 3) uniform sampler2D DerezedPass;
-layout(set = 0, binding = 4) uniform sampler2D DeditherPass;
-layout(set = 0, binding = 5) uniform sampler2D ColorCorrectPass;
-layout(set = 0, binding = 6) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 7) uniform sampler2D CRTPass;
-layout(set = 0, binding = 8) uniform sampler2D PostCRTPass;
-
-#ifdef IS_NO_REFLECT_PRESET
-#define MiddlePass PostCRTPass
-#else
-layout(set = 0, binding = 9) uniform sampler2D ReflectionPass;
-#define MiddlePass ReflectionPass
-#endif
-
-layout(set = 0, binding = 10) uniform sampler2D BR_LayersUnderCRTPass;
-layout(set = 0, binding = 11) uniform sampler2D BR_LayersOverCRTPass;
-
-layout(set = 0, binding = 12) uniform sampler2D CombinePassFeedback;
-#define PassFeedback CombinePassFeedback
-
-
-vec3 PrepGraphicsForHDR(vec3 in_color)
-{
-	vec3 out_color = in_color.rgb;
-	
-	out_color *= HSM_GLOBAL_GRAPHICS_BRIGHTNESS;
-	
-#ifdef IS_HDR_PRESET
-
-   if((HCRT_HDR < 1.0f) && (HCRT_COLOUR_ACCURATE < 1.0f))
-      if(HCRT_OUTPUT_COLOUR_SPACE == 2.0f)
-         out_color= (out_color * k709_to_XYZ) * kXYZ_to_DCIP3; 
-
-   if(HCRT_HDR > 0.5f)
-      out_color = InverseTonemap(out_color, HCRT_MAX_NITS, HCRT_PAPER_WHITE_NITS);
-
-	if((HCRT_HDR >= 1.0f) && (HCRT_COLOUR_ACCURATE < 1.0f))
-		out_color  *= k2020Gamuts[uint(HCRT_EXPAND_GAMUT)] * (HCRT_PAPER_WHITE_NITS / kMaxNitsFor2084);
-#endif
-
-	return out_color;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	UNFLIPPED_VIEWPORT_COORD = vTexCoord;
-	vec2 VIEWPORT_COORD = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	if (HSM_SHOW_PASS_INDEX > 0.5)
-	{
-		FragColor = vec4(0);
-
-		vec2 coord_for_raw_passes = HSM_SHOW_PASS_APPLY_SCREEN_COORD > 0.5 ? HSM_GetCRTShaderCurvedCoord(SCREEN_COORD) : vTexCoord;
-
-#ifndef IS_NO_REFLECT_PRESET
-		// REFLECTION
-		if (HSM_SHOW_PASS_INDEX == 1)
-			FragColor = texture(ReflectionPass, vTexCoord);
-#endif
-
-		// TUBE
-		if (HSM_SHOW_PASS_INDEX == 2)
-			FragColor = texture(PostCRTPass, vTexCoord);
-
-		// CRT
-		if (HSM_SHOW_PASS_INDEX == 3)
-			FragColor = texture(CRTPass, vTexCoord);
-
-		// INTERLACE & LINEARIZE
-		if (HSM_SHOW_PASS_INDEX == 4)
-			FragColor = texture(LinearizePass, (floor(coord_for_raw_passes * textureSize(LinearizePass, 0)) + 0.5) / textureSize(LinearizePass, 0));
-
-		// COLOR CORRECT & UPSCALE
-		if (HSM_SHOW_PASS_INDEX == 5)
-			FragColor = texture(ColorCorrectPass, (floor(coord_for_raw_passes * textureSize(ColorCorrectPass, 0)) + 0.5) / textureSize(ColorCorrectPass, 0));
-
-		// DEDITHER
-		if (HSM_SHOW_PASS_INDEX == 6)
-			FragColor = texture(DeditherPass, (floor(coord_for_raw_passes * textureSize(DeditherPass, 0)) + 0.5) / textureSize(DeditherPass, 0));
-
-		// DREZ
-		if (HSM_SHOW_PASS_INDEX == 7)
-			FragColor = texture(DerezedPass, coord_for_raw_passes);
-
-		// CORE
-		if (HSM_SHOW_PASS_INDEX == 8)
-			FragColor = texture(Original, coord_for_raw_passes);
-
-		// LAYERS TOP
-		if (HSM_SHOW_PASS_INDEX == 9)
-			FragColor = texture(BR_LayersOverCRTPass, vTexCoord);
-
-		// LAYERS BOTTOM
-		if (HSM_SHOW_PASS_INDEX == 10)
-			FragColor = texture(BR_LayersUnderCRTPass, vTexCoord);
-
-		// Linearize passes which are not already in linear space
-		if (HSM_SHOW_PASS_INDEX < 5 || HSM_SHOW_PASS_INDEX > 8)
-			FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA);
-
-		if (HSM_SHOW_PASS_ALPHA > 0.5)
-			FragColor = vec4(FragColor.a);
-
-		return;
-	}
-
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						TUBE_DIFFUSE_ASPECT,
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-
-	if (HHLP_IsOutsideCoordSpace(BEZEL_OUTSIDE_COORD))
-	{
-		vec4 feedback_color_test = texture(PassFeedback, vec2(0,0));
-		if (HSM_CACHE_GRAPHICS_ON > 0.5 && feedback_color_test.a < 0 && !CACHE_INFO_CHANGED && HSM_RENDER_SIMPLE_MODE < 0.5)
-		{
-			FragColor = texture(PassFeedback, UNFLIPPED_VIEWPORT_COORD);
-			return;
-		}
-	}
-
-	vec4 under_layer = texture(BR_LayersUnderCRTPass, vTexCoord);
-	under_layer.rgb = PrepGraphicsForHDR(under_layer.rgb);
-
-	vec4 out_color = under_layer;
-
-	vec4 crt_layer = texture(MiddlePass, vTexCoord);
-
-	if (HSM_RENDER_SIMPLE_MODE > 0.5)
-		crt_layer.rgb = vec3(0);
-
-	float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0)
-		bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * DEFAULT_SCREEN_CORNER_RADIUS;
-
-#ifndef IS_NO_REFLECT_PRESET
-	vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-
-	TUBE_MASK =  HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-	// Apply Reflection Image Mask
-	crt_layer *= TUBE_MASK + (1 - TUBE_MASK) * under_layer.a;
-#endif
-
-	if (HSM_RENDER_SIMPLE_MODE < 0.5)
-		out_color = HSM_PreMultAlphaBlend(out_color, crt_layer);
-
-	vec4 over_layer = texture(BR_LayersOverCRTPass, vTexCoord);
-	over_layer.rgb = PrepGraphicsForHDR(over_layer.rgb);
-
-	out_color = HSM_PreMultAlphaBlend(out_color, over_layer);
-	FragColor = out_color;
-
-	if (HSM_RENDER_SIMPLE_MODE > 0.5)
-	{
-		vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-
-		TUBE_DIFFUSE_CURVED_COORD = HSM_GetCurvedCoord(TUBE_DIFFUSE_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, TUBE_DIFFUSE_ASPECT);
-		TUBE_DIFFUSE_MASK = HSM_GetCornerMask(((TUBE_DIFFUSE_CURVED_COORD - 0.5) * 1.001) + 0.5, TUBE_DIFFUSE_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE, HSM_TUBE_BLACK_EDGE_SHARPNESS);
-
-		TUBE_MASK =  HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-
-		INSIDE_BEZEL_MASK = HSM_GetCornerMask(BEZEL_OUTSIDE_CURVED_COORD, TUBE_DIFFUSE_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_BZL_OUTER_CORNER_RADIUS_SCALE, 0.9);
-		BEZEL_MASK = INSIDE_BEZEL_MASK * (1 - TUBE_MASK);
-
-		OUTSIDE_BEZEL_MASK = 1 - INSIDE_BEZEL_MASK;
-		OUTSIDE_FRAME_MASK = 1 - HSM_GetCornerMask(FRAME_OUTSIDE_CURVED_COORD, TUBE_DIFFUSE_ASPECT, HSM_FRM_OUTER_CORNER_RADIUS, 1);
-
-		FRAME_MASK = OUTSIDE_BEZEL_MASK * (1 - OUTSIDE_FRAME_MASK);
-
-		if ( HSM_RENDER_SIMPLE_MODE == RENDER_SIMPLE_MODE_BLACK_SCREEN )
-			FragColor = HSM_PreMultAlphaBlend(FragColor, vec4(0, 0, 0, 1) * (TUBE_MASK));
-
-		if ( HSM_RENDER_SIMPLE_MODE == RENDER_SIMPLE_MODE_BLACK_SCREEN_AND_BG )
-			FragColor = HSM_PreMultAlphaBlend(FragColor, vec4(0, 0, 0, 1) * (TUBE_MASK + OUTSIDE_FRAME_MASK));
-
-		if ( HSM_RENDER_SIMPLE_MODE == RENDER_SIMPLE_MODE_PINK_MASK )
-		{
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_SCREEN )
-				FragColor = HSM_PreMultAlphaBlend(FragColor, vec4(1, 0, 1, 1) * (TUBE_DIFFUSE_MASK));
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_TUBE )
-				FragColor = HSM_PreMultAlphaBlend(FragColor, vec4(1, 0, 1, 1) * (TUBE_MASK));
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_BEZEL_AND_FRAME )
-				FragColor = HSM_PreMultAlphaBlend(FragColor, vec4(1, 0, 1, 1) * (TUBE_MASK + OUTSIDE_FRAME_MASK));
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_BEZEL )
-				FragColor = HSM_PreMultAlphaBlend(FragColor, vec4(1, 0, 1, 1) * (1 - BEZEL_MASK));
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_FRAME )
-				FragColor = HSM_PreMultAlphaBlend(FragColor, vec4(1, 0, 1, 1) * (1 - FRAME_MASK));
-		}
-		if ( HSM_RENDER_SIMPLE_MODE == RENDER_SIMPLE_MODE_BLACK_WHITE_MASK )
-		{
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_SCREEN )
-				FragColor = vec4(1 - TUBE_DIFFUSE_MASK);
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_TUBE )
-				FragColor = vec4(1 - TUBE_MASK);
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_BEZEL_AND_FRAME )
-				FragColor = vec4(1 - TUBE_MASK) - OUTSIDE_FRAME_MASK;
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_BEZEL )
-				FragColor = vec4(BEZEL_MASK);
-
-			if ( HSM_RENDER_SIMPLE_MASK_TYPE == RENDER_SIMPLE_MASK_TYPE_FRAME )
-				FragColor = vec4(FRAME_MASK);
-		}
-	}
-
-	// If we have calculated an image then set -1 as a flag to show that we have
-	if (UNFLIPPED_VIEWPORT_COORD.x < (2 / global.OutputSize.x) && UNFLIPPED_VIEWPORT_COORD.y < (2 / global.OutputSize.y))
-		FragColor.a = -1;
-
-#ifndef IS_HDR_PRESET	
-	FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA);
-#endif
-
-#ifdef IS_HDR_PRESET
-	vec3 output_colour = vec3(0);
-	LinearToOutputColor(FragColor.rgb, output_colour);
-	FragColor = vec4(output_colour, 1.0f);
-#endif
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/combine-passes.slang b/bezel/Mega_Bezel/shaders/base/combine-passes.slang
deleted file mode 100644
index 65f3710c1b..0000000000
--- a/bezel/Mega_Bezel/shaders/base/combine-passes.slang
+++ /dev/null
@@ -1,3 +0,0 @@
-#version 450
-
-#include "combine-passes.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/base-functions.inc b/bezel/Mega_Bezel/shaders/base/common/base-functions.inc
deleted file mode 100644
index 3d42492bec..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/base-functions.inc
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-// Returns 1 for vertical split, 2 for horizontal split
-float HSM_GetCoreImageSplitDirection()
-{
-	float core_image_split_direction = 1;
-
-	if (HSM_DUALSCREEN_CORE_IMAGE_SPLIT_MODE == 0)
-	{
-		if (HSM_DUALSCREEN_MODE == 1)
-			core_image_split_direction = 1;
-		if (HSM_DUALSCREEN_MODE == 2)
-			core_image_split_direction = 2;
-	}
-	else
-	{
-		core_image_split_direction = HSM_DUALSCREEN_CORE_IMAGE_SPLIT_MODE;
-	}
-	return core_image_split_direction;
-}
-
-vec2 HSM_GetCoordWithPositionOffset(vec2 in_coord, vec2 position_offset)
-{
-	return in_coord - position_offset;
-}
-
-vec2 HSM_GetInverseScaledCoord(vec2 in_coord, vec2 in_scale)
-{
-	vec2 middle = vec2(0.49999, 0.49999);
-	vec2 diff = in_coord.xy - middle;
-	vec2 screen_inverse_scale = 1.0 / in_scale;
-	vec2 scaled_coord = middle + diff * screen_inverse_scale;
-
-	return scaled_coord;
-}
-
-vec2 HSM_GetVTexCoordWithArgs(vec2 in_coord, vec2 in_scale, vec2 position_offset)
-{
-	return HSM_GetInverseScaledCoord(HSM_GetCoordWithPositionOffset(in_coord, position_offset), in_scale);
-}
-
-// Rows and Columns are 1 based
-vec4 HSM_GetCacheSampleRange(float column_index, float row_index)
-{
-	float num_rows = 8;
-	float num_columns = 8;
-
-	float range_width = 1 / num_columns;
-	float range_height = 1 / num_rows;
-
-	float zero_based_row_index = row_index - 1;
-	float zero_based_column_index = column_index - 1;
-
-	vec4 out_sample_range = vec4(0);
-
-	out_sample_range.x = zero_based_column_index * range_width;
-	out_sample_range.y = zero_based_row_index * range_height;
-	out_sample_range.z = out_sample_range.x + range_width;
-	out_sample_range.w = out_sample_range.y + range_height;
-	
-	return out_sample_range;
-}
-
-vec2 HSM_GetCacheSampleCoord(float column_index, float row_index)
-{
-	float num_rows = 8;
-	float num_columns = 8;
-
-	float range_width = 1 / num_columns;
-	float range_height = 1 / num_rows;
-
-	vec4 sample_range = HSM_GetCacheSampleRange(column_index, row_index);
-	return vec2(sample_range.x + range_width/2, sample_range.y + range_height/2);
-}
-
-vec2 HSM_GetViewportCoordWithFlip(vec2 viewport_coord)
-{
-	vec2 out_coord = viewport_coord;
-
-	// out_coord.y = HSM_FLIP_VIEWPORT_VERTICAL * (out_coord.y - 0.5) + 0.5;
-	// out_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * (out_coord.x - 0.5) + 0.5;
-
-	if (HSM_FLIP_VIEWPORT_VERTICAL == -1)
-		out_coord.y = 1 - out_coord.y;
-	
-	if (HSM_FLIP_VIEWPORT_HORIZONTAL == -1)
-		out_coord.x =  1 - out_coord.x;
-
-	return out_coord;
-}
-
-vec2 HSM_GetViewportCoordWithZoomAndPan(vec2 viewport_coord)
-{
-	vec2 out_coord = HSM_GetViewportCoordWithFlip(viewport_coord);
-
-	out_coord = (out_coord - 0.5) / HSM_VIEWPORT_ZOOM + 0.5;
-	out_coord.x += HSM_VIEWPORT_POSITION_X;
-	out_coord.y -= HSM_VIEWPORT_POSITION_Y; 
-
-	return out_coord;
-}
-
-float HSM_GetScreenIndex(vec2 viewport_coord)
-{
-	float out_index = 1;
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-
-	if (HSM_DUALSCREEN_MODE == 0)
-		out_index = 1;
-	if (HSM_DUALSCREEN_MODE == 1)
-		out_index = (viewport_coord.y < 0.5 + HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION / output_aspect) ? 1 : 2;
-	if (HSM_DUALSCREEN_MODE == 2)
-		out_index = (viewport_coord.x < 0.5 + HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION / output_aspect) ? 1 : 2;
-
-	return out_index;
-}
-
-vec4 HSM_UpdateGlobalScreenValuesFromCache(sampler2D in_cache_pass, vec2 vTexCoord)
-{
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-	vec2 flipped_viewport_coord = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	SCREEN_INDEX = HSM_GetScreenIndex(flipped_viewport_coord);
-	vec2 sample_coord = vec2(0);
-	vec4 texture_sample = vec4(0);
-
-	// Sample 1, 1
-	sample_coord = HSM_GetCacheSampleCoord(1, 1);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	AVERAGE_LUMA = texture_sample.a;
-	SAMPLING_SCANLINE_DIR_MULT = texture_sample.r;
-	SAMPLING_OPPOSITE_DIR_MULT = texture_sample.g;
-
-	float res_mult_size_sum = 0;
-	float res_mult_size2_sum = 0;
-
-	if (SCREEN_INDEX == 1)
-	{
-		// Sample 2, 1
-		// r SCREEN_ASPECT
-		// ba SCREEN_SCALE
-		sample_coord = HSM_GetCacheSampleCoord(2, 1);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		SCREEN_ASPECT = texture_sample.r;
-		SCREEN_SCALE = texture_sample.ba;
-
-		// Sample 3, 1
-		// rg TUBE_SCALE 
-		// ba SCREEN_POS_OFFSET
-		sample_coord = HSM_GetCacheSampleCoord(3, 1);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		TUBE_SCALE = texture_sample.rg;
-		SCREEN_POS_OFFSET = texture_sample.ba;
-
-		// Sample 3, 4
-		// rg TUBE_DIFFUSE_SCALE 
-		sample_coord = HSM_GetCacheSampleCoord(3, 4);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		TUBE_DIFFUSE_SCALE = texture_sample.rg;
-		TUBE_DIFFUSE_ASPECT = TUBE_DIFFUSE_SCALE.x / TUBE_DIFFUSE_SCALE.y * output_aspect;
-
-		// Sample 4, 1
-		// rg CROPPED_ROTATED_SIZE_WITH_RES_MULT
-		sample_coord = HSM_GetCacheSampleCoord(4, 1);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		CROPPED_ROTATED_SIZE_WITH_RES_MULT = texture_sample.rg;
-		res_mult_size_sum = CROPPED_ROTATED_SIZE_WITH_RES_MULT.x + CROPPED_ROTATED_SIZE_WITH_RES_MULT.y;
-		ROTATED_CORE_PREPPED_SIZE = texture_sample.ba;
-
-		// Sample 1, 2
-		// rg CROPPED_ROTATED_SIZE
-		// ba SAMPLE_AREA_START_PIXEL_COORD
-		sample_coord = HSM_GetCacheSampleCoord(1, 2);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		CROPPED_ROTATED_SIZE = texture_sample.rg;
-		SAMPLE_AREA_START_PIXEL_COORD = texture_sample.ba;
-
-		// // Sample 5, 1
-		// // rg CROPPED_UNROTATED_SIZE
-		// sample_coord = HSM_GetCacheSampleCoord(5, 1);
-		// CROPPED_UNROTATED_SIZE = texture_sample.rg;
-		// CROPPED_UNROTATED_SIZE_WITH_RES_MULT = texture_sample.ba;
-
-		// Sample 4, 4
-		// rg screen size first screen
-		// ba screen size second screen
-		sample_coord = HSM_GetCacheSampleCoord(4, 4);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		SCREEN_SIZE = texture_sample.rg;
-	}
-	// If we are in the section of the viewport which is the second screen
-	if (SCREEN_INDEX == 2)
-	{
-		// Sample 2, 2 Sample - 2nd Screen
-		// r SCREEN_ASPECT
-		// ba SCREEN_SCALE
-		sample_coord = HSM_GetCacheSampleCoord(2, 2);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		SCREEN_ASPECT = texture_sample.r;
-		SCREEN_SCALE = texture_sample.gb;
-
-		// Sample 3, 2 - 2nd Screen
-		// rg TUBE_SCALE
-		// ba SCREEN_POS_OFFSET
-		sample_coord = HSM_GetCacheSampleCoord(3, 2);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		TUBE_SCALE = 		texture_sample.rg;
-		SCREEN_POS_OFFSET = texture_sample.ba;
-
-		// TODO need to add TUBE_DIFFUSE_ASPECT & deal with 2nd Screen
-		// Sample 3, 4
-		// ba TUBE_DIFFUSE_SCALE 
-		sample_coord = HSM_GetCacheSampleCoord(3, 4);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		TUBE_DIFFUSE_SCALE = texture_sample.ba;
-		TUBE_DIFFUSE_ASPECT = TUBE_DIFFUSE_SCALE.x / TUBE_DIFFUSE_SCALE.y * output_aspect;
-
-		// Sample 4, 2
-		// rg CROPPED_ROTATED_SIZE_WITH_RES_MULT
-		sample_coord = HSM_GetCacheSampleCoord(4, 2);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		CROPPED_ROTATED_SIZE_WITH_RES_MULT = texture_sample.rg;
-		res_mult_size2_sum = CROPPED_ROTATED_SIZE_WITH_RES_MULT.x + CROPPED_ROTATED_SIZE_WITH_RES_MULT.y;
-
-		// Sample 1, 3
-		// rg CROPPED_ROTATED_SIZE
-		// ba SAMPLE_AREA_START_PIXEL_COORD
-		sample_coord = HSM_GetCacheSampleCoord(1, 3);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		CROPPED_ROTATED_SIZE = texture_sample.rg;
-		SAMPLE_AREA_START_PIXEL_COORD = texture_sample.ba;
-
-		// Sample 4, 4
-		// rg screen size first screen
-		// ba screen size second screen
-		sample_coord = HSM_GetCacheSampleCoord(4, 4);
-		texture_sample = texture(in_cache_pass, sample_coord);
-		SCREEN_SIZE = texture_sample.ba;
-	}
-
-	// Sample 3, 1
-	// rg TUBE_SCALE 
-	// ba SCREEN_POS_OFFSET
-	sample_coord = HSM_GetCacheSampleCoord(3, 1);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	// TUBE_SCALE_1ST_SCREEN = texture_sample.rg;
-	SCREEN_POS_OFFSET_1ST_SCREEN = texture_sample.ba;
-
-	// Sample 3, 4
-	// rg TUBE_DIFFUSE_SCALE_1ST_SCREEN 
-	sample_coord = HSM_GetCacheSampleCoord(3, 4);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	TUBE_DIFFUSE_SCALE_1ST_SCREEN = texture_sample.rg;
-	// TUBE_DIFFUSE_ASPECT_1ST_SCREEN = TUBE_DIFFUSE_SCALE_1ST_SCREEN.x / TUBE_DIFFUSE_SCALE_1ST_SCREEN.y * output_aspect;
-
-	// Sample 3, 2 - 2nd Screen
-	// rg TUBE_SCALE_2ND_SCREEN
-	// ba SCREEN_POS_OFFSET_2ND_SCREEN
-	sample_coord = HSM_GetCacheSampleCoord(3, 2);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	// TUBE_SCALE_2ND_SCREEN = 		texture_sample.rg;
-	SCREEN_POS_OFFSET_2ND_SCREEN = texture_sample.ba;
-
-	// TODO need to add TUBE_DIFFUSE_ASPECT & deal with 2nd Screen
-	// Sample 3, 4
-	// ba TUBE_DIFFUSE_SCALE_2ND_SCREEN 
-	sample_coord = HSM_GetCacheSampleCoord(3, 4);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	TUBE_DIFFUSE_SCALE_2ND_SCREEN = texture_sample.ba;
-
-	// Sample 2, 3 Sample
-	// rg CORE_SIZE
-	sample_coord = HSM_GetCacheSampleCoord(2, 3);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	CORE_SIZE = texture_sample.rg;
-	ROTATED_CORE_ORIGINAL_SIZE = texture_sample.ba;
-
-	// Sample 3, 3
-	// rg VIEWPORT_SCALE
-	// ba VIEWPORT_POS
-	sample_coord = HSM_GetCacheSampleCoord(3, 3);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	VIEWPORT_SCALE = texture_sample.rg;
-	VIEWPORT_POS = texture_sample.ba;
-
-	// Sample 4, 3
-	// rg SCREEN_SCALE_2ND_SCREEN
-	// ba SCREEN_POS_OFFSET_2ND_SCREEN
-	sample_coord = HSM_GetCacheSampleCoord(4, 3);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	SCREEN_SCALE_2ND_SCREEN = texture_sample.rg;
-	SCREEN_POS_OFFSET_2ND_SCREEN = texture_sample.ba;
-
-	// Sample 1, 4
-	// g CURRENT_FRAME_FROM_CACHE_INFO
-	// b ROTATED_DEREZED_SIZE
-	sample_coord = HSM_GetCacheSampleCoord(1, 4);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	CURRENT_FRAME_FROM_CACHE_INFO = texture_sample.g;
-	ROTATED_DEREZED_SIZE = texture_sample.ba;
-
-	// Sample 2, 4 
-	// r NEGATIVE_CROP_EXPAND_MULTIPLIER
-	// g MAX_NEGATIVE_CROP
-	sample_coord = HSM_GetCacheSampleCoord(2, 4);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	NEGATIVE_CROP_EXPAND_MULTIPLIER = texture_sample.r;
-	MAX_NEGATIVE_CROP = texture_sample.g;
-	USE_VERTICAL_SCANLINES = texture_sample.b;
-
-	// Sample 8, 8
-	// r CACHE_INFO_CHANGED
-	sample_coord = HSM_GetCacheSampleCoord(8, 8);
-	texture_sample = texture(in_cache_pass, sample_coord);
-	CACHE_INFO_CHANGED = texture_sample.r > 0.5 ? true : false;
-
-	SCREEN_SCALE_WITH_ZOOM = SCREEN_SCALE * HSM_VIEWPORT_ZOOM;
-	SCREEN_COORD = HSM_GetVTexCoordWithArgs(flipped_viewport_coord, SCREEN_SCALE, SCREEN_POS_OFFSET);
-	TUBE_DIFFUSE_COORD = HSM_GetVTexCoordWithArgs(flipped_viewport_coord, TUBE_DIFFUSE_SCALE, SCREEN_POS_OFFSET);
-	TUBE_DIFFUSE_COORD_MIXED_POS = HSM_GetVTexCoordWithArgs(flipped_viewport_coord, TUBE_DIFFUSE_SCALE_1ST_SCREEN, (SCREEN_POS_OFFSET_1ST_SCREEN + SCREEN_POS_OFFSET_2ND_SCREEN) / 2.0);
-
-	return vec4(0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/common-functions-bezel.inc b/bezel/Mega_Bezel/shaders/base/common/common-functions-bezel.inc
deleted file mode 100644
index c9b4a4472f..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/common-functions-bezel.inc
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-vec2 HSM_GetOuterBezelScale(vec2 tube_diffuse_scale, float screen_aspect)
-{
-	vec2 bezel_outer_scale_offset = vec2(HSM_BZL_WIDTH / screen_aspect + 1, HSM_BZL_HEIGHT + 1);
-	return bezel_outer_scale_offset;
-}
-
-vec2 GetDefaultScreenScale()
-{
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-	vec2 out_placement_scale = DEFAULT_UNCORRECTED_SCREEN_SCALE;
-	out_placement_scale.x /= output_aspect;
-	return out_placement_scale;
-}
-
-vec2 GetDefaultBezelScale()
-{
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-	vec2 out_placement_scale = DEFAULT_UNCORRECTED_BEZEL_SCALE;
-	out_placement_scale.x /= output_aspect;
-	return out_placement_scale;
-}
-
-float HSM_GetSimpleBezelCoords(vec2 tube_diffuse_coord, 
-								vec2 tube_diffuse_scale, 
-								vec2 tube_scale, 
-								float screen_aspect,
-								inout vec2 bezel_outside_coord, 
-								inout vec2 frame_outside_coord)
-{
-	float output_aspect = global.OutputSize.x / global.OutputSize.y;
-
-	vec2 bezel_outer_pos_offset = vec2(0, HSM_BZL_OUTER_POSITION_Y);
-	vec2 bezel_outer_scale_offset = HSM_GetOuterBezelScale(tube_diffuse_scale, screen_aspect);
-
-	bezel_outside_coord = tube_diffuse_coord + bezel_outer_pos_offset;
-
-	vec2 black_edge_scale_offset = tube_scale / tube_diffuse_scale;
-
-	bezel_outside_coord = HSM_GetInverseScaledCoord(bezel_outside_coord, black_edge_scale_offset * bezel_outer_scale_offset) + vec2(0, HSM_BZL_OUTER_POSITION_Y);
-	frame_outside_coord = (bezel_outside_coord + 
-							vec2(0, HSM_FRM_OUTER_POS_Y) - 0.5) / 
-							vec2((HSM_FRM_THICKNESS * HSM_FRM_THICKNESS_SCALE_X) / 
-							(tube_diffuse_scale.x / tube_diffuse_scale.y * output_aspect) + 1, 
-							HSM_FRM_THICKNESS + 1) + 0.5;
-	return 0;
-}
-
-float HSM_GetBezelCoords(vec2 tube_diffuse_coord, 
-							vec2 tube_diffuse_scale, 
-							vec2 tube_scale, 
-							float screen_aspect, 
-							bool curve_coords_on,
-							inout vec2 bezel_outside_scale,
-							inout vec2 bezel_outside_coord, 
-							inout vec2 bezel_outside_curved_coord, 
-							inout vec2 frame_outside_curved_coord)
-{
-	float output_aspect = global.OutputSize.x / global.OutputSize.y;
-
-	vec2 bezel_outer_pos_offset = vec2(0, HSM_BZL_OUTER_POSITION_Y);
-	vec2 bezel_outer_scale_offset = HSM_GetOuterBezelScale(tube_diffuse_scale, screen_aspect);
-
-	bezel_outside_coord = tube_diffuse_coord + bezel_outer_pos_offset;
-	bezel_outside_curved_coord = bezel_outside_coord;
-
-	// Only run curved coordinates if requested or we are using tilt
-	if (curve_coords_on)
-		if ((HSM_CURVATURE_MODE > 0) && ((HSM_CURVATURE_3D_TILT_ANGLE_X != 0) || (HSM_CURVATURE_3D_TILT_ANGLE_Y != 0)))
-			bezel_outside_curved_coord = HSM_GetCurvedCoord(bezel_outside_curved_coord, 0, bezel_outer_scale_offset.x * output_aspect / bezel_outer_scale_offset.y);
-
-	vec2 black_edge_scale_offset = tube_scale / tube_diffuse_scale;
-
-	bezel_outside_scale.xy = tube_diffuse_scale * black_edge_scale_offset * bezel_outer_scale_offset;
-	// bezel_outside_transform.zw = -vec2(HSM_SCREEN_POSITION_X, HSM_SCREEN_POSITION_Y) + bezel_outer_pos_offset * tube_diffuse_scale;
-
-	bezel_outside_coord = HSM_GetInverseScaledCoord(bezel_outside_coord, black_edge_scale_offset * bezel_outer_scale_offset) + vec2(0, HSM_BZL_OUTER_POSITION_Y);
-	bezel_outside_curved_coord = HSM_GetInverseScaledCoord(bezel_outside_curved_coord, black_edge_scale_offset * bezel_outer_scale_offset) + vec2(0, HSM_BZL_OUTER_POSITION_Y);
-
-	frame_outside_curved_coord = (bezel_outside_curved_coord + 
-							vec2(0, HSM_FRM_OUTER_POS_Y) - 0.5) / 
-							vec2((HSM_FRM_THICKNESS * HSM_FRM_THICKNESS_SCALE_X) / 
-							(tube_diffuse_scale.x / tube_diffuse_scale.y * output_aspect) + 1, 
-							HSM_FRM_THICKNESS + 1) + 0.5;
-
-	if (HSM_BZL_OUTER_CURVATURE_SCALE > 0)
-	{
-		if (curve_coords_on)
-			bezel_outside_curved_coord = HSM_GetTubeCurvedCoord(bezel_outside_curved_coord, 
-																HSM_BZL_OUTER_CURVATURE_SCALE, 
-																tube_diffuse_scale, 
-																tube_scale, 
-																bezel_outer_scale_offset.x * global.OutputSize.x / global.OutputSize.y / bezel_outer_scale_offset.y, 
-																0);
-
-		if (curve_coords_on)
-			if ( HSM_FRM_OUTER_CURVATURE_SCALE > 0)
-				frame_outside_curved_coord = HSM_GetTubeCurvedCoord(frame_outside_curved_coord, 
-																	HSM_BZL_OUTER_CURVATURE_SCALE * HSM_FRM_OUTER_CURVATURE_SCALE, 
-																	tube_diffuse_scale, 
-																	tube_scale, 
-																	bezel_outer_scale_offset.x * global.OutputSize.x / global.OutputSize.y / bezel_outer_scale_offset.y, 
-																	0);
-	}
-	
-	DEFAULT_SCREEN_SCALE = GetDefaultScreenScale();
-	DEFAULT_BEZEL_SCALE = GetDefaultBezelScale();
-
-	return 0;
-}
-
-float MAX_LAYER_ORDER = 12;
-
-bool HSM_GetUseTubeStaticReflection()
-{
-	return HSM_TUBE_STATIC_REFLECTION_IMAGE_ON > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE);
-}
-
-bool HSM_GetUseTubeDiffuseImage()
-{
-	return HSM_TUBE_DIFFUSE_MODE == 1 && HSM_GetUseOnCurrentScreenIndex(HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE);
-}
-
-bool HSM_GetUseTubeColoredGelImage()
-{
-	return HSM_TUBE_COLORED_GEL_IMAGE_ON > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_TUBE_COLORED_GEL_IMAGE_DUALSCREEN_VIS_MODE);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/common-functions.inc b/bezel/Mega_Bezel/shaders/base/common/common-functions.inc
deleted file mode 100644
index d2d22adef9..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/common-functions.inc
+++ /dev/null
@@ -1,1195 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-#include "helper-functions.inc"
-#include "base-functions.inc"
-
-#ifndef IS_POTATO_PRESET
-#include "royale-geometry-functions.inc"
-#endif
-
-float CURVATURE_MODE_OFF = 0;
-float CURVATURE_MODE_2D = 1;
-float CURVATURE_MODE_2D_CYLINDER = 2;
-float CURVATURE_MODE_3D_1 = 3;
-float CURVATURE_MODE_3D_2 = 4;
-float CURVATURE_MODE_3D_CYLINDER = 5;
-
-float HSM_GetAspectRatioFromMode(float in_aspect_ratio_mode, float in_explicit_aspect)
-{                                                  
-	float out_explicit_aspect = in_explicit_aspect;
-
-	if (in_aspect_ratio_mode == TEXTURE_ASPECT_MODE_VIEWPORT)
-		out_explicit_aspect = global.OutputSize.x / global.OutputSize.y;
-	if (in_aspect_ratio_mode == TEXTURE_ASPECT_MODE_4_3)
-		out_explicit_aspect = 1.33333;
-	if (in_aspect_ratio_mode == TEXTURE_ASPECT_MODE_3_4)
-		out_explicit_aspect = 0.75;
-	if (in_aspect_ratio_mode == TEXTURE_ASPECT_MODE_16_9)
-		out_explicit_aspect = 1.7777;
-	if (in_aspect_ratio_mode == TEXTURE_ASPECT_MODE_9_16)
-		out_explicit_aspect = 0.5625;
-
-	return out_explicit_aspect;
-}
-
-vec2 HSM_GetRotatedCoreOriginalSize()
-{
-	return abs(HSM_ROTATE_CORE_IMAGE) * global.OriginalSize.yx + (1 - abs(HSM_ROTATE_CORE_IMAGE)) * global.OriginalSize.xy;
-}
-
-// Core Prepped Size is the size after DeRez
-vec2 HSM_GetDerezedSize()
-{
-	return global.DerezedPassSize.xy;
-}
-
-vec2 HSM_GetRotatedDerezedSize()
-{
-	return abs(HSM_ROTATE_CORE_IMAGE) * global.DerezedPassSize.yx + (1 - abs(HSM_ROTATE_CORE_IMAGE)) * global.DerezedPassSize.xy;
-}
-
-float HSM_GetSwappedScreenIndex(float screen_index)
-{
-	float out_index = screen_index;
-
-	if (HSM_DUALSCREEN_CORE_IMAGE_SWAP_SCREENS == 1)
-	{
-		if (screen_index == 1)
-		{
-			out_index = 2;
-		}
-		else
-		{
-			out_index = 1;
-		}
-	}
-
-	return out_index;
-}
-
-vec2 HSM_RotateCoordinate(vec2 in_coord, float rotation)
-{
-	if (rotation == 0)
-		return in_coord;
-	
-	float abs_rotation = abs(rotation);
-	vec2 ctr_coord = in_coord - 0.5;
-
-	ctr_coord = (1 - abs_rotation) * ctr_coord
-				+ clamp(abs_rotation, 0, 1) * abs_rotation * vec2(-ctr_coord.y, ctr_coord.x)
-				+ abs(clamp(abs_rotation, -1, 0)) * abs_rotation * vec2(ctr_coord.y, -ctr_coord.x);
-
-	if (rotation < 0)
-		ctr_coord *= -1;
-
-	return ctr_coord + 0.5;
-}
-
-// Texture Sampler function which takes a coordinate in the cropped coordinate space
-vec4 HSM_GetTexSampleFromSampleStartAndSize(sampler2D in_sampler, vec2 in_screen_coord, vec2 sample_start_pixel_coord, vec2 window_size)
-{
-	vec2 core_prepped_size = HSM_GetRotatedDerezedSize();
-
-	if ( HSM_DUALSCREEN_MODE > 0 )
-		if (HSM_FLIP_CORE_VERTICAL == -1)
-			in_screen_coord.y = 1 - in_screen_coord.y;
-			
-		// in_screen_coord.y = abs(HSM_FLIP_CORE_VERTICAL) * (1 - in_screen_coord.y) + (1 - abs(HSM_FLIP_CORE_VERTICAL)) * in_screen_coord.y;
-		// in_screen_coord.y = HSM_FLIP_CORE_VERTICAL * (in_screen_coord.y - 0.5) + 0.5;
-		
-	vec2 px_coord = SAMPLE_AREA_START_PIXEL_COORD + in_screen_coord * window_size;
-
-	vec2 sample_coord = px_coord / core_prepped_size;
-	sample_coord =  HSM_RotateCoordinate(sample_coord, HSM_ROTATE_CORE_IMAGE);
-	
-	vec4 out_color = texture(in_sampler, sample_coord);
-
-	return out_color;
-}
-
-// Applies the position before scaling from the center
-// Should allow having an image where the center of the tube in the graphic is off center
-// the position offset moves it so the screen is centered, then the graphic is scaled from the center 
-vec2 HSM_AddPosScaleToCoord(vec2 in_base_coord, vec2 in_pos, vec2 in_scale)
-{
-	vec2 positioned_coord = in_base_coord + in_pos;
-	vec2 out_coord = HSM_GetInverseScaledCoord(positioned_coord, in_scale);
-	return out_coord;
-}
-
-vec2 GetSimpleImageScaledCoord(vec2 in_viewport_coord, vec2 in_viewport_unscaled_coord, vec2 in_tube_coord, vec2 in_tube_scale, in sampler2D in_sampler, vec2 in_pos, float in_inherit_pos, vec2 in_scale, float in_scale_inherit_mode, float in_keep_aspect, float in_mirror_horz, float in_rotate )
-{
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-
-	vec2 coord_ctr = vec2(1);
-
-	if (in_scale_inherit_mode == 0)
-		coord_ctr = in_viewport_unscaled_coord - 0.5;
-	if (in_scale_inherit_mode == 1)
-		coord_ctr = in_viewport_coord - 0.5;
-
-	if (in_scale_inherit_mode == 2)
-	{
-		if (in_inherit_pos < 0.5 || HSM_DUALSCREEN_MODE > 0.5)
-			coord_ctr = (in_viewport_coord - 0.5) / in_tube_scale * vec2((in_tube_scale.x / in_tube_scale.y), 1) * DEFAULT_SCREEN_HEIGHT; //in_tube_scale.y / (in_tube_scale.y / DEFAULT_SCREEN_HEIGHT);
-		else
-		 	coord_ctr = (in_tube_coord - 0.5) * vec2((in_tube_scale.x / in_tube_scale.y), 1) * DEFAULT_SCREEN_HEIGHT; // / vec2( 1 / (in_tube_scale.x / in_tube_scale.y), 1);
-
-		// If it's dual screen is on, then the screens are at least half the size,
-		// so scale up the image so it covers the whole viewport by default
-		if (HSM_DUALSCREEN_MODE > 0.5)
-			coord_ctr *= 0.5;
-	}
-
-	coord_ctr.x = in_mirror_horz == 1 ? -1 * coord_ctr.x : coord_ctr.x;
-	
-	in_viewport_coord = HSM_RotateCoordinate(in_viewport_coord, in_rotate);
-
-	vec2 tex_size = textureSize(in_sampler, 0);
-	float tex_aspect = in_rotate == 1 ? tex_size.y / tex_size.x : tex_size.x / tex_size.y;
-
-	coord_ctr.x *= in_keep_aspect == 1 ? output_aspect / tex_aspect : 1;
-	coord_ctr /= in_rotate > 0.5 ? global.FinalViewportSize.x / global.FinalViewportSize.y : 1;
-
-	if (in_rotate > 0.5)
-	{
-		coord_ctr = vec2(-coord_ctr.y, -coord_ctr.x);
-	}
-
-	return HSM_AddPosScaleToCoord(coord_ctr + 0.5, in_pos, in_scale);
-}
-
-vec2 HSM_GetScreenPositionOffset(vec2 placement_image_pos, vec2 screen_scale, float screen_index )
-{
-
-	float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y;
-
-
-	// If we are not using the image placement then get its offset from the center
-	placement_image_pos = HSM_USE_IMAGE_FOR_PLACEMENT == 1 && screen_index == 1 ? placement_image_pos : vec2(0.5);
-
-	vec2 pos_offset = screen_index == 1 ? vec2(HSM_SCREEN_POSITION_X / output_aspect, HSM_SCREEN_POSITION_Y) + (placement_image_pos - 0.5)
-										: vec2(HSM_2ND_SCREEN_POS_X / output_aspect, HSM_2ND_SCREEN_POS_Y);
-
-	float split_offset_multiplier = screen_index == 1 ? -1 : 1;
-
-	if (HSM_DUALSCREEN_MODE == 1)
-	{
-		if (HSM_DUALSCREEN_SHIFT_POSITION_WITH_SCALE == 1)
-			pos_offset.y += HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION + split_offset_multiplier * screen_scale.y * 1.17 / 2;
-		else
-			pos_offset.y += split_offset_multiplier * 0.25;
-
-		pos_offset.y += split_offset_multiplier * HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS;
-	}
-
-	if (HSM_DUALSCREEN_MODE == 2)
-	{
-		if (HSM_DUALSCREEN_SHIFT_POSITION_WITH_SCALE == 1)
-			pos_offset.x += HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION / output_aspect + split_offset_multiplier * screen_scale.x * 1.17 / 2;
-		else
-			pos_offset.x += split_offset_multiplier * 0.25 / output_aspect;
-
-		pos_offset.x += split_offset_multiplier * HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS / output_aspect;
-	}
-
-	return pos_offset;
-}
-
-float HSM_GetAverageLuma(sampler2D Source, vec2 SourceSize)
-{
-   //////// Calculate Average Luminance ////////// 
-   float m = max(log2(global.SourceSize.x), log2(global.SourceSize.y));
-	m = max(m - 1.0, 1.0);
-	
-	float luma_total = 0.0;
-	
-	float num_samples = 5;
-	float sample_dist = 1 / (num_samples - 1);
-	vec4 tex_sample = vec4(0);
-	for (float i = 0; i <= num_samples; i++)
-	{
-		for (float j = 0; j <= num_samples; j++)
-		{
-			tex_sample = textureLod(Source, vec2(sample_dist * i, sample_dist * j), m);
-			luma_total += max(0.0, (tex_sample.r + tex_sample.g + tex_sample.g) / 3);
-			// luma_total += max(0.0, length(tex_sample.rgb));
-		}
-	}
-	luma_total = pow(0.577350269 * luma_total / (num_samples * num_samples), 0.6);
-   return luma_total;
-}
-
-vec3 HSM_GetScreenPlacementAndHeight(sampler2D in_sampler_2D, float num_samples)
-{
-	if (HSM_USE_IMAGE_FOR_PLACEMENT == 1)
-	{
-		float screen_top_y_pos = 1;
-		float screen_bottom_y_pos = 0;
-
-		for (int i=0; i < num_samples; i++)
-		{
-			float y_pos = i * 1 / num_samples;
-			vec4 sample_color = texture(in_sampler_2D, vec2(0.5, y_pos));
-			float test_value = 0;
-			if (HSM_PLACEMENT_IMAGE_MODE > 0)
-				test_value = (sample_color.r + sample_color.b + sample_color.g) / 3;
-			else
-				test_value = 1 - sample_color.a;
-
-			if (test_value > 0.5)
-			{
-				screen_top_y_pos = min(screen_top_y_pos, y_pos);
-				screen_bottom_y_pos = max(screen_bottom_y_pos, y_pos);
-			}
-		}
-
-		float screen_left_x_pos = 0.75;
-		float screen_right_x_pos = 0.25;
-
-		if (HSM_PLACEMENT_IMAGE_USE_HORIZONTAL == 1)
-			for (int i=0; i < num_samples; i++)
-			{
-				float x_pos = 0.25 + i * 0.5 / num_samples;
-				vec4 sample_color = texture(in_sampler_2D, vec2(x_pos, 0.5));
-				float test_value = 0;
-				if (HSM_PLACEMENT_IMAGE_MODE == 1)
-					test_value = (sample_color.r + sample_color.b + sample_color.g) / 3;
-				else
-					test_value = 1 - sample_color.a;
-
-				if (test_value > 0.5)
-				{
-					screen_left_x_pos = min(screen_left_x_pos, x_pos);
-					screen_right_x_pos = max(screen_right_x_pos, x_pos);
-				}
-			}
-
-		return vec3((screen_left_x_pos + screen_right_x_pos) / 2, (screen_top_y_pos + screen_bottom_y_pos) / 2, screen_bottom_y_pos - screen_top_y_pos);
-	}
-	else
-		return vec3(0.5, 0.5, 1);
-}
-
-vec2 HSM_GetScreenVTexCoord(vec2 in_coord, vec2 in_screen_scale, vec2 position_offset)
-{
-	return HSM_GetVTexCoordWithArgs(in_coord, in_screen_scale, position_offset);
-}
-
-vec2 HSM_GetCurvatureValues(float screen_aspect)
-{
-	vec2 curvature_values = screen_aspect < 1 ? vec2(2 * HSM_CURVATURE_2D_SCALE_SHORT_AXIS * 2 / 100, HSM_CURVATURE_2D_SCALE_LONG_AXIS * 3 / 100)
-											  : vec2(HSM_CURVATURE_2D_SCALE_LONG_AXIS * 3 / 100, 2 * HSM_CURVATURE_2D_SCALE_SHORT_AXIS * 2 / 100);
-	return curvature_values;
-}
-
-
-// CRT Geom Curvature
-#define FIX(c) max(abs(c), 1e-5)
-
-float intersect(vec2 in_coord , vec2 sinangle, vec2 cosangle, float in_radius, float in_distance)
-{
-  float A = dot(in_coord, in_coord) + in_distance.x * in_distance.x;
-  float B = 2.0 * (in_radius * (dot(in_coord, sinangle) - in_distance.x * cosangle.x * cosangle.y) - in_distance.x * in_distance.x);
-  float C = in_distance.x * in_distance.x + 2.0 * in_radius * in_distance.x * cosangle.x * cosangle.y;
-  return (-B-sqrt(B * B - 4.0 * A * C)) / (2.0 * A);
-}
-
-vec2 bkwtrans(vec2 in_coord, vec2 sinangle, vec2 cosangle, float in_radius, float in_distance)
-{
-  float c = intersect(in_coord, sinangle, cosangle, in_radius, in_distance);
-  vec2 pt = vec2(c) * in_coord;
-  pt -= vec2(-in_radius) * sinangle;
-  pt /= vec2(in_radius);
-  vec2 tang = sinangle / cosangle;
-  vec2 poc = pt / cosangle;
-  float A = dot(tang, tang) + 1.0;
-  float B = -2.0 * dot(poc, tang);
-  float C = dot(poc,poc)-1.0;
-  float a = (-B + sqrt(B * B - 4.0 * A * C)) / (2.0 * A);
-  vec2 uv = (pt - a * sinangle) / cosangle;
-  float r = FIX(in_radius * acos(a));
-  return uv * r / sin(r / in_radius);
-}
-
-vec2 fwtrans(vec2 uv, vec2 sinangle, vec2 cosangle, float in_radius, float in_distance)
-{
-  float r = FIX(sqrt(dot(uv,uv)));
-  uv *= sin(r/in_radius)/r;
-  float x = 1.0-cos(r/in_radius);
-  float D = in_distance/in_radius + x*cosangle.x*cosangle.y+dot(uv,sinangle);
-  return in_distance*(uv*cosangle-x*sinangle)/D;
-}
-
-vec3 maxscale(vec2 sinangle, vec2 cosangle, float in_radius, float in_distance, float in_aspect)
-{
-  vec2 aspect_vec2 = vec2(1, 1/in_aspect);
-  vec2 c = bkwtrans(-in_radius * sinangle / (1.0 + in_radius/in_distance*cosangle.x*cosangle.y), sinangle, cosangle, in_radius, in_distance);
-  vec2 a = vec2(0.5,0.5)*aspect_vec2.xy;
-
-  vec2 lo = vec2(	fwtrans(vec2(-a.x,c.y), sinangle, cosangle, in_radius, in_distance).x,
-		 			fwtrans(vec2(c.x,-a.y), sinangle, cosangle, in_radius, in_distance).y)/aspect_vec2.xy;
-
-  vec2 hi = vec2(	fwtrans(vec2(+a.x,c.y), sinangle, cosangle, in_radius, in_distance).x,
-		 			fwtrans(vec2(c.x,+a.y), sinangle, cosangle, in_radius, in_distance).y)/aspect_vec2.xy;
-
-  return vec3((hi+lo)*aspect_vec2.xy*0.5,max(hi.x-lo.x,hi.y-lo.y));
-}
-
-vec2 transform(vec2 coord, vec3 stretch, vec2 sinangle, vec2 cosangle, float in_radius, float in_distance, vec2 aspect)
-{
-  coord = (coord-vec2(0.5))*aspect.xy*stretch.z+stretch.xy;
-  return (bkwtrans(coord, sinangle, cosangle, in_radius, in_distance)/aspect.xy+vec2(0.5));
-}
-
-// TODO need to rescale so the screen does not shrink
-vec2 HSM_GetGeomCurvedCoord(vec2 in_coord, float tilt_x, float tilt_y, float in_radius, float in_distance, float in_aspect)
-{
-	//default radius = 3.5
-    //default distance = 2
-	in_distance *= 1.4;
-	vec2 ang = vec2(tilt_x, tilt_y);
-	vec2 v_sinangle = sin(ang);
-	vec2 v_cosangle = cos(ang);
-	vec3 v_stretch = maxscale(v_sinangle, v_cosangle, in_radius, in_distance, in_aspect);
-	vec2 aspect_vec2 = vec2(1, 1/in_aspect);
-	vec2 curved_coord = transform(in_coord, v_stretch, v_sinangle, v_cosangle, in_radius, in_distance, aspect_vec2);
-
-	return curved_coord;
-}
-
-vec2 HSM_GetGeomCurvedCoordRetainWidth(vec2 in_coord, float tilt_x, float tilt_y, float in_radius, float in_distance, float in_aspect)
-{
-	vec2 ctr_curved_coord =  HSM_GetGeomCurvedCoord(in_coord, tilt_x, tilt_y, in_radius, in_distance, in_aspect) - 0.5;
-	vec2 right_edge_curved_ctr_coord = HSM_GetGeomCurvedCoord(vec2(1, 0.5), tilt_x, tilt_y, in_radius, in_distance, in_aspect) - 0.5;
-	ctr_curved_coord.x = ctr_curved_coord.x * 0.5 / right_edge_curved_ctr_coord.x;
-	return ctr_curved_coord + 0.5;
-}
-
-/*
-vec2 HSM_GetGuestCurvedCoord(vec2 in_coord, vec2 in_curvature, float in_curvature_shape)
-{
-	vec2 pos = in_coord;
-	float warpX = in_curvature.x;
-	float warpY = in_curvature.y;
-	float c_shape = in_curvature_shape;
-
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-*/
-
-/*
-vec2 HSM_GetTorridGristleCurvedCoord(vec2 in_coord, vec2 in_curvature){
-	// default curvature is vec2(0.031, 0.041
-	vec2 Distortion = in_curvature * 15;// * vec2(0.031, 0.041);
-
-	vec2 curvedCoords = in_coord * 2.0 - 1.0;
-	float curvedCoordsDistance = sqrt(curvedCoords.x*curvedCoords.x+curvedCoords.y*curvedCoords.y);
-
-	curvedCoords = curvedCoords / curvedCoordsDistance;
-
-	curvedCoords = curvedCoords * (1.0-pow(vec2(1.0-(curvedCoordsDistance/1.4142135623730950488016887242097)),(1.0/(1.0+Distortion*0.2))));
-
-	curvedCoords = curvedCoords / (1.0-pow(vec2(0.29289321881345247559915563789515),(1.0/(vec2(1.0)+Distortion*0.2))));
-
-	curvedCoords = curvedCoords * 0.5 + 0.5;
-	return curvedCoords;
-}
-*/
-
-vec2 HSM_GetCrtPiCurvedCoord(vec2 in_coord, vec2 in_curvature)
-{
-	// Barrel distortion shrinks the display area a bit, this will allow us to counteract that.
-	in_curvature *= 5;
-	vec2 barrelScale = 1.0 - (0.23 * in_curvature);
-    in_coord -= vec2(0.5);
-    float rsq = in_coord.x * in_coord.x + (HSM_CURVATURE_MODE == 2 ? 0 : in_coord.y * in_coord.y);
-    in_coord += in_coord * (in_curvature * rsq);
-    in_coord *= barrelScale;
-	in_coord += vec2(0.5);
-    return in_coord;
-}
-
-vec2 HSM_Get2DCurvedCoord(vec2 in_coord, vec2 curvature_values)
-{
-	vec2 ctr_curved_coord = vec2(0) ;
-
-	ctr_curved_coord = HSM_GetCrtPiCurvedCoord(in_coord, curvature_values) - 0.5;
-
-	vec2 right_edge_curved_ctr_coord = HSM_GetCrtPiCurvedCoord(vec2(1, 0.5), curvature_values) - 0.5;
-	ctr_curved_coord.x = ctr_curved_coord.x * 0.5 / right_edge_curved_ctr_coord.x;
-
-	vec2 bottom_edge_curved_ctr_coord =  HSM_GetCrtPiCurvedCoord(vec2(0.5, 1), curvature_values) - 0.5;
-	ctr_curved_coord.y = ctr_curved_coord.y * 0.5 / bottom_edge_curved_ctr_coord.y;
-
-	return ctr_curved_coord + 0.5;
-}
-
-vec2 HSM_GetCurvedCoord(vec2 in_coord, float curvature_multiplier, float screen_aspect)
-{
-	if (HSM_CURVATURE_MODE == CURVATURE_MODE_OFF)
-		return in_coord;
-	
-	float epsilon = 0.002;
-
-	vec2 adjusted_coord = in_coord;
-	float tilt_angle_y = HSM_CURVATURE_3D_TILT_ANGLE_Y;
-	float tilt_angle_x = HSM_CURVATURE_3D_TILT_ANGLE_X;
-	float pin_inner_edge = 0;
-
-	vec2 curved_coord = vec2(0);
-
-#ifndef IS_POTATO_PRESET
-	if (HSM_CURVATURE_MODE > CURVATURE_MODE_2D_CYLINDER)
-	{
-		if (HSM_USE_GEOM > 0.5)
-			curved_coord = HSM_GetGeomCurvedCoordRetainWidth(in_coord, HSM_CURVATURE_3D_TILT_ANGLE_X, HSM_CURVATURE_3D_TILT_ANGLE_Y, HSM_CURVATURE_3D_RADIUS, HSM_CURVATURE_3D_VIEW_DIST, screen_aspect);
-		else
-		{
-			float geom_radius_with_mult = HSM_CURVATURE_3D_RADIUS;
-			// Adjust curvature so 3D mode 1 looks similar to 3D mode 2
-			if (HSM_CURVATURE_MODE == CURVATURE_MODE_3D_1) geom_radius_with_mult -= 0.40;
-			if (HSM_CURVATURE_MODE == CURVATURE_MODE_3D_CYLINDER) geom_radius_with_mult -= 1;
-			geom_radius_with_mult *= (1 / (curvature_multiplier + epsilon));
-			mat2x2 pixel_to_video_uv;
-
-			float geom_mode = HSM_CURVATURE_MODE - 2;
-
-			curved_coord = HRG_GetGeomCurvedCoord(	adjusted_coord, 
-													geom_mode, 
-													geom_radius_with_mult,
-													HSM_CURVATURE_3D_VIEW_DIST,
-													tilt_angle_x,
-													tilt_angle_y,
-													screen_aspect,
-													pin_inner_edge,
-													global.SourceSize.xy,
-													global.OutputSize.xy,
-													pixel_to_video_uv);
-		}
-	}
-	else
-	{
-		vec2 curvature_values = curvature_multiplier * HSM_GetCurvatureValues(screen_aspect);
-		curved_coord = HSM_Get2DCurvedCoord(adjusted_coord, curvature_values);
-	}
-#endif
-
-#ifdef IS_POTATO_PRESET
-	vec2 curvature_values = curvature_multiplier * HSM_GetCurvatureValues(screen_aspect);
-	curved_coord = HSM_Get2DCurvedCoord(adjusted_coord, curvature_values);
-#endif
-
-	return curved_coord;
-}
-
-vec2 HSM_GetCRTShaderCurvedCoord(vec2 in_coord)
-{	
-	vec2 out_coord = HSM_GetCurvedCoord(in_coord, 1, SCREEN_ASPECT);
-	
-	if (HHLP_IsOutsideCoordSpace(out_coord))
-	{
-		vec2 tube_scale_ratio = TUBE_SCALE / SCREEN_SCALE;
-		out_coord = (out_coord - 0.5) / tube_scale_ratio + 0.5;
-	}
-	else if (HSM_CRT_CURVATURE_SCALE < 100)
-		out_coord = HSM_GetCurvedCoord(in_coord, HSM_CRT_CURVATURE_SCALE, SCREEN_ASPECT);
-
-	return out_coord;
-}
-
-vec2 HSM_GetMirrorWrappedCoord(vec2 in_coord)
-{	
-	vec2 ctr_coord = in_coord - 0.5;
-	if (abs(ctr_coord.x) > 0.5 || abs(ctr_coord.y) > 0.5 )
-		in_coord = ctr_coord / HSM_SCREEN_REFLECTION_SCALE + 0.5 + vec2(HSM_SCREEN_REFLECTION_POS_X, HSM_SCREEN_REFLECTION_POS_Y);
-
-	in_coord = mod(in_coord, 2);
-	vec2 ctr_mirror_coord = in_coord - 0.5;
-
-	float mirror_x = clamp(clamp(abs(ctr_mirror_coord.x) - 0.5, 0, 1) * 100000, 0, 1);
-	float mirror_y = clamp(clamp(abs(ctr_mirror_coord.y) - 0.5, 0, 1) * 100000, 0, 1);
-
-	ctr_mirror_coord.x = ctr_mirror_coord.x - mirror_x * 2 * sign(ctr_mirror_coord.x) * (abs(ctr_mirror_coord.x) - 0.5);
-	ctr_mirror_coord.y = ctr_mirror_coord.y - mirror_y * 2 * sign(ctr_mirror_coord.y) * (abs(ctr_mirror_coord.y) - 0.5);
-
-	return ctr_mirror_coord + 0.5;
-}
-
-vec2 HSM_GetMirrorWrapCoord(vec2 in_coord)
-{
-	vec2 ctr_coord = in_coord - 0.5;
-	vec2 ctr_mirror_coord = vec2(0,0);
-
-	float x_is_outside = clamp((clamp(abs(ctr_coord.x), 0.5, 1) - 0.5) * 100000, 0, 1);
-	ctr_mirror_coord.x = (1 - x_is_outside) * ctr_coord.x + 
-						x_is_outside * (ctr_coord.x - 2 * sign(ctr_coord.x) * (abs(ctr_coord.x) - 0.5));
-
-	float y_is_outside = clamp((clamp(abs(ctr_coord.y), 0.5, 1) - 0.5) * 100000, 0, 1);
-	ctr_mirror_coord.y = (1 - y_is_outside) * ctr_coord.y + 
-						y_is_outside * (ctr_coord.y - 2 * sign(ctr_coord.y) * (abs(ctr_coord.y) - 0.5));
-
-	return ctr_mirror_coord + 0.5;
-}
-
-// Borrowed from cgwg's crt-geom, under GPL
-float HSM_GetCornerMask(vec2 in_coord, float screen_aspect, float corner_radius, float edge_sharpness)
-// returns 0.0 - 1.0 value used for masking the corner so it looks round
-{
-	//(0.5 - abs(in_coord - 0.5)) * 2
-	vec2 new_coord = min(in_coord, vec2(1.0) - in_coord) * vec2(screen_aspect, 1);
-	vec2 corner_distance = vec2(max(corner_radius / 1000.0, (1.0 - edge_sharpness) * 0.01));
-	new_coord = (corner_distance - min(new_coord, corner_distance));
-	float distance = sqrt(dot(new_coord, new_coord));
-
-	return clamp((corner_distance.x - distance) * (edge_sharpness * 500 + 100), 0.0, 1.0);
-}
-
-// Guest improved corner mask, to integrate
-// sborder is border intensity
-// float corner(vec2 pos) {
-// 	vec2 b = vec2(bsize1, bsize1) *  vec2(1.0, OutputSize.x/OutputSize.y) * 0.05;
-// 	pos = clamp(pos, 0.0, 1.0);
-// 	pos = abs(2.0*(pos - 0.5));
-// 	float csize1 = mix(400.0, 7.0,  pow(4.0*csize, 0.10));
-// 	float crn = dot(pow(pos, csize1.xx), vec2(1.0, OutputSize.y/OutputSize.x));
-// 	crn = (csize == 0.0) ? max(pos.x, pos.y) : pow(crn, 1.0/csize1);
-// 	pos = max(pos, crn);
-// 	vec2 res = (bsize1 == 0.0) ? 1.0.xx : mix(0.0.xx, 1.0.xx, smoothstep(1.0.xx, 1.0.xx-b, sqrt(pos)));
-// 	res = pow(res, sborder.xx);	
-// 	return sqrt(res.x*res.y);
-// }
-
-vec2 HSM_GetTubeCurvedCoord(vec2 screen_coord, float curvature_scale, vec2 screen_scale, vec2 tube_scale, float screen_aspect, float apply_black_edge_offset)
-{
-	vec2 black_edge_scale_offset = tube_scale / screen_scale;
-
-	// Get the curved coordinate
-	vec2 tube_curved_coord = vec2(0.5, 0.5);
-
-	if (HSM_BZL_USE_INDEPENDENT_CURVATURE == 1)
-	{
-		vec2 curvature_values = screen_aspect < 1 ? vec2(2 * HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS * 2 / 100, HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS * 3 / 100)
-											: vec2(HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS * 3 / 100, 2 * HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS * 2 / 100);
-		curvature_values *= curvature_scale * HSM_BZL_INNER_CURVATURE_SCALE;
-		tube_curved_coord = HSM_Get2DCurvedCoord(screen_coord, curvature_values);
-	}
-	else
-	{
-		tube_curved_coord = HSM_GetCurvedCoord(screen_coord, curvature_scale * HSM_BZL_INNER_CURVATURE_SCALE, screen_aspect);
-	}
-	if (apply_black_edge_offset == 1)
-		tube_curved_coord = HSM_GetInverseScaledCoord(tube_curved_coord, black_edge_scale_offset);
-
-	return tube_curved_coord;
-}
-
-/*
-Light Illumination
-vec3 evaluateLight(in vec3 pos)
-{
-    vec3 lightPos = LPOS;
-    vec3 lightCol = LCOL;
-    vec3 L = lightPos-pos;
-    return lightCol * 1.0/dot(L,L);
-}
-
-vec3 evaluateLight(in vec3 pos, in vec3 normal)
-{
-    vec3 lightPos = LPOS;
-    vec3 L = lightPos-pos;
-    float distanceToL = length(L);
-    vec3 Lnorm = L/distanceToL;
-    return max(0.0,dot(normal,Lnorm)) * evaluateLight(pos);
-}
-*/
-
-float HSM_rand(inout float r)
-{
-	r = fract(3712.65 * r + 0.61432);
-	return (r - 0.5) * 2.0;
-}
-
-vec4 HSM_GetStoichaicBlurredSample(sampler2D in_sampler, vec2 in_coord, float num_samples, float max_blur_size, float blur_ratio)
-{
-	if (num_samples < 1)
-		return texture(in_sampler, in_coord);
-
-	// Common value for max_blur_size is about 40
-	float p = blur_ratio * max_blur_size / global.SourceSize.y;
-	vec4 blurred_color = vec4(0.0);
-	// srand
-	float radius = sin(dot(in_coord, vec2(1233.224, 1743.335)));
-	vec2 radius_vector;
-	
-	vec2 sample_coord = vec2(0);
-
-	// The following are all unrolled otherwise they won't compile in D3D11
-	if (num_samples < 1.5)
-	{
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 1;
-	}
-
-	if (num_samples < 2.5)
-	{
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 2;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 2;
-	}
-
-	if (num_samples > 2.5)
-	{
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-
-		radius_vector.x = HSM_rand(radius);
-		radius_vector.y = HSM_rand(radius);
-		sample_coord = in_coord + radius_vector * p;
-
-		blurred_color += texture(in_sampler, abs(sample_coord)) / 12;
-	}
-
-	return blurred_color;
-}
-
-bool HSM_GetIsInABCompareArea(vec2 viewport_coord)
-{
-	float test_value = HSM_AB_COMPARE_AREA > 1.5 ? viewport_coord.y : viewport_coord.x;
-	float position = mod(HSM_AB_COMPARE_AREA, 2) == 1 ? (1 - HSM_AB_COMPARE_SPLIT_POSITION) : HSM_AB_COMPARE_SPLIT_POSITION;
-	return  mod(HSM_AB_COMPARE_AREA, 2) == 0 && test_value < position || 
-			mod(HSM_AB_COMPARE_AREA, 2) == 1 && test_value > position;
-}
-
-vec4 HSM_GetMipmappedTexSample(sampler2D in_sampler, vec2 in_coord, vec2 in_scale, float in_blend_bias)
-{
-	vec2 tex_size = textureSize(in_sampler, 0);
-	vec2 scaled_tex_size = in_scale * global.FinalViewportSize.xy;
-	float mipmap_lod = log2(tex_size.y / scaled_tex_size.y);
-	return textureLod(in_sampler, in_coord, mipmap_lod + in_blend_bias);
-}
-
-// Texture Sampler function which takes a coordinate in the cropped coordinate space
-vec4 HSM_GetCroppedTexSample(sampler2D in_sampler, vec2 in_screen_coord)
-{
-	return HSM_GetTexSampleFromSampleStartAndSize(in_sampler, in_screen_coord, SAMPLE_AREA_START_PIXEL_COORD, CROPPED_ROTATED_SIZE);
-}
-
-float HSM_GetVignetteFactor(vec2 coord, float amount, float size)
-{
-	float orig_mamehlsl_amount = amount;
-	vec2 ctr_coord = coord - 0.5;
-
-	float vignette_length = length(ctr_coord * vec2(0.5 / size * global.OutputSize.x/global.OutputSize.y + 0.5, 1));
-	float vignette_blur = (orig_mamehlsl_amount * 0.75) + 0.25;
-
-	// 0.5 full screen fitting circle
-	float vignette_radius = 1.0 - (orig_mamehlsl_amount * 0.25);
-	float vignette = smoothstep(vignette_radius, vignette_radius - vignette_blur, vignette_length);
-
-	float vignette_multiplier = smoothstep(0, 0.05, amount);
-	return 1 - vignette_multiplier + vignette * vignette_multiplier;
-}
-
-float HSM_GetScreenVignetteFactor(vec2 in_coord)
-{
-	vec2 vpos = HSM_GetMirrorWrappedCoord(in_coord);
-	vpos = (vpos - 0.5) / 1.01 + 0.5;
-	vpos *= 1.0 - vpos.xy;
-    float vig = vpos.x * vpos.y * HSM_SCREEN_VIGNETTE_STRENGTH;
-    vig = min(pow(vig, HSM_SCREEN_VIGNETTE_POWER), 1.0);
-
-	return vig;
-}
-
-bool HSM_GetUseOnCurrentScreenIndex(float dual_screen_vis_mode)
-{
-	return dual_screen_vis_mode == SHOW_ON_DUALSCREEN_MODE_BOTH || dual_screen_vis_mode == SCREEN_INDEX;
-}
-
-bool HSM_GetUseScreenVignette()
-{
-	return HSM_SCREEN_VIGNETTE_ON > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE);
-}
-
-vec4 HSM_GetNightLightingMultiplyColor( vec2 in_coord, float hue, float saturation, float value, float contrast, float global_ambient_opacity, in sampler2D NightLightingImage )
-{
-	vec4 lighting_image = vec4(0);
-	// if (HSM_AMBIENT1_DITHERING_SAMPLES > 0.5)
-	// {
-	// 	// Dithering if needed to reduce banding
-	// 	float blur_max_size = 1;
-	// 	float blur_amount = 0.2;
-	// 	lighting_image = HSM_GetStoichaicBlurredSample(NightLightingImage, in_coord.xy, HSM_AMBIENT1_DITHERING_SAMPLES, blur_max_size, blur_amount);
-	// }
-	// else
-	lighting_image = HSM_GetMipmappedTexSample(NightLightingImage, in_coord.xy, vec2(1), 0);
-	lighting_image = HSM_Linearize(lighting_image, DEFAULT_SRGB_GAMMA);
-
-	lighting_image = contrast * (lighting_image - 0.5) + 0.5;
-
-	// Do HSV alterations on the night lighting image
-	if (hue != 0 || saturation != 1 || value != 1)
-	{
-		vec3 night_lighting_image_hsv = HSM_RGBtoHSV(lighting_image.rgb);
-		night_lighting_image_hsv.x += hue;
-		night_lighting_image_hsv.y *= saturation;
-		night_lighting_image_hsv.z *= value;
-		lighting_image = vec4(HSM_HSVtoRGB(night_lighting_image_hsv), lighting_image.a);
-	}
-
-	lighting_image.rgb = mix( vec3(1), lighting_image.rgb, global_ambient_opacity );
-
-	return lighting_image;
-}
-
-bool HSM_Fill_Ambient_Images(vec2 in_viewport_coord, vec2 in_viewport_unscaled_coord, vec2 in_tube_coord, vec2 in_tube_scale, float in_swap_images, in sampler2D in_ambient_sampler, in sampler2D in_ambient2_sampler, inout vec4 ambient_lighting_image, inout vec4 ambient2_lighting_image)
-{
-		ambient_lighting_image = vec4(1);
-		ambient2_lighting_image = vec4(1);
-
-		if (HSM_AMBIENT1_OPACITY > 0)
-		{
-			float ambient1_scale = HSM_AMBIENT1_SCALE;
-			if (HSM_AMBIENT1_SCALE_INHERIT_MODE == 1 && HSM_AMBIENT1_SCALE * HSM_VIEWPORT_ZOOM < 1)
-				ambient1_scale = 1 / HSM_VIEWPORT_ZOOM;
-
-			vec2 lighting_coord = GetSimpleImageScaledCoord(in_viewport_coord, 
-															in_viewport_unscaled_coord,
-															in_tube_coord,
-															in_tube_scale,
-															in_ambient_sampler,
-															vec2(HSM_AMBIENT1_POSITION_X, HSM_AMBIENT1_POSITION_Y),
-															HSM_AMBIENT1_POS_INHERIT_MODE, 
-															vec2(ambient1_scale * HSM_AMBIENT1_SCALE_X, ambient1_scale), 
-															HSM_AMBIENT1_SCALE_INHERIT_MODE, 
-															HSM_AMBIENT1_SCALE_KEEP_ASPECT,
-															HSM_AMBIENT1_MIRROR_HORZ,
-															HSM_AMBIENT1_ROTATE );
-
-			ambient_lighting_image = HSM_GetNightLightingMultiplyColor( lighting_coord,
-																		HSM_AMBIENT1_HUE,
-																		HSM_AMBIENT1_SATURATION,
-																		HSM_AMBIENT1_VALUE,
-																		HSM_AMBIENT1_CONTRAST,
-																		HSM_AMBIENT1_OPACITY,
-																		in_ambient_sampler );
-		}
-
-		if (HSM_AMBIENT2_OPACITY > 0)
-		{
-			float ambient2_scale = HSM_AMBIENT2_SCALE;
-			if (HSM_AMBIENT2_SCALE_INHERIT_MODE == 1 && HSM_AMBIENT2_SCALE * HSM_VIEWPORT_ZOOM < 1)
-				ambient2_scale = 1 / HSM_VIEWPORT_ZOOM;
-
-			vec2 lighting2_coord = GetSimpleImageScaledCoord(in_viewport_coord, 
-															in_viewport_unscaled_coord,
-															in_tube_coord,
-															in_tube_scale,
-															in_ambient2_sampler,
-															vec2(HSM_AMBIENT2_POSITION_X, HSM_AMBIENT2_POSITION_Y),
-															HSM_AMBIENT2_POS_INHERIT_MODE, 
-															vec2(ambient2_scale * HSM_AMBIENT2_SCALE_X, ambient2_scale), 
-															HSM_AMBIENT2_SCALE_INHERIT_MODE, 
-															HSM_AMBIENT2_SCALE_KEEP_ASPECT,
-															HSM_AMBIENT2_MIRROR_HORZ,
-															HSM_AMBIENT2_ROTATE );
-
-			ambient2_lighting_image = HSM_GetNightLightingMultiplyColor( lighting2_coord,
-																		HSM_AMBIENT2_HUE,
-																		HSM_AMBIENT2_SATURATION,
-																		HSM_AMBIENT2_VALUE,
-																		HSM_AMBIENT2_CONTRAST,
-																		HSM_AMBIENT2_OPACITY,
-																		in_ambient2_sampler );
-		}
-
-	// if (in_swap_images == 1)
-	// {
-	// 	vec4 temp_image = ambient_lighting_image;
-	// 	ambient_lighting_image = ambient2_lighting_image;
-	// 	ambient2_lighting_image = temp_image;
-	// }
-
-	return true;
-}
-
-vec3 ApplyAmbientImages(vec3 base_image, vec3 ambient_image, vec3 ambient2_image, float blend_ambient, float blend_ambient2, float apply_in_add_mode, float layer_blend_mode, float swap_images) 
-{
-	vec3 outImage = base_image;
-
-	if (swap_images == 1)
-		ambient2_image = ambient_image;
-	if (swap_images == 2)
-		ambient_image = ambient2_image;
-	if (swap_images == 3)
-	{
-		vec3 temp_image = ambient_image;
-		ambient_image = ambient2_image;
-		ambient2_image = temp_image;
-	}
-
-	if ( (HSM_AMBIENT1_OPACITY > 0 || HSM_AMBIENT2_OPACITY > 0) && (blend_ambient > 0 || blend_ambient2 > 0) )
-	{
-		if(	apply_in_add_mode == 1 || layer_blend_mode != BLEND_MODE_ADD)
-		{
-			if (blend_ambient > 0)
-			{
-				outImage = (1 - blend_ambient) * outImage.rgb + blend_ambient * outImage.rgb * ambient_image.rgb;
-			}
-			if (blend_ambient2 > 0)
-			{
-				outImage = (1 - blend_ambient2) * outImage.rgb + blend_ambient2 * outImage.rgb * ambient2_image.rgb;
-			}
-		}
-	}
-
-	return outImage;
-}
-
-vec4 HSM_ApplyMonochrome(vec4 in_color)
-{
-	vec4 out_color = in_color;
-	out_color.rgb = pow(out_color.rgb, HSM_MONOCHROME_GAMMA.xxx);
-	float luma = dot(out_color.rgb, vec3(0.299, 0.587, 0.114));
-	luma *= HSM_MONOCHROME_BRIGHTNESS;
-	vec3 mcolor = vec3(1.0);
-
-	if (HSM_MONOCHROME_MODE > 1.5) mcolor = (HSM_MONOCHROME_MODE > 2.5) ? vec3(0.2549, 1.0, 0.0) : vec3(1.0, 0.749, 0.0);
-
-	if (HSM_MONOCHROME_HUE_OFFSET != 0 || HSM_MONOCHROME_SATURATION != 0)
-	{
-		vec3 mcolor_hsv = HSM_RGBtoHSV(mcolor);
-		mcolor_hsv.x += HSM_MONOCHROME_HUE_OFFSET;
-		mcolor_hsv.y *= HSM_MONOCHROME_SATURATION;
-		mcolor = HSM_HSVtoRGB(mcolor_hsv);
-	}
-
-	out_color.rgb = pow(luma, 1.0/HSM_MONOCHROME_GAMMA) * mcolor;
-	return out_color;
-}
-
-float HSM_GetTubeOpacity()
-{
-	float tube_diffuse_opacity = HSM_TUBE_DIFFUSE_MODE < 1.5 ? HSM_TUBE_OPACITY : 0;
-
-	// If CRT Blend Mode is Multiply (2) then the tube must be fully opaque
-	if (HSM_CRT_BLEND_MODE == 2)
-		tube_diffuse_opacity = 1;
-
-	return tube_diffuse_opacity;
-}
-
-vec3 HSM_ApplyAmbientImage(vec3 base_image, vec3 ambient_image, float layer_blend_amount) 
-{
-	if (layer_blend_amount > 0)
-		return (1 - layer_blend_amount) * base_image.rgb + layer_blend_amount * base_image.rgb * ambient_image.rgb;
-	else
-		return base_image;
-}
-
-bool HSM_GetUseFakeScanlines()
-{
-	float scane_axis_core_res = USE_VERTICAL_SCANLINES * CROPPED_ROTATED_SIZE_WITH_RES_MULT.x + (1 - USE_VERTICAL_SCANLINES) * CROPPED_ROTATED_SIZE_WITH_RES_MULT.y;
-	return HSM_FAKE_SCANLINE_OPACITY > 0.001 && (HSM_FAKE_SCANLINE_MODE == 1 || (HSM_FAKE_SCANLINE_MODE == 2 && scane_axis_core_res > HSM_INTERLACE_TRIGGER_RES));
-}
-
-float HSM_GetNoScanlineMode()
-{
-	// If Use Fake Scanlines is On then turn off Guest Scanlines as they will just look bad
-	float scan_res = (1 - USE_VERTICAL_SCANLINES) * CROPPED_ROTATED_SIZE_WITH_RES_MULT.y + 
-						USE_VERTICAL_SCANLINES *  CROPPED_ROTATED_SIZE_WITH_RES_MULT.x;
-
-	return global.no_scanlines > 0.5 || HSM_GetUseFakeScanlines() || HSM_INTERLACE_MODE < 0 && HSM_INTERLACE_TRIGGER_RES <= scan_res ? 1 : 0;
-}
-
-vec4 HSM_ApplyScanlineMask(vec4 in_color, vec2 screen_scale, vec2 in_coord, vec2 in_screen_curved_coord, vec2 in_tube_curved_coord, float in_scanline_opacity)
-{
-	//   Stuff to try implementing
-    //   Try mame hlsl darkening
-    //   Check Lottes tone mapping
-
-	in_coord = mix(in_coord, in_screen_curved_coord, HSM_FAKE_SCANLINE_CURVATURE);
-
-    /* Scanlines */
-	float scanline_roll_offset = float(mod(global.FrameCount, 1280)) / 1280 * HSM_FAKE_SCANLINE_ROLL; 
-
-    // float scans = clamp( 0.35+0.18*sin(6.0*time-curved_uv.y*resolution.y*1.5), 0.0, 1.0);
-    // float s = pow(scans,0.9);
-    // col = col * vec3(s);
-
-	float scan_axis_pos = USE_VERTICAL_SCANLINES > 0.5 ? in_coord.x : in_coord.y;
-	scan_axis_pos += scanline_roll_offset;
-
-	vec2 screen_size = global.OutputSize.xy * screen_scale;
-	float scan_axis_screen_scale_res = USE_VERTICAL_SCANLINES > 0.5 ? screen_size.x : screen_size.y;
-	
-	float cropped_rotated_scan_res = USE_VERTICAL_SCANLINES > 0.5 ? CROPPED_ROTATED_SIZE.x : CROPPED_ROTATED_SIZE.y;
-	float simulated_scanline_res = HSM_FAKE_SCANLINE_RES_MODE > 0.5 ? HSM_FAKE_SCANLINE_RES : cropped_rotated_scan_res;
-
-	float scanline_size = scan_axis_screen_scale_res / simulated_scanline_res;
-
-	if (HSM_FAKE_SCANLINE_INT_SCALE == 1)
-		scanline_size = ceil(scanline_size);
-
-	float scan = mod(scan_axis_pos * scan_axis_screen_scale_res + scanline_size, scanline_size) / scanline_size;
-
-	// Alternate, modulating the scanline width depending on brightness
-	//float scanline_mask = HHLP_EasePowerOut(1 - abs(scan - 0.5) * 2, 0.5 + 2 * smoothstep(0.4, 0.9, (in_color.r + in_color.g +  in_color.b) / 3));
-	float color_brightness_modulation = HHLP_EasePowerOut(smoothstep(0.4, 0.99, (in_color.r + in_color.g +  in_color.b) / 3), 2);
-
-	float scanline_mask = 1 - abs(scan - 0.5) * 2;
-	scanline_mask = pow(1 - scanline_mask, 1);
-
-	float final_scanline_mask = clamp(1 * scanline_mask, 0, 1);
-
-	color_brightness_modulation = HHLP_EasePowerOut(smoothstep(0.4, HSM_FAKE_SCANLINE_BRIGHTNESS_CUTOFF + 1.5, (in_color.r + in_color.g +  in_color.b) / 3), 2);
-	final_scanline_mask = clamp(mix(1, mix(final_scanline_mask, 1, color_brightness_modulation), in_scanline_opacity), 0, 1);
-
-	vec4 masked_color = in_color;
-	masked_color *= 1 + 0.5 * in_scanline_opacity;
-	masked_color = clamp(final_scanline_mask * masked_color, 0, 1);
-	masked_color.w = in_color.w;
-
-	// Darken the outside image a bit
-	vec4 crt_darkened_color = mix(in_color, in_color * 0.9, HSM_FAKE_SCANLINE_OPACITY);
-
-	// Show scanlines only in the tube area
-	float softened_tube_mask = HSM_GetCornerMask((in_tube_curved_coord - 0.5) * 0.995 + 0.5 , TUBE_DIFFUSE_ASPECT, HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS, 0.05);
-	vec4 out_color = mix(crt_darkened_color, masked_color, softened_tube_mask);
-
-	return clamp(out_color, 0, 1);
-}
-
-vec4 HSM_Apply_Sinden_Lightgun_Border(vec4 in_rgba, vec2 in_tube_diffuse_curved_coord, float in_tube_diffuse_mask, float in_black_edge_corner_radius)
-{
-	float sinden_gun_mask =  in_tube_diffuse_mask - HSM_GetCornerMask((in_tube_diffuse_curved_coord - 0.5) * (1 + vec2(1 / TUBE_DIFFUSE_ASPECT * HSM_SINDEN_BORDER_THICKNESS, HSM_SINDEN_BORDER_THICKNESS)) + 0.5, TUBE_DIFFUSE_ASPECT, in_black_edge_corner_radius, 0.99);
-	vec4 out_rgba = in_rgba;
-
-	vec3 base_rgb = vec3(1);
-	out_rgba.rgb = base_rgb * HSM_SINDEN_BORDER_BRIGHTNESS * sinden_gun_mask + (1 - sinden_gun_mask) * out_rgba.rgb;
-
-	// out_rgba.rgb += HSM_SINDEN_BORDER_OPACITY * sinden_gun_mask;
-	return out_rgba;
-}
-
-vec2 HSM_ApplyOverscan(vec2 in_coord, float overscan_x, float overscan_y)
-{
-	vec2 ctr_coord = in_coord * 2.0 - 1.0;
-
-	ctr_coord /= vec2(overscan_x, overscan_y) + 1;
-
-	return ctr_coord * 0.5 + 0.5;
-}
-
-float HSM_GetRasterBloomScale(float raster_bloom_overscan_mode, float raster_bloom_mult, float screen_avg_luma)
-{
-	// Define the neutral range around the center
-	float neutral_range = HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE;
-
-	// Calculate the bloom scale based on the neutral range
-	float bloom_scale = 1.0;
-	float neutral_center = HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE_CENTER;
-	float neutral_min = neutral_center - neutral_range;
-	float neutral_max = neutral_center + neutral_range;
-	float adjusted_luma = neutral_center;
-	if (screen_avg_luma < 0.5 - neutral_range || screen_avg_luma > 0.5 + neutral_range) 
-	{
-		if (screen_avg_luma < neutral_min) 
-			adjusted_luma = neutral_center * HHLP_EasePowerIn(smoothstep(0, neutral_min, screen_avg_luma), 2);
-
-		if (screen_avg_luma > neutral_max) 
-			adjusted_luma = neutral_center + (1 - neutral_center) * HHLP_EasePowerOut(smoothstep(neutral_max, 1, screen_avg_luma), 2);
-	}
-	bloom_scale = 1.00 + raster_bloom_mult * ((1.0 - 0.5 * raster_bloom_overscan_mode) - adjusted_luma);
-	return bloom_scale;
-}
-
-// Thanks to Guest.r for this simple yet effective implementation of raster bloom
-vec2 HSM_ApplyRasterBloomOverscan(vec2 in_coord, float raster_bloom_overscan_mode, float raster_bloom_mult, float screen_avg_luma)
-{
-	//raster_bloom_overscan_mode can be 0, 1, or 2 to adjust if the bloom can only expand or shrink
-
-	vec2 ctr_coord = in_coord * 2.0 - 1.0;
-
-	float raster_bloom_factor = HSM_GetRasterBloomScale(raster_bloom_overscan_mode, raster_bloom_mult, screen_avg_luma);
-	ctr_coord *= vec2(raster_bloom_factor, raster_bloom_factor);
-
-	return ctr_coord * 0.5 + 0.5;
-}
-
-vec2 HSM_GetCrtShaderFinalCoord(vec2 screen_coord,
-								vec2 screen_scale,
-								float raster_bloom_avg_lum,
-								inout vec2 screen_curved_coord
-								)
-
-{
-	// -- START -- This section repeated in function below
-	screen_curved_coord = HSM_GetCRTShaderCurvedCoord(screen_coord);
-
-	// Get the Mirrored coord and then add overscan to it
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetMirrorWrappedCoord(screen_curved_coord);
-	screen_curved_coord_with_overscan_and_mirror = HSM_ApplyOverscan(screen_curved_coord_with_overscan_and_mirror, HSM_OVERSCAN_X, HSM_OVERSCAN_Y);
-
-	if (HSM_OVERSCAN_RASTER_BLOOM_ON > 0.5)
-	{
-		screen_curved_coord_with_overscan_and_mirror = HSM_ApplyRasterBloomOverscan(screen_curved_coord_with_overscan_and_mirror, 
-			HSM_OVERSCAN_RASTER_BLOOM_MODE, 
-			HSM_OVERSCAN_RASTER_BLOOM_AMOUNT, 
-			raster_bloom_avg_lum);
-	}
-	// -- END -- Repeated Section
-
-	return screen_curved_coord_with_overscan_and_mirror;
-}
-
-vec2 HSM_GetCrtShaderFinalCoordExtraVariables(vec2 screen_coord,
-	vec2 screen_scale,
-	float raster_bloom_avg_lum,
-	inout vec2 screen_curved_coord,
-	inout vec2 screen_curved_coord_with_overscan,
-	inout vec2 screen_coord_with_overscan,
-	inout vec2 screen_scale_with_overscan)
-
-{
-	// -- START -- This section repeated from function above
-	screen_curved_coord = HSM_GetCRTShaderCurvedCoord(screen_coord);
-
-	// Get the Mirrored coord and then add overscan to it
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetMirrorWrappedCoord(screen_curved_coord);
-	screen_curved_coord_with_overscan_and_mirror = HSM_ApplyOverscan(screen_curved_coord_with_overscan_and_mirror, HSM_OVERSCAN_X, HSM_OVERSCAN_Y);
-
-	if (HSM_OVERSCAN_RASTER_BLOOM_ON > 0.5)
-	{
-		screen_curved_coord_with_overscan_and_mirror = HSM_ApplyRasterBloomOverscan(screen_curved_coord_with_overscan_and_mirror, 
-			HSM_OVERSCAN_RASTER_BLOOM_MODE, 
-			HSM_OVERSCAN_RASTER_BLOOM_AMOUNT, 
-			raster_bloom_avg_lum);
-	}
-	// -- END -- Repeated Section
-
-	// Screen Coordinate overscan but without curvature 
-	// Screen Curved Coordinate but not Mirrored
-	screen_curved_coord_with_overscan = HSM_ApplyOverscan(screen_curved_coord, HSM_OVERSCAN_X, HSM_OVERSCAN_Y);
-	screen_scale_with_overscan = screen_scale * (vec2(HSM_OVERSCAN_X, HSM_OVERSCAN_Y) + 1);
-
-	if (HSM_OVERSCAN_RASTER_BLOOM_ON > 0.5)
-	{
-		screen_curved_coord_with_overscan = HSM_ApplyRasterBloomOverscan(screen_curved_coord_with_overscan, 
-			HSM_OVERSCAN_RASTER_BLOOM_MODE, 
-			HSM_OVERSCAN_RASTER_BLOOM_AMOUNT, 
-			raster_bloom_avg_lum);
-
-		screen_coord_with_overscan = HSM_ApplyRasterBloomOverscan(screen_coord_with_overscan, 
-			HSM_OVERSCAN_RASTER_BLOOM_MODE, 
-			HSM_OVERSCAN_RASTER_BLOOM_AMOUNT, 
-			raster_bloom_avg_lum);
-
-		screen_scale_with_overscan *= HSM_GetRasterBloomScale(HSM_OVERSCAN_RASTER_BLOOM_MODE, 
-			HSM_OVERSCAN_RASTER_BLOOM_AMOUNT, 
-			raster_bloom_avg_lum);
-	}
-
-	screen_coord_with_overscan = HSM_ApplyOverscan(screen_coord, HSM_OVERSCAN_X, HSM_OVERSCAN_Y);
-
-	return screen_curved_coord_with_overscan_and_mirror;
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals-and-all-params.inc b/bezel/Mega_Bezel/shaders/base/common/globals-and-all-params.inc
deleted file mode 100644
index 487c973a4a..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals-and-all-params.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#include "globals.inc"
-#include "params-0-screen-scale.inc"
-#include "params-2-bezel.inc"
-#include "params-2-reflection.inc"
-#include "params-4-image-layers.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals-and-bezel-params.inc b/bezel/Mega_Bezel/shaders/base/common/globals-and-bezel-params.inc
deleted file mode 100644
index 41edba6f71..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals-and-bezel-params.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "globals.inc"
-#include "params-0-screen-scale.inc"
-#include "params-2-bezel.inc"
-#include "params-4-image-layers.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals-and-glass-params.inc b/bezel/Mega_Bezel/shaders/base/common/globals-and-glass-params.inc
deleted file mode 100644
index 030f7c9d15..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals-and-glass-params.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#define IS_GLASS_PRESET
-
-#include "globals.inc"
-#include "params-0-screen-scale.inc"
-#include "params-2-bezel.inc"
-#include "params-2-reflection.inc"
-#include "params-3-glass-only.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals-and-image-layers-params.inc b/bezel/Mega_Bezel/shaders/base/common/globals-and-image-layers-params.inc
deleted file mode 100644
index 8b96a206a0..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals-and-image-layers-params.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "globals.inc"
-#include "params-0-screen-scale.inc"
-#include "params-2-bezel.inc"
-#include "params-4-image-layers.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals-and-potato-params.inc b/bezel/Mega_Bezel/shaders/base/common/globals-and-potato-params.inc
deleted file mode 100644
index b9405c2a97..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals-and-potato-params.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#define IS_POTATO_PRESET
-
-#include "globals.inc"
-#include "params-0-screen-scale.inc"
-#include "params-1-potato-only.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals-and-reflection-params.inc b/bezel/Mega_Bezel/shaders/base/common/globals-and-reflection-params.inc
deleted file mode 100644
index 6d4bdd3c1e..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals-and-reflection-params.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "globals.inc"
-#include "params-0-screen-scale.inc"
-#include "params-2-bezel.inc"
-#include "params-2-reflection.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals-and-screen-scale-params.inc b/bezel/Mega_Bezel/shaders/base/common/globals-and-screen-scale-params.inc
deleted file mode 100644
index 1ad7bb9589..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals-and-screen-scale-params.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "globals.inc"
-#include "params-0-screen-scale.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/globals.inc b/bezel/Mega_Bezel/shaders/base/common/globals.inc
deleted file mode 100644
index 0131fb3dc3..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/globals.inc
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-    vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OriginalFeedbackSize;
-	vec4 OutputSize;
-	vec4 FinalViewportSize;
-	vec4 DerezedPassSize;
-	int FrameDirection;
-	uint FrameCount;
-
-	float HSM_RESOLUTION_DEBUG_ON;
-	float HSM_SINDEN_BORDER_ON;
-	float HSM_SINDEN_BORDER_OPACITY;
-float HSM_SINDEN_BORDER_BRIGHTNESS;
-float HSM_SINDEN_AMBIENT_LIGHTING;
-	float HSM_SINDEN_BORDER_THICKNESS;
-float HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION;
-	float HSM_CACHE_GRAPHICS_ON;
-	float HSM_CACHE_UPDATE_INDICATOR_MODE;
-
-	// Graphics Brightness
-	float HSM_GLOBAL_GRAPHICS_BRIGHTNESS;
-	float HSM_STATIC_LAYERS_GAMMA;
-
-	// Night Lighting
-	float HSM_AMBIENT_LIGHTING_OPACITY;
-	float HSM_AMBIENT1_OPACITY;
-	float HSM_AMBIENT2_OPACITY;
-	float HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE;
-
-	float HSM_AMBIENT1_HUE;
-	float HSM_AMBIENT1_SATURATION;
-	float HSM_AMBIENT1_VALUE;
-	float HSM_AMBIENT1_CONTRAST;
-	float HSM_AMBIENT1_SCALE_KEEP_ASPECT;
-	float HSM_AMBIENT1_SCALE_INHERIT_MODE;
-	float HSM_AMBIENT1_SCALE;
-	float HSM_AMBIENT1_SCALE_X;
-	float HSM_AMBIENT1_ROTATE;
-	float HSM_AMBIENT1_MIRROR_HORZ;
-	float HSM_AMBIENT1_POS_INHERIT_MODE;
-	float HSM_AMBIENT1_POSITION_X;
-	float HSM_AMBIENT1_POSITION_Y;
-	float HSM_AMBIENT1_DITHERING_SAMPLES;
-
-	float HSM_AMBIENT2_HUE;
-	float HSM_AMBIENT2_SATURATION;
-	float HSM_AMBIENT2_VALUE;
-	float HSM_AMBIENT2_CONTRAST;
-	float HSM_AMBIENT2_SCALE_KEEP_ASPECT;
-	float HSM_AMBIENT2_SCALE_INHERIT_MODE;
-	float HSM_AMBIENT2_SCALE;
-	float HSM_AMBIENT2_SCALE_X;
-	float HSM_AMBIENT2_ROTATE;
-	float HSM_AMBIENT2_MIRROR_HORZ;
-	float HSM_AMBIENT2_POS_INHERIT_MODE;
-	float HSM_AMBIENT2_POSITION_X;
-	float HSM_AMBIENT2_POSITION_Y;
-
-	//    Zoom & Pan
-	float HSM_VIEWPORT_ZOOM;
-	float HSM_VIEWPORT_POSITION_X;
-	float HSM_VIEWPORT_POSITION_Y;
-	float HSM_VIEWPORT_ZOOM_MASK;
-	
-	//    FLIP & ROTATE
-	float HSM_FLIP_VIEWPORT_VERTICAL;
-	float HSM_FLIP_VIEWPORT_HORIZONTAL;
-	float HSM_FLIP_CORE_VERTICAL;
-	float HSM_FLIP_CORE_HORIZONTAL;
-	float HSM_ROTATE_CORE_IMAGE;
-
-	//    ASPECT RATIO
-	float HSM_ASPECT_RATIO_ORIENTATION;
-	float HSM_ASPECT_RATIO_MODE;
-	float HSM_ASPECT_RATIO_EXPLICIT;
-
-	//    SCALING
-	float HSM_INT_SCALE_MODE;
-    float HSM_INT_SCALE_MULTIPLE_OFFSET;
-	float HSM_INT_SCALE_MULTIPLE_OFFSET_LONG;
-	float HSM_INT_SCALE_MAX_HEIGHT;
-	float HSM_VERTICAL_PRESET;
-	float HSM_NON_INTEGER_SCALE;
-
-	float HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER;
-	float HSM_PHYSICAL_MONITOR_ASPECT_RATIO;
-	float HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE;
-	float HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE;
-
-
-	//    Extended Scale
-	float HSM_USE_IMAGE_FOR_PLACEMENT;
-	float HSM_PLACEMENT_IMAGE_USE_HORIZONTAL;
-	float HSM_PLACEMENT_IMAGE_MODE;
-	float HSM_NON_INTEGER_SCALE_OFFSET;
-	float HSM_USE_SNAP_TO_CLOSEST_INT_SCALE;
-	float HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE;
-
-	//    Position
-	float HSM_SCREEN_POSITION_X;
-	float HSM_SCREEN_POSITION_Y;
-
-	//    CROPPING
-	float HSM_CROP_MODE;
-	float HSM_CROP_PERCENT_ZOOM;
-	float HSM_CROP_PERCENT_TOP;
-	float HSM_CROP_PERCENT_BOTTOM;
-	float HSM_CROP_PERCENT_LEFT;
-	float HSM_CROP_PERCENT_RIGHT;
-	float HSM_CROP_BLACK_THRESHOLD;
-
-	//    SCANLINES
-	float HSM_SCANLINE_DIRECTION;
-
-	//    CORE RES SAMPLING
-	float HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR;
-	float HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR;
-	float HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR;
-	float HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR;
-	float HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR;
-
-	//    INTERLACING
-	float HSM_INTERLACE_TRIGGER_RES;
-	float HSM_INTERLACE_MODE;
-	float HSM_INTERLACE_EFFECT_SMOOTHNESS_INTERS;
-	float HSM_INTERLACE_SCANLINE_EFFECT;
-	float iscans;
-	float vga_mode;
-	float hiscan;
-
-	//    FAKE SCANLINES
-	float HSM_FAKE_SCANLINE_MODE;
-	float HSM_FAKE_SCANLINE_OPACITY;
-	float HSM_FAKE_SCANLINE_RES_MODE;
-	float HSM_FAKE_SCANLINE_RES;
-	float HSM_FAKE_SCANLINE_INT_SCALE;
-	float HSM_FAKE_SCANLINE_ROLL;
-	float HSM_FAKE_SCANLINE_CURVATURE;
-	float HSM_FAKE_SCANLINE_BRIGHTNESS_CUTOFF;
-
-	//    DUAL SCREEN
-	float HSM_DUALSCREEN_MODE;
-	float HSM_DUALSCREEN_CORE_IMAGE_SPLIT_MODE;
-	float HSM_DUALSCREEN_CORE_IMAGE_SWAP_SCREENS;
-	float HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET;
-	float HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION;
-	float HSM_DUALSCREEN_SHIFT_POSITION_WITH_SCALE;
-	float HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS;
-	float HSM_2ND_SCREEN_ASPECT_RATIO_MODE;
-	float HSM_2ND_SCREEN_INDEPENDENT_SCALE;
-	float HSM_2ND_SCREEN_SCALE_OFFSET;
-	float HSM_2ND_SCREEN_POS_X;
-	float HSM_2ND_SCREEN_POS_Y;
-	float HSM_2ND_SCREEN_CROP_PERCENT_ZOOM;
-	float HSM_2ND_SCREEN_CROP_PERCENT_TOP;
-	float HSM_2ND_SCREEN_CROP_PERCENT_BOTTOM;
-	float HSM_2ND_SCREEN_CROP_PERCENT_LEFT;
-	float HSM_2ND_SCREEN_CROP_PERCENT_RIGHT;
-
-
-	//    CURVATURE
-	float HSM_CURVATURE_MODE;
-	float HSM_CURVATURE_2D_SCALE_LONG_AXIS;
-	float HSM_CURVATURE_2D_SCALE_SHORT_AXIS;
-	float HSM_CURVATURE_3D_RADIUS;
-	float HSM_CURVATURE_3D_VIEW_DIST;
-	float HSM_CURVATURE_3D_TILT_ANGLE_X;
-	float HSM_CURVATURE_3D_TILT_ANGLE_Y;
-	float HSM_CRT_CURVATURE_SCALE;
-
-	//    SIGNAL NOISE
-	float HSM_SIGNAL_NOISE_ON;
-	float HSM_SIGNAL_NOISE_AMOUNT;
-float HSM_SIGNAL_NOISE_BLACK_LEVEL;
-	float HSM_SIGNAL_NOISE_SIZE_MODE;
-	float HSM_SIGNAL_NOISE_SIZE_MULT;
-	float HSM_SIGNAL_NOISE_TYPE;
-
-	//    ANTI-FLICKER
-	float HSM_ANTI_FLICKER_ON;
-	float HSM_ANTI_FLICKER_THRESHOLD;
-	
-	//    CRT vs ORIGINAL A/B TESTING
-	float HSM_AB_COMPARE_SHOW_MODE;
-	float HSM_AB_COMPARE_AREA;
-	float HSM_AB_COMPARE_FREEZE_CRT_TUBE;
-	float HSM_AB_COMPARE_FREEZE_GRAPHICS;
-	float HSM_AB_COMPARE_SPLIT_AREA;
-	float HSM_AB_COMPARE_SPLIT_POSITION;
-
-	// Show Pass
-	float HSM_SHOW_PASS_INDEX;
-float HSM_SHOW_PASS_ALPHA;
-	float HSM_SHOW_PASS_APPLY_SCREEN_COORD;
-
-	float HSM_SCREEN_VIGNETTE_ON;
-	float HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE;
-	float HSM_SCREEN_VIGNETTE_STRENGTH;
-	float HSM_SCREEN_VIGNETTE_POWER;
-	float HSM_SCREEN_VIGNETTE_IN_REFLECTION;
-	
-	//    Monochrome
-	float HSM_MONOCHROME_MODE;
-	float HSM_MONOCHROME_BRIGHTNESS;
-	float HSM_MONOCHROME_GAMMA;
-	float HSM_MONOCHROME_HUE_OFFSET;
-	float HSM_MONOCHROME_SATURATION;
-	float HSM_MONOCHROME_DUALSCREEN_VIS_MODE;
-
-	//    Reflection Transform
-	// float HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS;
-	float HSM_SCREEN_REFLECTION_SCALE;
-	float HSM_SCREEN_REFLECTION_POS_X;
-	float HSM_SCREEN_REFLECTION_POS_Y;
-	
-	// float HSM_PHOSPHOR_PERSISTENCE_BLEND;
-	// float HSM_PHOSPHOR_PERSISTENCE_RED;
-	// float HSM_PHOSPHOR_PERSISTENCE_GREEN;
-	// float HSM_PHOSPHOR_PERSISTENCE_BLUE;
-
-	//    TUBE IMAGES
-	float HSM_TUBE_DIFFUSE_MODE;
-	float HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE;
-	float HSM_TUBE_OPACITY;
-	float HSM_TUBE_DIFFUSE_IMAGE_AMOUNT;
-	float HSM_TUBE_DIFFUSE_IMAGE_HUE;
-	float HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON;
-	float HSM_TUBE_DIFFUSE_IMAGE_SATURATION;
-	float HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS;
-	float HSM_TUBE_DIFFUSE_IMAGE_GAMMA;
-	float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING;
-	float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING;
-	float HSM_TUBE_DIFFUSE_IMAGE_SCALE;
-	float HSM_TUBE_DIFFUSE_IMAGE_SCALE_X;
-	float HSM_TUBE_DIFFUSE_IMAGE_ROTATION;
-	float HSM_TUBE_EMPTY_THICKNESS;
-	float HSM_TUBE_EMPTY_THICKNESS_X_SCALE;
-	float HSM_TUBE_DIFFUSE_FORCE_ASPECT;
-	float HSM_TUBE_EXPLICIT_ASPECT;
-	float HSM_SCREEN_CORNER_RADIUS_SCALE;
-
-	float HSM_TUBE_COLORED_GEL_IMAGE_ON;
-	float HSM_TUBE_COLORED_GEL_IMAGE_DUALSCREEN_VIS_MODE;
-	float HSM_TUBE_COLORED_GEL_IMAGE_MULTIPLY_AMOUNT;
-	float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT;
-	float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS;
-	float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_VIGNETTE;
-	float HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD;
-	float HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT;
-	float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL;
-
-	float HSM_TUBE_SHADOW_IMAGE_ON;
-	float HSM_TUBE_SHADOW_IMAGE_OPACITY;
-	float HSM_TUBE_SHADOW_IMAGE_SCALE_X;
-	float HSM_TUBE_SHADOW_IMAGE_SCALE_Y;
-	float HSM_TUBE_SHADOW_IMAGE_POS_X;
-	float HSM_TUBE_SHADOW_IMAGE_POS_Y;
-	float HSM_TUBE_SHADOW_CURVATURE_SCALE;
-
-	float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING;
-	float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING;
-	float HSM_TUBE_COLORED_GEL_IMAGE_FAKE_SCANLINE_AMOUNT;
-	float HSM_TUBE_COLORED_GEL_IMAGE_SCALE;
-	float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL;
-	float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL;	
-
-	//    TUBE STATIC REFLECTION
-	float HSM_TUBE_STATIC_REFLECTION_IMAGE_ON;
-	float HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE;
-	float HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY;
-	float HSM_TUBE_STATIC_OPACITY_DIFFUSE_MULTIPLY;
-	float HSM_TUBE_STATIC_BLACK_LEVEL;
-	float HSM_TUBE_STATIC_AMBIENT_LIGHTING;
-	float HSM_TUBE_STATIC_AMBIENT2_LIGHTING;
-	float HSM_TUBE_STATIC_SCALE;
-	float HSM_TUBE_STATIC_SCALE_X;
-	float HSM_TUBE_STATIC_POS_X;
-	float HSM_TUBE_STATIC_POS_Y;
-	float HSM_TUBE_STATIC_SHADOW_OPACITY;
-	float HSM_TUBE_STATIC_DITHER_SAMPLES;
-	float HSM_TUBE_STATIC_DITHER_DISTANCE;
-	float HSM_TUBE_STATIC_DITHER_AMOUNT;
-
-	// CRT Screen
-	// These names are inconsistent with the general naming on purpose
-	// They match the namse in Guest's shader
-	float HSM_CRT_BLEND_MODE;
-	float HSM_CRT_BLEND_AMOUNT;
-	float HSM_CRT_SCREEN_BLEND_MODE;
-
-	//    Screen Vignette
-	//    SCREEN BLACK EDGE
-	float HSM_GLOBAL_CORNER_RADIUS;
-	float HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE;
-	float HSM_TUBE_BLACK_EDGE_SHARPNESS;
-	float HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE;
-	float HSM_TUBE_BLACK_EDGE_THICKNESS;
-	float HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE;
-
-	//    Bezel Independent Scale
-	float HSM_BZL_USE_INDEPENDENT_SCALE;
-	float HSM_BZL_INDEPENDENT_SCALE;
-	float HSM_BZL_USE_INDEPENDENT_CURVATURE;
-	float HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS;
-	float HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS;
-
-	//    Bezel General
-	float HSM_BZL_OPACITY;
-	float HSM_BZL_BLEND_MODE;
-	float HSM_BZL_WIDTH;
-	float HSM_BZL_HEIGHT;
-	float HSM_BZL_SCALE_OFFSET;
-	float HSM_BZL_INNER_CURVATURE_SCALE;
-	float HSM_BZL_INNER_CORNER_RADIUS_SCALE;
-
-	//	Bezel Params not in Screen Scale
-	float HSM_BZL_OUTER_CURVATURE_SCALE;
-	float HSM_BZL_INNER_EDGE_THICKNESS;
-	float HSM_BZL_INNER_EDGE_SHARPNESS;
-	float HSM_BZL_OUTER_CORNER_RADIUS_SCALE;
-	float HSM_BZL_INNER_EDGE_SHADOW;
-
-	// Generated Bezel
-	float HSM_BZL_COLOR_HUE;
-	float HSM_BZL_COLOR_SATURATION;
-	float HSM_BZL_COLOR_VALUE;
-	float HSM_BZL_NOISE;
-	float HSM_BZL_BRIGHTNESS;	
-	float HSM_BZL_BRIGHTNESS_MULT_TOP;
-	float HSM_BZL_BRIGHTNESS_MULT_BOTTOM;
-	float HSM_BZL_BRIGHTNESS_MULT_SIDES;
-	float HSM_BZL_BRIGHTNESS_MULT_SIDE_LEFT;
-	float HSM_BZL_BRIGHTNESS_MULT_SIDE_RIGHT;
-	float HSM_BZL_HIGHLIGHT;
-float HSM_BZL_INNER_EDGE_HIGHLIGHT;
-	float HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER;
-
-	// Generated Frame
-	float HSM_FRM_USE_INDEPENDENT_COLOR;
-	float HSM_FRM_COLOR_HUE;
-	float HSM_FRM_COLOR_SATURATION;
-	float HSM_FRM_COLOR_VALUE;
-	float HSM_FRM_NOISE;
-	float HSM_FRM_OUTER_CURVATURE_SCALE;
-	float HSM_FRM_THICKNESS;
-	float HSM_FRM_THICKNESS_SCALE_X;
-	float HSM_FRM_OUTER_POS_Y;
-	float HSM_FRM_INNER_EDGE_THICKNESS;
-float HSM_FRM_INNER_EDGE_HIGHLIGHT;	float HSM_FRM_OUTER_EDGE_THICKNESS;
-	float HSM_FRM_OUTER_EDGE_SHADING;
-	float HSM_FRM_OUTER_CORNER_RADIUS;
-	float HSM_BZL_OUTER_POSITION_Y;
-	float HSM_FRM_SHADOW_OPACITY;
-	float HSM_FRM_SHADOW_WIDTH;
-
-	// Corner 
-	float HSM_REFLECT_CORNER_FADE;
-	float HSM_REFLECT_CORNER_INNER_SPREAD;
-	float HSM_REFLECT_CORNER_OUTER_SPREAD;
-	float HSM_REFLECT_CORNER_ROTATION_OFFSET_TOP;
-	float HSM_REFLECT_CORNER_ROTATION_OFFSET_BOTTOM;
-	float HSM_REFLECT_CORNER_SPREAD_FALLOFF;
-	float HSM_REFLECT_CORNER_FADE_DISTANCE;
-
-	// Reflection
-	float HSM_REFLECT_GLOBAL_AMOUNT;
-	float HSM_REFLECT_GLOBAL_GAMMA_ADJUST;
-
-	float HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT;
-	float HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW;
-	float HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT;
-	float HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS;
-float HSM_REFLECT_SHOW_TUBE_FX_AMOUNT;
-	float HSM_REFLECT_DIRECT_AMOUNT;
-	float HSM_REFLECT_DIFFUSED_AMOUNT;
-	float HSM_REFLECT_FULLSCREEN_GLOW;
-	float HSM_REFLECT_FULLSCREEN_GLOW_GAMMA;
-
-	float HSM_REFLECT_FADE_AMOUNT;
-	float HSM_REFLECT_RADIAL_FADE_WIDTH;
-	float HSM_REFLECT_RADIAL_FADE_HEIGHT;
-
-	float HSM_REFLECT_LATERAL_OUTER_FADE_POSITION;
-	float HSM_REFLECT_LATERAL_OUTER_FADE_DISTANCE;
-
-	float HSM_REFLECT_NOISE_AMOUNT;
-	float HSM_REFLECT_NOISE_SAMPLES;
-	float HSM_REFLECT_NOISE_SAMPLE_DISTANCE;
-
-	// Blur Stuff
-	float HSM_REFLECT_BLUR_NUM_SAMPLES;
-	float HSM_REFLECT_BLUR_FALLOFF_DISTANCE;
-	float HSM_REFLECT_BLUR_MIN;
-	float HSM_REFLECT_BLUR_MAX;
-	
-	float HSM_REFLECT_MASK_IMAGE_AMOUNT;
-	float HSM_REFLECT_MASK_FOLLOW_LAYER;
-	float HSM_REFLECT_MASK_FOLLOW_MODE;
-	float HSM_REFLECT_MASK_BRIGHTNESS;
-	float HSM_REFLECT_MASK_BLACK_LEVEL;
-float HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS;
-
-	float HSM_GLASS_BORDER_ON;
-	float HSM_REFLECT_VIGNETTE_AMOUNT;
-	float HSM_REFLECT_VIGNETTE_SIZE;
-
-	float HSM_POTATO_SHOW_BG_OVER_SCREEN;
-	float HSM_POTATO_COLORIZE_CRT_WITH_BG;
-	float HSM_POTATO_COLORIZE_BRIGHTNESS;
-	float HSM_STANDARD_DECAL_SCALE_WITH_FRAME;
-	float HSM_STANDARD_TOP_SCALE_WITH_FRAME;
-
-	// Layer Order
-	float HSM_BG_LAYER_ORDER;
-	float HSM_VIEWPORT_VIGNETTE_LAYER_ORDER;
-	float HSM_CRT_LAYER_ORDER;
-	float HSM_DEVICE_LAYER_ORDER;
-	float HSM_DEVICELED_LAYER_ORDER;
-	float HSM_CAB_GLASS_LAYER_ORDER;
-	float HSM_DECAL_LAYER_ORDER;
-	float HSM_LED_LAYER_ORDER;
-	float HSM_TOP_LAYER_ORDER;
-
-	// Cutout
-	float HSM_CUTOUT_ASPECT_MODE;
-	float HSM_CUTOUT_EXPLICIT_ASPECT;
-	float HSM_CUTOUT_FOLLOW_LAYER;
-	float HSM_CUTOUT_FOLLOW_FULL_USES_ZOOM;
-	float HSM_CUTOUT_SCALE;
-	float HSM_CUTOUT_SCALE_X;
-	float HSM_CUTOUT_CORNER_RADIUS;
-	float HSM_CUTOUT_POS_X;
-	float HSM_CUTOUT_POS_Y;
-
-	// Background
-	float HSM_BG_OPACITY;
-	float HSM_BG_HUE;
-	float HSM_BG_COLORIZE_ON;
-	float HSM_BG_SATURATION;
-	float HSM_BG_BRIGHTNESS;
-	float HSM_BG_GAMMA;
-	float HSM_BG_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER;
-	float HSM_BG_APPLY_AMBIENT_IN_ADD_MODE;
-	float HSM_BG_BLEND_MODE;
-	float HSM_BG_SOURCE_MATTE_TYPE;
-	float HSM_BG_MASK_MODE;
-	float HSM_BG_CUTOUT_MODE;
-	float HSM_BG_DUALSCREEN_VIS_MODE;
-	float HSM_BG_FOLLOW_LAYER;
-	float HSM_BG_FOLLOW_MODE;
-	float HSM_BG_FOLLOW_FULL_USES_ZOOM;
-	float HSM_BG_FILL_MODE;
-	float HSM_BG_SPLIT_PRESERVE_CENTER;
-	float HSM_BG_SPLIT_REPEAT_WIDTH;
-	float HSM_BG_SCALE;
-	float HSM_BG_SCALE_X;
-	float HSM_BG_POS_X;
-	float HSM_BG_POS_Y;
-	float HSM_BG_WRAP_MODE;
-	float HSM_BG_MIPMAPPING_BLEND_BIAS;
-
-	// Background Vignette
-	float HSM_VIEWPORT_VIGNETTE_OPACITY;
-	float HSM_VIEWPORT_VIGNETTE_MASK_MODE;
-	float HSM_VIEWPORT_VIGNETTE_CUTOUT_MODE;
-	float HSM_VIEWPORT_VIGNETTE_FOLLOW_LAYER;
-	float HSM_VIEWPORT_VIGNETTE_SCALE;
-	float HSM_VIEWPORT_VIGNETTE_SCALE_X;
-	float HSM_VIEWPORT_VIGNETTE_POS_X;
-	float HSM_VIEWPORT_VIGNETTE_POS_Y;
-
-	// LED
-	float HSM_LED_OPACITY;
-	float HSM_LED_HUE;
-	float HSM_LED_COLORIZE_ON;
-	float HSM_LED_SATURATION;
-	float HSM_LED_BRIGHTNESS;
-	float HSM_LED_GAMMA;
-	float HSM_LED_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER;
-	float HSM_LED_APPLY_AMBIENT_IN_ADD_MODE;
-	float HSM_LED_BLEND_MODE;
-	float HSM_LED_SOURCE_MATTE_TYPE;
-	float HSM_LED_MASK_MODE;
-	float HSM_LED_CUTOUT_MODE;
-	float HSM_LED_DUALSCREEN_VIS_MODE;
-	float HSM_LED_FOLLOW_LAYER;
-	float HSM_LED_FOLLOW_MODE;
-	float HSM_LED_FOLLOW_FULL_USES_ZOOM;
-	float HSM_LED_FILL_MODE;
-	float HSM_LED_SPLIT_PRESERVE_CENTER;
-	float HSM_LED_SPLIT_REPEAT_WIDTH;
-	float HSM_LED_SCALE;
-	float HSM_LED_SCALE_X;
-	float HSM_LED_POS_X;
-	float HSM_LED_POS_Y;
-	float HSM_LED_MIPMAPPING_BLEND_BIAS;
-
-	// Device
-	float HSM_DEVICE_OPACITY;
-	float HSM_DEVICE_HUE;
-	float HSM_DEVICE_COLORIZE_ON;
-	float HSM_DEVICE_SATURATION;
-	float HSM_DEVICE_BRIGHTNESS;
-	float HSM_DEVICE_GAMMA;
-	float HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER;
-	float HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE;
-	float HSM_DEVICE_BLEND_MODE;
-	float HSM_DEVICE_SOURCE_MATTE_TYPE;
-	float HSM_DEVICE_MASK_MODE;
-	float HSM_DEVICE_CUTOUT_MODE;
-	float HSM_DEVICE_DUALSCREEN_VIS_MODE;
-	float HSM_DEVICE_FOLLOW_LAYER;
-	float HSM_DEVICE_FOLLOW_MODE;
-	float HSM_DEVICE_FOLLOW_FULL_USES_ZOOM;
-	float HSM_DEVICE_FILL_MODE;
-	float HSM_DEVICE_SPLIT_PRESERVE_CENTER;
-	float HSM_DEVICE_SPLIT_REPEAT_WIDTH;
-	float HSM_DEVICE_SCALE;
-	float HSM_DEVICE_SCALE_X;
-	float HSM_DEVICE_POS_X;
-	float HSM_DEVICE_POS_Y;
-	float HSM_DEVICE_MIPMAPPING_BLEND_BIAS;
-
-	// DEVICELED
-	float HSM_DEVICELED_OPACITY;
-	float HSM_DEVICELED_HUE;
-	float HSM_DEVICELED_COLORIZE_ON;
-	float HSM_DEVICELED_SATURATION;
-	float HSM_DEVICELED_BRIGHTNESS;
-	float HSM_DEVICELED_GAMMA;
-	float HSM_DEVICELED_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_DEVICELED_AMBIENT2_LIGHTING_MULTIPLIER;
-	float HSM_DEVICELED_APPLY_AMBIENT_IN_ADD_MODE;
-	float HSM_DEVICELED_BLEND_MODE;
-	float HSM_DEVICELED_SOURCE_MATTE_TYPE;
-	float HSM_DEVICELED_MASK_MODE;
-	float HSM_DEVICELED_CUTOUT_MODE;
-	float HSM_DEVICELED_DUALSCREEN_VIS_MODE;
-	float HSM_DEVICELED_FOLLOW_LAYER;
-	float HSM_DEVICELED_FOLLOW_MODE;
-	float HSM_DEVICELED_FOLLOW_FULL_USES_ZOOM;
-	float HSM_DEVICELED_FILL_MODE;
-	float HSM_DEVICELED_SPLIT_PRESERVE_CENTER;
-	float HSM_DEVICELED_SPLIT_REPEAT_WIDTH;
-	float HSM_DEVICELED_SCALE;
-	float HSM_DEVICELED_SCALE_X;
-	float HSM_DEVICELED_POS_X;
-	float HSM_DEVICELED_POS_Y;
-	float HSM_DEVICELED_MIPMAPPING_BLEND_BIAS;	
-
-	// Generated Bezel & Frame
-	float HSM_FRM_OPACITY;
-	float HSM_FRM_BLEND_MODE;
-	float HSM_FRM_TEXTURE_OPACITY;
-	float HSM_FRM_TEXTURE_BLEND_MODE;
-
-	// Decal
-	float HSM_DECAL_OPACITY;
-	float HSM_DECAL_HUE;
-	float HSM_DECAL_COLORIZE_ON;
-	float HSM_DECAL_SATURATION;
-	float HSM_DECAL_BRIGHTNESS;
-	float HSM_DECAL_GAMMA;
-	float HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER;
-	float HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE;
-	float HSM_DECAL_BLEND_MODE;
-	float HSM_DECAL_SOURCE_MATTE_TYPE;
-	float HSM_DECAL_MASK_MODE;
-	float HSM_DECAL_CUTOUT_MODE;
-	float HSM_DECAL_DUALSCREEN_VIS_MODE;
-	float HSM_DECAL_FOLLOW_LAYER;
-	float HSM_DECAL_FOLLOW_MODE;
-	float HSM_DECAL_FOLLOW_FULL_USES_ZOOM;
-	float HSM_DECAL_FILL_MODE;
-	float HSM_DECAL_SPLIT_PRESERVE_CENTER;
-	float HSM_DECAL_SPLIT_REPEAT_WIDTH;
-	float HSM_DECAL_SCALE;
-	float HSM_DECAL_SCALE_X;
-	float HSM_DECAL_POS_X;
-	float HSM_DECAL_POS_Y;
-	float HSM_DECAL_MIPMAPPING_BLEND_BIAS;
-
-	// Cab Glass
-	float HSM_CAB_GLASS_OPACITY;
-	float HSM_CAB_GLASS_HUE;
-	float HSM_CAB_GLASS_COLORIZE_ON;
-	float HSM_CAB_GLASS_SATURATION;
-	float HSM_CAB_GLASS_BRIGHTNESS;
-	float HSM_CAB_GLASS_GAMMA;
-	float HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER;
-	float HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE;
-	float HSM_CAB_GLASS_BLEND_MODE;
-	float HSM_CAB_GLASS_SOURCE_MATTE_TYPE;
-	float HSM_CAB_GLASS_MASK_MODE;
-	float HSM_CAB_GLASS_CUTOUT_MODE;
-	float HSM_CAB_GLASS_DUALSCREEN_VIS_MODE;
-	float HSM_CAB_GLASS_FOLLOW_LAYER;
-	float HSM_CAB_GLASS_FOLLOW_MODE;
-	float HSM_CAB_GLASS_FOLLOW_FULL_USES_ZOOM;
-	float HSM_CAB_GLASS_FILL_MODE;
-	float HSM_CAB_GLASS_SPLIT_PRESERVE_CENTER;
-	float HSM_CAB_GLASS_SPLIT_REPEAT_WIDTH;
-	float HSM_CAB_GLASS_SCALE;
-	float HSM_CAB_GLASS_SCALE_X;
-	float HSM_CAB_GLASS_POS_X;
-	float HSM_CAB_GLASS_POS_Y;
-	float HSM_CAB_GLASS_MIPMAPPING_BLEND_BIAS;
-
-	// Top Image
-	float HSM_TOP_OPACITY;
-	float HSM_TOP_HUE;
-	float HSM_TOP_COLORIZE_ON;
-	float HSM_TOP_SATURATION;
-	float HSM_TOP_BRIGHTNESS;
-	float HSM_TOP_GAMMA;
-	float HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER;
-	float HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER;
-	float HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE;
-	float HSM_TOP_BLEND_MODE;
-	float HSM_TOP_SOURCE_MATTE_TYPE;
-	float HSM_TOP_MASK_MODE;
-	float HSM_TOP_CUTOUT_MODE;
-	float HSM_TOP_DUALSCREEN_VIS_MODE;
-	float HSM_TOP_FOLLOW_LAYER;
-	float HSM_TOP_FOLLOW_MODE;
-	float HSM_TOP_FOLLOW_FULL_USES_ZOOM;
-	float HSM_TOP_FILL_MODE;
-	float HSM_TOP_SPLIT_PRESERVE_CENTER;
-	float HSM_TOP_SPLIT_REPEAT_WIDTH;
-	float HSM_TOP_SCALE;
-	float HSM_TOP_SCALE_X;
-	float HSM_TOP_POS_X;
-	float HSM_TOP_POS_Y;	
-	float HSM_TOP_MIRROR_WRAP;
-	float HSM_TOP_MIPMAPPING_BLEND_BIAS;
-
-	float HSM_RENDER_SIMPLE_MODE;
-	float HSM_RENDER_SIMPLE_MASK_TYPE;
-	float HSM_LAYERING_DEBUG_MASK_MODE;
-
-	float HSM_INTRO_LOGO_BLEND_MODE;
-	float HSM_INTRO_LOGO_FLIP_VERTICAL;
-	float HSM_INTRO_NOISE_BLEND_MODE;
-	float HSM_INTRO_NOISE_HOLD;
-	float HSM_INTRO_NOISE_FADE_OUT;
-	float HSM_INTRO_SOLID_BLACK_HOLD;
-	float HSM_INTRO_SOLID_BLACK_FADE_OUT;
-	float HSM_INTRO_SOLID_COLOR_BLEND_MODE;
-	float HSM_INTRO_LOGO_OVER_SOLID_COLOR;
-	float HSM_INTRO_LOGO_PLACEMENT;
-	float HSM_INTRO_LOGO_HEIGHT;
-	float HSM_INTRO_LOGO_POS_X;
-	float HSM_INTRO_LOGO_POS_Y;
-	float HSM_INTRO_WHEN_TO_SHOW;
-	float HSM_INTRO_SPEED;
-	float HSM_INTRO_LOGO_WAIT;
-	float HSM_INTRO_LOGO_FADE_IN;
-	float HSM_INTRO_LOGO_HOLD;
-	float HSM_INTRO_LOGO_FADE_OUT;
-	float HSM_INTRO_SOLID_COLOR_HUE;
-	float HSM_INTRO_SOLID_COLOR_SAT;
-	float HSM_INTRO_SOLID_COLOR_VALUE;
-	float HSM_INTRO_SOLID_COLOR_HOLD;
-	float HSM_INTRO_SOLID_COLOR_FADE_OUT;
-
-	// Guest-Dr-Venom Params
-	float GAMMA_INPUT;
-	float gamma_out;
-	float post_br;
-	float post_br_affect_black_level;
-
-	float m_glow;
-	float m_glow_low;
-	float m_glow_high;
-	float m_glow_dist;
-	float m_glow_mask;
-	float smask_mit;
-	float bmask;
-	float bmask1;
-	float hmask1;
-
-	float glow;
-	float bloom;
-	float mask_bloom;
-	float bloom_dist;
-	float halation;
-
-
-	float TATE;
-	float IOS;
-	float HSM_OVERSCAN_RASTER_BLOOM_ON;
-	float HSM_OVERSCAN_RASTER_BLOOM_MODE;
-	float HSM_OVERSCAN_RASTER_BLOOM_AMOUNT;
-	float HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE;
-	float HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE_CENTER;
-	float HSM_OVERSCAN_AMOUNT;
-	float HSM_OVERSCAN_X;
-	float HSM_OVERSCAN_Y;
-	
-	// float intres;
-	float prescalex;
-	float c_shape;
-	float sborder;
-	float csize;
-	float bsize1;
-	float warpX;
-	float warpY;
-
-	float gamma_c;
-	float brightboost;
-	float brightboost1;
-	float clips;
-
-	float blendMode;
-
-	float gsl;
-	float scanline1;
-	float scanline2;
-	float beam_min;
-	float beam_max;
-	float tds;
-	float beam_size;
-	float vertmask;
-	float scans;
-	float scan_falloff;
-	float spike;
-	float ssharp;
-	float ring;
-	float no_scanlines;
-	float scangamma;
-
-	float rolling_scan;
-
-	float h_sharp;
-	float s_sharp;
-	float smart_ei;
-	float ei_limit;
-	float sth;
-
-	float barspeed;
-	float barintensity;
-	float bardir;
-
-	float shadowMask;
-	float maskstr;
-	float mcut;	
-	float maskboost;
-	float masksize;
-	float mask_zoom;
-	float mzoom_sh;
-	float masksizeautothreshold;
-	float maskDark;
-	float maskLight;
-	float mask_gamma;
-	float slotmask;
-	float slotmask1;
-	float slotwidth;
-	float double_slot;
-	float slotms;
-	float smoothmask;
-	float mshift;
-	float mask_layout;
-	
-	float GDV_DECONVERGENCE_ON;
-	float decons;
-	float deconrr;
-	float deconrg;
-	float deconrb;
-	float deconrry;
-	float deconrgy;
-	float deconrby;	
-	float deconsmooth;
-	float dctypex;
-	float dctypey; 
-	float dcscalemode; 
-	
-	float GDV_NOISE_ON;
-	float addnoised;
-	float noisetype;
-	float noiseresd;
-	float noiseresd4kmult;
-
-	// Grade Params
-	float g_grade_on;
-    float g_Dark_to_Dim;
-    float g_GCompress;
-    float wp_temperature;
-    float g_analog;
-    float g_digital;
-    float g_sfixes;
-    float g_MD_Pal;
-    float g_SMS_bl;
-    float g_CRT_br;
-    float g_CRT_bg;
-    float g_CRT_bb;
-    float g_CRT_rf;
-    float g_CRT_sl;
-    float g_satr;
-    float g_satg;
-    float g_satb;
-
-	// Grade Afterglow Params
-    float AS;
-    float asat;
-
-	// Megatron Parameters
-	float hcrt_h_size;
-	float hcrt_v_size;
-	float hcrt_h_cent;
-	float hcrt_v_cent;
-	float hcrt_pin_phase;
-	float hcrt_pin_amp;
-
-} global;
-
-/////////////// DEFINES ///////////////
-
-// Maximum Negative cropping fron each edge
-// This means that the pass with the negative crop area 
-// added needs to have twice this much added in each direction 
-#define DEFAULT_CRT_GAMMA 2.4
-#define DEFAULT_SRGB_GAMMA 2.2
-
-#define DEFAULT_SCREEN_HEIGHT 0.8297
-#define DEFAULT_SCREEN_HEIGHT_PORTRAIT_MULTIPLIER (DEFAULT_SCREEN_HEIGHT - 0.4792) / DEFAULT_SCREEN_HEIGHT
-
-#define SHOW_ON_DUALSCREEN_MODE_BOTH 0
-#define SHOW_ON_DUALSCREEN_MODE_SCREEN_1 1
-#define SHOW_ON_DUALSCREEN_MODE_SCREEN_2 2
-
-#define FOLLOW_LAYER_VIEWPORT 0
-#define FOLLOW_LAYER_TUBE_DIFFUSE 1
-#define FOLLOW_LAYER_BEZEL_OUTSIDE 2
-#define FOLLOW_LAYER_BG 3
-#define FOLLOW_LAYER_DEVICE 4
-#define FOLLOW_LAYER_DECAL 5
-#define FOLLOW_LAYER_CAB_GLASS 6
-#define FOLLOW_LAYER_TOP 7
-
-float FOLLOW_MODE_SCALE_AND_POS = 0;
-float FOLLOW_MODE_EXACT = 1;
-
-#define TEXTURE_ASPECT_MODE_VIEWPORT 0
-#define TEXTURE_ASPECT_MODE_EXPLICIT 1
-#define TEXTURE_ASPECT_MODE_4_3 2
-#define TEXTURE_ASPECT_MODE_3_4 3
-#define TEXTURE_ASPECT_MODE_16_9 4
-#define TEXTURE_ASPECT_MODE_9_16 5
-
-float NEGATIVE_CROP_EXPAND_MULTIPLIER = 0.5;
-float MAX_NEGATIVE_CROP = 0.5;
-
-// In square coordinate space
-#define DEFAULT_UNCORRECTED_SCREEN_SCALE vec2(1.10585, 0.8296)
-#define DEFAULT_UNCORRECTED_BEZEL_SCALE vec2(1.2050, 0.9110)
-
-float DEFAULT_SCREEN_ASPECT = DEFAULT_UNCORRECTED_SCREEN_SCALE.x / DEFAULT_UNCORRECTED_SCREEN_SCALE.y;
-float DEFAULT_BEZEL_ASPECT = DEFAULT_UNCORRECTED_BEZEL_SCALE.x / DEFAULT_UNCORRECTED_BEZEL_SCALE.y;
-
-vec2 DEFAULT_SCREEN_SCALE = vec2(0);
-vec2 DEFAULT_BEZEL_SCALE = vec2(0);
-
-#define DEFAULT_SCREEN_CORNER_RADIUS 10
-
-int INFOCACHE_MAX_INDEX = 4;
-
-bool CACHE_INFO_CHANGED = false;
-float CURRENT_FRAME_FROM_CACHE_INFO = 0;
-
-float TUBE_DIFFUSE_MASK = 0;
-float TUBE_MASK = 0;
-float BEZEL_MASK = 0;
-float INSIDE_BEZEL_MASK = 0;
-float OUTSIDE_TUBE_MASK_FOR_IMAGE = 0;
-float FRAME_MASK = 0;
-float FRAME_MASK_FOR_IMAGE = 0;
-float OUTSIDE_BEZEL_MASK = 0;
-float OUTSIDE_FRAME_MASK_FOR_IMAGE = 0;
-float OUTSIDE_FRAME_MASK = 0;
-float CUTOUT_MASK = 0;
-
-float SCREEN_INDEX = 1;
-
-float SCREEN_ASPECT = 1;
-vec2 SCREEN_SCALE = vec2(1);
-vec2 SCREEN_SCALE_WITH_ZOOM = vec2(1);
-vec2 SCREEN_POS_OFFSET = vec2(0.15);
-vec2 SCREEN_SCALE_2ND_SCREEN = vec2(1);
-
-vec2 SCREEN_POS_OFFSET_1ST_SCREEN = vec2(0.15);
-vec2 SCREEN_POS_OFFSET_2ND_SCREEN = vec2(0.15);
-
-vec2 VIEWPORT_SCALE = vec2(1);
-vec2 VIEWPORT_POS = vec2(1);
-vec2 TUBE_SCALE = vec2(1);
-vec2 TUBE_DIFFUSE_SCALE = vec2(1);
-float TUBE_DIFFUSE_ASPECT = 1;
-
-vec2 TUBE_DIFFUSE_SCALE_1ST_SCREEN = vec2(1);
-vec2 TUBE_DIFFUSE_SCALE_2ND_SCREEN = vec2(1);
-
-vec2 FRAME_SCALE = vec2(1);
-
-vec2 BEZEL_OUTSIDE_SCALE = vec2(0.5);
-vec2 BACKGROUND_SCALE = vec2(0.5);
-vec2 LED_SCALE = vec2(0.5);
-vec2 DEVICE_SCALE = vec2(0.5);
-vec2 DEVICELED_SCALE = vec2(0.5);
-vec2 DECAL_SCALE = vec2(0.5);
-vec2 CAB_GLASS_SCALE = vec2(0.5);
-vec2 TOP_IMAGE_SCALE = vec2(0.5);
-
-float AVERAGE_LUMA = 0;
-float USE_VERTICAL_SCANLINES = 0;
-float SAMPLING_SCANLINE_DIR_MULT = 0;
-float SAMPLING_OPPOSITE_DIR_MULT = 0;
-
-vec2 CORE_SIZE = vec2(1);
-
-vec2 ROTATED_CORE_ORIGINAL_SIZE = vec2(1);
-vec2 ROTATED_CORE_PREPPED_SIZE = vec2(1);
-vec2 ROTATED_DEREZED_SIZE = vec2(1);
-
-vec2 CROPPED_UNROTATED_SIZE = vec2(1);
-vec2 CROPPED_UNROTATED_SIZE_WITH_RES_MULT = vec2(1);
-vec2 CROPPED_ROTATED_SIZE = vec2(1);
-vec2 CROPPED_ROTATED_SIZE_WITH_RES_MULT = vec2(1);
-vec2 CROPPED_ROTATED_SIZE_WITH_RES_MULT_FEEDBACK = vec2(1);
-vec2 SAMPLE_AREA_START_PIXEL_COORD = vec2(1);
-
-vec2 SCREEN_SIZE = vec2(1);
-
-vec2 VIEWPORT_UNSCALED_COORD = vec2(0.5);
-vec2 SCREEN_COORD = vec2(0.5);
-vec2 TUBE_COORD = vec2(0.5);
-vec2 TUBE_DIFFUSE_COORD = vec2(0.5);
-vec2 TUBE_DIFFUSE_COORD_MIXED_POS = vec2(0.5);
-vec2 BEZEL_OUTSIDE_COORD = vec2(0.5);
-vec2 BACKGROUND_COORD = vec2(0.5);
-vec2 DEVICE_COORD = vec2(0.5);
-vec2 DEVICELED_COORD = vec2(0.5);
-vec2 LED_COORD = vec2(0.5);
-vec2 DECAL_COORD = vec2(0.5);
-vec2 CAB_GLASS_COORD = vec2(0.5);
-vec2 TOP_IMAGE_COORD = vec2(0.5);
-
-vec2 SCREEN_CURVED_COORD = vec2(0.5);
-vec2 TUBE_CURVED_COORD = vec2(0.5);
-vec2 TUBE_DIFFUSE_CURVED_COORD = vec2(0.5);
-vec2 BEZEL_OUTSIDE_CURVED_COORD = vec2(0.5);
-vec2 FRAME_OUTSIDE_CURVED_COORD = vec2(0.5);
-
-vec2 BACKGROUND_CURVED_COORD = vec2(0.5);
-vec2 LED_CURVED_COORD = vec2(0.5);
-vec2 DEVICE_CURVED_COORD = vec2(0.5);
-vec2 DEVICELED_CURVED_COORD = vec2(0.5);
-vec2 DECAL_CURVED_COORD = vec2(0.5);
-vec2 CAB_GLASS_CURVED_COORD = vec2(0.5);
-vec2 TOP_IMAGE_CURVED_COORD = vec2(0.5);
-
diff --git a/bezel/Mega_Bezel/shaders/base/common/helper-functions.inc b/bezel/Mega_Bezel/shaders/base/common/helper-functions.inc
deleted file mode 100644
index 7bef9d3ee3..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/helper-functions.inc
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-	Texture interpolation based on "Improved texture interpolation" by Inigo Quilez
-	Original description: http://www.iquilezles.org/www/articles/texture/texture.htm
-	Expects the texture to be using linear filtering
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-float SOURCE_MATTE_PREMULTIPLIED = 0;
-float SOURCE_MATTE_WHITE = 1;
-float SOURCE_MATTE_NONE = 2;
-
-float BLEND_MODE_OFF = 0;
-float BLEND_MODE_NORMAL = 1;
-float BLEND_MODE_ADD = 2;
-float BLEND_MODE_MULTIPLY = 3;
-
-vec4 HSM_ApplyGamma(vec4 in_color, float in_gamma)
-{
-	vec3 out_color = pow(in_color.rgb, vec3(1 / in_gamma));
-	return vec4(out_color, in_color.a);
-}
-
-// 'Removes' encoded gamma from color to put the color in linear space
-vec4 HSM_Linearize(vec4 in_color, float encoded_gamma)
-{
-	return HSM_ApplyGamma(in_color, 1 / encoded_gamma);
-}
-
-// Adds gamma onto color in linear space to get a color with encoded gamma
-vec4 HSM_Delinearize(vec4 in_color, float in_gamma)
-{
-	return HSM_ApplyGamma(in_color, in_gamma);
-}
-
-vec3 HSM_RGBtoHSV(vec3 c)
-{
-    vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
-    vec4 p = c.g < c.b ? vec4(c.bg, K.wz) : vec4(c.gb, K.xy);
-    vec4 q = c.r < p.x ? vec4(p.xyw, c.r) : vec4(c.r, p.yzx);
-
-    float d = q.x - min(q.w, q.y);
-    float e = 1.0e-10;
-    return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
-}
-
-vec3 HSM_HSVtoRGB(vec3 c)
-{
-    vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-    vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-    return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
-}
-
-vec3 HSM_ApplyHSVAdjustment(vec3 in_color_rgb, float in_hue, float in_saturation, float in_brightness, float in_colorize_on, float in_gamma_adjust)
-{
-	if (!(in_colorize_on == 1 || in_hue != 0 || in_saturation != 1 || in_brightness != 1 || in_gamma_adjust != 1))
-		return in_color_rgb;
-	
-	vec3 color_hsv = HSM_RGBtoHSV(in_color_rgb);
-
-	if (in_colorize_on > 0.5)
-	{
-		color_hsv.x = in_hue;
-		color_hsv.y = mix(mix(0, color_hsv.y, clamp(in_saturation, 0, 1)), 1, clamp(in_saturation - 1, 0, 1) );
-	}
-	else
-	{
-		color_hsv.x += in_hue;
-		color_hsv.y *= in_saturation;
-	}
-
-	color_hsv.z *= in_brightness;
-
-	vec3 color_rgb = HSM_HSVtoRGB(color_hsv);
-
-	if (in_gamma_adjust != 1)
-		color_rgb = HSM_ApplyGamma(vec4(color_rgb.r, color_rgb.g, color_rgb.b, 1), in_gamma_adjust).rgb;
-
-	return color_rgb;
-}
-
-vec4 HSM_GetPreMultipliedColorLinear(vec4 in_color, float matte_type, float encoded_gamma)
-{
-	vec4 out_color = in_color;
-
-	if (matte_type == SOURCE_MATTE_WHITE)
-		out_color.rgb = clamp(out_color.rgb - (1 - out_color.a), 0, 1);
-
-	out_color = HSM_Linearize(out_color, encoded_gamma);
-
-	// If the color was not already premultiplied (matted with black) premultiply it now
-	if (matte_type == SOURCE_MATTE_NONE)
-		out_color.rgb *= out_color.a;
-
-	return out_color;
-}
-
-/* Composite one image over top another using the alpha to blend
- * It is expected that the input colors have been already premultiplied
- * which means their rgb has already been multiplied by their alpha */
-vec4 HSM_PreMultAlphaBlend(vec4 color_under, vec4 color_over)
-{
-	vec4 out_color = vec4(color_over.rgb + (color_under.rgb * (1 - color_over.a)), clamp(color_under.a + color_over.a, 0, 1));
-	return out_color;
-}
-
-vec4 HSM_BlendMultiply(vec4 color_under, vec4 color_over, float opacity)
-{
-	float final_opacity = color_over.a * opacity;
-	return vec4(color_under.rgb * (final_opacity * color_over.rgb + (1 - final_opacity) * vec3(1)), color_under.a);
-}
-
-// Assumes Opacity is already encoded in alpha
-vec4 HSM_BlendModeLayerMix(vec4 color_under, vec4 color_over, float blend_mode, float layer_opacity)
-{
-	if (blend_mode == 0)
-		return color_under;
-
-	if (blend_mode == BLEND_MODE_OFF)
-		return color_under;
-	
-	color_over.a *= layer_opacity;
-
-	vec4 out_color = vec4(0);
-
-	if (blend_mode == BLEND_MODE_NORMAL)
-	{
-		color_over.rgb *= color_over.a;
-		out_color = HSM_PreMultAlphaBlend(color_under, color_over);
-	}
-	else
-	{
-		vec4 blend_color = color_under; 
-		if (blend_mode == BLEND_MODE_ADD)  	 		blend_color.rgb = color_under.rgb + color_over.rgb ;
-		if (blend_mode == BLEND_MODE_MULTIPLY)  	blend_color.rgb = color_under.rgb * color_over.rgb ;
-
-		out_color = vec4(clamp(mix(color_under.rgb, blend_color.rgb, color_over.a), 0, 1), color_under.a);
-	}
-	return out_color;
-}
-
-vec4 HSM_TextureQuilez(sampler2D in_sampler_2D, vec2 in_texture_size, vec2 p)
-{
-	vec2 tex_size = textureSize(in_sampler_2D, 0);
-	p = p * in_texture_size + vec2(0.5, 0.5);
-
-	vec2 i = floor(p);
-	vec2 f = p - i;
-	f = f * f * f * (f * (f * 6.0 - vec2(15.0, 15.0)) + vec2(10.0, 10.0));
-	p = i + f;
-
-	p = (p - vec2(0.5, 0.5)) * (1/in_texture_size);
-
-	// final sum and weight normalization
-	return texture(in_sampler_2D, p);
-}
-
-float HHLP_GetMaskCenteredOnValue(float in_value, float value_to_match, float threshold)
-{
-	float edge_0 = value_to_match - threshold;
-	float edge_1 = value_to_match - 0.5 * threshold;
-	float edge_2 = value_to_match + 0.5 * threshold;
-	float edge_3 = value_to_match + threshold;
-	float out_mask = 1.0;
-	out_mask *= smoothstep(edge_0, edge_1, in_value);
-	out_mask *= smoothstep(edge_3, edge_2, in_value);
-	return out_mask;
-}
-
-// Quadratic Bezier allows us to have a controlled falloff between 0 and 1 
-// One use is to avoid the perception of discontinuity at the outer edge experienced with a linear gradients
-float HHLP_QuadraticBezier (float x, vec2 a)
-{
-  // Originally adapted by @kyndinfo from BEZMATH.PS (1993) by Don Lancaster
-  // http://www.tinaja.com/text/bezmath.html
-  
-  float epsilon = 0.00001;
-  a.x = clamp(a.x,0.0,1.0); 
-  a.y = clamp(a.y,0.0,1.0); 
-  if (a.x == 0.5){
-    a += epsilon;
-  }
-  
-  // solve t from x (an inverse operation)
-  float om2a = 1.0 - 2.0 * a.x;
-  float t = (sqrt(a.x*a.x + om2a*x) - a.x)/om2a;
-  float y = (1.0-2.0*a.y)*(t*t) + (2.0*a.y)*t;
-  return y;
-}
-
-float HHLP_EasePowerIn(float x, float in_exponent) 
-{
-  x = max(0, min(x, 1));
-  return pow(x, in_exponent);
-}
-
-float HHLP_EasePowerOut(float x, float in_exponent) 
-{
-  x = 1.0 - max(0, min(x, 1));
-  return 1.0 - pow(x, in_exponent);
-}
-
-float HHLP_EasePowerInOut(float x, float in_exponent) 
-{
-  x = max(0, min(x, 1));
-  if (x < 0.5) 
-  {
-    return pow(x * 2, in_exponent) * 0.5;
-  } 
-  else 
-  {
-    return 1.0 - pow((1 - x) * 2, in_exponent) * 0.5;
-  }
-}
-
-float HHLP_GetDistanceToLine(float x1, float y1, float a, float b, float c)
-{
-    float d = abs((a * x1 + b * y1 + c)) /  
-              (sqrt(a * a + b * b));
-    return d; 
-}
-
-// Returns 1 if in_value < compare_value
-// Useful when ifs are bad for performance
-float HHLP_IsUnderValue(float in_value, float compare_value)
-{
-	return clamp((compare_value - in_value) * 100000, 0, 1);
-}
-
-// Returns 1 if in_value > compare_value
-// Useful when ifs are bad for performance
-float HHLP_IsOverValue(float in_value, float compare_value)
-{
-	return clamp(-1 * (compare_value - in_value) * 100000, 0, 1);
-}
-
-// Returns 1 if in_value == compare_value within the epsilon value provided
-// Useful when ifs are bad for performance
-float HHLP_EqualsValue(float in_value, float compare_value, float epsilon)
-{
-	return HHLP_IsUnderValue(in_value, compare_value + epsilon) * HHLP_IsOverValue(in_value, compare_value - epsilon);
-}
-
-float HHLP_EqualsResolution(vec2 in_res, vec2 test_res)
-{
-  float hardcoded_epsilon = 0.001;
-  return  HHLP_EqualsValue(in_res.x, test_res.x, hardcoded_epsilon) * 
-          HHLP_EqualsValue(in_res.y, test_res.y, hardcoded_epsilon);
-}
-
-vec4 HHLP_GetBilinearTextureSample(sampler2D in_sampler, vec2 in_coord, vec4 in_size)
-{
-   vec2 uv = in_coord * in_size.xy - 0.5; // Shift by 0.5 since the texel sampling points are in the texel center.
-   vec2 a = fract(uv);
-   vec2 tex = (floor(uv) + 0.5) * in_size.zw; // Build a sampling point which is in the center of the texel.
-
-   // Sample the bilinear footprint.
-   vec4 t0 = textureLodOffset(in_sampler, tex, 0.0, ivec2(0, 0));
-   vec4 t1 = textureLodOffset(in_sampler, tex, 0.0, ivec2(1, 0));
-   vec4 t2 = textureLodOffset(in_sampler, tex, 0.0, ivec2(0, 1));
-   vec4 t3 = textureLodOffset(in_sampler, tex, 0.0, ivec2(1, 1));
-
-   // Bilinear filter.
-   vec4 result = mix(mix(t0, t1, a.x), mix(t2, t3, a.x), a.y);
-
-   return result;
-}
-
-bool HHLP_IsOutsideCoordSpace(vec2 in_coord)
-{
-	return (abs(in_coord.x - 0.5) > 0.501 || abs(in_coord.y - 0.5) > 0.501);
-}
-
-float rand(vec2 co, float size){
-    return fract(sin(dot(co, vec2(12.9898, 78.233))) * 43758.5453) * size;
-}
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-0-screen-scale.inc b/bezel/Mega_Bezel/shaders/base/common/params-0-screen-scale.inc
deleted file mode 100644
index 7561a8ae36..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-0-screen-scale.inc
+++ /dev/null
@@ -1,1104 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-// Screen Scale Required Parameters
-#pragma parameter HSM_MEGA_BEZEL_TITLE								"[ --- HSM MEGA BEZEL V1.17.2_2024-05-18 --- ]" 0 0 0.001 0.001
-
-#pragma parameter HSM_RESOLUTION_DEBUG_ON							"          Show Resolution Info" 0 0 1 1
-float HSM_RESOLUTION_DEBUG_ON = global.HSM_RESOLUTION_DEBUG_ON;
-
-
-//---------------------------------------------------------------------------------------------------
-//    CRT BRIGHTNESS & GAMMA
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_CRT_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CRT_TITLE                             "[ CRT BRIGHTNESS & GAMMA ]:" 0 0 0.001 0.001
-
-#pragma parameter GAMMA_INPUT   							"          Gamma In (Game Embedded Gamma) Def 2.4" 2.4 0.1 5 0.05
-#define GAMMA_INPUT global.GAMMA_INPUT
-
-#pragma parameter gamma_out   								"          Gamma Out (Electron Gun Gamma) Def 2.4" 2.4 0.1 5 0.05
-#define HSM_GAMMA_OUT_CRT global.gamma_out
-
-#pragma parameter post_br                                   "          Post CRT Brightness" 1 0.01 5 0.01
-#define HSM_POST_CRT_BRIGHTNESS global.post_br
-
-#pragma parameter post_br_affect_black_level                "          Post CRT Brightness Affects Grade Black Level" 100 0 100 10
-#define HSM_POST_CRT_BRIGHTNESS_AFFECT_BLACK_LEVEL global.post_br_affect_black_level / 100
-
-
-//---------------------------------------------------------------------------------------------------
-//    Global Graphics Brightness
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_GLOBAL_GRAPHICS_BRIGHTNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_GLOBAL_GRAPHICS_BRIGHTNESS_TITLE              "[ GRAPHICS GLOBAL BRIGHTNESS ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_GLOBAL_GRAPHICS_BRIGHTNESS                    "          Graphics Brightness"  100 0 500 1
-float HSM_GLOBAL_GRAPHICS_BRIGHTNESS = global.HSM_GLOBAL_GRAPHICS_BRIGHTNESS / 100;
-
-#pragma parameter HSM_STATIC_LAYERS_GAMMA		                    "          Graphics Gamma Adjust" 1 0.01 5 0.01
-float HSM_STATIC_LAYERS_GAMMA = global.HSM_STATIC_LAYERS_GAMMA;
-
-
-//---------------------------------------------------------------------------------------------------
-//    AMBIENT LIGHTING AKA NIGHTLIGHTING
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_AMBIENT_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_AMBIENT_TITLE                       "[ AMBIENT LIGHTING ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_AMBIENT_LIGHTING_OPACITY                      "          Ambient Global Opacity Multiplier"  0 0 100 1
-float HSM_AMBIENT_LIGHTING_OPACITY = global.HSM_AMBIENT_LIGHTING_OPACITY / 100;
-
-#pragma parameter HSM_AMBIENT1_OPACITY                     "          Ambient 1st Image Opacity"  100 0 100 1
-float HSM_AMBIENT1_OPACITY = global.HSM_AMBIENT1_OPACITY / 100 * global.HSM_AMBIENT_LIGHTING_OPACITY / 100;
-
-#pragma parameter HSM_AMBIENT2_OPACITY                     "          Ambient 2nd Image Opacity (Used for BG by Default)"  100 0 100 1
-float HSM_AMBIENT2_OPACITY = global.HSM_AMBIENT2_OPACITY / 100 * global.HSM_AMBIENT_LIGHTING_OPACITY / 100;
-
-#pragma parameter HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE     "          Which Images to Use: BOTH | 1 ONLY | 2 ONLY | SWAP"  0 0 3 1
-float HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE = global.HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE;
-
-
-//---------------------------------------------------------------------------------------------------
-//    Sinden Lightgun Border
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_SINDEN_EMPTY_LINE					" " 0 0 0.001 0.001
-#pragma parameter HSM_SINDEN_TITLE                      "[ SINDEN LIGHTGUN BORDER ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_SINDEN_BORDER_ON					"         Show Border" 0 0 1 1
-float HSM_SINDEN_BORDER_ON = global.HSM_SINDEN_BORDER_ON;
-
-#pragma parameter HSM_SINDEN_BORDER_BRIGHTNESS				"         Brightness" 60 0 200 5
-float HSM_SINDEN_BORDER_BRIGHTNESS = global.HSM_SINDEN_BORDER_BRIGHTNESS / 100;
-
-#pragma parameter HSM_SINDEN_BORDER_THICKNESS		    "         Thickness" 2 0 30 0.5
-float HSM_SINDEN_BORDER_THICKNESS = global.HSM_SINDEN_BORDER_THICKNESS / 100;
-
-#pragma parameter HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION	"         Compensate Empty Tube" 0 0 1 1
-float HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION = global.HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION;
-
-
-//---------------------------------------------------------------------------------------------------
-//    Zoom & Pan
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_ZOOM_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_VIEWPORT_ZOOM_TITLE							"[ VIEWPORT ZOOM ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_VIEWPORT_ZOOM									"          Viewport Zoom"  100 10 500 0.2
-float HSM_VIEWPORT_ZOOM = global.HSM_VIEWPORT_ZOOM / 100;
-
-#pragma parameter HSM_VIEWPORT_ZOOM_MASK							"          Zoom CRT Mask"  0 0 1 1
-float HSM_VIEWPORT_ZOOM_MASK = global.HSM_VIEWPORT_ZOOM_MASK;
-
-#pragma parameter HSM_VIEWPORT_POSITION_X							"          Viewport Position X"  0 -500 500 1
-float HSM_VIEWPORT_POSITION_X = -1 * global.HSM_VIEWPORT_POSITION_X / 1000;
-
-#pragma parameter HSM_VIEWPORT_POSITION_Y							"          Viewport Position Y"  0 -500 500 1
-float HSM_VIEWPORT_POSITION_Y = -1 * global.HSM_VIEWPORT_POSITION_Y / 1000;
-
-
-//---------------------------------------------------------------------------------------------------
-//    FLIP & ROTATE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_FLIP_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_FLIP_ROTATE_TITLE								"[ FLIP & ROTATE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_FLIP_VIEWPORT_VERTICAL						"          Flip Viewport Vertical"  0 0 1 1
-float HSM_FLIP_VIEWPORT_VERTICAL = -(global.HSM_FLIP_VIEWPORT_VERTICAL * 2 - 1);
-
-#pragma parameter HSM_FLIP_VIEWPORT_HORIZONTAL						"          Flip Viewport Horizontal"  0 0 1 1
-float HSM_FLIP_VIEWPORT_HORIZONTAL = -(global.HSM_FLIP_VIEWPORT_HORIZONTAL * 2 - 1);
-
-#pragma parameter HSM_FLIP_CORE_VERTICAL							"          Flip Core Image Vertical"  0 0 1 1
-// float HSM_FLIP_CORE_VERTICAL = global.HSM_FLIP_CORE_VERTICAL;
-float HSM_FLIP_CORE_VERTICAL = -(global.HSM_FLIP_CORE_VERTICAL * 2 - 1);
-
-#pragma parameter HSM_FLIP_CORE_HORIZONTAL							"          Flip Core Image Horizontal"  0 0 1 1
-// float HSM_FLIP_CORE_HORIZONTAL = global.HSM_FLIP_CORE_HORIZONTAL;
-float HSM_FLIP_CORE_HORIZONTAL = -(global.HSM_FLIP_CORE_HORIZONTAL * 2 - 1);
-
-#pragma parameter HSM_ROTATE_CORE_IMAGE								"          Rotate CRT Tube --  -1:270 | 0 | 1:90"  0 -1 1 1
-float HSM_ROTATE_CORE_IMAGE = global.HSM_ROTATE_CORE_IMAGE;
-
-
-//---------------------------------------------------------------------------------------------------
-//    ASPECT RATIO
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_ASPECT_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_ASPECT_RATIO_TITLE							"[ ASPECT RATIO ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_ASPECT_RATIO_ORIENTATION 						"          Orientation - Auto | Horizontal | Vertical"  0 0 2 1
-float HSM_ASPECT_RATIO_ORIENTATION = global.HSM_ASPECT_RATIO_ORIENTATION;
-
-#pragma parameter HSM_ASPECT_RATIO_MODE 							"         Type - Auto | Explicit | 4:3 | 3:2 | 16:9 | PAR | Full"  0 0 6 1
-float HSM_ASPECT_RATIO_MODE = global.HSM_ASPECT_RATIO_MODE;
-
-#pragma parameter HSM_ASPECT_RATIO_EXPLICIT							"          Explicit Aspect Ratio (Also Auto Ratio Fallback)"  1.3333 0 8 0.002
-float HSM_ASPECT_RATIO_EXPLICIT = global.HSM_ASPECT_RATIO_EXPLICIT;
-
-
-//---------------------------------------------------------------------------------------------------
-//    CRT SCREEN SCALING GENERAL
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_SCALING_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_SCALING_TITLE									"[ CRT SCREEN SCALING GENERAL ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_INT_SCALE_MODE 								"          Integer Scale Mode - OFF | ShortAxis | BothAxes" 0 0 2 1
-#define HSM_INT_SCALE_MODE global.HSM_INT_SCALE_MODE
-
-#pragma parameter HSM_VERTICAL_PRESET 								"       Preset is for Monitor Portrait Mode (Smaller CRT Screen)" 0 0 1 1
-float HSM_VERTICAL_PRESET = global.HSM_VERTICAL_PRESET;
-
-
-//---------------------------------------------------------------------------------------------------
-//    Integer Scale
-//---------------------------------------------------------------------------------------------------
-
-#pragma parameter HSM_INTEGER_SCALE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_INTEGER_SCALE_TITLE							"[ INTEGER SCALE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_INT_SCALE_MAX_HEIGHT 					        "          Base Integer Scale Max Height %" 89 60 140 0.5
-float HSM_INT_SCALE_MAX_HEIGHT = global.HSM_INT_SCALE_MAX_HEIGHT / 100;
-
-#pragma parameter HSM_INT_SCALE_MULTIPLE_OFFSET 					"          Integer Scale Multiple Offset" 0 -20 20 1
-#define HSM_INT_SCALE_MULTIPLE_OFFSET global.HSM_INT_SCALE_MULTIPLE_OFFSET
-
-#pragma parameter HSM_INT_SCALE_MULTIPLE_OFFSET_LONG 				"          Integer Scale Multiple Offset on Long Axis" 0 -20 20 1
-#define HSM_INT_SCALE_MULTIPLE_OFFSET_LONG global.HSM_INT_SCALE_MULTIPLE_OFFSET_LONG
-
-
-//---------------------------------------------------------------------------------------------------
-//    NON-INTEGER SCALE
-//---------------------------------------------------------------------------------------------------
-
-#pragma parameter HSM_NON_INTEGER_SCALE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_NON_INTEGER_SCALE_PERCENT_TITLE							"[ NON-INTEGER SCALE PERCENT ]:" 0 0 0.001 0.001
-
-// Non integer scale is set to 82.97 so that cores which output 224px will have integer scale by default
-// This is 8x integer scale at 3840x2160 and 6x integer scale at 1920x1080
-#pragma parameter HSM_NON_INTEGER_SCALE 							"          Non-Integer Scale %" 82.97 1 200 0.2
-float HSM_NON_INTEGER_SCALE = global.HSM_NON_INTEGER_SCALE / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    PHYSICAL SIZE
-//---------------------------------------------------------------------------------------------------
-
-#pragma parameter HSM_PHYSICAL_SIZE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_PHYSICAL_SIZE_TITLE							"[ NON-INTEGER - PHYSICAL SIZES ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER 			"          Use Physical Monitor and Tube Sizes for Non-Integer" 0 0 1 1
-float HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER = global.HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER;
-
-#pragma parameter HSM_PHYSICAL_MONITOR_ASPECT_RATIO					"          Your Monitor's Aspect Ratio" 1.77 0.25 5 0.01
-float HSM_PHYSICAL_MONITOR_ASPECT_RATIO = global.HSM_PHYSICAL_MONITOR_ASPECT_RATIO;
-
-#pragma parameter HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE		        "          Your Monitor's Size (Diagonal)" 27 1 100 0.1
-float HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE = global.HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE;
-
-#pragma parameter HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE				"          Simulated Tube Size (Diagonal)" 18.1 1 100 0.1
-float HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE = global.HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE;
-
-
-//---------------------------------------------------------------------------------------------------
-//    AUTOMATIC SCALE & POSITION
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_AUTOMATIC_SCREEN_SCALE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_AUTOMATIC_SCREEN_SCALE_TITLE					"[ NON-INTEGER - AUTOMATIC SCREEN SCALE & PLACEMENT ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_USE_IMAGE_FOR_PLACEMENT 						"          Use Image For Automatic Placement (Scale and Y Pos)" 0 0 1 1
-float HSM_USE_IMAGE_FOR_PLACEMENT = global.HSM_USE_IMAGE_FOR_PLACEMENT;
-
-#pragma parameter HSM_PLACEMENT_IMAGE_USE_HORIZONTAL 				"          Auto Place Horizontal (X Pos)" 0 0 1 1
-float HSM_PLACEMENT_IMAGE_USE_HORIZONTAL = global.HSM_PLACEMENT_IMAGE_USE_HORIZONTAL;
-
-#pragma parameter HSM_PLACEMENT_IMAGE_MODE 						    "          Placement Image Mode: TRANSPARENCY : WHITE ON BLACK" 0 0 1 1
-float HSM_PLACEMENT_IMAGE_MODE = global.HSM_PLACEMENT_IMAGE_MODE;
-
-
-//---------------------------------------------------------------------------------------------------
-//    NON-INTEGER SCALE OFFSET
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_NONINTEGER_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_NONINTEGER_SCALE_OFFSET_TITLE					"[ NON-INTEGER SCALE OFFSET ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_NON_INTEGER_SCALE_OFFSET 						"          Non-Integer Scale Offset" 100 5 400 0.1
-float HSM_NON_INTEGER_SCALE_OFFSET = global.HSM_NON_INTEGER_SCALE_OFFSET / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    SNAP TO INTEGER SCALE
-//---------------------------------------------------------------------------------------------------
-
-#pragma parameter HSM_SNAP_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_SNAP_NONINTEGER_TITLE							"[ SNAP NON-INTEGER TO CLOSEST INTEGER SCALE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_USE_SNAP_TO_CLOSEST_INT_SCALE 				"          Snap to Closest Integer Scale: OFF | ON" 0 0 1 1
-float HSM_USE_SNAP_TO_CLOSEST_INT_SCALE = global.HSM_USE_SNAP_TO_CLOSEST_INT_SCALE;
-
-#pragma parameter HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE 			"          Snap To Closest Integer Scale Tolerance" 20 0 300 1
-float HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE = HSM_USE_SNAP_TO_CLOSEST_INT_SCALE > 0.5 ? global.HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE / 100 : 0;
-
-
-
-//---------------------------------------------------------------------------------------------------
-//    POSITION OFFSET
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_SCREEN_POS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_SCREEN_POSITION_TITLE							"[ POSITION OFFSET ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_SCREEN_POSITION_X 							"          Position X" 0 -1000 1000 1
-float HSM_SCREEN_POSITION_X = global.HSM_SCREEN_POSITION_X / 1000;
-
-#pragma parameter HSM_SCREEN_POSITION_Y 							"          Position Y" 0 -1000 1000 1
-float HSM_SCREEN_POSITION_Y = -1 * global.HSM_SCREEN_POSITION_Y / 1000;
-
-
-//---------------------------------------------------------------------------------------------------
-//    CROPPING
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_CROPPING_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CROPPING_TITLE								"[ CROPPING CORE IMAGE ]:" 0 0 0.001 0.001
-#pragma parameter HSM_CROP_FYI 									    "    FYI !!! Negative Crop is currently Disabled" 0 0 0.001 0.001
-
-#pragma parameter HSM_CROP_MODE 									"          Crop Mode  -  OFF | CROP BLACK ONLY | CROP ANY" 2 0 2 1
-float HSM_CROP_MODE = global.HSM_CROP_MODE;
-
-#pragma parameter HSM_CROP_PERCENT_ZOOM								"          Crop Zoom %" 0 -50 100 0.1
-float HSM_CROP_PERCENT_ZOOM = global.HSM_CROP_PERCENT_ZOOM / 100;
-
-#pragma parameter HSM_CROP_PERCENT_TOP 								"          Crop Top %" 0 -50 100 0.1
-float HSM_CROP_PERCENT_TOP = global.HSM_CROP_PERCENT_TOP / 100;
-
-#pragma parameter HSM_CROP_PERCENT_BOTTOM 							"          Crop Bottom %" 0 -50 100 0.1
-float HSM_CROP_PERCENT_BOTTOM = global.HSM_CROP_PERCENT_BOTTOM / 100;
-
-#pragma parameter HSM_CROP_PERCENT_LEFT 							"          Crop Left %" 0 -50 100 0.1
-float HSM_CROP_PERCENT_LEFT = global.HSM_CROP_PERCENT_LEFT / 100;
-
-#pragma parameter HSM_CROP_PERCENT_RIGHT 							"          Crop Right %" 0 -50 100 0.1
-float HSM_CROP_PERCENT_RIGHT = global.HSM_CROP_PERCENT_RIGHT / 100;
-
-#pragma parameter HSM_CROP_BLACK_THRESHOLD 							"          Black Threshold for 'CROP BLACK ONLY'" 0 0 100 1
-float HSM_CROP_BLACK_THRESHOLD = global.HSM_CROP_BLACK_THRESHOLD / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    DREZ Filter
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_GSHARP_DREZ_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter GSHARP_DREZ_TITLE 	    "[ --- DREZ DOWNSAMPLE FILTER - GUEST.R G-SHARP RESAMPLER --- ]:"  0 0 0.01 0.01
-
-#pragma parameter HSM_DREZ_GSHARP_ON 	    "          G-SHARP ON" 	  1 0 1 1
-#pragma parameter HSM_DREZ_THRESHOLD_RATIO 	"         Downsample Threshold (Original Res Vs Downsampled Res)" 	  1.5 1 4 0.1
-// Default was 1.2, now set to 2.3 to match smoothing in Hyllian b-spline
-#pragma parameter HSM_DREZ_HSHARP0 		    "          Filter Range"  2.3 1.0 6.0 0.1
-#pragma parameter HSM_DREZ_SIGMA_HV 		"          Gaussian Blur Sigma" 0.75 0.1 7.0 0.05
-#pragma parameter HSM_DREZ_SHAR 			"          Sharpness Definition" 0.5 0.0 2.0 0.05
-#pragma parameter HSM_DREZ_HAR 			    "          Anti-Ringing" 0.5 0.0 1.0 0.10
-
-
-//---------------------------------------------------------------------------------------------------
-//    CORE RES SAMPLING
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_SAMPLING_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_SAMPLING_TITLE								"[ CORE RES SAMPLING ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR			"          Scanline Dir Multiplier"  100 25 1600 25
-float HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = global.HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR / 100;
-
-#pragma parameter HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR 					"          Scanline Dir Downsample Blur" 0 0 200 1
-float HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = global.HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR / 100;
-
-#pragma parameter HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR			"          Opposite Dir Multiplier"  100 25 1600 25
-float HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = global.HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR / 100;
-
-#pragma parameter HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR 					"          Opposite Dir Downsample Blur" 0 0 200 1
-float HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = global.HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR / 100;
-
-// #pragma parameter HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR 			"          Shift Sampling Relative to Scanlines" 0 -100 100 5
-// float HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR = global.HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR / 100;
-
-//---------------------------------------------------------------------------------------------------
-//    FAST SHARPEN - GUEST.R
-//---------------------------------------------------------------------------------------------------
-#pragma parameter SHARPEN_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter SHARPEN_TITLE  	"[ FAST SHARPEN - GUEST.R ]:"         			0.00 0.0 2.00 0.05
-#pragma parameter SHARPEN_ON  		"          FSharpen - ON"       		1 0 1 1
-#pragma parameter CSHARPEN          "          FSharpen - Sharpen strength"         0.00 0.0 5.00 0.10
-#pragma parameter CCONTR            "          FSharpen - Sharpen Contrast/Ringing" 0.05 0.0 0.25 0.01
-#pragma parameter CDETAILS          "          FSharpen - Details sharpened"        1.00 0.0 1.00 0.05
-#pragma parameter DEBLUR            "          FSharpen - Deblur Strength (For NTSC Only)"          1.00 1.0 7.00 0.25
-
-
-//---------------------------------------------------------------------------------------------------
-//    INTERLACING from Guest.r's Guest Advanced Shader
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_INTERLACE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_INTERLACE_TITLE								"[ SCANLINES & INTERLACING( By Guest.r) ]:" 0 0 0.001 0.001
-#pragma parameter HSM_SCANLINE_DIRECTION 							"          Scanline Direction - Auto | Horiz | Vert"  0 0 2 1
-float HSM_SCANLINE_DIRECTION = global.HSM_SCANLINE_DIRECTION;
-
-#pragma parameter hiscan "          High Resolution Scanlines (ScaleFx or XBR Only)" 0.0 0.0 1.0 1.0
-#define hiscan        global.hiscan
-
-// Uses naming from Guest Advanced
-#pragma parameter no_scanlines                                      "          No-Scanline Mode (Guest Advanced Only)" 0.0 0.0 1.5 0.05
-
-#pragma parameter HSM_INTERLACE_SUPPORT1							"[  Interlace Mode: What Happens if Vertical Res > Trigger Res ]" 0 0 0.001 0.001
-#pragma parameter HSM_INTERLACE_SUPPORT2 							"[ -1:NO SCANLN 0:NO LACE 1-3:NORM LACE 4-5:INTERPOLATE FIELDS ]" 0 0 0.0001 1
-
-#pragma parameter HSM_INTERLACE_MODE 								"          Interlace Mode:" 4 -1.0 5.0 1.0
-#define HSM_INTERLACE_MODE global.HSM_INTERLACE_MODE
-
-#pragma parameter HSM_INTERLACE_TRIGGER_RES 						"          Trigger Res for Interlace, Fake Scanlines & VGA" 375 100 2000 25
-#define HSM_INTERLACE_TRIGGER_RES global.HSM_INTERLACE_TRIGGER_RES
-
-#pragma parameter HSM_INTERLACE_EFFECT_SMOOTHNESS_INTERS 			"          Interlace Effect Smoothness" 0 0 100 10
-#define HSM_INTERLACE_EFFECT_SMOOTHNESS_INTERS global.HSM_INTERLACE_EFFECT_SMOOTHNESS_INTERS / 200
-
-#pragma parameter HSM_INTERLACE_SCANLINE_EFFECT 					"          Interlace Scanline Effect ('Laced brightness)" 0.20 0.0 1.0 0.05
-#define HSM_INTERLACE_SCANLINE_EFFECT global.HSM_INTERLACE_SCANLINE_EFFECT / 100
-
-#pragma parameter iscans 				                            "          Interlace (Scanline) Saturation" 0.25 0 1 0.05
-#define iscans global.iscans
-
-#pragma parameter vga_mode                                          "          VGA Single/Double Scan mode" 0.0 0.0 1.0 1.0
-#define vga_mode  global.vga_mode     // interlace saturation
-
-
-//---------------------------------------------------------------------------------------------------
-//    FAKE SCANLINES
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_FAKE_SCANLINES_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_FAKE_SCANLINE_TITLE							"[ FAKE SCANLINES ]" 0 0 0.001 0.001
-
-#pragma parameter HSM_FAKE_SCANLINE_MODE 							"          Show Fake Scanlines - OFF | ON | USE TRIGGER RES" 2 0 2 1
-#define HSM_FAKE_SCANLINE_MODE global.HSM_FAKE_SCANLINE_MODE
-
-#pragma parameter HSM_FAKE_SCANLINE_OPACITY 						"          Opacity - Def 70" 0 0 100 5
-#define HSM_FAKE_SCANLINE_OPACITY global.HSM_FAKE_SCANLINE_OPACITY / 100
-
-#pragma parameter HSM_FAKE_SCANLINE_RES_MODE						"          Scan Resolution Mode: AUTO (CORE RES) : EXPLICIT" 1 0 1 1
-#define HSM_FAKE_SCANLINE_RES_MODE global.HSM_FAKE_SCANLINE_RES_MODE
-
-#pragma parameter HSM_FAKE_SCANLINE_RES 							"          Explicit Scan Resolution" 240 0 480 8
-#define HSM_FAKE_SCANLINE_RES global.HSM_FAKE_SCANLINE_RES
-
-#pragma parameter HSM_FAKE_SCANLINE_INT_SCALE 						"          Int Scale Scanlines" 1 0 1 1
-#define HSM_FAKE_SCANLINE_INT_SCALE global.HSM_FAKE_SCANLINE_INT_SCALE
-
-#pragma parameter HSM_FAKE_SCANLINE_ROLL 							"          Rolling Scanline" 0 -100 100 1
-#define HSM_FAKE_SCANLINE_ROLL global.HSM_FAKE_SCANLINE_ROLL / 100
-
-#pragma parameter HSM_FAKE_SCANLINE_CURVATURE 						"          Scanline Curvature" 0 0 100 1
-#define HSM_FAKE_SCANLINE_CURVATURE global.HSM_FAKE_SCANLINE_CURVATURE / 100
-
-// #pragma parameter HSM_FAKE_SCANLINE_BRIGHTNESS_CUTOFF 	"[ SCREEN FX ]  Fake 240p Scanline Brightness Cutoff - Def 3" 3 0 10 0.05
-#ifndef HSM_FAKE_SCANLINE_BRIGHTNESS_CUTOFF
-	#define HSM_FAKE_SCANLINE_BRIGHTNESS_CUTOFF 3
-#endif
-
-//---------------------------------------------------------------------------------------------------
-//    CURVATURE
-//---------------------------------------------------------------------------------------------------
-
-#pragma parameter HSM_OVERSCAN_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_OVERSCAN_TITLE "[ OVERSCAN & RASTER BLOOM ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter HSM_OVERSCAN_AMOUNT "          Overscan %" 0 -50 100 0.5
-#define HSM_OVERSCAN_AMOUNT        (global.HSM_OVERSCAN_AMOUNT / 100)
-
-#pragma parameter HSM_OVERSCAN_X "          Overscan X %" 0 -50 100 0.5
-#define HSM_OVERSCAN_X        (HSM_OVERSCAN_AMOUNT + global.HSM_OVERSCAN_X / 100)
-
-#pragma parameter HSM_OVERSCAN_Y "          Overscan Y %" 0 -50 100 0.5
-#define HSM_OVERSCAN_Y        (HSM_OVERSCAN_AMOUNT + global.HSM_OVERSCAN_Y / 100)
-
-#pragma parameter HSM_OVERSCAN_RASTER_BLOOM_ON "          Raster Bloom ON -- (Scaling based on average luma)" 0 0 1 1
-#define HSM_OVERSCAN_RASTER_BLOOM_ON        global.HSM_OVERSCAN_RASTER_BLOOM_ON
-
-#pragma parameter HSM_OVERSCAN_RASTER_BLOOM_MODE "          Raster Bloom Overscan Mode" 2.0 0.0 2.0 1.0
-#define HSM_OVERSCAN_RASTER_BLOOM_MODE           global.HSM_OVERSCAN_RASTER_BLOOM_MODE
-
-#pragma parameter HSM_OVERSCAN_RASTER_BLOOM_AMOUNT "          Raster Bloom %" 5.0 0.0 20.0 1.0
-#define HSM_OVERSCAN_RASTER_BLOOM_AMOUNT        global.HSM_OVERSCAN_RASTER_BLOOM_AMOUNT / 100     // Bloom overscan percentage
-
-#pragma parameter HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE "          Raster Bloom Overscan Neutral Area" 0.3 0.0 1.0 0.05
-#define HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE           global.HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE
-
-#pragma parameter HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE_CENTER "          Raster Bloom Overscan Neutral Area Center" 0.5 0.0 1.0 0.05
-#define HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE_CENTER           global.HSM_OVERSCAN_RASTER_BLOOM_NEUTRAL_RANGE_CENTER
-
-
-//---------------------------------------------------------------------------------------------------
-//    CURVATURE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_CURVATURE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CURVATURE_TITLE								"[ CURVATURE ]:" 0 0 0.001 0.001
-
-// #pragma parameter HSM_USE_GEOM 									"          Use Geom Curvature" 0 -1 3 1
-// float HSM_USE_GEOM = global.HSM_USE_GEOM;
-float HSM_USE_GEOM = 0;
-
-#pragma parameter HSM_CURVATURE_MODE 								"       Curvature Mode  OFF | 2D | 2D-CYL | 3D-1 | 3D-2 | 3D CYL" 1 0 5 1
-float HSM_CURVATURE_MODE = global.HSM_CURVATURE_MODE;
-
-#pragma parameter HSM_CURVATURE_2D_SCALE_LONG_AXIS 					"          2D Curvature on Long Axis" 100 5 400 5
-#define HSM_CURVATURE_2D_SCALE_LONG_AXIS global.HSM_CURVATURE_2D_SCALE_LONG_AXIS / 100
-
-#pragma parameter HSM_CURVATURE_2D_SCALE_SHORT_AXIS 				"          2D Curvature on Short Axis" 100 5 400 5
-#define HSM_CURVATURE_2D_SCALE_SHORT_AXIS global.HSM_CURVATURE_2D_SCALE_SHORT_AXIS / 100
-
-#pragma parameter HSM_CURVATURE_3D_RADIUS 							"          3D Radius" 200 16 102400 1
-float HSM_CURVATURE_3D_RADIUS = global.HSM_CURVATURE_3D_RADIUS / 100;
-
-#pragma parameter HSM_CURVATURE_3D_VIEW_DIST 						"          3D View Distance - Def 150" 150 50 102400 5
-float HSM_CURVATURE_3D_VIEW_DIST = global.HSM_CURVATURE_3D_VIEW_DIST / 100;
-
-#pragma parameter HSM_CURVATURE_3D_TILT_ANGLE_X 					"          3D Tilt Angle X" 0 -120 120 1
-float HSM_CURVATURE_3D_TILT_ANGLE_X = global.HSM_CURVATURE_3D_TILT_ANGLE_X / 100;
-
-#pragma parameter HSM_CURVATURE_3D_TILT_ANGLE_Y 					"          3D Tilt Angle Y" 0 -120 120 1
-float HSM_CURVATURE_3D_TILT_ANGLE_Y = global.HSM_CURVATURE_3D_TILT_ANGLE_Y / 100;
-
-#pragma parameter HSM_CRT_CURVATURE_SCALE 				            "       CRT Curvature Scale Multiplier: 0 = Less Moire Artifacts" 100 0 100 1
-float HSM_CRT_CURVATURE_SCALE = global.HSM_CRT_CURVATURE_SCALE / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    SIGNAL NOISE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_SIGNAL_NOISE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_SIGNAL_NOISE_TITLE							"[ Signal-Noise ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_SIGNAL_NOISE_ON 								"          Signal Noise ON" 0 0 1 1
-#define HSM_SIGNAL_NOISE_ON global.HSM_SIGNAL_NOISE_ON
-
-#pragma parameter HSM_SIGNAL_NOISE_AMOUNT 						    "          Amount" 0.2 -1.0 1.0 0.02
-#define HSM_SIGNAL_NOISE_AMOUNT global.HSM_SIGNAL_NOISE_AMOUNT
-
-#pragma parameter HSM_SIGNAL_NOISE_BLACK_LEVEL 						"          Contrast"  100 0 300 5
-#define HSM_SIGNAL_NOISE_BLACK_LEVEL global.HSM_SIGNAL_NOISE_BLACK_LEVEL / 100
-
-#pragma parameter HSM_SIGNAL_NOISE_SIZE_MODE 						"          Noise Resolution Mode:  SCANLINE | CORE | SMOOTHED" 0 0 2 1
-#define HSM_SIGNAL_NOISE_SIZE_MODE global.HSM_SIGNAL_NOISE_SIZE_MODE
-
-#pragma parameter HSM_SIGNAL_NOISE_SIZE_MULT 						"          Size Mult" 0.5 0.5 4 0.5
-#define HSM_SIGNAL_NOISE_SIZE_MULT global.HSM_SIGNAL_NOISE_SIZE_MULT
-
-#pragma parameter HSM_SIGNAL_NOISE_TYPE 						    "          Noise Type:  LUMA ADD | COLORED" 0 0 1 1
-#define HSM_SIGNAL_NOISE_TYPE global.HSM_SIGNAL_NOISE_TYPE
-
-
-//---------------------------------------------------------------------------------------------------
-//    ANTI-FLICKER
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_ANTI_FLICKER_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_ANTI_FLICKER_TITLE							"[ ANTI-FLICKER ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_ANTI_FLICKER_ON 								"          Anti-Flicker ON" 0 0 1 1
-#define HSM_ANTI_FLICKER_ON global.HSM_ANTI_FLICKER_ON
-
-#pragma parameter HSM_ANTI_FLICKER_THRESHOLD 						"          Luma Difference Threshold" 25 0 100 5
-#define HSM_ANTI_FLICKER_THRESHOLD global.HSM_ANTI_FLICKER_THRESHOLD / 100
-
-
-//---------------------------------------------------------------------------------------------------
-//    Global Graphics Caching
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_GLOBAL_GRAPHICS_CACHE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_GLOBAL_GRAPHICS_CACHE_TITLE                   "[ GRAPHICS CACHE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_CACHE_GRAPHICS_ON							    "         Cache Graphics: OFF | ON" 1 0 1 1
-float HSM_CACHE_GRAPHICS_ON = global.HSM_CACHE_GRAPHICS_ON;
-
-#pragma parameter HSM_CACHE_UPDATE_INDICATOR_MODE					"        Cache Update Indicator: OFF | ON | ONLY IF CACHE IS OFF" 2 0 2 1
-float HSM_CACHE_UPDATE_INDICATOR_MODE = global.HSM_CACHE_UPDATE_INDICATOR_MODE;
-
-
-//---------------------------------------------------------------------------------------------------
-//    A/B SPLITSCREEN COMPARE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_CRT_AB_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CRT_AB_COMPARE_TITLE							"[ A/B SPLITSCREEN COMPARE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_AB_COMPARE_SHOW_MODE   				        "          Show:  CRT SHADER | ORIGINAL" 0 0 1 1
-float HSM_AB_COMPARE_SHOW_MODE = global.HSM_AB_COMPARE_SHOW_MODE;
-
-#pragma parameter HSM_AB_COMPARE_AREA   					        "          Compare Area:  LEFT | RIGHT | TOP | BOTTOM" 0 0 3 1
-float HSM_AB_COMPARE_AREA = global.HSM_AB_COMPARE_AREA;
-
-#pragma parameter HSM_AB_COMPARE_SPLIT_POSITION   		            "          Splitscreen Position" 50 0 100 0.2
-float HSM_AB_COMPARE_SPLIT_POSITION = global.HSM_AB_COMPARE_SPLIT_POSITION / 100;
-
-#pragma parameter HSM_AB_COMPARE_FREEZE_CRT_TUBE   				    "          Freeze CRT Tube (Freeze Left, New changes on Right)" 0 0 1 1
-float HSM_AB_COMPARE_FREEZE_CRT_TUBE = global.HSM_AB_COMPARE_FREEZE_CRT_TUBE;
-
-#pragma parameter HSM_AB_COMPARE_FREEZE_GRAPHICS   				    "          Freeze Graphics (Freeze Left, New changes on Right)" 0 0 1 1
-float HSM_AB_COMPARE_FREEZE_GRAPHICS = global.HSM_AB_COMPARE_FREEZE_GRAPHICS;
-
-
-//---------------------------------------------------------------------------------------------------
-//    SHOW PASS
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_PASS_VIEWER_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_PASS_VIEWER_TITLE       "[ SHOW PASS (For Debugging) ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_SHOW_PASS_INDEX_INFO1   "     0:END | 1:REFLECTION | 2:TUBE | 3:CRT" 0 0 0.001 0.001
-#pragma parameter HSM_SHOW_PASS_INDEX_INFO2   "     4:INTERLACE | 5:COLOR CORRECT & UPSCALE" 0 0 0.001 0.001
-#pragma parameter HSM_SHOW_PASS_INDEX_INFO3   "     6:DEDITHER | 7:DREZ | 8:CORE" 0 0 0.001 0.001
-#pragma parameter HSM_SHOW_PASS_INDEX_INFO4   "     9:LAYERS TOP | 10:LAYERS BOTTOM" 0 0 0.001 0.001
-
-#pragma parameter HSM_SHOW_PASS_INDEX         "          Show Pass Index" 0 0 10 1
-float HSM_SHOW_PASS_INDEX = global.HSM_SHOW_PASS_INDEX;
-
-#pragma parameter HSM_SHOW_PASS_APPLY_SCREEN_COORD  "          Apply Screen Scale & Curvature to Unscaled Passes" 1 0 1 1
-float HSM_SHOW_PASS_APPLY_SCREEN_COORD = global.HSM_SHOW_PASS_APPLY_SCREEN_COORD;
-
-#pragma parameter HSM_SHOW_PASS_ALPHA         "          Show Alpha Channel" 0 0 1 1
-float HSM_SHOW_PASS_ALPHA = global.HSM_SHOW_PASS_ALPHA;
-
-
-//---------------------------------------------------------------------------------------------------
-//    SCREEN VIGNETTE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_SCREEN_VIGNETTE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_SCREEN_VIGNETTE_TITLE							"[ SCREEN VIGNETTE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_SCREEN_VIGNETTE_ON                			"          Use Vignette" 1 0 1 1
-#define HSM_SCREEN_VIGNETTE_ON global.HSM_SCREEN_VIGNETTE_ON
-
-#pragma parameter HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE           "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE = global.HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE;
-
-#pragma parameter HSM_SCREEN_VIGNETTE_STRENGTH                		"          Amount (Strength)" 40 0 98 2
-#define HSM_SCREEN_VIGNETTE_STRENGTH (1 - global.HSM_SCREEN_VIGNETTE_STRENGTH / 100) * 50
-
-#pragma parameter HSM_SCREEN_VIGNETTE_POWER                			"          Corner Amount (Power)" 26 0 200 2
-#define HSM_SCREEN_VIGNETTE_POWER global.HSM_SCREEN_VIGNETTE_POWER / 100
-
-#pragma parameter HSM_SCREEN_VIGNETTE_IN_REFLECTION                	"          Amount of Vignette in Reflection" 100 0 100 1
-#define HSM_SCREEN_VIGNETTE_IN_REFLECTION global.HSM_SCREEN_VIGNETTE_IN_REFLECTION / 100
-
-
-//---------------------------------------------------------------------------------------------------
-//    MONOCHROME
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_MONOCHROME_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_MONOCHROME_TITLE 								"[ MONOCHROME ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_MONOCHROME_MODE  								"          Monochrome Color: OFF | BW | AMBER | GREEN" 0.0 0.0 3.0 1.0
-#define HSM_MONOCHROME_MODE global.HSM_MONOCHROME_MODE
-
-#pragma parameter HSM_MONOCHROME_BRIGHTNESS							"          Monochrome Brightness" 100 1 500 1
-#define HSM_MONOCHROME_BRIGHTNESS global.HSM_MONOCHROME_BRIGHTNESS / 100
-
-#pragma parameter HSM_MONOCHROME_GAMMA 								"          Monochrome Gamma" 1.0 0.1 5 0.1
-#define HSM_MONOCHROME_GAMMA global.HSM_MONOCHROME_GAMMA
-
-#pragma parameter HSM_MONOCHROME_HUE_OFFSET 						"          Monochrome Hue Offset" 0 -180 180 1
-#define HSM_MONOCHROME_HUE_OFFSET (global.HSM_MONOCHROME_HUE_OFFSET / 360)
-
-#pragma parameter HSM_MONOCHROME_SATURATION 						"          Monochrome Saturation" 100 -100 200 1
-#define HSM_MONOCHROME_SATURATION (global.HSM_MONOCHROME_SATURATION / 100)
-
-#pragma parameter HSM_MONOCHROME_DUALSCREEN_VIS_MODE                "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_MONOCHROME_DUALSCREEN_VIS_MODE = global.HSM_MONOCHROME_DUALSCREEN_VIS_MODE;
-
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE EMPTY
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TUBE_ASPECT_AND_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TUBE_ASPECT_AND_EMPTY_TITLE						"[ TUBE ASPECT & EMPTY SPACE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_TUBE_DIFFUSE_FORCE_ASPECT 			        "          Tube Aspect - EVEN | SCREEN | Explicit"  1 0 2 1
-#define HSM_TUBE_DIFFUSE_FORCE_ASPECT global.HSM_TUBE_DIFFUSE_FORCE_ASPECT
-
-#pragma parameter HSM_TUBE_EXPLICIT_ASPECT 			                "          Explicit Tube Aspect "  1.3333 0.5 3 0.01
-#define HSM_TUBE_EXPLICIT_ASPECT global.HSM_TUBE_EXPLICIT_ASPECT
-
-#pragma parameter HSM_TUBE_EMPTY_THICKNESS 				            "          Empty Tube Thickness" 0 0 6000 10
-#define HSM_TUBE_EMPTY_THICKNESS (0.7 * global.HSM_TUBE_EMPTY_THICKNESS / 100)
-
-#pragma parameter HSM_TUBE_EMPTY_THICKNESS_X_SCALE 			        "          Empty Tube Thicknes X Scale" 100 0 3000 1
-#define HSM_TUBE_EMPTY_THICKNESS_X_SCALE (global.HSM_TUBE_EMPTY_THICKNESS_X_SCALE / 100)
-
-#pragma parameter HSM_SCREEN_CORNER_RADIUS_SCALE 			        "          Screen (Game Image) Corner Radius Scale" 100 5 3000 1
-#define HSM_SCREEN_CORNER_RADIUS_SCALE (global.HSM_SCREEN_CORNER_RADIUS_SCALE / 100)
-
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE DIFFUSE IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TUBE_DIFFUSE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_TITLE						"[ TUBE DIFFUSE IMAGE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_TUBE_DIFFUSE_MODE  					        "          Tube Diffuse Color - BLACK | IMAGE | TRANSPARENT" 0 0 2 1
-float HSM_TUBE_DIFFUSE_MODE = global.HSM_TUBE_DIFFUSE_MODE;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_AMOUNT                     "          Amount" 100 0 100 1
-float HSM_TUBE_DIFFUSE_IMAGE_AMOUNT = global.HSM_TUBE_DIFFUSE_IMAGE_AMOUNT / 100;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE        "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE = global.HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON                "          Colorize On" 0 0 1 1
-float HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON = global.HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_HUE                        "          Hue Offset" 0 0 360 1
-float HSM_TUBE_DIFFUSE_IMAGE_HUE = global.HSM_TUBE_DIFFUSE_IMAGE_HUE / 360;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_SATURATION                 "          Saturation" 100 0 200 1
-float HSM_TUBE_DIFFUSE_IMAGE_SATURATION = global.HSM_TUBE_DIFFUSE_IMAGE_SATURATION / 100;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS                 "          Brightness" 15 0 500 1
-float HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS = global.HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS / 100;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_GAMMA                      "          Gamma Adjust" 1 0 5 0.01
-float HSM_TUBE_DIFFUSE_IMAGE_GAMMA = global.HSM_TUBE_DIFFUSE_IMAGE_GAMMA;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING           "          Ambient Lighting Multiplier" 100 0 100 1
-float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING = global.HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING / 100;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING          "          Ambient 2nd Image Lighting Multiplier" 0 0 100 1
-float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING = global.HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING / 100;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_SCALE  			        "          Image Scale" 140 0 1000 1
-float HSM_TUBE_DIFFUSE_IMAGE_SCALE = global.HSM_TUBE_DIFFUSE_IMAGE_SCALE / 100;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_SCALE_X  			        "          Image Scale X" 100 0 1000 1
-float HSM_TUBE_DIFFUSE_IMAGE_SCALE_X = global.HSM_TUBE_DIFFUSE_IMAGE_SCALE_X / 100;
-
-#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_ROTATION  			        "          Image Rotation: -1: 270 | 0 | 1: 90" 0 -1 1 1
-float HSM_TUBE_DIFFUSE_IMAGE_ROTATION = global.HSM_TUBE_DIFFUSE_IMAGE_ROTATION;
-
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE SHADOW IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TUBE_SHADOW_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TUBE_SHADOW_IMAGE_TITLE					"[ TUBE SHADOW IMAGE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_TUBE_SHADOW_IMAGE_ON  					"          Tube Shadow Image - OFF | ON" 1 0 1 1
-float HSM_TUBE_SHADOW_IMAGE_ON = global.HSM_TUBE_SHADOW_IMAGE_ON;
-
-#pragma parameter HSM_TUBE_SHADOW_IMAGE_OPACITY                 "          Opacity" 60 0 100 2
-float HSM_TUBE_SHADOW_IMAGE_OPACITY = global.HSM_TUBE_SHADOW_IMAGE_OPACITY / 100;
-
-#pragma parameter HSM_TUBE_SHADOW_IMAGE_POS_X			        "          Position X" 0 -500 500 0.1
-float HSM_TUBE_SHADOW_IMAGE_POS_X = global.HSM_TUBE_SHADOW_IMAGE_POS_X / 100;
-
-#pragma parameter HSM_TUBE_SHADOW_IMAGE_POS_Y			        "          Position Y" 9 -500 500 0.1
-float HSM_TUBE_SHADOW_IMAGE_POS_Y = global.HSM_TUBE_SHADOW_IMAGE_POS_Y / 100;
-
-#pragma parameter HSM_TUBE_SHADOW_IMAGE_SCALE_X  			    "          Scale X" 122 0 1000 0.1
-float HSM_TUBE_SHADOW_IMAGE_SCALE_X = global.HSM_TUBE_SHADOW_IMAGE_SCALE_X / 100;
-
-#pragma parameter HSM_TUBE_SHADOW_IMAGE_SCALE_Y  			    "          Scale Y" 130 0 1000 0.1
-float HSM_TUBE_SHADOW_IMAGE_SCALE_Y = global.HSM_TUBE_SHADOW_IMAGE_SCALE_Y / 100;
-
-#pragma parameter HSM_TUBE_SHADOW_CURVATURE_SCALE			    "          Curvature Scale" 300 0 2000 1
-float HSM_TUBE_SHADOW_CURVATURE_SCALE = global.HSM_TUBE_SHADOW_CURVATURE_SCALE / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE GLASS STATIC REFLECTION IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TUBE_STATIC_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TUBE_STATIC_TITLE			"[ TUBE GLASS STATIC REFLECTION IMAGE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_ON  				"          Use Tube Static Reflection Image - OFF | ON" 0 0 1 1
-float HSM_TUBE_STATIC_REFLECTION_IMAGE_ON = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_ON;
-
-#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE    "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE;
-
-#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY  		"          Opacity" 14 0 100 0.1
-float HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY / 100;
-
-#pragma parameter HSM_TUBE_STATIC_OPACITY_DIFFUSE_MULTIPLY  "          Multiply Opacity by Diffuse Amount " 25 0 100 5
-float HSM_TUBE_STATIC_OPACITY_DIFFUSE_MULTIPLY = global.HSM_TUBE_STATIC_OPACITY_DIFFUSE_MULTIPLY / 100;
-
-#pragma parameter HSM_TUBE_STATIC_BLACK_LEVEL      "          Black Level"  25 -100 100 0.5
-float HSM_TUBE_STATIC_BLACK_LEVEL = global.HSM_TUBE_STATIC_BLACK_LEVEL / 1000 + 1;
-
-#pragma parameter HSM_TUBE_STATIC_AMBIENT_LIGHTING "          Ambient Lighting Multiplier" 60 0 100 1
-float HSM_TUBE_STATIC_AMBIENT_LIGHTING = global.HSM_TUBE_STATIC_AMBIENT_LIGHTING / 100;
-
-#pragma parameter HSM_TUBE_STATIC_AMBIENT2_LIGHTING "          Ambient 2nd Image Lighting Multiplier" 0 0 100 1
-float HSM_TUBE_STATIC_AMBIENT2_LIGHTING = global.HSM_TUBE_STATIC_AMBIENT2_LIGHTING / 100;
-
-#pragma parameter HSM_TUBE_STATIC_SCALE  			"          Scale" 120 0 1000 1
-float HSM_TUBE_STATIC_SCALE = global.HSM_TUBE_STATIC_SCALE / 100.0;
-
-#pragma parameter HSM_TUBE_STATIC_SCALE_X 			"          Scale X" 100 0 1000 1
-float HSM_TUBE_STATIC_SCALE_X = global.HSM_TUBE_STATIC_SCALE_X / 100.0;
-
-#pragma parameter HSM_TUBE_STATIC_POS_X  			"          Pos X"   10 -500 500 1
-float HSM_TUBE_STATIC_POS_X = global.HSM_TUBE_STATIC_POS_X / -1000;
-
-#pragma parameter HSM_TUBE_STATIC_POS_Y  			"          Pos Y"   10 -500 500 1
-float HSM_TUBE_STATIC_POS_Y = global.HSM_TUBE_STATIC_POS_Y / 1000;
-
-#pragma parameter HSM_TUBE_STATIC_SHADOW_OPACITY  	"          Shadow Opacity" 0 0 100 1
-float HSM_TUBE_STATIC_SHADOW_OPACITY = global.HSM_TUBE_STATIC_SHADOW_OPACITY / 100;
-
-#pragma parameter HSM_TUBE_STATIC_DITHER_SAMPLES  "          Noise Samples (Reduces Banding)" 0 0 10 1
-float HSM_TUBE_STATIC_DITHER_SAMPLES = global.HSM_TUBE_STATIC_DITHER_SAMPLES;
-
-#pragma parameter HSM_TUBE_STATIC_DITHER_DISTANCE  "          Noise Distance" 5 0 10 0.5
-float HSM_TUBE_STATIC_DITHER_DISTANCE = global.HSM_TUBE_STATIC_DITHER_DISTANCE;
-
-#pragma parameter HSM_TUBE_STATIC_DITHER_AMOUNT "          Noise Amount" 0.6 0 10 0.1
-float HSM_TUBE_STATIC_DITHER_AMOUNT = global.HSM_TUBE_STATIC_DITHER_AMOUNT;
-
-
-//---------------------------------------------------------------------------------------------------
-//    CRT Blend Over Diffuse
-//---------------------------------------------------------------------------------------------------
-
-#pragma parameter HSM_CRT_BLEND_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CRT_BLEND_TITLE						"[ CRT & TUBE BLENDING ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_TUBE_OPACITY                          "          Tube Opacity" 100 0 100 0.1
-float HSM_TUBE_OPACITY = global.HSM_TUBE_OPACITY / 100;
-
-#pragma parameter HSM_CRT_BLEND_MODE                        "          CRT Blend Mode: OFF | ADD | MULTIPLY" 1 0 2 1
-#define HSM_CRT_BLEND_MODE global.HSM_CRT_BLEND_MODE
-
-#pragma parameter HSM_CRT_BLEND_AMOUNT                      "          CRT Blend Amount" 100 0 100 1
-#define HSM_CRT_BLEND_AMOUNT global.HSM_CRT_BLEND_AMOUNT / 100
-
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE COLORED GEL
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TUBE_COLORED_GEL_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TUBE_COLORED_GEL_TITLE						"[ TUBE COLORED GEL IMAGE GENERAL ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_ON  					"          Use Tube Colored Gel - OFF | ON" 0 0 1 1
-float HSM_TUBE_COLORED_GEL_IMAGE_ON = global.HSM_TUBE_COLORED_GEL_IMAGE_ON;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_SCALE  			    "          Scale" 100 0 1000 1
-float HSM_TUBE_COLORED_GEL_IMAGE_SCALE = global.HSM_TUBE_COLORED_GEL_IMAGE_SCALE / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL  		"          Flip Horizontal" 0 0 1 1
-float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL = -(global.HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL * 2 - 1);
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL  		"          Flip Vertical" 0 0 1 1
-float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL = -(global.HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL * 2 - 1);
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_DUALSCREEN_VIS_MODE    "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_TUBE_COLORED_GEL_IMAGE_DUALSCREEN_VIS_MODE = global.HSM_TUBE_COLORED_GEL_IMAGE_DUALSCREEN_VIS_MODE;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_MULTIPLY_AMOUNT  		"          Multiply Blend Amount" 90 0 100 1
-float HSM_TUBE_COLORED_GEL_IMAGE_MULTIPLY_AMOUNT = global.HSM_TUBE_COLORED_GEL_IMAGE_MULTIPLY_AMOUNT / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT  		"          Additive Blend Amount" 0 0 100 0.05
-float HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT = global.HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    TUBE COLORED GEL
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TUBE_COLORED_GEL_NORMAL_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TUBE_COLORED_GEL_NORMAL_TITLE					"[ TUBE COLORED GEL NORMAL BLEND ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT  		"          Blend Amount" 15 0 100 1
-float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT = global.HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD "          Transparency Threshold" 23 0 100 1
-float HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD = global.HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS  	"          Brightness" 100 0 200 1
-float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS = global.HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_VIGNETTE  		"          Vignette Amount" 0 0 100 1
-float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_VIGNETTE = global.HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_VIGNETTE / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_FAKE_SCANLINE_AMOUNT   "          Fake Scanline Amount" 0 0 100 1
-float HSM_TUBE_COLORED_GEL_IMAGE_FAKE_SCANLINE_AMOUNT = global.HSM_TUBE_COLORED_GEL_IMAGE_FAKE_SCANLINE_AMOUNT / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING       "          Ambient Lighting Multiplier" 100 0 100 1
-float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING = global.HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING / 100;
-
-#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING      "          Ambient 2nd Image Lighting Multiplier" 0 0 100 1
-float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING = global.HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING / 100;
-
-// #pragma parameter HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL				"          Show CRT on Top of Colored Gel Normal" 0 0 1 1
-// float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL = global.HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL;
-float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL = 0;
-
-
-//---------------------------------------------------------------------------------------------------
-//    SCREEN BLACK EDGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_SCREEN_EDGE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_SCREEN_EDGE_TITLE								"[ SCREEN BLACK EDGE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_GLOBAL_CORNER_RADIUS 							"          Global Corner Radius - Def 10" 10 4 500 2
-#define HSM_GLOBAL_CORNER_RADIUS global.HSM_GLOBAL_CORNER_RADIUS
-
-#pragma parameter HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE 			"          Black Edge Corner Radius Scale" 100 10 8000 10
-#define HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE global.HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE / 100
-
-#pragma parameter HSM_TUBE_BLACK_EDGE_SHARPNESS 					"          Black Edge Sharpness - Def 70" 70 0 90 1
-#define HSM_TUBE_BLACK_EDGE_SHARPNESS global.HSM_TUBE_BLACK_EDGE_SHARPNESS / 100
-
-#pragma parameter HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE 				"          Black Edge Curvature Scale Multiplier" 100 20 8000 10
-#define HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE global.HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE / 100
-
-#pragma parameter HSM_TUBE_BLACK_EDGE_THICKNESS 					"          Black Edge Thickness" 100 -800 6000 5
-#define HSM_TUBE_BLACK_EDGE_THICKNESS (0.7 * global.HSM_TUBE_BLACK_EDGE_THICKNESS / 100)
-
-#pragma parameter HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE 			"          Black Edge Thickness X Scale" 100 0 3000 10
-#define HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE (global.HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE / 100)
-
-
-//---------------------------------------------------------------------------------------------------
-//    DUAL SCREEN
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_DUALSCREEN_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DUALSCREEN_TITLE								"[ DUAL SCREEN ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_DUALSCREEN_MODE								"          Dual Screen Mode - OFF | VERTICAL | HORIZONTAL" 0 0 2 1
-float HSM_DUALSCREEN_MODE = global.HSM_DUALSCREEN_MODE;
-
-#pragma parameter HSM_DUALSCREEN_CORE_IMAGE_SPLIT_MODE				"          Core Image Split Mode  - AUTO | VERTICAL | HORIZONTAL" 1 0 2 1
-float HSM_DUALSCREEN_CORE_IMAGE_SPLIT_MODE = global.HSM_DUALSCREEN_CORE_IMAGE_SPLIT_MODE;
-
-#pragma parameter HSM_DUALSCREEN_CORE_IMAGE_SWAP_SCREENS			"          Core Image Swap Screen Content" 0 0 1 1
-float HSM_DUALSCREEN_CORE_IMAGE_SWAP_SCREENS = global.HSM_DUALSCREEN_CORE_IMAGE_SWAP_SCREENS;
-
-#pragma parameter HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET			"          Core Image Split Offset" 0 -100 100 1
-float HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET = global.HSM_DUALSCREEN_CORE_IMAGE_SPLIT_OFFSET / 1000;
-
-// #pragma parameter HSM_2ND_SCREEN_SIDES_CROP				"          Crop % from Edges of 2nd Screen" 0 0 100 0.1
-// float HSM_2ND_SCREEN_SIDES_CROP = global.HSM_2ND_SCREEN_SIDES_CROP / 100;
-
-#pragma parameter HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION			"          Viewport Split Offset" 0 -500 500 1
-float HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION = global.HSM_DUALSCREEN_VIEWPORT_SPLIT_LOCATION / 1000;
-
-#pragma parameter HSM_DUALSCREEN_SHIFT_POSITION_WITH_SCALE			"          Scale Screens from Center of Split" 1 0 1 1
-float HSM_DUALSCREEN_SHIFT_POSITION_WITH_SCALE = global.HSM_DUALSCREEN_SHIFT_POSITION_WITH_SCALE;
-
-#pragma parameter HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS	"          Position Offset Between Screens" 0 -250 250 0.2
-float HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS = global.HSM_DUALSCREEN_POSITION_OFFSET_BETWEEN_SCREENS / 1000;
-
-#pragma parameter HSM_2ND_SCREEN_ASPECT_RATIO_MODE		            "        2nd Screen Aspect Ratio Mode - Same as 1st Screen | PAR" 0 0 1 1
-float HSM_2ND_SCREEN_ASPECT_RATIO_MODE = global.HSM_2ND_SCREEN_ASPECT_RATIO_MODE;
-
-#pragma parameter HSM_2ND_SCREEN_INDEPENDENT_SCALE		            "          2nd Screen Use Independent Scale" 0 0 1 1
-float HSM_2ND_SCREEN_INDEPENDENT_SCALE = global.HSM_2ND_SCREEN_INDEPENDENT_SCALE;
-
-#pragma parameter HSM_2ND_SCREEN_SCALE_OFFSET			            "          2nd Screen Scale Offset" 100 1 500 0.5
-float HSM_2ND_SCREEN_SCALE_OFFSET = global.HSM_2ND_SCREEN_SCALE_OFFSET / 100;
-
-#pragma parameter HSM_2ND_SCREEN_POS_X					            "          2nd Screen Pos X" 0 -500 500 1
-float HSM_2ND_SCREEN_POS_X = global.HSM_2ND_SCREEN_POS_X / 1000;
-
-#pragma parameter HSM_2ND_SCREEN_POS_Y					            "          2nd Screen Pos Y" 0 -500 500 1
-float HSM_2ND_SCREEN_POS_Y = global.HSM_2ND_SCREEN_POS_Y / 1000;
-
-#pragma parameter HSM_2ND_SCREEN_CROP_PERCENT_ZOOM					"          2nd Screen Crop Zoom %" 0 -10 100 0.1
-float HSM_2ND_SCREEN_CROP_PERCENT_ZOOM = global.HSM_2ND_SCREEN_CROP_PERCENT_ZOOM / 100;
-
-#pragma parameter HSM_2ND_SCREEN_CROP_PERCENT_TOP 					"          2nd Screen Crop Top %" 0 -10 100 0.1
-float HSM_2ND_SCREEN_CROP_PERCENT_TOP = global.HSM_2ND_SCREEN_CROP_PERCENT_TOP / 100;
-
-#pragma parameter HSM_2ND_SCREEN_CROP_PERCENT_BOTTOM 				"          2nd Screen Crop Bottom %" 0 -10 100 0.1
-float HSM_2ND_SCREEN_CROP_PERCENT_BOTTOM = global.HSM_2ND_SCREEN_CROP_PERCENT_BOTTOM / 100;
-
-#pragma parameter HSM_2ND_SCREEN_CROP_PERCENT_LEFT 					"          2nd Screen Crop Left %" 0 -10 100 0.1
-float HSM_2ND_SCREEN_CROP_PERCENT_LEFT = global.HSM_2ND_SCREEN_CROP_PERCENT_LEFT / 100;
-
-#pragma parameter HSM_2ND_SCREEN_CROP_PERCENT_RIGHT 				"          2nd Screen Crop Right %" 0 -10 100 0.1
-float HSM_2ND_SCREEN_CROP_PERCENT_RIGHT = global.HSM_2ND_SCREEN_CROP_PERCENT_RIGHT / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    Reflection Transform
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_REFLECTION_APPEARANCE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECTION_APPEARANCE_TITLE					"[ REFLECTION POSITION & SCALE ]:" 0 0 0.001 0.001
-
-// #pragma parameter HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS    "          Follow Tube Diffuse Extra Thickness" 0 1 200 1
-// float HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS = global.HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS / 100;
-
-#pragma parameter HSM_SCREEN_REFLECTION_SCALE     					"          Screen Reflection Scale" 100 1 300 1
-float HSM_SCREEN_REFLECTION_SCALE = global.HSM_SCREEN_REFLECTION_SCALE / 100;
-
-#pragma parameter HSM_SCREEN_REFLECTION_POS_X     					"          Screen Reflection Pos X" 0 -100 100 1
-float HSM_SCREEN_REFLECTION_POS_X = global.HSM_SCREEN_REFLECTION_POS_X / 600;
-
-#pragma parameter HSM_SCREEN_REFLECTION_POS_Y     					"          Screen Reflection Pos Y" 0 -100 100 1
-float HSM_SCREEN_REFLECTION_POS_Y = global.HSM_SCREEN_REFLECTION_POS_Y / 600;
-
-
-
-#pragma parameter HSM_AMBIENT1_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_AMBIENT1_TITLE                       "[ AMBIENT LIGHTING IMAGE 1 ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_AMBIENT1_HUE                 	        "          Hue"  0 -180 180 1
-float HSM_AMBIENT1_HUE = global.HSM_AMBIENT1_HUE / 360;
-
-#pragma parameter HSM_AMBIENT1_SATURATION          	        "          Saturation"  100 0 300 1
-float HSM_AMBIENT1_SATURATION = global.HSM_AMBIENT1_SATURATION / 100;
-
-#pragma parameter HSM_AMBIENT1_VALUE               	        "          Value"  120 0 400 1
-float HSM_AMBIENT1_VALUE = global.HSM_AMBIENT1_VALUE / 100;
-
-#pragma parameter HSM_AMBIENT1_CONTRAST               	    "          Contrast"  100 0 200 0.5
-float HSM_AMBIENT1_CONTRAST = global.HSM_AMBIENT1_CONTRAST / 100;
-
-#pragma parameter HSM_AMBIENT1_SCALE_KEEP_ASPECT           "        Scale Aspect - MATCH VIEWPORT | USE TEXURE ASPECT"  1 0 1 1
-float HSM_AMBIENT1_SCALE_KEEP_ASPECT = global.HSM_AMBIENT1_SCALE_KEEP_ASPECT;
-
-#pragma parameter HSM_AMBIENT1_SCALE_INHERIT_MODE         	"          Scale Inheritance - OFF | ZOOM | TUBE"  2 0 2 1
-float HSM_AMBIENT1_SCALE_INHERIT_MODE = global.HSM_AMBIENT1_SCALE_INHERIT_MODE;
-
-#pragma parameter HSM_AMBIENT1_SCALE             	        "          Scale Offset"  250 10 1000 1
-float HSM_AMBIENT1_SCALE = global.HSM_AMBIENT1_SCALE / 100;
-
-#pragma parameter HSM_AMBIENT1_SCALE_X             	        "          Scale Offset X"  100 10 1000 0.5
-float HSM_AMBIENT1_SCALE_X = global.HSM_AMBIENT1_SCALE_X / 100;
-
-#pragma parameter HSM_AMBIENT1_ROTATE         	            "          Rotate"  0 0 1 1
-float HSM_AMBIENT1_ROTATE = global.HSM_AMBIENT1_ROTATE;
-
-#pragma parameter HSM_AMBIENT1_MIRROR_HORZ         	        "          Mirror Horizontal"  0 0 1 1
-float HSM_AMBIENT1_MIRROR_HORZ = global.HSM_AMBIENT1_MIRROR_HORZ;
-
-#pragma parameter HSM_AMBIENT1_POS_INHERIT_MODE         	"          Position Inheritance - OFF | ON"  1 0 1 1
-float HSM_AMBIENT1_POS_INHERIT_MODE = global.HSM_AMBIENT1_POS_INHERIT_MODE;
-
-#pragma parameter HSM_AMBIENT1_POSITION_X 					"          Position X" 0 -1500 1500 1
-float HSM_AMBIENT1_POSITION_X = global.HSM_AMBIENT1_POSITION_X / -1000;
-
-#pragma parameter HSM_AMBIENT1_POSITION_Y 					"          Position Y" 0 -1500 1500 1
-float HSM_AMBIENT1_POSITION_Y = -1 * global.HSM_AMBIENT1_POSITION_Y / -1000;
-
-// Commented out because I don't think anyone is using this
-// #pragma parameter HSM_AMBIENT1_DITHERING_SAMPLES   "          Dithering Noise Samples (Reduces Banding)" 0 0 10 1
-// float HSM_AMBIENT1_DITHERING_SAMPLES = global.HSM_AMBIENT1_DITHERING_SAMPLES;
-float HSM_AMBIENT1_DITHERING_SAMPLES = 0;
-
-
-//---------------------------------------------------------------------------------------------------
-//    Ambient Lighting Image 2
-//---------------------------------------------------------------------------------------------------
-
-#pragma parameter HSM_AMBIENT2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_AMBIENT2_TITLE                            "[ AMBIENT LIGHTING IMAGE 2 ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_AMBIENT2_HUE                 	            "          Hue"  0 -180 180 1
-float HSM_AMBIENT2_HUE = global.HSM_AMBIENT2_HUE / 360;
-
-#pragma parameter HSM_AMBIENT2_SATURATION          	            "          Saturation"  100 0 300 1
-float HSM_AMBIENT2_SATURATION = global.HSM_AMBIENT2_SATURATION / 100;
-
-#pragma parameter HSM_AMBIENT2_VALUE               	            "          Value"  100 0 400 1
-float HSM_AMBIENT2_VALUE = global.HSM_AMBIENT2_VALUE / 100;
-
-#pragma parameter HSM_AMBIENT2_CONTRAST               	        "          Contrast"  100 0 200 0.5
-float HSM_AMBIENT2_CONTRAST = global.HSM_AMBIENT2_CONTRAST / 100;
-
-#pragma parameter HSM_AMBIENT2_SCALE_KEEP_ASPECT                "        Scale Aspect - MATCH VIEWPORT | USE TEXURE ASPECT"  0 0 1 1
-float HSM_AMBIENT2_SCALE_KEEP_ASPECT = global.HSM_AMBIENT2_SCALE_KEEP_ASPECT;
-
-#pragma parameter HSM_AMBIENT2_SCALE_INHERIT_MODE         	    "          Scale Inheritance - OFF | ZOOM | TUBE"  1 0 2 1
-float HSM_AMBIENT2_SCALE_INHERIT_MODE = global.HSM_AMBIENT2_SCALE_INHERIT_MODE;
-
-#pragma parameter HSM_AMBIENT2_SCALE             	            "          Scale Offset"  100 10 1000 0.5
-float HSM_AMBIENT2_SCALE = global.HSM_AMBIENT2_SCALE / 100;
-
-#pragma parameter HSM_AMBIENT2_SCALE_X             	            "          Scale Offset X"  100 10 1000 0.5
-float HSM_AMBIENT2_SCALE_X = global.HSM_AMBIENT2_SCALE_X / 100;
-
-#pragma parameter HSM_AMBIENT2_ROTATE         	                "          Rotate"  0 0 1 1
-float HSM_AMBIENT2_ROTATE = global.HSM_AMBIENT2_ROTATE;
-
-#pragma parameter HSM_AMBIENT2_MIRROR_HORZ         	            "          Mirror Horizontal"  0 0 1 1
-float HSM_AMBIENT2_MIRROR_HORZ = global.HSM_AMBIENT2_MIRROR_HORZ;
-
-#pragma parameter HSM_AMBIENT2_POS_INHERIT_MODE         	    "          Position Inheritance - OFF | ON"  1 0 1 1
-float HSM_AMBIENT2_POS_INHERIT_MODE = global.HSM_AMBIENT2_POS_INHERIT_MODE;
-
-#pragma parameter HSM_AMBIENT2_POSITION_X 						"          Position X" 0 -1000 1000 1
-float HSM_AMBIENT2_POSITION_X = global.HSM_AMBIENT2_POSITION_X / -1000;
-
-#pragma parameter HSM_AMBIENT2_POSITION_Y 						"          Position Y" 0 -1000 1000 1
-float HSM_AMBIENT2_POSITION_Y = -1 * global.HSM_AMBIENT2_POSITION_Y / -1000;
-
-
-//---------------------------------------------------------------------------------------------------
-//    BEZEL INDEPENDENT SCALE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BEZEL_INDEPENDENT_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_BEZEL_INDEPENDENT_TITLE						"[ BEZEL INDEPENDENT SCALE & CURVATURE ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_BZL_USE_INDEPENDENT_SCALE 					"          Use Independent Scale" 0 0 1 1
-#define HSM_BZL_USE_INDEPENDENT_SCALE global.HSM_BZL_USE_INDEPENDENT_SCALE
-
-#pragma parameter HSM_BZL_INDEPENDENT_SCALE 						"          Independent Scale (When scale from image is not used)" 82.97 1 200 0.1
-#define HSM_BZL_INDEPENDENT_SCALE global.HSM_BZL_INDEPENDENT_SCALE / 100
-
-#pragma parameter HSM_BZL_USE_INDEPENDENT_CURVATURE 				"          Use Independent Curvature" 0 0 1 1
-#define HSM_BZL_USE_INDEPENDENT_CURVATURE global.HSM_BZL_USE_INDEPENDENT_CURVATURE
-
-#pragma parameter HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS 	"          Independent Curvature X" 100 0 400 5
-#define HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS global.HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS / 100
-
-#pragma parameter HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS 	"          Independent Curvature Y" 100 0 400 5
-#define HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS global.HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS / 100
-
-
-//---------------------------------------------------------------------------------------------------
-//    BEZEL GENERAL
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BEZEL_GENERAL_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_BEZEL_GENERAL_TITLE							"[ BEZEL GENERAL ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_BZL_OPACITY                                   "          Opacity" 100 0 100 5
-float HSM_BZL_OPACITY = global.HSM_BZL_OPACITY / 100;
-
-#pragma parameter HSM_BZL_BLEND_MODE                                "          Blend Mode - Off | Normal | Add | Mult"  1 0 3 1
-float HSM_BZL_BLEND_MODE = global.HSM_BZL_BLEND_MODE;
-
-#pragma parameter HSM_BZL_WIDTH 						            "          Width - Def 125" 125 -250 5000 1
-float HSM_BZL_WIDTH = global.HSM_BZL_WIDTH * 0.0008624;
-
-#pragma parameter HSM_BZL_HEIGHT 					                "          Height" 100 -250 5000 1
-float HSM_BZL_HEIGHT = global.HSM_BZL_HEIGHT * 0.0008732;
-
-#pragma parameter HSM_BZL_SCALE_OFFSET 								"          Scale Offset" 100 1 200 0.1
-#define HSM_BZL_SCALE_OFFSET global.HSM_BZL_SCALE_OFFSET / 100
-
-#pragma parameter HSM_BZL_INNER_CURVATURE_SCALE 					"          Inner Curvature Scale Multiplier" 100 0 8000 10
-#define HSM_BZL_INNER_CURVATURE_SCALE global.HSM_BZL_INNER_CURVATURE_SCALE / 100
-
-#pragma parameter HSM_BZL_INNER_CORNER_RADIUS_SCALE	    			"          Inner Corner Radius Scale - Def 80" 80 0 8000 1
-float HSM_BZL_INNER_CORNER_RADIUS_SCALE = global.HSM_BZL_INNER_CORNER_RADIUS_SCALE / 100;
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-1-potato-only.inc b/bezel/Mega_Bezel/shaders/base/common/params-1-potato-only.inc
deleted file mode 100644
index 195668bf1d..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-1-potato-only.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-#pragma parameter HSM_CRT_SCREEN_BLEND_MODE                         "          CRT POTATO Blend Mode - OFF | NORMAL | ADD (Backdrop)" 1 0 2 1
-float HSM_CRT_SCREEN_BLEND_MODE = global.HSM_CRT_SCREEN_BLEND_MODE;
-
-//---------------------------------------------------------------------------------------------------
-//    BASIC BACKGROUND IMAGE LAYER
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BASIC_BG_IMG_TITLE	                    "[ POTATO BACKGROUND IMAGE LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_POTATO_SHOW_BG_OVER_SCREEN 	"          Show BG: 0:UNDER SCREEN | 1:OVER SCREEN" 1 0 1 1
-float HSM_POTATO_SHOW_BG_OVER_SCREEN = global.HSM_POTATO_SHOW_BG_OVER_SCREEN;
-
-#pragma parameter HSM_BG_BLEND_MODE               "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  1 -1 3 1
-float HSM_BG_BLEND_MODE = global.HSM_BG_BLEND_MODE;
-
-#pragma parameter HSM_POTATO_COLORIZE_CRT_WITH_BG                  "          Colorize CRT with BG" 0 0 100 1
-float HSM_POTATO_COLORIZE_CRT_WITH_BG = global.HSM_POTATO_COLORIZE_CRT_WITH_BG / 100;
-
-#pragma parameter HSM_POTATO_COLORIZE_BRIGHTNESS                  "          Colorize Brightness" 100 0 1000 10
-float HSM_POTATO_COLORIZE_BRIGHTNESS = global.HSM_POTATO_COLORIZE_BRIGHTNESS / 100;
-
-#pragma parameter HSM_BG_OPACITY                  "          Opacity" 100 0 100 0.1
-float HSM_BG_OPACITY = global.HSM_BG_OPACITY / 100;
-
-#pragma parameter HSM_BG_BRIGHTNESS                "          Brightness" 100 0 200 1
-float HSM_BG_BRIGHTNESS = global.HSM_BG_BRIGHTNESS / 100;
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-2-bezel.inc b/bezel/Mega_Bezel/shaders/base/common/params-2-bezel.inc
deleted file mode 100644
index df5423dcae..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-2-bezel.inc
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-//---------------------------------------------------------------------------------------------------
-//    BEZEL
-//---------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------
-//    GENERATED BEZEL & FRAME
-//---------------------------------------------------------------------------------------------------
-// #pragma parameter HSM_BZL_TITLE "-----[ GENERATED BEZEL & FRAME ]-------------------------------" 0 0 0 1
-
-#define HAS_BEZEL_PARAMS
-
-#pragma parameter HSM_BZL_INNER_EDGE_THICKNESS		    "          Inner Edge Thickness" 110 0 700 10
-float HSM_BZL_INNER_EDGE_THICKNESS = global.HSM_BZL_INNER_EDGE_THICKNESS  * 0.00007;
-
-#pragma parameter HSM_BZL_INNER_EDGE_SHARPNESS		    "          Inner Edge Sharpness - Def 95" 95 0 90 5
-float HSM_BZL_INNER_EDGE_SHARPNESS = global.HSM_BZL_INNER_EDGE_SHARPNESS  / 100;
-
-#pragma parameter HSM_BZL_OUTER_POSITION_Y 			    "          Outer Edge Position Y" 0 -500 500 1
-float HSM_BZL_OUTER_POSITION_Y = global.HSM_BZL_OUTER_POSITION_Y / 2000;
-
-#pragma parameter HSM_BZL_OUTER_CURVATURE_SCALE 		"          Outer Curvature Scale" 0 0 500 5
-float HSM_BZL_OUTER_CURVATURE_SCALE = global.HSM_BZL_OUTER_CURVATURE_SCALE / 100;
-
-#pragma parameter HSM_BZL_OUTER_CORNER_RADIUS_SCALE 	"          Outer Corner Radius Scale - Def 60" 60 0 4000 1
-float HSM_BZL_OUTER_CORNER_RADIUS_SCALE = 0.9 * global.HSM_BZL_OUTER_CORNER_RADIUS_SCALE / 100;
-
-#pragma parameter HSM_BZL_NOISE 					"          Noise - Def 30" 30 0 100 1
-float HSM_BZL_NOISE = global.HSM_BZL_NOISE / 100;
-
-#pragma parameter HSM_BZL_INNER_EDGE_SHADOW             "          Opacity of Shadow from Bezel on Tube" 70 0 200 5
-float HSM_BZL_INNER_EDGE_SHADOW = global.HSM_BZL_INNER_EDGE_SHADOW / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-// Bezel Brightness
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BEZEL_BRIGHTNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_BEZEL_BRIGHTNESS_TITLE		    "[ BEZEL BRIGHTNESS ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_BZL_BRIGHTNESS 				    "          Base Brightness - Def 30" 30 0 600 2
-float HSM_BZL_BRIGHTNESS = global.HSM_BZL_BRIGHTNESS / 100;
-
-#pragma parameter HSM_BZL_BRIGHTNESS_MULT_TOP 	        "          Top Multiplier - Def 50" 50 0 1000 2
-float HSM_BZL_BRIGHTNESS_MULT_TOP = global.HSM_BZL_BRIGHTNESS_MULT_TOP / 100;
-
-#pragma parameter HSM_BZL_BRIGHTNESS_MULT_BOTTOM 	    "          Bottom Multiplier - Def 200" 200 0 1000 2
-float HSM_BZL_BRIGHTNESS_MULT_BOTTOM = global.HSM_BZL_BRIGHTNESS_MULT_BOTTOM / 100;
-
-#pragma parameter HSM_BZL_BRIGHTNESS_MULT_SIDES 	    "          Sides Multiplier" 100 0 1000 2
-float HSM_BZL_BRIGHTNESS_MULT_SIDES = global.HSM_BZL_BRIGHTNESS_MULT_SIDES / 100;
-
-#pragma parameter HSM_BZL_BRIGHTNESS_MULT_SIDE_LEFT 	"          Left Side Multiplier" 100 0 1000 2
-float HSM_BZL_BRIGHTNESS_MULT_SIDE_LEFT = global.HSM_BZL_BRIGHTNESS_MULT_SIDE_LEFT / 100;
-
-#pragma parameter HSM_BZL_BRIGHTNESS_MULT_SIDE_RIGHT 	"          Right Side Multiplier" 100 0 1000 2
-float HSM_BZL_BRIGHTNESS_MULT_SIDE_RIGHT = global.HSM_BZL_BRIGHTNESS_MULT_SIDE_RIGHT / 100;
-
-#pragma parameter HSM_BZL_HIGHLIGHT 					"          Main Highlight" 1 0 100 0.2
-float HSM_BZL_HIGHLIGHT = global.HSM_BZL_HIGHLIGHT / 100;
-
-#pragma parameter HSM_BZL_INNER_EDGE_HIGHLIGHT 			"          Inner Edge Highlight" 100 0 100 5
-float HSM_BZL_INNER_EDGE_HIGHLIGHT = global.HSM_BZL_INNER_EDGE_HIGHLIGHT / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-// Bezel Color
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BEZEL_COLOR_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_BEZEL_COLOR_TITLE		"[ BEZEL COLOR ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_BZL_COLOR_HUE					"          Hue" 0 0 360 1
-float HSM_BZL_COLOR_HUE = global.HSM_BZL_COLOR_HUE / 360;
-
-#pragma parameter HSM_BZL_COLOR_SATURATION			"          Saturation" 0 0 100 1
-float HSM_BZL_COLOR_SATURATION = global.HSM_BZL_COLOR_SATURATION / 100;
-
-#pragma parameter HSM_BZL_COLOR_VALUE				"          Value/Brightness - Def 10" 10 0 100 0.2
-float HSM_BZL_COLOR_VALUE = global.HSM_BZL_COLOR_VALUE / 100;
-
-#pragma parameter HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER         "          Bezel Ambient Lighting Multiplier"  100 0 100 1
-float HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER         "          Ambient 2nd Image Lighting Multiplier"  0 0 100 1
-float HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-// Frame Color
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_FRM_COLOR_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_FRM_COLOR_TITLE		"[ FRAME COLOR ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_FRM_USE_INDEPENDENT_COLOR				"          Use Independent Frame Color" 0 0 1 1
-float HSM_FRM_USE_INDEPENDENT_COLOR = global.HSM_FRM_USE_INDEPENDENT_COLOR;
-
-#pragma parameter HSM_FRM_COLOR_HUE					"          Hue" 0 0 360 1
-float HSM_FRM_COLOR_HUE = global.HSM_FRM_COLOR_HUE / 360;
-
-#pragma parameter HSM_FRM_COLOR_SATURATION			"          Saturation" 0 0 100 1
-float HSM_FRM_COLOR_SATURATION = global.HSM_FRM_COLOR_SATURATION / 100;
-
-#pragma parameter HSM_FRM_COLOR_VALUE				"          Value/Brightness - Def 10" 10 0 100 0.2
-float HSM_FRM_COLOR_VALUE = global.HSM_FRM_COLOR_VALUE / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    FRAME
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_FRAME_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_FRAME_TITLE			        "[ FRAME GENERAL ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_FRM_OPACITY                   "          Opacity" 100 0 100 5
-float HSM_FRM_OPACITY = global.HSM_FRM_OPACITY / 100;
-
-// #pragma parameter HSM_FRM_BLEND_MODE                    "          Blend Mode - Off | Normal | Add | Mult"  1 0 3 1
-// float HSM_FRM_BLEND_MODE = global.HSM_FRM_BLEND_MODE;
-
-float HSM_FRM_BLEND_MODE = 1;
-
-#pragma parameter HSM_FRM_TEXTURE_OPACITY               "          Texture Overlay Opacity (Highlight)" 1.5 0 100 0.1
-float HSM_FRM_TEXTURE_OPACITY = global.HSM_FRM_TEXTURE_OPACITY / 100;
-
-#pragma parameter HSM_FRM_TEXTURE_BLEND_MODE            "         Texture Overlay Blend Mode - Off | Normal | Add | Mult"  2 0 3 1
-float HSM_FRM_TEXTURE_BLEND_MODE = global.HSM_FRM_TEXTURE_BLEND_MODE;
-
-#pragma parameter HSM_FRM_NOISE 					    "          Noise - Def 30" 30 0 100 1
-float HSM_FRM_NOISE = global.HSM_FRM_NOISE / 100;
-
-#pragma parameter HSM_FRM_INNER_EDGE_THICKNESS 		    "          Inner Edge Thickness" 100 0 5000 5
-float HSM_FRM_INNER_EDGE_THICKNESS = global.HSM_FRM_INNER_EDGE_THICKNESS * 0.00003;
-
-#pragma parameter HSM_FRM_INNER_EDGE_HIGHLIGHT 		    "          Inner Edge Highlight" 14 0 100 1
-float HSM_FRM_INNER_EDGE_HIGHLIGHT = global.HSM_FRM_INNER_EDGE_HIGHLIGHT * 0.001;
-
-#pragma parameter HSM_FRM_THICKNESS 					"          Frame Thickness" 100 0 2000 5
-float HSM_FRM_THICKNESS = global.HSM_FRM_THICKNESS * 0.0007;
-
-#pragma parameter HSM_FRM_THICKNESS_SCALE_X 			"          Frame Thickness Scale X" 100 0 1000 2
-float HSM_FRM_THICKNESS_SCALE_X = global.HSM_FRM_THICKNESS_SCALE_X / 100;
-
-#pragma parameter HSM_FRM_OUTER_POS_Y 			        "          Frame Outer Pos Y" 0 -100 100 0.05
-float HSM_FRM_OUTER_POS_Y = global.HSM_FRM_OUTER_POS_Y / 100;
-
-#pragma parameter HSM_FRM_OUTER_CURVATURE_SCALE 		"          Frame Outer Curvature Scale" 0 0 500 5
-float HSM_FRM_OUTER_CURVATURE_SCALE = global.HSM_FRM_OUTER_CURVATURE_SCALE / 100;
-
-// TODO how this is being used is strange
-#pragma parameter HSM_FRM_OUTER_CORNER_RADIUS 		    "          Outer Corner Radius" 5 0 70 0.05
-float HSM_FRM_OUTER_CORNER_RADIUS = global.HSM_FRM_OUTER_CORNER_RADIUS;
-
-#pragma parameter HSM_FRM_OUTER_EDGE_THICKNESS 		    "          Outer Edge Thickness" 100 0 1000 10
-float HSM_FRM_OUTER_EDGE_THICKNESS = global.HSM_FRM_OUTER_EDGE_THICKNESS * 0.00006;
-
-#pragma parameter HSM_FRM_OUTER_EDGE_SHADING 		    "          Outer Edge Shading" 50 0 100 5
-float HSM_FRM_OUTER_EDGE_SHADING = global.HSM_FRM_OUTER_EDGE_SHADING / 100;
-
-#pragma parameter HSM_FRM_SHADOW_OPACITY	            "          Shadow Opacity" 100 0 300 1
-float HSM_FRM_SHADOW_OPACITY = global.HSM_FRM_SHADOW_OPACITY / 100;
-
-#pragma parameter HSM_FRM_SHADOW_WIDTH                  "          Shadow Width" 100 0 500 1
-float HSM_FRM_SHADOW_WIDTH = global.HSM_FRM_SHADOW_WIDTH / 1000;
-
-
-#pragma parameter HSM_REFLECT_CORNER_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECT_CORNER_TITLE			            "[ CORNER CREASE - ALSO CONTROLS REFLECTION]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_REFLECT_CORNER_FADE 						"          Corner Fade" 10 1 100 0.5
-float HSM_REFLECT_CORNER_FADE = global.HSM_REFLECT_CORNER_FADE / 100;
-
-#pragma parameter HSM_REFLECT_CORNER_FADE_DISTANCE 				"          Corner Fade Distance" 100 1 100 1
-float HSM_REFLECT_CORNER_FADE_DISTANCE = global.HSM_REFLECT_CORNER_FADE_DISTANCE / 100;
-
-#pragma parameter HSM_REFLECT_CORNER_INNER_SPREAD 	            "          Corner Inner Spread" 500 0 1000 10
-float HSM_REFLECT_CORNER_INNER_SPREAD = global.HSM_REFLECT_CORNER_INNER_SPREAD / 100;
-
-#pragma parameter HSM_REFLECT_CORNER_OUTER_SPREAD 	            "          Corner Outer Spread" 160 0 1000 10
-float HSM_REFLECT_CORNER_OUTER_SPREAD = global.HSM_REFLECT_CORNER_OUTER_SPREAD / 100;
-
-#pragma parameter HSM_REFLECT_CORNER_ROTATION_OFFSET_TOP 	    "          Corner Rotation Offset Top" 0 -90 90 0.5
-float HSM_REFLECT_CORNER_ROTATION_OFFSET_TOP = global.HSM_REFLECT_CORNER_ROTATION_OFFSET_TOP;
-
-#pragma parameter HSM_REFLECT_CORNER_ROTATION_OFFSET_BOTTOM 	"          Corner Rotation Offset Bottom" 0 -90 90 0.5
-float HSM_REFLECT_CORNER_ROTATION_OFFSET_BOTTOM = global.HSM_REFLECT_CORNER_ROTATION_OFFSET_BOTTOM;
-
-#pragma parameter HSM_REFLECT_CORNER_SPREAD_FALLOFF             "          Corner Spread Falloff"  100 1 200 1
-float HSM_REFLECT_CORNER_SPREAD_FALLOFF = global.HSM_REFLECT_CORNER_SPREAD_FALLOFF;
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-2-reflection-mask.inc b/bezel/Mega_Bezel/shaders/base/common/params-2-reflection-mask.inc
deleted file mode 100644
index 1a3a1a27c9..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-2-reflection-mask.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-//---------------------------------------------------------------------------------------------------
-//    REFLECTION MASK
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_REFLECT_MASK_EMPTY_LINE					    " " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECT_MASK_TITLE			                "[ REFLECTION MASK IMAGE - Only in Image Layer Presets ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_REFLECT_MASK_IMAGE_AMOUNT 		            "          Reflection Image Mask Amount" 0 0 100 1
-#ifndef HSM_REFLECT_MASK_IMAGE_AMOUNT 
-#define HSM_REFLECT_MASK_IMAGE_AMOUNT global.HSM_REFLECT_MASK_IMAGE_AMOUNT / 100
-#endif
-
-#pragma parameter HSM_REFLECT_MASK_FOLLOW_LAYER                    "    Follow Layer - FULL | TUBE | BEZEL |BG|DEVICE|DECAL|CAB|TOP" 4 0 7 1
-#ifndef HSM_REFLECT_MASK_FOLLOW_LAYER
-#define HSM_REFLECT_MASK_FOLLOW_LAYER global.HSM_REFLECT_MASK_FOLLOW_LAYER
-#endif
-
-#pragma parameter HSM_REFLECT_MASK_FOLLOW_MODE                      "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 1 0 1 1
-#ifndef HSM_REFLECT_MASK_FOLLOW_MODE
-#define HSM_REFLECT_MASK_FOLLOW_MODE global.HSM_REFLECT_MASK_FOLLOW_MODE
-#endif
-
-#pragma parameter HSM_REFLECT_MASK_BRIGHTNESS                      "          Mask Brightness" 100 0 200 1
-#ifndef HSM_REFLECT_MASK_BRIGHTNESS
-#define HSM_REFLECT_MASK_BRIGHTNESS global.HSM_REFLECT_MASK_BRIGHTNESS / 100
-#endif
-
-#pragma parameter HSM_REFLECT_MASK_BLACK_LEVEL                      "          Mask Black Level" 0 -100 100 0.5
-#ifndef HSM_REFLECT_MASK_BLACK_LEVEL
-#define HSM_REFLECT_MASK_BLACK_LEVEL (global.HSM_REFLECT_MASK_BLACK_LEVEL / 1000 + 1)
-#endif
-
-#pragma parameter HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS            "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-#ifndef HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS
-#define HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS global.HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS
-#endif
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-2-reflection.inc b/bezel/Mega_Bezel/shaders/base/common/params-2-reflection.inc
deleted file mode 100644
index 443fcd421e..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-2-reflection.inc
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-//---------------------------------------------------------------------------------------------------
-//    REFLECTION
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_REFLECTION_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECTION_TITLE			                "[ REFLECTION ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_REFLECT_GLOBAL_AMOUNT 				    "          Global Amount" 40 0 1000 1
-float HSM_REFLECT_GLOBAL_AMOUNT = global.HSM_REFLECT_GLOBAL_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_GLOBAL_GAMMA_ADJUST 			    "          Global Gamma Adjust" 1.2 0.25 3 0.05
-float HSM_REFLECT_GLOBAL_GAMMA_ADJUST = global.HSM_REFLECT_GLOBAL_GAMMA_ADJUST;
-
-#pragma parameter HSM_REFLECT_DIRECT_AMOUNT 				    "          Direct Reflection" 150 0 300 2
-float HSM_REFLECT_DIRECT_AMOUNT = global.HSM_REFLECT_DIRECT_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_DIFFUSED_AMOUNT 				    "          Diffused Reflection" 50 0 300 2
-float HSM_REFLECT_DIFFUSED_AMOUNT = global.HSM_REFLECT_DIFFUSED_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_FULLSCREEN_GLOW 				    "          FullScreen Glow" 75 0 600 0.5
-float HSM_REFLECT_FULLSCREEN_GLOW = global.HSM_REFLECT_FULLSCREEN_GLOW / 100;
-
-#pragma parameter HSM_REFLECT_FULLSCREEN_GLOW_GAMMA 		    "          FullScreen Glow Gamma" 3 0 5 0.02
-float HSM_REFLECT_FULLSCREEN_GLOW_GAMMA = global.HSM_REFLECT_FULLSCREEN_GLOW_GAMMA;
-
-#pragma parameter HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT 			"          Bezel Inner Edge Amount" 130 0 300 2
-float HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT = global.HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW 	"          Bezel Inner Edge Fullscreen Glow" 40 0 1000 1
-float HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW = global.HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW / 100;
-
-#pragma parameter HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT 		    "          Frame Inner Edge Amount" 50 0 300 2
-float HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT = global.HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS 	    "          Frame Inner Edge Sharpness" 90 0 90 2
-float HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS = global.HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS / 100;
-
-#pragma parameter HSM_REFLECT_SHOW_TUBE_FX_AMOUNT 	            "          Show Tube Effects in Reflection Amount" 100 0 100 2
-float HSM_REFLECT_SHOW_TUBE_FX_AMOUNT = global.HSM_REFLECT_SHOW_TUBE_FX_AMOUNT / 100;
-
-//---------------------------------------------------------------------------------------------------
-// Reflection Fading
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_REFLECTION_FADE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECTION_FADE_TITLE			            "[ REFLECTION FADE ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_REFLECT_FADE_AMOUNT 					    "          Fade Amount" 100 0 100 5
-float HSM_REFLECT_FADE_AMOUNT = global.HSM_REFLECT_FADE_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_RADIAL_FADE_WIDTH 			    "          Radial Fade Width" 100 0 1000 1
-float HSM_REFLECT_RADIAL_FADE_WIDTH = global.HSM_REFLECT_RADIAL_FADE_WIDTH / 350;
-
-#pragma parameter HSM_REFLECT_RADIAL_FADE_HEIGHT 				"          Radial Fade Height" 100 0 1000 1
-float HSM_REFLECT_RADIAL_FADE_HEIGHT = global.HSM_REFLECT_RADIAL_FADE_HEIGHT / 350;
-
-#pragma parameter HSM_REFLECT_LATERAL_OUTER_FADE_POSITION 		"          Lateral Outer Fade Position" -18 -500 500 0.5
-float HSM_REFLECT_LATERAL_OUTER_FADE_POSITION = global.HSM_REFLECT_LATERAL_OUTER_FADE_POSITION / -1000;
-
-#pragma parameter HSM_REFLECT_LATERAL_OUTER_FADE_DISTANCE 		"          Lateral Outer Fade Distance" 20 1 400 0.5
-float HSM_REFLECT_LATERAL_OUTER_FADE_DISTANCE = global.HSM_REFLECT_LATERAL_OUTER_FADE_DISTANCE / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-// Reflection Blur
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_REFLECT_BLUR_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECT_BLUR_TITLE			                "[ REFLECTION BLUR ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_REFLECT_BLUR_NUM_SAMPLES 					    "          Blur Samples - 0 for OFF" 12 0 40 1
-float HSM_REFLECT_BLUR_NUM_SAMPLES = global.HSM_REFLECT_BLUR_NUM_SAMPLES;
-
-#pragma parameter HSM_REFLECT_BLUR_MIN 							    "          Min Blur" 	0 0 100 1
-float HSM_REFLECT_BLUR_MIN = global.HSM_REFLECT_BLUR_MIN / 100;
-
-#pragma parameter HSM_REFLECT_BLUR_MAX 							    "          Max Blur" 	95 0 100 1
-float HSM_REFLECT_BLUR_MAX = global.HSM_REFLECT_BLUR_MAX / 100;
-
-#pragma parameter HSM_REFLECT_BLUR_FALLOFF_DISTANCE 				"          Falloff Distance" 	100 0 1000 1
-float HSM_REFLECT_BLUR_FALLOFF_DISTANCE = global.HSM_REFLECT_BLUR_FALLOFF_DISTANCE / 100;
-
-// Reflection Noise
-#pragma parameter HSM_REFLECT_NOISE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECT_NOISE_TITLE			                "[ REFLECTION NOISE ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_REFLECT_NOISE_AMOUNT 						    "          Noise Amount" 50 0 100 1
-float HSM_REFLECT_NOISE_AMOUNT = global.HSM_REFLECT_NOISE_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_NOISE_SAMPLES 					    "          Noise Samples - 0 | 1 | 2 | 12" 1 0 3 1
-float HSM_REFLECT_NOISE_SAMPLES = global.HSM_REFLECT_NOISE_SAMPLES;
-
-#pragma parameter HSM_REFLECT_NOISE_SAMPLE_DISTANCE 			    "          Sample Distance" 100 0 500 5
-float HSM_REFLECT_NOISE_SAMPLE_DISTANCE = global.HSM_REFLECT_NOISE_SAMPLE_DISTANCE / 500;
-
-// #pragma parameter HSM_REFLECT_BRIGHTNESS_NOISE_BLACK_LEVEL                      "          Mask Black Level" 0 -100 100 0.5
-// float HSM_REFLECT_BRIGHTNESS_NOISE_BLACK_LEVEL = (global.HSM_REFLECT_BRIGHTNESS_NOISE_BLACK_LEVEL / 1000 + 1);
-
-// #pragma parameter HSM_REFLECT_BRIGHTNESS_NOISE_BRIGHTNESS                      "          Mask Brightness" 100 0 200 1
-// float HSM_REFLECT_BRIGHTNESS_NOISE_BRIGHTNESS = global.HSM_REFLECT_BRIGHTNESS_NOISE_BRIGHTNESS / 100;
-
-//---------------------------------------------------------------------------------------------------
-//    REFLECTION MASK
-//---------------------------------------------------------------------------------------------------
-#include "params-2-reflection-mask.inc"
-
-
-// Glass Preset Stuff
-#pragma parameter HSM_REFLECT_GLASS_EMPTY_LINE						" " 0 0 0.001 0.001
-#pragma parameter HSM_REFLECT_GLASS_TITLE			                "[ REFLECTION GLASS ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_GLASS_BORDER_ON                               "          Glass Border ON (For Glass Preset)" 0 0 1 1
-float HSM_GLASS_BORDER_ON = global.HSM_GLASS_BORDER_ON;
-
-#pragma parameter HSM_REFLECT_VIGNETTE_AMOUNT 		                "          Glass Reflection Vignette" 0 0 100 0.5
-float HSM_REFLECT_VIGNETTE_AMOUNT = global.HSM_REFLECT_VIGNETTE_AMOUNT / 100;
-
-#pragma parameter HSM_REFLECT_VIGNETTE_SIZE 		                "          Glass Reflection Vignette Size" 100 50 200 2
-float HSM_REFLECT_VIGNETTE_SIZE = global.HSM_REFLECT_VIGNETTE_SIZE / 100;
-
-
-/////////////// CONSTANT TUNING SETTINGS ///////////////
-
-// #ifndef HSM_REFLECT_CORNER_SPREAD_FALLOFF
-//     #define HSM_REFLECT_CORNER_SPREAD_FALLOFF 100
-// #endif
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-3-glass-only.inc b/bezel/Mega_Bezel/shaders/base/common/params-3-glass-only.inc
deleted file mode 100644
index cede43e19a..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-3-glass-only.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-//---------------------------------------------------------------------------------------------------
-//    STANDARD BACKGROUND IMAGE LAYER
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BG_IMG_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_BG_IMG_TITLE	            "[ GLASS BACKGROUND IMAGE ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_BG_OPACITY                  "          Opacity" 100 0 100 0.1
-float HSM_BG_OPACITY = global.HSM_BG_OPACITY / 100;
-
-#pragma parameter HSM_BG_BLEND_MODE               "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  1 -1 3 1
-float HSM_BG_BLEND_MODE = global.HSM_BG_BLEND_MODE;
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-4-image-layers.inc b/bezel/Mega_Bezel/shaders/base/common/params-4-image-layers.inc
deleted file mode 100644
index 8faf6b6040..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-4-image-layers.inc
+++ /dev/null
@@ -1,760 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-#define HAS_IMAGE_LAYER_PARAMS
-
-//---------------------------------------------------------------------------------------------------
-//    IMAGE LAYERING START
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_LAYER_ORDER_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_LAYER_ORDER_TITLE			  "[ LAYER ORDER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_BG_LAYER_ORDER              "          Background Layer"  0 0 12 1
-float HSM_BG_LAYER_ORDER = global.HSM_BG_LAYER_ORDER;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_LAYER_ORDER "          Viewport Vignette"  1 0 12 1
-float HSM_VIEWPORT_VIGNETTE_LAYER_ORDER = global.HSM_VIEWPORT_VIGNETTE_LAYER_ORDER;
-
-#pragma parameter HSM_LED_LAYER_ORDER             "          LED Layer"  2 0 12 1
-float HSM_LED_LAYER_ORDER = global.HSM_LED_LAYER_ORDER;
-
-#pragma parameter HSM_DEVICE_LAYER_ORDER         "          Device Layer"  3 0 12 1
-float HSM_DEVICE_LAYER_ORDER = global.HSM_DEVICE_LAYER_ORDER;
-
-#pragma parameter HSM_DEVICELED_LAYER_ORDER      "          Device LED Layer"  4 0 12 1
-float HSM_DEVICELED_LAYER_ORDER = global.HSM_DEVICELED_LAYER_ORDER;
-
-#pragma parameter HSM_CRT_LAYER_ORDER             "          CRT Screen Bezel & Frame"  5 0 12 1
-float HSM_CRT_LAYER_ORDER = global.HSM_CRT_LAYER_ORDER;
-
-#pragma parameter HSM_DECAL_LAYER_ORDER           "          Decal Layer"  7 0 12 1
-float HSM_DECAL_LAYER_ORDER = global.HSM_DECAL_LAYER_ORDER;
-
-#pragma parameter HSM_CAB_GLASS_LAYER_ORDER       "          Cabinet Glass Layer"  9 0 12 1
-float HSM_CAB_GLASS_LAYER_ORDER = global.HSM_CAB_GLASS_LAYER_ORDER;
-
-#pragma parameter HSM_TOP_LAYER_ORDER             "          Top Layer"  12 0 12 1
-float HSM_TOP_LAYER_ORDER = global.HSM_TOP_LAYER_ORDER;
-
-
-//---------------------------------------------------------------------------------------------------
-//    CutOut in Image Layers
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_CUTOUT_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CUTOUT_TITLE			     "[ CUTOUT ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_CUTOUT_ASPECT_MODE        "         Cutout Aspect- FULL | EXPL. | 4:3 | 3:4 | 16:9 | 9:16" 4 0 5 1
-float HSM_CUTOUT_ASPECT_MODE = global.HSM_CUTOUT_ASPECT_MODE;
-
-#pragma parameter HSM_CUTOUT_EXPLICIT_ASPECT    "          Explicit Aspect" 1.33333 0.01 3 0.01
-float HSM_CUTOUT_EXPLICIT_ASPECT = global.HSM_CUTOUT_EXPLICIT_ASPECT;
-
-#pragma parameter HSM_CUTOUT_FOLLOW_LAYER       " Follow Layer - FULL | TUBE | BZL | BG | DEVICE | DECAL"  0 0 5 1
-float HSM_CUTOUT_FOLLOW_LAYER = global.HSM_CUTOUT_FOLLOW_LAYER;
-
-#pragma parameter HSM_CUTOUT_FOLLOW_FULL_USES_ZOOM     "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_CUTOUT_FOLLOW_FULL_USES_ZOOM = global.HSM_CUTOUT_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_CUTOUT_SCALE 				"          Scale" 100 -100 200 0.1
-float HSM_CUTOUT_SCALE = global.HSM_CUTOUT_SCALE / 100;
-
-#pragma parameter HSM_CUTOUT_SCALE_X 		    "          Scale X" 100 -100 200 0.1
-float HSM_CUTOUT_SCALE_X = global.HSM_CUTOUT_SCALE_X / 100;
-
-#pragma parameter HSM_CUTOUT_POS_X 		        "          Position XY" 0 -100 200 0.05
-float HSM_CUTOUT_POS_X = global.HSM_CUTOUT_POS_X / -100;
-
-#pragma parameter HSM_CUTOUT_POS_Y 		        "          Position Y" 0 -100 200 0.05
-float HSM_CUTOUT_POS_Y = global.HSM_CUTOUT_POS_Y / 100;
-
-#pragma parameter HSM_CUTOUT_CORNER_RADIUS 		"          Corner Radius - Def 0" 0 0 70 1
-float HSM_CUTOUT_CORNER_RADIUS = global.HSM_CUTOUT_CORNER_RADIUS;
-
-
-//---------------------------------------------------------------------------------------------------
-//    REFLECTION MASK
-//---------------------------------------------------------------------------------------------------
-#include "params-2-reflection-mask.inc"
-
-
-//---------------------------------------------------------------------------------------------------
-//    MASK DEBUG
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_MASK_DEBUG_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_MASK_DEBUG_TITLE			"[ MASK DEBUG ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_LAYERING_DEBUG_MASK_MODE    "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG" -1 -2 8 1
-float HSM_LAYERING_DEBUG_MASK_MODE = global.HSM_LAYERING_DEBUG_MASK_MODE;
-
-//---------------------------------------------------------------------------------------------------
-//    BG IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BACKGROUND_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_BACKGROUND_TITLE			"[ BACKGROUND LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_BG_OPACITY                  "          Opacity" 100 0 100 0.1
-float HSM_BG_OPACITY = global.HSM_BG_OPACITY / 100;
-
-#pragma parameter HSM_BG_COLORIZE_ON              "          Colorize On" 0 0 1 1
-float HSM_BG_COLORIZE_ON = global.HSM_BG_COLORIZE_ON;
-
-#pragma parameter HSM_BG_HUE                       "          Hue Offset" 0 0 360 1
-float HSM_BG_HUE = global.HSM_BG_HUE / 360;
-
-#pragma parameter HSM_BG_SATURATION                "          Saturation" 100 0 200 1
-float HSM_BG_SATURATION = global.HSM_BG_SATURATION / 100;
-
-#pragma parameter HSM_BG_BRIGHTNESS                "          Brightness" 100 0 200 1
-float HSM_BG_BRIGHTNESS = global.HSM_BG_BRIGHTNESS / 100;
-
-#pragma parameter HSM_BG_GAMMA                     "          Gamma Adjust" 1 0 5 0.01
-float HSM_BG_GAMMA = global.HSM_BG_GAMMA;
-
-#pragma parameter HSM_BG_AMBIENT_LIGHTING_MULTIPLIER         "          Ambient Lighting Multiplier"  0 0 100 1
-float HSM_BG_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_BG_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER         "          Ambient 2nd Image Lighting Multiplier"  100 0 100 1
-float HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_BG_APPLY_AMBIENT_IN_ADD_MODE         "          Apply Ambient Lighting in ADD Blend Mode"  0 0 1 1
-float HSM_BG_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_BG_APPLY_AMBIENT_IN_ADD_MODE;
-
-#pragma parameter HSM_BG_BLEND_MODE               "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  1 -1 3 1
-float HSM_BG_BLEND_MODE = global.HSM_BG_BLEND_MODE;
-
-#pragma parameter HSM_BG_SOURCE_MATTE_TYPE        "          Source Matte Color - BLACK | WHITE | NONE"  0 0 2 1
-float HSM_BG_SOURCE_MATTE_TYPE = global.HSM_BG_SOURCE_MATTE_TYPE;
-
-#pragma parameter HSM_BG_MIPMAPPING_BLEND_BIAS    "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-float HSM_BG_MIPMAPPING_BLEND_BIAS = global.HSM_BG_MIPMAPPING_BLEND_BIAS;
-
-#pragma parameter HSM_BG_MASK_MODE                "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG" 0 0 8 1
-float HSM_BG_MASK_MODE = global.HSM_BG_MASK_MODE;
-
-#pragma parameter HSM_BG_CUTOUT_MODE              "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_BG_CUTOUT_MODE = global.HSM_BG_CUTOUT_MODE;
-
-#pragma parameter HSM_BG_DUALSCREEN_VIS_MODE      "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_BG_DUALSCREEN_VIS_MODE = global.HSM_BG_DUALSCREEN_VIS_MODE;
-
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_BG2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_BG_TITLE2			           "[ BACKGROUND SCALE & FOLLOW ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_BG_FOLLOW_LAYER               "          Follow Layer - FULL | TUBE | BEZEL" 0 0 2 1
-float HSM_BG_FOLLOW_LAYER = global.HSM_BG_FOLLOW_LAYER;
-
-#pragma parameter HSM_BG_FOLLOW_MODE              "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 0 0 1 1
-float HSM_BG_FOLLOW_MODE = global.HSM_BG_FOLLOW_MODE;
-
-#pragma parameter HSM_BG_FOLLOW_FULL_USES_ZOOM     "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_BG_FOLLOW_FULL_USES_ZOOM = global.HSM_BG_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_BG_FILL_MODE                "         Image Fill Mode - KEEP TEXURE ASPECT | SPLIT | STRETCH"  0 0 2 1
-float HSM_BG_FILL_MODE = global.HSM_BG_FILL_MODE;
-
-#pragma parameter HSM_BG_SPLIT_PRESERVE_CENTER    "          Split Mode Preserve Center %"  0 0 500 1
-float HSM_BG_SPLIT_PRESERVE_CENTER = global.HSM_BG_SPLIT_PRESERVE_CENTER / 1000;
-
-#pragma parameter HSM_BG_SPLIT_REPEAT_WIDTH       "          Split Mode Repeat Width %"  0 0 100 1
-float HSM_BG_SPLIT_REPEAT_WIDTH = global.HSM_BG_SPLIT_REPEAT_WIDTH / 1000;
-
-#pragma parameter HSM_BG_SCALE                    "          Scale" 100 0 1000 0.1
-float HSM_BG_SCALE = global.HSM_BG_SCALE / 100;
-
-#pragma parameter HSM_BG_SCALE_X                  "          Scale X" 100 0 1000 0.1
-float HSM_BG_SCALE_X = global.HSM_BG_SCALE_X / 100;
-
-#pragma parameter HSM_BG_POS_X                    "          Position X"  0 -1000 1000 0.05
-float HSM_BG_POS_X = global.HSM_BG_POS_X / -100;
-
-#pragma parameter HSM_BG_POS_Y                    "          Position Y"  0 -1000 1000 0.05
-float HSM_BG_POS_Y = global.HSM_BG_POS_Y / 100;
-
-#pragma parameter HSM_BG_WRAP_MODE                "          Wrap Mode: NONE | TILED | MIRRORED" 1 0 2 1
-float HSM_BG_WRAP_MODE = global.HSM_BG_WRAP_MODE;
-
-
-//---------------------------------------------------------------------------------------------------
-//    VIEWPORT VIGNETTE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_VIEWPORT_VIGNETTE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_VIEWPORT_VIGNETTE_TITLE		"[ VIEWPORT VIGNETTE LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_OPACITY     "          Opacity" 0 0 100 2
-float HSM_VIEWPORT_VIGNETTE_OPACITY = global.HSM_VIEWPORT_VIGNETTE_OPACITY / 100;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_MASK_MODE   "Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG" 5 0 8 1
-float HSM_VIEWPORT_VIGNETTE_MASK_MODE = global.HSM_VIEWPORT_VIGNETTE_MASK_MODE;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_CUTOUT_MODE  "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_VIEWPORT_VIGNETTE_CUTOUT_MODE = global.HSM_VIEWPORT_VIGNETTE_CUTOUT_MODE;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_FOLLOW_LAYER   "          Follow Layer- FULL | BG | TUBE | BZL" 0 0 5 1
-float HSM_VIEWPORT_VIGNETTE_FOLLOW_LAYER = global.HSM_VIEWPORT_VIGNETTE_FOLLOW_LAYER;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_SCALE        "          Scale" 100 0 1000 0.1
-float HSM_VIEWPORT_VIGNETTE_SCALE = global.HSM_VIEWPORT_VIGNETTE_SCALE / 100;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_SCALE_X      "          Scale X" 100 0 1000 0.1
-float HSM_VIEWPORT_VIGNETTE_SCALE_X = global.HSM_VIEWPORT_VIGNETTE_SCALE_X / 100;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_POS_X        "          Position X"  0 -1000 1000 0.05
-float HSM_VIEWPORT_VIGNETTE_POS_X = global.HSM_VIEWPORT_VIGNETTE_POS_X / -100;
-
-#pragma parameter HSM_VIEWPORT_VIGNETTE_POS_Y        "          Position Y"  0 -1000 1000 0.05
-float HSM_VIEWPORT_VIGNETTE_POS_Y = global.HSM_VIEWPORT_VIGNETTE_POS_Y / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    LED IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_LEDX_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_LED_TITLE		                "[ LED LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_LED_OPACITY                   "          Opacity"  100 0 100 1
-float HSM_LED_OPACITY = global.HSM_LED_OPACITY / 100;
-
-#pragma parameter HSM_LED_COLORIZE_ON               "          Colorize" 0 0 1 1
-float HSM_LED_COLORIZE_ON = global.HSM_LED_COLORIZE_ON;
-
-#pragma parameter HSM_LED_HUE                       "          Hue Offset" 0 0 360 1
-float HSM_LED_HUE = global.HSM_LED_HUE / 360;
-
-#pragma parameter HSM_LED_SATURATION                "          Saturation" 100 0 200 1
-float HSM_LED_SATURATION = global.HSM_LED_SATURATION / 100;
-
-#pragma parameter HSM_LED_BRIGHTNESS                "          Brightness" 100 0 200 1
-float HSM_LED_BRIGHTNESS = global.HSM_LED_BRIGHTNESS / 100;
-
-#pragma parameter HSM_LED_GAMMA                     "          Gamma Adjust" 1 0 5 0.01
-float HSM_LED_GAMMA = global.HSM_LED_GAMMA;
-
-#pragma parameter HSM_LED_AMBIENT_LIGHTING_MULTIPLIER   "          Ambient Lighting Multiplier"  100 0 100 1
-float HSM_LED_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_LED_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER         "          Ambient 2nd Image Lighting Multiplier"  0 0 100 1
-float HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_LED_APPLY_AMBIENT_IN_ADD_MODE     "          Apply Ambient Lighting in ADD Blend Mode"  0 0 1 1
-float HSM_LED_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_LED_APPLY_AMBIENT_IN_ADD_MODE;
-
-#pragma parameter HSM_LED_BLEND_MODE                    "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  2 0 3 1
-float HSM_LED_BLEND_MODE = global.HSM_LED_BLEND_MODE;
-
-#pragma parameter HSM_LED_SOURCE_MATTE_TYPE             "          Source Matte Color - BLACK | WHITE | NONE"  0 0 2 1
-float HSM_LED_SOURCE_MATTE_TYPE = global.HSM_LED_SOURCE_MATTE_TYPE;
-
-#pragma parameter HSM_LED_MASK_MODE                     "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG"   0 0 8 1
-float HSM_LED_MASK_MODE = global.HSM_LED_MASK_MODE;
-
-#pragma parameter HSM_LED_MIPMAPPING_BLEND_BIAS         "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-float HSM_LED_MIPMAPPING_BLEND_BIAS = global.HSM_LED_MIPMAPPING_BLEND_BIAS;
-
-#pragma parameter HSM_LED_CUTOUT_MODE                   "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_LED_CUTOUT_MODE = global.HSM_LED_CUTOUT_MODE;
-
-#pragma parameter HSM_LED_DUALSCREEN_VIS_MODE           "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_LED_DUALSCREEN_VIS_MODE = global.HSM_LED_DUALSCREEN_VIS_MODE;
-
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_LED2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_LED_TITLE2		                "[ LED SCALE & FOLLOW ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_LED_FOLLOW_LAYER                  "             Follow Layer - FULL | TUBE | BEZEL | BG | DEVICE"  3 0 4 1
-float HSM_LED_FOLLOW_LAYER = global.HSM_LED_FOLLOW_LAYER;
-
-#pragma parameter HSM_LED_FOLLOW_MODE                   "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 0 0 1 1
-float HSM_LED_FOLLOW_MODE = global.HSM_LED_FOLLOW_MODE;
-
-#pragma parameter HSM_LED_FOLLOW_FULL_USES_ZOOM          "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_LED_FOLLOW_FULL_USES_ZOOM = global.HSM_LED_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_LED_FILL_MODE                     "         Image Fill Mode - KEEP TEXURE ASPECT | SPLIT | STRETCH"  0 0 2 1
-float HSM_LED_FILL_MODE = global.HSM_LED_FILL_MODE;
-
-#pragma parameter HSM_LED_SPLIT_PRESERVE_CENTER         "          Split Mode Preserve Center %"  0 0 500 1
-float HSM_LED_SPLIT_PRESERVE_CENTER = global.HSM_LED_SPLIT_PRESERVE_CENTER / 1000;
-
-#pragma parameter HSM_LED_SPLIT_REPEAT_WIDTH            "          Split Mode Repeat Width %"  0 0 100 1
-float HSM_LED_SPLIT_REPEAT_WIDTH = global.HSM_LED_SPLIT_REPEAT_WIDTH / 1000;
-
-#pragma parameter HSM_LED_SCALE                         "          Scale" 100 0 1000 0.1
-float HSM_LED_SCALE = global.HSM_LED_SCALE / 100;
-
-#pragma parameter HSM_LED_SCALE_X                       "          Scale X" 100 0 1000 0.1
-float HSM_LED_SCALE_X = global.HSM_LED_SCALE_X / 100;
-
-#pragma parameter HSM_LED_POS_X                         "          Position X"  0 -1000 1000 0.05
-float HSM_LED_POS_X = global.HSM_LED_POS_X / -100;
-
-#pragma parameter HSM_LED_POS_Y                         "          Position Y"  0 -1000 1000 0.05
-float HSM_LED_POS_Y = global.HSM_LED_POS_Y / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    DEVICE IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_DEVICE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DEVICE_TITLE			           "[ DEVICE IMAGE LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DEVICE_OPACITY                   "          Opacity" 100 0 100 1
-float HSM_DEVICE_OPACITY = global.HSM_DEVICE_OPACITY / 100;
-
-#pragma parameter HSM_DEVICE_COLORIZE_ON               "          Colorize" 0 0 1 1
-float HSM_DEVICE_COLORIZE_ON = global.HSM_DEVICE_COLORIZE_ON;
-
-#pragma parameter HSM_DEVICE_HUE                       "          Hue Offset" 0 0 360 1
-float HSM_DEVICE_HUE = global.HSM_DEVICE_HUE / 360;
-
-#pragma parameter HSM_DEVICE_SATURATION                "          Saturation" 100 0 200 1
-float HSM_DEVICE_SATURATION = global.HSM_DEVICE_SATURATION / 100;
-
-#pragma parameter HSM_DEVICE_BRIGHTNESS                "          Brightness" 100 0 200 1
-float HSM_DEVICE_BRIGHTNESS = global.HSM_DEVICE_BRIGHTNESS / 100;
-
-#pragma parameter HSM_DEVICE_GAMMA                     "          Gamma Adjust" 1 0 5 0.01
-float HSM_DEVICE_GAMMA = global.HSM_DEVICE_GAMMA;
-
-#pragma parameter HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER         "          Ambient Lighting Multiplier"  100 0 100 1
-float HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER         "          Ambient 2nd Image Lighting Multiplier"  0 0 100 1
-float HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE         "          Apply Ambient Lighting in ADD Blend Mode"  0 0 1 1
-float HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE;
-
-#pragma parameter HSM_DEVICE_BLEND_MODE                "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  1 0 3 1
-float HSM_DEVICE_BLEND_MODE = global.HSM_DEVICE_BLEND_MODE;
-
-#pragma parameter HSM_DEVICE_SOURCE_MATTE_TYPE         "          Source Matte Color - BLACK | WHITE | NONE"  0 0 2 1
-float HSM_DEVICE_SOURCE_MATTE_TYPE = global.HSM_DEVICE_SOURCE_MATTE_TYPE;
-
-#pragma parameter HSM_DEVICE_MASK_MODE                 "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG" 0 0 8 1
-float HSM_DEVICE_MASK_MODE = global.HSM_DEVICE_MASK_MODE;
-
-#pragma parameter HSM_DEVICE_MIPMAPPING_BLEND_BIAS          "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-float HSM_DEVICE_MIPMAPPING_BLEND_BIAS = global.HSM_DEVICE_MIPMAPPING_BLEND_BIAS;
-
-#pragma parameter HSM_DEVICE_CUTOUT_MODE               "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_DEVICE_CUTOUT_MODE = global.HSM_DEVICE_CUTOUT_MODE;
-
-#pragma parameter HSM_DEVICE_DUALSCREEN_VIS_MODE           "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_DEVICE_DUALSCREEN_VIS_MODE = global.HSM_DEVICE_DUALSCREEN_VIS_MODE;
-
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_DEVICE2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DEVICE_TITLE2			           "[ DEVICE SCALE & FOLLOW ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DEVICE_FOLLOW_LAYER                "          Follow Layer - FULL | TUBE | BEZEL | BG"  1 0 3 1
-float HSM_DEVICE_FOLLOW_LAYER = global.HSM_DEVICE_FOLLOW_LAYER;
-
-#pragma parameter HSM_DEVICE_FOLLOW_MODE                    "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 0 0 1 1
-float HSM_DEVICE_FOLLOW_MODE = global.HSM_DEVICE_FOLLOW_MODE;
-
-#pragma parameter HSM_DEVICE_FOLLOW_FULL_USES_ZOOM      "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_DEVICE_FOLLOW_FULL_USES_ZOOM = global.HSM_DEVICE_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_DEVICE_FILL_MODE                 "         Image Fill Mode - KEEP TEXURE ASPECT | SPLIT | STRETCH"  0 0 2 1
-float HSM_DEVICE_FILL_MODE = global.HSM_DEVICE_FILL_MODE;
-
-#pragma parameter HSM_DEVICE_SPLIT_PRESERVE_CENTER     "          Split Mode Preserve Center %"  0 0 500 1
-float HSM_DEVICE_SPLIT_PRESERVE_CENTER = global.HSM_DEVICE_SPLIT_PRESERVE_CENTER / 1000;
-
-#pragma parameter HSM_DEVICE_SPLIT_REPEAT_WIDTH        "          Split Mode Repeat Width %"  0 0 100 1
-float HSM_DEVICE_SPLIT_REPEAT_WIDTH = global.HSM_DEVICE_SPLIT_REPEAT_WIDTH / 1000;
-
-#pragma parameter HSM_DEVICE_SCALE                     "          Scale" 100 0 1000 0.1
-float HSM_DEVICE_SCALE = global.HSM_DEVICE_SCALE / 100;
-
-#pragma parameter HSM_DEVICE_SCALE_X                   "          Scale X" 100 0 1000 0.1
-float HSM_DEVICE_SCALE_X = global.HSM_DEVICE_SCALE_X / 100;
-
-#pragma parameter HSM_DEVICE_POS_X                     "          Position X"  0 -1000 1000 0.05
-float HSM_DEVICE_POS_X = global.HSM_DEVICE_POS_X / -100;
-
-#pragma parameter HSM_DEVICE_POS_Y                     "          Position Y"  0 -1000 1000 0.05
-float HSM_DEVICE_POS_Y = global.HSM_DEVICE_POS_Y / 100;
-
-
-
-//---------------------------------------------------------------------------------------------------
-//    DEVICELED IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_DEVICELED_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DEVICELED_TITLE			           "[ DEVICE LED IMAGE LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DEVICELED_OPACITY                   "          Opacity" 100 0 100 1
-float HSM_DEVICELED_OPACITY = global.HSM_DEVICELED_OPACITY / 100;
-
-#pragma parameter HSM_DEVICELED_COLORIZE_ON               "          Colorize" 0 0 1 1
-float HSM_DEVICELED_COLORIZE_ON = global.HSM_DEVICELED_COLORIZE_ON;
-
-#pragma parameter HSM_DEVICELED_HUE                       "          Hue Offset" 0 0 360 1
-float HSM_DEVICELED_HUE = global.HSM_DEVICELED_HUE / 360;
-
-#pragma parameter HSM_DEVICELED_SATURATION                "          Saturation" 100 0 200 1
-float HSM_DEVICELED_SATURATION = global.HSM_DEVICELED_SATURATION / 100;
-
-#pragma parameter HSM_DEVICELED_BRIGHTNESS                "          Brightness" 100 0 200 1
-float HSM_DEVICELED_BRIGHTNESS = global.HSM_DEVICELED_BRIGHTNESS / 100;
-
-#pragma parameter HSM_DEVICELED_GAMMA                     "          Gamma Adjust" 1 0 5 0.01
-float HSM_DEVICELED_GAMMA = global.HSM_DEVICELED_GAMMA;
-
-#pragma parameter HSM_DEVICELED_AMBIENT_LIGHTING_MULTIPLIER "          Ambient Lighting Multiplier"  100 0 100 1
-float HSM_DEVICELED_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_DEVICELED_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_DEVICELED_AMBIENT2_LIGHTING_MULTIPLIER "          Ambient 2nd Image Lighting Multiplier"  0 0 100 1
-float HSM_DEVICELED_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_DEVICELED_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_DEVICELED_APPLY_AMBIENT_IN_ADD_MODE "          Apply Ambient Lighting in ADD Blend Mode"  0 0 1 1
-float HSM_DEVICELED_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_DEVICELED_APPLY_AMBIENT_IN_ADD_MODE;
-
-#pragma parameter HSM_DEVICELED_BLEND_MODE                "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  2 0 3 1
-float HSM_DEVICELED_BLEND_MODE = global.HSM_DEVICELED_BLEND_MODE;
-
-#pragma parameter HSM_DEVICELED_SOURCE_MATTE_TYPE         "          Source Matte Color - BLACK | WHITE | NONE"  0 0 2 1
-float HSM_DEVICELED_SOURCE_MATTE_TYPE = global.HSM_DEVICELED_SOURCE_MATTE_TYPE;
-
-#pragma parameter HSM_DEVICELED_MASK_MODE                 "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG" 0 0 8 1
-float HSM_DEVICELED_MASK_MODE = global.HSM_DEVICELED_MASK_MODE;
-
-#pragma parameter HSM_DEVICELED_MIPMAPPING_BLEND_BIAS          "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-float HSM_DEVICELED_MIPMAPPING_BLEND_BIAS = global.HSM_DEVICELED_MIPMAPPING_BLEND_BIAS;
-
-#pragma parameter HSM_DEVICELED_CUTOUT_MODE               "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_DEVICELED_CUTOUT_MODE = global.HSM_DEVICELED_CUTOUT_MODE;
-
-#pragma parameter HSM_DEVICELED_DUALSCREEN_VIS_MODE       "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_DEVICELED_DUALSCREEN_VIS_MODE = global.HSM_DEVICELED_DUALSCREEN_VIS_MODE;
-
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_DEVICELED2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DEVICELED_TITLE2			          "[ DEVICE LED SCALE & FOLLOW ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DEVICELED_FOLLOW_LAYER              "          Follow Layer - FULL | TUBE | BEZEL | BG | DEVICE"  4 0 4 1
-float HSM_DEVICELED_FOLLOW_LAYER = global.HSM_DEVICELED_FOLLOW_LAYER;
-
-#pragma parameter HSM_DEVICELED_FOLLOW_MODE               "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 1 0 1 1
-float HSM_DEVICELED_FOLLOW_MODE = global.HSM_DEVICELED_FOLLOW_MODE;
-
-#pragma parameter HSM_DEVICELED_FOLLOW_FULL_USES_ZOOM     "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_DEVICELED_FOLLOW_FULL_USES_ZOOM = global.HSM_DEVICELED_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_DEVICELED_FILL_MODE                 "         Image Fill Mode - KEEP TEXURE ASPECT | SPLIT | STRETCH"  0 0 2 1
-float HSM_DEVICELED_FILL_MODE = global.HSM_DEVICELED_FILL_MODE;
-
-#pragma parameter HSM_DEVICELED_SPLIT_PRESERVE_CENTER     "          Split Mode Preserve Center %"  0 0 500 1
-float HSM_DEVICELED_SPLIT_PRESERVE_CENTER = global.HSM_DEVICELED_SPLIT_PRESERVE_CENTER / 1000;
-
-#pragma parameter HSM_DEVICELED_SPLIT_REPEAT_WIDTH        "          Split Mode Repeat Width %"  0 0 100 1
-float HSM_DEVICELED_SPLIT_REPEAT_WIDTH = global.HSM_DEVICELED_SPLIT_REPEAT_WIDTH / 1000;
-
-#pragma parameter HSM_DEVICELED_SCALE                     "          Scale" 100 0 1000 0.1
-float HSM_DEVICELED_SCALE = global.HSM_DEVICELED_SCALE / 100;
-
-#pragma parameter HSM_DEVICELED_SCALE_X                   "          Scale X" 100 0 1000 0.1
-float HSM_DEVICELED_SCALE_X = global.HSM_DEVICELED_SCALE_X / 100;
-
-#pragma parameter HSM_DEVICELED_POS_X                     "          Position X"  0 -1000 1000 0.05
-float HSM_DEVICELED_POS_X = global.HSM_DEVICELED_POS_X / -100;
-
-#pragma parameter HSM_DEVICELED_POS_Y                     "          Position Y"  0 -1000 1000 0.05
-float HSM_DEVICELED_POS_Y = global.HSM_DEVICELED_POS_Y / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    DECAL IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_DECAL_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DECAL_TITLE			            "[ DECAL LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DECAL_OPACITY                     "          Opacity"  100 0 100 0.1
-float HSM_DECAL_OPACITY = global.HSM_DECAL_OPACITY / 100;
-
-#pragma parameter HSM_DECAL_COLORIZE_ON                 "          Colorize" 0 0 1 1
-float HSM_DECAL_COLORIZE_ON = global.HSM_DECAL_COLORIZE_ON;
-
-#pragma parameter HSM_DECAL_HUE                         "          Hue Offset" 0 0 360 1
-float HSM_DECAL_HUE = global.HSM_DECAL_HUE / 360;
-
-#pragma parameter HSM_DECAL_SATURATION                  "          Saturation" 100 0 200 1
-float HSM_DECAL_SATURATION = global.HSM_DECAL_SATURATION / 100;
-
-#pragma parameter HSM_DECAL_BRIGHTNESS                  "          Brightness" 100 0 200 1
-float HSM_DECAL_BRIGHTNESS = global.HSM_DECAL_BRIGHTNESS / 100;
-
-#pragma parameter HSM_DECAL_GAMMA                       "          Gamma Adjust" 1 0 5 0.01
-float HSM_DECAL_GAMMA = global.HSM_DECAL_GAMMA;
-
-#pragma parameter HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER "          Ambient Lighting Multiplier"  100 0 100 1
-float HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER "          Ambient 2nd Image Lighting Multiplier"  0 0 100 1
-float HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE   "          Apply Ambient Lighting in ADD Blend Mode"  0 0 1 1
-float HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE;
-
-#pragma parameter HSM_DECAL_BLEND_MODE                  "          Blend Mode -  OFF | NORMAL | ADD | MULTIPLY"  1 0 3 1
-float HSM_DECAL_BLEND_MODE = global.HSM_DECAL_BLEND_MODE;
-
-#pragma parameter HSM_DECAL_SOURCE_MATTE_TYPE           "          Source Matte Color - BLACK | WHITE | NONE"  0 0 2 1
-float HSM_DECAL_SOURCE_MATTE_TYPE = global.HSM_DECAL_SOURCE_MATTE_TYPE;
-
-#pragma parameter HSM_DECAL_MIPMAPPING_BLEND_BIAS       "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-float HSM_DECAL_MIPMAPPING_BLEND_BIAS = global.HSM_DECAL_MIPMAPPING_BLEND_BIAS;
-
-#pragma parameter HSM_DECAL_MASK_MODE                   "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG"   0 0 8 1
-float HSM_DECAL_MASK_MODE = global.HSM_DECAL_MASK_MODE;
-
-#pragma parameter HSM_DECAL_CUTOUT_MODE                 "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_DECAL_CUTOUT_MODE = global.HSM_DECAL_CUTOUT_MODE;
-
-#pragma parameter HSM_DECAL_DUALSCREEN_VIS_MODE         "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_DECAL_DUALSCREEN_VIS_MODE = global.HSM_DECAL_DUALSCREEN_VIS_MODE;
-
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_DECAL2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DECAL_TITLE2			            "[ DECAL SCALE & FOLLOW ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DECAL_FOLLOW_LAYER                "          Follow Layer - FULL | TUBE | BEZEL | BG | DEVICE"  0 0 4 1
-float HSM_DECAL_FOLLOW_LAYER = global.HSM_DECAL_FOLLOW_LAYER;
-
-#pragma parameter HSM_DECAL_FOLLOW_MODE                 "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 0 0 1 1
-float HSM_DECAL_FOLLOW_MODE = global.HSM_DECAL_FOLLOW_MODE;
-
-#pragma parameter HSM_DECAL_FOLLOW_FULL_USES_ZOOM       "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_DECAL_FOLLOW_FULL_USES_ZOOM = global.HSM_DECAL_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_DECAL_FILL_MODE                   "         Image Fill Mode - KEEP TEXURE ASPECT | SPLIT | STRETCH"  0 0 2 1
-float HSM_DECAL_FILL_MODE = global.HSM_DECAL_FILL_MODE;
-
-#pragma parameter HSM_DECAL_SPLIT_PRESERVE_CENTER       "          Split Mode Preserve Center %"  0 0 500 1
-float HSM_DECAL_SPLIT_PRESERVE_CENTER = global.HSM_DECAL_SPLIT_PRESERVE_CENTER / 1000;
-
-#pragma parameter HSM_DECAL_SPLIT_REPEAT_WIDTH          "          Split Mode Repeat Width %"  0 0 100 1
-float HSM_DECAL_SPLIT_REPEAT_WIDTH = global.HSM_DECAL_SPLIT_REPEAT_WIDTH / 1000;
-
-#pragma parameter HSM_DECAL_SCALE                       "          Scale"  100 1 500 0.1
-float HSM_DECAL_SCALE = global.HSM_DECAL_SCALE / 100;
-
-#pragma parameter HSM_DECAL_SCALE_X                     "          Scale X"  100 50 500 0.1
-float HSM_DECAL_SCALE_X = global.HSM_DECAL_SCALE_X / 100;
-
-#pragma parameter HSM_DECAL_POS_X                       "          Position X"  0 -1000 1000 0.05
-float HSM_DECAL_POS_X = global.HSM_DECAL_POS_X / -100;
-
-#pragma parameter HSM_DECAL_POS_Y                       "          Position Y"  0 -1000 1000 0.05
-float HSM_DECAL_POS_Y = global.HSM_DECAL_POS_Y / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    CAB GLS IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_CAB_GLASS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CAB_GLASS_TITLE			            "[ CABINET GLASS LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_CAB_GLASS_OPACITY                     "          Opacity" 100 0 100 1
-float HSM_CAB_GLASS_OPACITY = global.HSM_CAB_GLASS_OPACITY / 100;
-
-#pragma parameter HSM_CAB_GLASS_COLORIZE_ON                 "          Colorize" 0 0 1 1
-float HSM_CAB_GLASS_COLORIZE_ON = global.HSM_CAB_GLASS_COLORIZE_ON;
-
-#pragma parameter HSM_CAB_GLASS_HUE                         "          Hue Offset" 0 0 360 1
-float HSM_CAB_GLASS_HUE = global.HSM_CAB_GLASS_HUE / 360;
-
-#pragma parameter HSM_CAB_GLASS_SATURATION                  "          Saturation" 100 0 200 1
-float HSM_CAB_GLASS_SATURATION = global.HSM_CAB_GLASS_SATURATION / 100;
-
-#pragma parameter HSM_CAB_GLASS_BRIGHTNESS                  "          Brightness" 100 0 400 1
-float HSM_CAB_GLASS_BRIGHTNESS = global.HSM_CAB_GLASS_BRIGHTNESS / 100;
-
-#pragma parameter HSM_CAB_GLASS_GAMMA                       "          Gamma Adjust" 1 0 5 0.01
-float HSM_CAB_GLASS_GAMMA = global.HSM_CAB_GLASS_GAMMA;
-
-#pragma parameter HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER "          Ambient Lighting Multiplier"  100 0 100 1
-float HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER "          Ambient 2nd Image Lighting Multiplier"  0 0 100 1
-float HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE         "          Apply Ambient Lighting in ADD Blend Mode"  0 0 1 1
-float HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE;
-
-#pragma parameter HSM_CAB_GLASS_BLEND_MODE                  "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  1 0 3 1
-float HSM_CAB_GLASS_BLEND_MODE = global.HSM_CAB_GLASS_BLEND_MODE;
-
-#pragma parameter HSM_CAB_GLASS_SOURCE_MATTE_TYPE           "          Source Matte Color - BLACK | WHITE | NONE"  0 0 2 1
-float HSM_CAB_GLASS_SOURCE_MATTE_TYPE = global.HSM_CAB_GLASS_SOURCE_MATTE_TYPE;
-
-#pragma parameter HSM_CAB_GLASS_MIPMAPPING_BLEND_BIAS       "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-float HSM_CAB_GLASS_MIPMAPPING_BLEND_BIAS = global.HSM_CAB_GLASS_MIPMAPPING_BLEND_BIAS;
-
-#pragma parameter HSM_CAB_GLASS_MASK_MODE                   "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG" 0 0 8 1
-float HSM_CAB_GLASS_MASK_MODE = global.HSM_CAB_GLASS_MASK_MODE;
-
-#pragma parameter HSM_CAB_GLASS_CUTOUT_MODE                 "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_CAB_GLASS_CUTOUT_MODE = global.HSM_CAB_GLASS_CUTOUT_MODE;
-
-#pragma parameter HSM_CAB_GLASS_DUALSCREEN_VIS_MODE         "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_CAB_GLASS_DUALSCREEN_VIS_MODE = global.HSM_CAB_GLASS_DUALSCREEN_VIS_MODE;
-
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_CAB_GLASS2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_CAB_GLASS_TITLE2			            "[ CABINET GLASS SCALE & FOLLOW ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_CAB_GLASS_FOLLOW_LAYER                "        Follow Layer- FULL | TUBE | BEZEL | BG | DEVICE | DECAL" 0 0 5 1
-float HSM_CAB_GLASS_FOLLOW_LAYER = global.HSM_CAB_GLASS_FOLLOW_LAYER;
-
-#pragma parameter HSM_CAB_GLASS_FOLLOW_MODE                 "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 0 0 1 1
-float HSM_CAB_GLASS_FOLLOW_MODE = global.HSM_CAB_GLASS_FOLLOW_MODE;
-
-#pragma parameter HSM_CAB_GLASS_FOLLOW_FULL_USES_ZOOM       "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_CAB_GLASS_FOLLOW_FULL_USES_ZOOM = global.HSM_CAB_GLASS_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_CAB_GLASS_FILL_MODE                   "         Image Fill Mode - KEEP TEXURE ASPECT | SPLIT | STRETCH"  0 0 2 1
-float HSM_CAB_GLASS_FILL_MODE = global.HSM_CAB_GLASS_FILL_MODE;
-
-#pragma parameter HSM_CAB_GLASS_SPLIT_PRESERVE_CENTER       "          Split Mode Preserve Center %"  0 0 500 1
-float HSM_CAB_GLASS_SPLIT_PRESERVE_CENTER = global.HSM_CAB_GLASS_SPLIT_PRESERVE_CENTER / 1000;
-
-#pragma parameter HSM_CAB_GLASS_SPLIT_REPEAT_WIDTH          "          Split Mode Repeat Width %"  0 0 100 1
-float HSM_CAB_GLASS_SPLIT_REPEAT_WIDTH = global.HSM_CAB_GLASS_SPLIT_REPEAT_WIDTH / 1000;
-
-#pragma parameter HSM_CAB_GLASS_SCALE                       "          Scale" 100 10 500 0.1
-float HSM_CAB_GLASS_SCALE = global.HSM_CAB_GLASS_SCALE / 100;
-
-#pragma parameter HSM_CAB_GLASS_SCALE_X                     "          Scale X" 100 0 500 0.1
-float HSM_CAB_GLASS_SCALE_X = global.HSM_CAB_GLASS_SCALE_X / 100;
-
-#pragma parameter HSM_CAB_GLASS_POS_X                       "          Position X"  0 -1000 1000 0.05
-float HSM_CAB_GLASS_POS_X = global.HSM_CAB_GLASS_POS_X / -100;
-
-#pragma parameter HSM_CAB_GLASS_POS_Y                       "          Position Y"  0 -1000 1000 0.05
-float HSM_CAB_GLASS_POS_Y = global.HSM_CAB_GLASS_POS_Y / 100;
-
-
-//---------------------------------------------------------------------------------------------------
-//    TOP IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TOP_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TOP_TITLE			                "[ TOP EXTRA LAYER ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_TOP_OPACITY                       "          Opacity"  100 0 100 0.1
-float HSM_TOP_OPACITY = global.HSM_TOP_OPACITY / 100;
-
-#pragma parameter HSM_TOP_COLORIZE_ON                   "          Colorize" 0 0 1 1
-float HSM_TOP_COLORIZE_ON = global.HSM_TOP_COLORIZE_ON;
-
-#pragma parameter HSM_TOP_HUE                           "          Hue Offset" 0 0 360 1
-float HSM_TOP_HUE = global.HSM_TOP_HUE / 360;
-
-#pragma parameter HSM_TOP_SATURATION                    "          Saturation" 100 0 200 1
-float HSM_TOP_SATURATION = global.HSM_TOP_SATURATION / 100;
-
-#pragma parameter HSM_TOP_BRIGHTNESS                    "          Brightness" 100 0 200 1
-float HSM_TOP_BRIGHTNESS = global.HSM_TOP_BRIGHTNESS / 100;
-
-#pragma parameter HSM_TOP_GAMMA                         "          Gamma Adjust" 1 0 5 0.01
-float HSM_TOP_GAMMA = global.HSM_TOP_GAMMA;
-
-#pragma parameter HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER   "          Ambient Lighting Multiplier"  100 0 100 1
-float HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER  "          Ambient 2nd Image Lighting Multiplier"  0 0 100 1
-float HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER / 100;
-
-#pragma parameter HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE     "          Apply Ambient Lighting in ADD Blend Mode"  0 0 1 1
-float HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE;
-
-#pragma parameter HSM_TOP_BLEND_MODE                    "          Blend Mode - OFF | NORMAL | ADD | MULTIPLY"  1 0 3 1
-float HSM_TOP_BLEND_MODE = global.HSM_TOP_BLEND_MODE;
-
-#pragma parameter HSM_TOP_SOURCE_MATTE_TYPE             "          Source Matte Color - BLACK | WHITE | NONE"  0 0 2 1
-float HSM_TOP_SOURCE_MATTE_TYPE = global.HSM_TOP_SOURCE_MATTE_TYPE;
-
-#pragma parameter HSM_TOP_MIPMAPPING_BLEND_BIAS         "          Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1
-float HSM_TOP_MIPMAPPING_BLEND_BIAS = global.HSM_TOP_MIPMAPPING_BLEND_BIAS;
-
-#pragma parameter HSM_TOP_MASK_MODE                     "    Mask - ALL | SCRN | TUBE | BZ- | BZ | BZ+ | FRM | FRM+ | BG"   0 0 8 1
-float HSM_TOP_MASK_MODE = global.HSM_TOP_MASK_MODE;
-
-#pragma parameter HSM_TOP_CUTOUT_MODE                   "          Cutout Mask - OFF | ON | INVERT" 0 0 2 1
-float HSM_TOP_CUTOUT_MODE = global.HSM_TOP_CUTOUT_MODE;
-
-#pragma parameter HSM_TOP_DUALSCREEN_VIS_MODE           "          Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1
-float HSM_TOP_DUALSCREEN_VIS_MODE = global.HSM_TOP_DUALSCREEN_VIS_MODE;
-
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_TOP2_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_TOP_TITLE2			           "[ TOP SCALE & FOLLOW ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_TOP_FOLLOW_LAYER                  "      Follow Layer - FULL | TUBE | BEZEL | BG | DEVICE | DECAL" 0 0 5 1
-float HSM_TOP_FOLLOW_LAYER = global.HSM_TOP_FOLLOW_LAYER;
-
-#pragma parameter HSM_TOP_FOLLOW_MODE                   "          Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 0 0 1 1
-float HSM_TOP_FOLLOW_MODE = global.HSM_TOP_FOLLOW_MODE;
-
-#pragma parameter HSM_TOP_FOLLOW_FULL_USES_ZOOM          "          Follow Full also follows Zoom" 1 0 1 1
-float HSM_TOP_FOLLOW_FULL_USES_ZOOM = global.HSM_TOP_FOLLOW_FULL_USES_ZOOM;
-
-#pragma parameter HSM_TOP_FILL_MODE                     "         Image Fill Mode - KEEP TEXURE ASPECT | SPLIT | STRETCH"  0 0 2 1
-float HSM_TOP_FILL_MODE = global.HSM_TOP_FILL_MODE;
-
-#pragma parameter HSM_TOP_SPLIT_PRESERVE_CENTER       "          Split Mode Preserve Center %"  0 0 500 1
-float HSM_TOP_SPLIT_PRESERVE_CENTER = global.HSM_TOP_SPLIT_PRESERVE_CENTER / 1000;
-
-#pragma parameter HSM_TOP_SPLIT_REPEAT_WIDTH            "          Split Mode Repeat Width %"  0 0 100 1
-float HSM_TOP_SPLIT_REPEAT_WIDTH = global.HSM_TOP_SPLIT_REPEAT_WIDTH / 1000;
-
-#pragma parameter HSM_TOP_SCALE                         "          Scale" 100 0 1000 0.1
-float HSM_TOP_SCALE = global.HSM_TOP_SCALE / 100;
-
-#pragma parameter HSM_TOP_SCALE_X                       "          Scale X" 100 0 1000 0.1
-float HSM_TOP_SCALE_X = global.HSM_TOP_SCALE_X / 100;
-
-#pragma parameter HSM_TOP_POS_X                         "          Position X"  0 -1000 1000 0.05
-float HSM_TOP_POS_X = global.HSM_TOP_POS_X / -100;
-
-#pragma parameter HSM_TOP_POS_Y                         "          Position Y"  0 -1000 1000 0.05
-float HSM_TOP_POS_Y = global.HSM_TOP_POS_Y / 100;
-
-#pragma parameter HSM_TOP_MIRROR_WRAP                   "          Mirror Wrap" 1 0 1 1
-float HSM_TOP_MIRROR_WRAP = global.HSM_TOP_MIRROR_WRAP;
-
-
-//---------------------------------------------------------------------------------------------------
-//    RENDER FOR SIMPLIFIED PRESETS
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_RENDER_FOR_SIMPLIFIED_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_RENDER_FOR_SIMPLIFIED_TITLE       "[ MEGA BEZEL DEV RENDER FOR SIMPLIFIED PRESETS ]:" 0 0 0.001 0.001
-
-#pragma parameter HSM_RENDER_SIMPLE_MODE                "     Mode:  NORM | BLACK-SCREEN | BLACK-BG | PINK-MASK| BW-MASK" 0 0 4 1
-float HSM_RENDER_SIMPLE_MODE = global.HSM_RENDER_SIMPLE_MODE;
-
-#pragma parameter HSM_RENDER_SIMPLE_MASK_TYPE           "      Mask Type:  SCREEN | TUBE | BEZEL & FRAME | BEZEL | FRAME" 0 0 4 1
-float HSM_RENDER_SIMPLE_MASK_TYPE = global.HSM_RENDER_SIMPLE_MASK_TYPE;
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/params-5-intro.inc b/bezel/Mega_Bezel/shaders/base/common/params-5-intro.inc
deleted file mode 100644
index 9ccde1f604..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/params-5-intro.inc
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-//---------------------------------------------------------------------------------------------------
-//    INTRO IMAGE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_INTRO_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_INTRO_IMAGE_TITLE							"[ INTRO SEQUENCE ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_INTRO_WHEN_TO_SHOW     					"          When to Show Intro - OFF|Game Load|Shader Load|Repeat"  1 0 3 1
-#define HSM_INTRO_WHEN_TO_SHOW global.HSM_INTRO_WHEN_TO_SHOW
-
-#pragma parameter HSM_INTRO_SPEED     							"          Speed"  100 1 500 5
-#define HSM_INTRO_SPEED (global.HSM_INTRO_SPEED / 100)
-
-
-#pragma parameter HSM_INTRO_LOGO_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_INTRO_LOGO_TITLE							"[ INTRO LOGO ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_INTRO_LOGO_BLEND_MODE        				"          Logo Blend Mode - OFF | NORM | ADD | MULT"  1 0 3 1
-#define HSM_INTRO_LOGO_BLEND_MODE global.HSM_INTRO_LOGO_BLEND_MODE
-
-// #pragma parameter HSM_INTRO_LOGO_FLIP_VERTICAL        		"          Logo Flip Vertical"  0 0 1 1
-// #define HSM_INTRO_LOGO_FLIP_VERTICAL global.HSM_INTRO_LOGO_FLIP_VERTICAL
-
-#pragma parameter HSM_INTRO_LOGO_OVER_SOLID_COLOR       		"          Logo Over Solid Color - Off | ON"  1 0 1 1
-#define HSM_INTRO_LOGO_OVER_SOLID_COLOR global.HSM_INTRO_LOGO_OVER_SOLID_COLOR
-
-#pragma parameter HSM_INTRO_LOGO_HEIGHT        					"          Logo Height (0 for exact resolution)"  42.86 0 100 1
-#define HSM_INTRO_LOGO_HEIGHT (global.HSM_INTRO_LOGO_HEIGHT / 100)
-
-#pragma parameter HSM_INTRO_LOGO_PLACEMENT        				"          Logo Placement - Middle | TL | TR | BL | BR"  0 0 4 1
-#define HSM_INTRO_LOGO_PLACEMENT global.HSM_INTRO_LOGO_PLACEMENT
-
-#pragma parameter HSM_INTRO_LOGO_POS_X        					"          Logo Pos X"  0 -100 100 0.5
-#define HSM_INTRO_LOGO_POS_X global.HSM_INTRO_LOGO_POS_X / 100
-
-#pragma parameter HSM_INTRO_LOGO_POS_Y        					"          Logo Pos Y"  2 -100 100 0.5
-#define HSM_INTRO_LOGO_POS_Y global.HSM_INTRO_LOGO_POS_Y / 100
-
-// #pragma parameter HSM_INTRO_LOGO_WAIT     					"          Logo Wait Before Start Frames"  20 0 1200 5
-// #define HSM_INTRO_LOGO_WAIT global.HSM_INTRO_LOGO_WAIT
-#define HSM_INTRO_LOGO_WAIT 20
-
-// #pragma parameter HSM_INTRO_LOGO_FADE_IN       				"          Logo Fade In Frames"  20 0 600 5
-// #define HSM_INTRO_LOGO_FADE_IN global.HSM_INTRO_LOGO_FADE_IN
-#define HSM_INTRO_LOGO_FADE_IN 20
-
-// #pragma parameter HSM_INTRO_LOGO_HOLD     					"          Logo Hold Frames"  130 0 600 5
-// #define HSM_INTRO_LOGO_HOLD global.HSM_INTRO_LOGO_HOLD
-#define HSM_INTRO_LOGO_HOLD 130
-
-// #pragma parameter HSM_INTRO_LOGO_FADE_OUT       				"          Logo Fade Out Frames"  80 0 600 5
-// #define HSM_INTRO_LOGO_FADE_OUT global.HSM_INTRO_LOGO_FADE_OUT
-#define HSM_INTRO_LOGO_FADE_OUT 80
-
-
-#pragma parameter HSM_INTRO_SOLID_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_INTRO_LOGO_SOLID_TITLE					"[ INTRO SOLID COLOR ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_INTRO_SOLID_COLOR_BLEND_MODE      		"          Solid Color Blend Mode - OFF | NORM | ADD | MULT"  1 0 3 1
-#define HSM_INTRO_SOLID_COLOR_BLEND_MODE global.HSM_INTRO_SOLID_COLOR_BLEND_MODE
-
-#pragma parameter HSM_INTRO_SOLID_COLOR_HUE     				"          Solid Color Hue"  0 0 360 1
-#define HSM_INTRO_SOLID_COLOR_HUE (global.HSM_INTRO_SOLID_COLOR_HUE / 360)
-
-#pragma parameter HSM_INTRO_SOLID_COLOR_SAT     				"          Solid Color Saturation"  0 0 100 5
-#define HSM_INTRO_SOLID_COLOR_SAT (global.HSM_INTRO_SOLID_COLOR_SAT / 100)
-
-#pragma parameter HSM_INTRO_SOLID_COLOR_VALUE     				"          Solid Color Value"  100 0 100 5
-#define HSM_INTRO_SOLID_COLOR_VALUE (global.HSM_INTRO_SOLID_COLOR_VALUE / 100)
-
-// #pragma parameter HSM_INTRO_SOLID_COLOR_HOLD     			"          Solid Color Hold Frames"  40 0 600 5
-// #define HSM_INTRO_SOLID_COLOR_HOLD global.HSM_INTRO_SOLID_COLOR_HOLD
-#define HSM_INTRO_SOLID_COLOR_HOLD 40
-
-// #pragma parameter HSM_INTRO_SOLID_COLOR_FADE_OUT        		"          Solid Color Fade Out Frames"  40 0 600 5
-// #define HSM_INTRO_SOLID_COLOR_FADE_OUT global.HSM_INTRO_SOLID_COLOR_FADE_OUT
-#define HSM_INTRO_SOLID_COLOR_FADE_OUT 40
-
-
-#pragma parameter HSM_INTRO_NOISE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_INTRO_NOISE_TITLE							"[ INTRO STATIC NOISE ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_INTRO_NOISE_BLEND_MODE        			"          Static Noise Blend Mode - OFF | NORM | ADD | MULT"  1 0 3 1
-#define HSM_INTRO_NOISE_BLEND_MODE global.HSM_INTRO_NOISE_BLEND_MODE
-
-// #pragma parameter HSM_INTRO_NOISE_HOLD     					"          Static Noise Hold Frames"  80 0 600 5
-// #define HSM_INTRO_NOISE_HOLD global.HSM_INTRO_NOISE_HOLD
-#define HSM_INTRO_NOISE_HOLD 80
-
-// #pragma parameter HSM_INTRO_NOISE_FADE_OUT       			"          Static Noise Fade Out Frames"  120 0 600 5
-// #define HSM_INTRO_NOISE_FADE_OUT global.HSM_INTRO_NOISE_FADE_OUT
-#define HSM_INTRO_NOISE_FADE_OUT 120
-
-#pragma parameter HSM_INTRO_SOLID_BLACK_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_INTRO_SOLID_BLACK_TITLE					"[ INTRO SOLID BLACK ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_INTRO_SOLID_BLACK_HOLD     				"          Solid Black Hold Frames"  0 0 600 5
-#define HSM_INTRO_SOLID_BLACK_HOLD global.HSM_INTRO_SOLID_BLACK_HOLD
-
-// #pragma parameter HSM_INTRO_SOLID_BLACK_FADE_OUT       			"          Solid Black Fade Out Frames"  0 0 600 5
-// #define HSM_INTRO_SOLID_BLACK_FADE_OUT global.HSM_INTRO_SOLID_BLACK_FADE_OUT
-#define HSM_INTRO_SOLID_BLACK_FADE_OUT 0
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/common/royale-geometry-functions.inc b/bezel/Mega_Bezel/shaders/base/common/royale-geometry-functions.inc
deleted file mode 100644
index 62a6260170..0000000000
--- a/bezel/Mega_Bezel/shaders/base/common/royale-geometry-functions.inc
+++ /dev/null
@@ -1,812 +0,0 @@
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  royale-geometry-functions, extracted from crt-royale
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  GPL & Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-
-
-////////////////////////////  MACROS AND CONSTANTS  ////////////////////////////
-
-//  Curvature-related constants:
-#define HRG_MAX_POINT_CLOUD_SIZE 9
-
-/////////////////////////////  CURVATURE FUNCTIONS /////////////////////////////
-
-vec2 hrg_quadratic_solve(float a, float b_over_2, float c)
-{
-    //  Requires:   1.) a, b, and c are quadratic formula coefficients
-    //              2.) b_over_2 = b/2.0 (simplifies terms to factor 2 out)
-    //              3.) b_over_2 must be guaranteed < 0 (avoids a branch)
-    //  Returns:    Returns vec2(first_solution, discriminant), so the caller
-    //              can choose how to handle the "no intersection" case.  The
-    //              Kahan or Citardauq formula is used for numerical robustness.
-    float discriminant = b_over_2 * b_over_2 - a * c;
-    float solution0 = c / (-b_over_2 + sqrt(discriminant));
-    return vec2(solution0, discriminant);
-}
-
-vec2 hrg_intersect_sphere(vec3 view_vec, vec3 eye_pos_vec, float in_geom_radius)
-{
-    //  Requires:   1.) view_vec and eye_pos_vec are 3D vectors in the sphere's
-    //                  local coordinate frame (eye_pos_vec is a position, i.e.
-    //                  a vector from the origin to the eye/camera)
-    //              2.) in_geom_radius is a global containing the sphere's radius
-    //  Returns:    Cast a ray of direction view_vec from eye_pos_vec at a
-    //              sphere of radius in_geom_radius, and return the distance to
-    //              the first intersection in units of length(view_vec).
-    //              http://wiki.cgsociety.org/index.php/Ray_Sphere_Intersection
-    //  Quadratic formula coefficients (b_over_2 is guaranteed negative):
-    float a = dot(view_vec, view_vec);
-    float b_over_2 = dot(view_vec, eye_pos_vec);  //  * 2.0 factored out
-    float c = dot(eye_pos_vec, eye_pos_vec) - in_geom_radius * in_geom_radius;
-    return hrg_quadratic_solve(a, b_over_2, c);
-}
-
-vec2 hrg_intersect_cylinder(vec3 view_vec, vec3 eye_pos_vec, float in_geom_radius)
-{
-    //  Requires:   1.) view_vec and eye_pos_vec are 3D vectors in the sphere's
-    //                  local coordinate frame (eye_pos_vec is a position, i.e.
-    //                  a vector from the origin to the eye/camera)
-    //              2.) in_geom_radius is a global containing the cylinder's radius
-    //  Returns:    Cast a ray of direction view_vec from eye_pos_vec at a
-    //              cylinder of radius in_geom_radius, and return the distance to
-    //              the first intersection in units of length(view_vec).  The
-    //              derivation of the coefficients is in Christer Ericson's
-    //              Real-Time Collision Detection, p. 195-196, and this version
-    //              uses LaGrange's identity to reduce operations.
-    //  Arbitrary "cylinder top" reference point for an infinite cylinder:
-    vec3 cylinder_top_vec = vec3(0, in_geom_radius, 0);
-    vec3 cylinder_axis_vec = vec3(0, 1, 0);//vec3(0, 2.0*in_geom_radius, 0);
-    vec3 top_to_eye_vec = eye_pos_vec - cylinder_top_vec;
-    vec3 axis_x_view = cross(cylinder_axis_vec, view_vec);
-    vec3 axis_x_top_to_eye = cross(cylinder_axis_vec, top_to_eye_vec);
-    //  Quadratic formula coefficients (b_over_2 is guaranteed negative):
-    float a = dot(axis_x_view, axis_x_view);
-    float b_over_2 = dot(axis_x_top_to_eye, axis_x_view);
-    float c = dot(axis_x_top_to_eye, axis_x_top_to_eye) - in_geom_radius * in_geom_radius; //*dot(cylinder_axis_vec, cylinder_axis_vec);
-    return hrg_quadratic_solve(a, b_over_2, c);
-}
-
-vec2 hrg_cylinder_xyz_to_uv( vec3 intersection_pos_local, vec2 output_aspect, float in_geom_radius)
-{
-    //  Requires:   An xyz intersection position on a cylinder.
-    //  Returns:    video_uv coords mapped to range [-0.5, 0.5]
-    //  Mapping:    Define square_uv.x to be the signed arc length in xz-space,
-    //              and define square_uv.y = -intersection_pos_local.y (+v = -y).
-    //  Start with a numerically robust arc length calculation.
-    float angle_from_image_center = atan(intersection_pos_local.x, intersection_pos_local.z);
-    float signed_arc_len = angle_from_image_center * in_geom_radius;
-    //  Get a uv-mapping where [-0.5, 0.5] maps to a "square" area, then divide
-    //  by the aspect ratio to stretch the mapping appropriately:
-    vec2 square_uv = vec2(signed_arc_len, -intersection_pos_local.y);
-    vec2 video_uv = square_uv / output_aspect;
-    return video_uv;
-}
-
-vec3 hrg_cylinder_uv_to_xyz(vec2 video_uv, vec2 output_aspect, float in_geom_radius)
-{
-    //  Requires:   video_uv coords mapped to range [-0.5, 0.5]
-    //  Returns:    An xyz intersection position on a cylinder.  This is the
-    //              inverse of hrg_cylinder_xyz_to_uv().
-    //  Expand video_uv by the aspect ratio to get proportionate x/y lengths,
-    //  then calculate an xyz position for the cylindrical mapping above.
-    vec2 square_uv = video_uv * output_aspect;
-    float arc_len = square_uv.x;
-    float angle_from_image_center = arc_len / in_geom_radius;
-    float x_pos = sin(angle_from_image_center) * in_geom_radius;
-    float z_pos = cos(angle_from_image_center) * in_geom_radius;
-    //  Or: z = sqrt(in_geom_radius**2 - x**2)
-    //  Or: z = in_geom_radius/sqrt(1 + tan(angle)**2), x = z * tan(angle)
-    vec3 intersection_pos_local = vec3(x_pos, -square_uv.y, z_pos);
-    return intersection_pos_local;
-}
-
-vec2 hrg_sphere_xyz_to_uv(vec3 intersection_pos_local, vec2 output_aspect, float in_geom_radius)
-{
-    //  Requires:   An xyz intersection position on a sphere.
-    //  Returns:    video_uv coords mapped to range [-0.5, 0.5]
-    //  Mapping:    First define square_uv.x/square_uv.y ==
-    //              intersection_pos_local.x/intersection_pos_local.y.  Then,
-    //              length(square_uv) is the arc length from the image center
-    //              at (0, 0, in_geom_radius) along the tangent great circle.
-    //              Credit for this mapping goes to cgwg: I never managed to
-    //              understand his code, but he told me his mapping was based on
-    //              great circle distances when I asked him about it, which
-    //              informed this very similar (almost identical) mapping.
-    //  Start with a numerically robust arc length calculation between the ray-
-    //  sphere intersection point and the image center using a method posted by
-    //  Roger Stafford on comp.soft-sys.matlab:
-    //  https://groups.google.com/d/msg/comp.soft-sys.matlab/zNbUui3bjcA/c0HV_bHSx9cJ
-    vec3 image_center_pos_local = vec3(0, 0, in_geom_radius);
-    float cp_len =
-        length(cross(intersection_pos_local, image_center_pos_local));
-    float dp = dot(intersection_pos_local, image_center_pos_local);
-    float angle_from_image_center = atan(cp_len, dp);
-    float arc_len = angle_from_image_center * in_geom_radius;
-    //  Get a uv-mapping where [-0.5, 0.5] maps to a "square" area, then divide
-    //  by the aspect ratio to stretch the mapping appropriately:
-    vec2 square_uv_unit = normalize(vec2(intersection_pos_local.x, -intersection_pos_local.y));
-    vec2 square_uv = arc_len * square_uv_unit;
-    vec2 video_uv = square_uv / output_aspect;
-    return video_uv;
-}
-
-vec3 hrg_sphere_uv_to_xyz(vec2 video_uv, vec2 output_aspect, float in_geom_radius)
-{
-    //  Requires:   video_uv coords mapped to range [-0.5, 0.5]
-    //  Returns:    An xyz intersection position on a sphere.  This is the
-    //              inverse of hrg_sphere_xyz_to_uv().
-    //  Expand video_uv by the aspect ratio to get proportionate x/y lengths,
-    //  then calculate an xyz position for the spherical mapping above.
-    vec2 square_uv = video_uv * output_aspect;
-    //  Using length or sqrt here butchers the framerate on my 8800GTS if
-    //  this function is called too many times, and so does taking the max
-    //  component of square_uv/square_uv_unit (program length threshold?).
-    //float arc_len = length(square_uv);
-    vec2 square_uv_unit = normalize(square_uv);
-    float arc_len = square_uv.y/square_uv_unit.y;
-    float angle_from_image_center = arc_len / in_geom_radius;
-    float xy_dist_from_sphere_center = sin(angle_from_image_center) * in_geom_radius;
-    //vec2 xy_pos = xy_dist_from_sphere_center * (square_uv/FIX_ZERO(arc_len));
-    vec2 xy_pos = xy_dist_from_sphere_center * square_uv_unit;
-    float z_pos = cos(angle_from_image_center) * in_geom_radius;
-    vec3 intersection_pos_local = vec3(xy_pos.x, -xy_pos.y, z_pos);
-    return intersection_pos_local;
-}
-
-vec2 hrg_sphere_alt_xyz_to_uv(vec3 intersection_pos_local, vec2 output_aspect, float in_geom_radius)
-{
-    //  Requires:   An xyz intersection position on a cylinder.
-    //  Returns:    video_uv coords mapped to range [-0.5, 0.5]
-    //  Mapping:    Define square_uv.x to be the signed arc length in xz-space,
-    //              and define square_uv.y == signed arc length in yz-space.
-    //  See hrg_cylinder_xyz_to_uv() for implementation details (very similar).
-    vec2 angle_from_image_center = atan( vec2(intersection_pos_local.x, -intersection_pos_local.y),
-                                                intersection_pos_local.zz);
-    vec2 signed_arc_len = angle_from_image_center * in_geom_radius;
-    vec2 video_uv = signed_arc_len / output_aspect;
-    return video_uv;
-}
-
-vec3 hrg_sphere_alt_uv_to_xyz(vec2 video_uv, vec2 output_aspect, float in_geom_radius)
-{
-    //  Requires:   video_uv coords mapped to range [-0.5, 0.5]
-    //  Returns:    An xyz intersection position on a sphere.  This is the
-    //              inverse of hrg_sphere_alt_xyz_to_uv().
-    //  See hrg_cylinder_uv_to_xyz() for implementation details (very similar).
-    vec2 square_uv = video_uv * output_aspect;
-    vec2 arc_len = square_uv;
-    vec2 angle_from_image_center = arc_len / in_geom_radius;
-    vec2 xy_pos = sin(angle_from_image_center) * in_geom_radius;
-    float z_pos = sqrt(in_geom_radius * in_geom_radius - dot(xy_pos, xy_pos));
-    return vec3(xy_pos.x, -xy_pos.y, z_pos);
-}
-
-vec2 hrg_intersect(vec3 view_vec_local, vec3 eye_pos_local, float in_geom_mode, float in_geom_radius)
-{
-    return in_geom_mode < 2.5 ?    hrg_intersect_sphere(view_vec_local, eye_pos_local, in_geom_radius) :
-                                hrg_intersect_cylinder(view_vec_local, eye_pos_local, in_geom_radius);
-}
-
-vec2 hrg_xyz_to_uv( vec3 intersection_pos_local, vec2 output_aspect, float in_geom_mode, float in_geom_radius)
-{
-    return in_geom_mode < 1.5 ?    hrg_sphere_xyz_to_uv(intersection_pos_local, output_aspect, in_geom_radius) :
-                                in_geom_mode < 2.5 ?   hrg_sphere_alt_xyz_to_uv(intersection_pos_local, output_aspect, in_geom_radius) :
-                                                    hrg_cylinder_xyz_to_uv(intersection_pos_local, output_aspect, in_geom_radius);
-}
-
-vec3 hrg_uv_to_xyz(vec2 uv, vec2 output_aspect, float in_geom_mode, float in_geom_radius)
-{
-    return in_geom_mode < 1.5 ? hrg_sphere_uv_to_xyz(uv, output_aspect, in_geom_radius) :
-                             in_geom_mode < 2.5 ? hrg_sphere_alt_uv_to_xyz(uv, output_aspect, in_geom_radius) :
-                                               hrg_cylinder_uv_to_xyz(uv, output_aspect, in_geom_radius);
-}
-
-vec2 hrg_view_vec_to_uv(vec3 view_vec_local, 
-                    vec3 eye_pos_local,
-                    vec2 output_aspect, 
-                    float in_geom_mode,
-                    float in_geom_radius, 
-                    out vec3 intersection_pos)
-{
-    //  Get the intersection point on the primitive, given an eye position
-    //  and view vector already in its local coordinate frame:
-    vec2 intersect_dist_and_discriminant = hrg_intersect(view_vec_local, eye_pos_local, in_geom_mode, in_geom_radius);
-    vec3 intersection_pos_local = eye_pos_local + view_vec_local * intersect_dist_and_discriminant.x;
-    //  Save the intersection position to an output parameter:
-    intersection_pos = intersection_pos_local;
-    //  Transform into uv coords, but give out-of-range coords if the
-    //  view ray doesn't hrg_intersect the primitive in the first place:
-    return intersect_dist_and_discriminant.y > 0.005 ?  hrg_xyz_to_uv(intersection_pos_local, output_aspect, in_geom_mode, in_geom_radius) : 
-                                                        vec2(1);
-}
-
-vec3 hrg_get_ideal_global_eye_pos_for_points(   vec3 eye_pos,
-                                            vec2 output_aspect, 
-                                            vec3 global_coords[HRG_MAX_POINT_CLOUD_SIZE],
-                                            int num_points,
-                                            float in_geom_radius,
-                                            float in_geom_view_dist)
-{
-    //  Requires:   Parameters:
-    //              1.) Starting eye_pos is a global 3D position at which the
-    //                  camera contains all points in global_coords[] in its FOV
-    //              2.) output_aspect = hrg_get_aspect_vector(
-    //                      IN.OutputSize.xy.x / IN.OutputSize.xy.y);
-    //              3.) global_coords is a point cloud containing global xyz
-    //                  coords of extreme points on the simulated CRT screen.
-    //              Globals:
-    //              1.) in_geom_view_dist must be > 0.  It controls the "near
-    //                  plane" used to interpret flat_video_uv as a view
-    //                  vector, which controls the field of view (FOV).
-    //              Eyespace coordinate frame: +x = right, +y = up, +z = back
-    //  Returns:    Return an eye position at which the point cloud spans as
-    //              much of the screen as possible (given the FOV controlled by
-    //              in_geom_view_dist) without being cropped or sheared.
-    //  Algorithm:
-    //  1.) Move the eye laterally to a point which attempts to maximize the
-    //      the amount we can move forward without clipping the CRT screen.
-    //  2.) Move forward by as much as possible without clipping the CRT.
-    //  Get the allowed movement range by solving for the eye_pos offsets
-    //  that result in each point being projected to a screen edge/corner in
-    //  pseudo-normalized device coords (where xy ranges from [-0.5, 0.5]
-    //  and z = eyespace z):
-    //      pndc_coord = vec3(vec2(eyespace_xyz.x, -eyespace_xyz.y)*
-    //      in_geom_view_dist / (output_aspect * -eyespace_xyz.z), eyespace_xyz.z);
-    //  Notes:
-    //  The field of view is controlled by in_geom_view_dist's magnitude relative to
-    //  the view vector's x and y components:
-    //      view_vec.xy ranges from [-0.5, 0.5] * output_aspect
-    //      view_vec.z = -in_geom_view_dist
-    //  But for the purposes of perspective divide, it should be considered:
-    //      view_vec.xy ranges from [-0.5, 0.5] * output_aspect / in_geom_view_dist
-    //      view_vec.z = -1
-    int max_centering_iters = 1;  //  Keep for easy testing.
-    for(int iter = 0; iter < max_centering_iters; iter++)
-    {
-        //  0.) Get the eyespace coordinates of our point cloud:
-        vec3 eyespace_coords[HRG_MAX_POINT_CLOUD_SIZE];
-        for(int i = 0; i < num_points; i++)
-        {
-            eyespace_coords[i] = global_coords[i] - eye_pos;
-        }
-        //  1a.)For each point, find out how far we can move eye_pos in each
-        //      lateral direction without the point clipping the frustum.
-        //      Eyespace +y = up, screenspace +y = down, so flip y after
-        //      applying the eyespace offset (on the way to "clip space").
-        //  Solve for two offsets per point based on:
-        //      (eyespace_xyz.xy - offset_dr) * vec2(1, -1) *
-        //      in_geom_view_dist / (output_aspect * -eyespace_xyz.z) = vec2(-0.5)
-        //      (eyespace_xyz.xy - offset_dr) * vec2(1, -1) *
-        //      in_geom_view_dist / (output_aspect * -eyespace_xyz.z) = vec2(0.5)
-        //  offset_ul and offset_dr represent the farthest we can move the
-        //  eye_pos up-left and down-right.  Save the min of all offset_dr's
-        //  and the max of all offset_ul's (since it's negative).
-        float abs_radius = abs(in_geom_radius);  //  In case anyone gets ideas. ;)
-        vec2 offset_dr_min = vec2(10.0 * abs_radius, 10.0 * abs_radius);
-        vec2 offset_ul_max = vec2(-10.0 * abs_radius, -10.0 * abs_radius);
-        for(int i = 0; i < num_points; i++)
-        {
-            vec2 flipy = vec2(1, -1);
-            vec3 eyespace_xyz = eyespace_coords[i];
-            vec2 offset_dr = eyespace_xyz.xy - vec2(-0.5) *
-                            (output_aspect * -eyespace_xyz.z) / 
-                            (in_geom_view_dist * flipy);
-            vec2 offset_ul = eyespace_xyz.xy - vec2(0.5) *
-                            (output_aspect * -eyespace_xyz.z) / 
-                            (in_geom_view_dist * flipy);
-            offset_dr_min = min(offset_dr_min, offset_dr);
-            offset_ul_max = max(offset_ul_max, offset_ul);
-        }
-        //  1b.)Update eye_pos: Adding the average of offset_ul_max and
-        //      offset_dr_min gives it equal leeway on the top vs. bottom
-        //      and left vs. right.  Recalculate eyespace_coords accordingly.
-        vec2 center_offset = 0.5 * (offset_ul_max + offset_dr_min);
-        eye_pos.xy += center_offset;
-        for(int i = 0; i < num_points; i++)
-        {
-            eyespace_coords[i] = global_coords[i] - eye_pos;
-        }
-        //  2a.)For each point, find out how far we can move eye_pos forward
-        //      without the point clipping the frustum.  Flip the y
-        //      direction in advance (matters for a later step, not here).
-        //      Solve for four offsets per point based on:
-        //      eyespace_xyz_flipy.x * in_geom_view_dist /
-        //          (output_aspect.x * (offset_z - eyespace_xyz_flipy.z)) =-0.5
-        //      eyespace_xyz_flipy.y * in_geom_view_dist /
-        //          (output_aspect.y * (offset_z - eyespace_xyz_flipy.z)) =-0.5
-        //      eyespace_xyz_flipy.x * in_geom_view_dist /
-        //          (output_aspect.x * (offset_z - eyespace_xyz_flipy.z)) = 0.5
-        //      eyespace_xyz_flipy.y * in_geom_view_dist /
-        //          (output_aspect.y * (offset_z - eyespace_xyz_flipy.z)) = 0.5
-        //      We'll vectorize the actual computation.  Take the maximum of
-        //      these four for a single offset, and continue taking the max
-        //      for every point (use max because offset.z is negative).
-        float offset_z_max = -10.0 * in_geom_radius * in_geom_view_dist;
-        for(int i = 0; i < num_points; i++)
-        {
-            vec3 eyespace_xyz_flipy = eyespace_coords[i] * vec3(1, -1, 1);
-            vec4 offset_zzzz = eyespace_xyz_flipy.zzzz +  
-                                (eyespace_xyz_flipy.xyxy * in_geom_view_dist) /
-                                (vec4(-0.5, -0.5, 0.5, 0.5) * vec4(output_aspect, output_aspect));
-            //  Ignore offsets that push positive x/y values to opposite
-            //  boundaries, and vice versa, and don't let the camera move
-            //  past a point in the dead center of the screen:
-            offset_z_max = (eyespace_xyz_flipy.x < 0) ? max(offset_z_max, offset_zzzz.x) : offset_z_max;
-            offset_z_max = (eyespace_xyz_flipy.y < 0) ? max(offset_z_max, offset_zzzz.y) : offset_z_max;
-            offset_z_max = (eyespace_xyz_flipy.x > 0) ? max(offset_z_max, offset_zzzz.z) : offset_z_max;
-            offset_z_max = (eyespace_xyz_flipy.y > 0) ? max(offset_z_max, offset_zzzz.w) : offset_z_max;
-            offset_z_max = max(offset_z_max, eyespace_xyz_flipy.z);
-        }
-        //  2b.)Update eye_pos: Add the maximum (smallest negative) z offset.
-        eye_pos.z += offset_z_max;
-    }
-    return eye_pos;
-}
-
-vec3 hrg_get_ideal_global_eye_pos(  mat3x3 local_to_global,
-                                    vec2 output_aspect, 
-                                    float in_geom_mode, 
-                                    float in_geom_radius, 
-                                    float in_geom_view_dist)
-{
-    //  Start with an initial eye_pos that includes the entire primitive
-    //  (sphere or cylinder) in its field-of-view:
-    vec3 high_view = vec3(0, output_aspect.y, -in_geom_view_dist);
-    vec3 low_view = high_view * vec3(1, -1, 1);
-    float len_sq = dot(high_view, high_view);
-    float fov = abs(acos(dot(high_view, low_view)/len_sq));
-    //  Trigonometry/similar triangles say distance = in_geom_radius/sin(fov/2):
-    float eye_z_spherical = in_geom_radius / sin(fov*0.5);
-    vec3 eye_pos = in_geom_mode < 2.5 ?  vec3(0, 0, eye_z_spherical) :
-                                            vec3(0, 0, max(in_geom_view_dist, eye_z_spherical));
-
-    //  Get global xyz coords of extreme sample points on the simulated CRT
-    //  screen.  Start with the center, edge centers, and corners of the
-    //  video image.  We can't ignore backfacing points: They're occluded
-    //  by closer points on the primitive, but they may NOT be occluded by
-    //  the convex hull of the remaining samples (i.e. the remaining convex
-    //  hull might not envelope points that do occlude a back-facing point.)
-    int num_points = HRG_MAX_POINT_CLOUD_SIZE;
-    vec3 global_coords[HRG_MAX_POINT_CLOUD_SIZE];
-    global_coords[0] = hrg_uv_to_xyz(vec2(0,     0),   output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[1] = hrg_uv_to_xyz(vec2(0,    -0.5), output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[2] = hrg_uv_to_xyz(vec2(0,     0.5), output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[3] = hrg_uv_to_xyz(vec2(-0.5,  0),   output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[4] = hrg_uv_to_xyz(vec2(0.5,   0),   output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[5] = hrg_uv_to_xyz(vec2(-0.5, -0.5), output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[6] = hrg_uv_to_xyz(vec2(0.5,  -0.5), output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[7] = hrg_uv_to_xyz(vec2(-0.5,  0.5), output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    global_coords[8] = hrg_uv_to_xyz(vec2(0.5,   0.5), output_aspect, in_geom_mode, in_geom_radius) * local_to_global;
-    //  Adding more inner image points could help in extreme cases, but too many
-    //  points will kille the framerate.  For safety, default to the initial
-    //  eye_pos if any z coords are negative:
-    float num_negative_z_coords = 0;
-    for(int i = 0; i < num_points; i++)
-    {
-        num_negative_z_coords += float(global_coords[0].z < 0);
-    }
-    //  Outsource the optimized eye_pos calculation:
-    return num_negative_z_coords > 0.5 ?    eye_pos :
-                                            hrg_get_ideal_global_eye_pos_for_points(eye_pos, 
-                                                                                    output_aspect,
-                                                                                    global_coords, 
-                                                                                    num_points, 
-                                                                                    in_geom_radius, 
-                                                                                    in_geom_view_dist);
-}
-
-mat3x3 hrg_get_pixel_to_object_matrix(  mat3x3 global_to_local,
-                                    vec3 eye_pos_local, 
-                                    vec3 view_vec_global,
-                                    vec3 intersection_pos_local, 
-                                    vec3 normal,
-                                    vec2 output_pixel_size)
-{
-    //  Requires:   See hrg_get_curved_video_uv_coords_and_tangent_matrix for
-    //              descriptions of each parameter.
-    //  Returns:    Return a transformation matrix from 2D pixel-space vectors
-    //              (where (+1, +1) is a vector to one pixel down-right,
-    //              i.e. same directionality as uv texels) to 3D object-space
-    //              vectors in the CRT's local coordinate frame (right-handed)
-    //              ***which are tangent to the CRT surface at the intersection
-    //              position.***  (Basically, we want to convert pixel-space
-    //              vectors to 3D vectors along the CRT's surface, for later
-    //              conversion to uv vectors.)
-    //  Shorthand inputs:
-    vec3 pos = intersection_pos_local;
-    vec3 eye_pos = eye_pos_local;
-    //  Get a piecewise-linear matrix transforming from "pixelspace" offset
-    //  vectors (1 = one pixel) to object space vectors in the tangent
-    //  plane (faster than finding 3 view-object intersections).
-    //  1.) Get the local view vecs for the pixels to the right and down:
-    vec3 view_vec_right_global =  view_vec_global + vec3(output_pixel_size.x, 0, 0);
-    vec3 view_vec_down_global =   view_vec_global + vec3(0, -output_pixel_size.y, 0);
-    vec3 view_vec_right_local =   view_vec_right_global * global_to_local;
-    vec3 view_vec_down_local =    view_vec_down_global * global_to_local;
-    //  2.) Using the true intersection point, hrg_intersect the neighboring
-    //      view vectors with the tangent plane:
-    vec3 intersection_vec_dot_normal = vec3(dot(pos - eye_pos, normal));
-    vec3 right_pos =    eye_pos + 
-                        (intersection_vec_dot_normal / dot(view_vec_right_local, normal)) *
-                        view_vec_right_local;
-    vec3 down_pos =     eye_pos + 
-                        (intersection_vec_dot_normal / dot(view_vec_down_local, normal)) * 
-                        view_vec_down_local;
-    //  3.) Subtract the original intersection pos from its neighbors; the
-    //      resulting vectors are object-space vectors tangent to the plane.
-    //      These vectors are the object-space transformations of (1, 0)
-    //      and (0, 1) pixel offsets, so they form the first two basis
-    //      vectors of a pixelspace to object space transformation.  This
-    //      transformation is 2D to 3D, so use (0, 0, 0) for the third vector.
-    vec3 object_right_vec = right_pos - pos;
-    vec3 object_down_vec = down_pos - pos;
-    mat3x3 pixel_to_object = mat3x3(
-                                    object_right_vec.x, object_down_vec.x, 0,
-                                    object_right_vec.y, object_down_vec.y, 0,
-                                    object_right_vec.z, object_down_vec.z, 0
-                                    );
-    return pixel_to_object;
-}
-
-mat3x3 hrg_get_object_to_tangent_matrix(vec3 intersection_pos_local,
-                                    vec3 normal, 
-                                    vec2 output_aspect, 
-                                    float in_geom_mode)
-{
-    //  Requires:   See hrg_get_curved_video_uv_coords_and_tangent_matrix for
-    //              descriptions of each parameter.
-    //  Returns:    Return a transformation matrix from 3D object-space vectors
-    //              in the CRT's local coordinate frame (right-handed, +y = up)
-    //              to 2D video_uv vectors (+v = down).
-    //  Description:
-    //  The TBN matrix formed by the [tangent, bitangent, normal] basis
-    //  vectors transforms ordinary vectors from tangent->object space.
-    //  The cotangent matrix formed by the [cotangent, cobitangent, normal]
-    //  basis vectors transforms normal vectors (covectors) from
-    //  tangent->object space.  It's the inverse-transpose of the TBN matrix.
-    //  We want the inverse of the TBN matrix (transpose of the cotangent
-    //  matrix), which transforms ordinary vectors from object->tangent space.
-    //  Start by calculating the relevant basis vectors in accordance with
-    //  Christian Schüler's blog post "Followup: Normal Mapping Without
-    //  Precomputed Tangents":  http://www.thetenthplanet.de/archives/1180
-    //  With our particular uv mapping, the scale of the u and v directions
-    //  is determined entirely by the aspect ratio for cylindrical and ordinary
-    //  spherical mappings, and so tangent and bitangent lengths are also
-    //  determined by it (the alternate mapping is more complex).  Therefore, we
-    //  must ensure appropriate cotangent and cobitangent lengths as well.
-    //  Base these off the uv<=>xyz mappings for each primitive.
-    vec3 pos = intersection_pos_local;
-    vec3 x_vec = vec3(1, 0, 0);
-    vec3 y_vec = vec3(0, 1, 0);
-    //  The tangent and bitangent vectors correspond with increasing u and v,
-    //  respectively.  Mathematically we'd base the cotangent/cobitangent on
-    //  those, but we'll compute the cotangent/cobitangent directly when we can.
-    vec3 cotangent_unscaled;
-    vec3 cobitangent_unscaled;
-    //  in_geom_mode should be constant-folded without RUNTIME_GEOMETRY_MODE.
-    if(in_geom_mode < 1.5)
-    {
-        //  Sphere:
-        //  tangent = normalize(cross(normal, cross(x_vec, pos))) * output_aspect.x
-        //  bitangent = normalize(cross(cross(y_vec, pos), normal)) * output_aspect.y
-        //  inv_determinant = 1/length(cross(bitangent, tangent))
-        //  cotangent = cross(normal, bitangent) * inv_determinant
-        //            == normalize(cross(y_vec, pos)) * output_aspect.y * inv_determinant
-        //  cobitangent = cross(tangent, normal) * inv_determinant
-        //            == normalize(cross(x_vec, pos)) * output_aspect.x * inv_determinant
-        //  Simplified (scale by inv_determinant below):
-        cotangent_unscaled = normalize(cross(y_vec, pos)) * output_aspect.y;
-        cobitangent_unscaled = normalize(cross(x_vec, pos)) * output_aspect.x;
-    }
-    else if(in_geom_mode < 2.5)
-    {
-        //  Sphere, alternate mapping:
-        //  This mapping works a bit like the cylindrical mapping in two
-        //  directions, which makes the lengths and directions more complex.
-        //  Unfortunately, I can't find much of a shortcut:
-        vec3 tangent = normalize(cross(y_vec, vec3(pos.x, 0, pos.z))) * output_aspect.x;
-        vec3 bitangent = normalize(cross(x_vec, vec3(0, pos.yz))) * output_aspect.y;
-        cotangent_unscaled = cross(normal, bitangent);
-        cobitangent_unscaled = cross(tangent, normal);
-    }
-    else
-    {
-        //  Cylinder:
-        //  tangent = normalize(cross(y_vec, normal)) * output_aspect.x;
-        //  bitangent = vec3(0, -output_aspect.y, 0);
-        //  inv_determinant = 1/length(cross(bitangent, tangent))
-        //  cotangent = cross(normal, bitangent) * inv_determinant
-        //            == normalize(cross(y_vec, pos)) * output_aspect.y * inv_determinant
-        //  cobitangent = cross(tangent, normal) * inv_determinant
-        //            == vec3(0, -output_aspect.x, 0) * inv_determinant
-        cotangent_unscaled = cross(y_vec, normal) * output_aspect.y;
-        cobitangent_unscaled = vec3(0, -output_aspect.x, 0);
-    }
-    vec3 computed_normal = cross(cobitangent_unscaled, cotangent_unscaled);
-    float inv_determinant = inversesqrt(dot(computed_normal, computed_normal));
-    vec3 cotangent = cotangent_unscaled * inv_determinant;
-    vec3 cobitangent = cobitangent_unscaled * inv_determinant;
-    //  The [cotangent, cobitangent, normal] column vecs form the cotangent
-    //  frame, i.e. the inverse-transpose TBN matrix.  Get its transpose:
-    mat3x3 object_to_tangent = mat3x3(  cotangent, 
-                                        cobitangent, 
-                                        normal);
-    return object_to_tangent;
-}
-
-vec2 hrg_get_curved_video_uv_coords_and_tangent_matrix( vec2 flat_video_uv, 
-                                                    vec3 eye_pos_local,
-                                                    vec2 output_pixel_size, 
-                                                    vec2 output_aspect,
-                                                    float in_geom_mode, 
-                                                    float in_geom_radius, 
-                                                    float in_geom_view_dist,
-                                                    mat3x3 global_to_local,
-                                                    out mat2x2 pixel_to_tangent_video_uv)
-{
-    //  Requires:   Parameters:
-    //              1.) flat_video_uv coords are in range [0, 1], where
-    //                  (0, 0) is the top-left corner of the screen and
-    //                  (1, 1) is the bottom-right corner.
-    //              2.) eye_pos_local is the 3D camera position in the simulated
-    //                  CRT's local coordinate frame.  For best results, it must
-    //                  be computed based on the same in_geom_view_dist used here.
-    //              3.) output_pixel_size = vec2(1)/IN.OutputSize.xy
-    //              4.) output_aspect = hrg_get_aspect_vector(
-    //                      IN.OutputSize.xy.x / IN.OutputSize.xy.y);
-    //              5.) in_geom_mode is a static or runtime mode setting:
-    //                  0 = off, 1 = sphere, 2 = sphere alt., 3 = cylinder
-    //              6.) global_to_local is a 3x3 matrix transforming (ordinary)
-    //                  worldspace vectors to the CRT's local coordinate frame
-    //              Globals:
-    //              1.) in_geom_view_dist must be > 0.  It controls the "near
-    //                  plane" used to interpret flat_video_uv as a view
-    //                  vector, which controls the field of view (FOV).
-    //  Returns:    Return final uv coords in [0, 1], and return a pixel-
-    //              space to video_uv tangent-space matrix in the out parameter.
-    //              (This matrix assumes pixel-space +y = down, like +v = down.)
-    //              We'll transform flat_video_uv into a view vector, project
-    //              the view vector from the camera/eye, hrg_intersect with a sphere
-    //              or cylinder representing the simulated CRT, and convert the
-    //              intersection position into final uv coords and a local
-    //              transformation matrix.
-    //  First get the 3D view vector (output_aspect and in_geom_view_dist are globals):
-    //  1.) Center uv around (0, 0) and make (-0.5, -0.5) and (0.5, 0.5)
-    //      correspond to the top-left/bottom-right output screen corners.
-    //  2.) Multiply by output_aspect to preemptively "undo" Retroarch's screen-
-    //      space 2D aspect correction.  We'll reapply it in uv-space.
-    //  3.) (x, y) = (u, -v), because +v is down in 2D screenspace, but +y
-    //      is up in 3D worldspace (enforce a right-handed system).
-    //  4.) The view vector z controls the "near plane" distance and FOV.
-    //      For the effect of "looking through a window" at a CRT, it should be
-    //      set equal to the user's distance from their physical screen, in
-    //      units of the viewport's physical diagonal size.
-    vec2 view_uv = (flat_video_uv - vec2(0.5)) * output_aspect;
-    vec3 view_vec_global = vec3(view_uv.x, -view_uv.y, -in_geom_view_dist);
-    //  Transform the view vector into the CRT's local coordinate frame, convert
-    //  to video_uv coords, and get the local 3D intersection position:
-    vec3 view_vec_local = view_vec_global * global_to_local;
-    vec3 pos;
-    vec2 centered_uv = hrg_view_vec_to_uv(  view_vec_local, 
-                                        eye_pos_local, 
-                                        output_aspect, 
-                                        in_geom_mode, 
-                                        in_geom_radius, 
-                                        pos);
-    vec2 video_uv = centered_uv + vec2(0.5);
-    //  Get a pixel-to-tangent-video-uv matrix.  The caller could deal with
-    //  all but one of these cases, but that would be more complicated.
-    //#ifdef DRIVERS_ALLOW_DERIVATIVES
-        //  Derivatives obtain a matrix very fast, but the direction of pixel-
-        //  space +y seems to depend on the pass.  Enforce the correct direction
-        //  on a best-effort basis (but it shouldn't matter for antialiasing).
-        // vec2 duv_dx = dFdx(video_uv);
-        // vec2 duv_dy = dFdy(video_uv);
-        // // #ifdef LAST_PASS
-        //     pixel_to_tangent_video_uv = mat2x2(    duv_dx.x,   duv_dy.x,
-        //                                             -duv_dx.y,  -duv_dy.y);
-    //     #else
-    //         pixel_to_tangent_video_uv = mat2x2(   duv_dx.x,   duv_dy.x,
-    //                                                 duv_dx.y,   duv_dy.y);
-    //     #endif
-    // #else
-        //  Manually define a transformation matrix.  We'll assume pixel-space
-        //  +y = down, just like +v = down.
-        bool geom_force_correct_tangent_matrix = true;
-        if(geom_force_correct_tangent_matrix)
-        {
-            //  Get the surface normal based on the local intersection position:
-            vec3 normal_base = in_geom_mode < 2.5 ?    pos :
-                                                    vec3(pos.x, 0, pos.z);
-            vec3 normal = normalize(normal_base);
-            //  Get pixel-to-object and object-to-tangent matrices and combine
-            //  them into a 2x2 pixel-to-tangent matrix for video_uv offsets:
-            mat3x3 pixel_to_object = hrg_get_pixel_to_object_matrix(global_to_local, 
-                                                                eye_pos_local, 
-                                                                view_vec_global, 
-                                                                pos, 
-                                                                normal,
-                                                                output_pixel_size);
-            mat3x3 object_to_tangent = hrg_get_object_to_tangent_matrix(pos, normal, output_aspect, in_geom_mode);
-            mat3x3 pixel_to_tangent3x3 = pixel_to_object * object_to_tangent;
-            pixel_to_tangent_video_uv = mat2x2(   pixel_to_tangent3x3[0][0], pixel_to_tangent3x3[0][1], 
-                                                    pixel_to_tangent3x3[1][0], pixel_to_tangent3x3[1][1]);//._m00_m01_m10_m11);
-        }
-        else
-        {
-            //  Ignore curvature, and just consider flat scaling.  The
-            //  difference is only apparent with strong curvature:
-            pixel_to_tangent_video_uv = mat2x2(   output_pixel_size.x,    0, 
-                                                    0,                      output_pixel_size.y);
-        }
-    //#endif
-    return video_uv;
-}
-
-float HRG_GetBorderDimFactor(vec2 video_uv, vec2 output_aspect, float in_border_size, float in_border_darkness, float in_border_compress)
-{
-    //  COPYRIGHT NOTE FOR THIS FUNCTION:
-    //  Copyright (C) 2010-2012 cgwg, 2014 TroggleMonkey
-    //  This function uses an algorithm first coded in several of cgwg's GPL-
-    //  licensed lines in crt-geom-curved.cg and its ancestors.
-
-    //  Calculate border_dim_factor from the proximity to uv-space image
-    //  borders; output_aspect/in_border_size/border/darkness/in_border_compress are globals:
-    vec2 edge_dists = min(video_uv, vec2(1) - video_uv) * output_aspect;
-    vec2 border_penetration = max(vec2(in_border_size) - edge_dists, vec2(0));
-    float penetration_ratio = length(border_penetration)/in_border_size;
-    float border_escape_ratio = max(1 - penetration_ratio, 0);
-    float border_dim_factor = pow(border_escape_ratio, in_border_darkness) * max(1, in_border_compress);
-    return min(border_dim_factor, 1);
-}
-
-//  Provide accessors for vector constants that pack scalar uniforms:
-vec2 hrg_get_aspect_vector(float geom_aspect_ratio)
-{
-    //  Get an aspect ratio vector.  Enforce geom_max_aspect_ratio, and prevent
-    //  the absolute scale from affecting the uv-mapping for curvature:
-    float geom_max_aspect_ratio = 4/3;
-    float geom_clamped_aspect_ratio = min(geom_aspect_ratio, geom_max_aspect_ratio);
-    vec2 output_aspect = normalize(vec2(geom_clamped_aspect_ratio, 1));
-    return output_aspect;
-}
-
-vec2 HRG_GetGeomCurvedCoord(    vec2 in_coord, 
-                                float in_geom_mode, 
-                                float in_geom_radius, 
-                                float in_geom_view_dist,
-                                float in_geom_tilt_angle_x, 
-                                float in_geom_tilt_angle_y,
-                                float in_screen_aspect,
-                                float pin_inner_edge,
-                                vec2 in_source_size,
-                                vec2 in_output_size,
-                                out mat2x2 pixel_to_video_uv)
-{
-    vec2 output_pixel_size = vec2(1.0, 1.0) / in_output_size;
-
-    float geom_radius_scaled = in_geom_radius;
-
-    vec2 output_aspect = hrg_get_aspect_vector(in_screen_aspect);
-
-    //  Create a local-to-global rotation matrix for the CRT's coordinate
-    //  frame and its global-to-local inverse.  Rotate around the x axis
-    //  first (pitch) and then the y axis (yaw) with yucky Euler angles.
-    //  Positive angles go clockwise around the right-vec and up-vec.
-    vec2 geom_tilt_angle = vec2(in_geom_tilt_angle_x, in_geom_tilt_angle_y);
-    vec2 sin_tilt = sin(geom_tilt_angle);
-    vec2 cos_tilt = cos(geom_tilt_angle);
-
-    //  Conceptual breakdown:
-    mat3x3 rot_x_matrix = mat3x3(   1,              0,              0,
-                                    0,              cos_tilt.y,     -sin_tilt.y,
-                                    0,              sin_tilt.y,     cos_tilt.y);
-                                
-    mat3x3 rot_y_matrix = mat3x3(   cos_tilt.x,     0,              sin_tilt.x,
-                                    0,              1,              0,
-                                    -sin_tilt.x,    0,              cos_tilt.x);
-
-    mat3x3 local_to_global = rot_x_matrix * rot_y_matrix;
-    //  This is a pure rotation, so transpose = inverse:
-    mat3x3 global_to_local = transpose(local_to_global);
-
-    //  Get an optimal eye position based on in_geom_view_dist, viewport_aspect,
-    //  and CRT radius/rotation:
-    vec3 eye_pos_global = hrg_get_ideal_global_eye_pos( local_to_global, 
-                                                        output_aspect, 
-                                                        in_geom_mode, 
-                                                        geom_radius_scaled, 
-                                                        in_geom_view_dist);
-    vec3 eye_pos_local = eye_pos_global * global_to_local;
-
-
-    vec2 curved_coord;
-
-    if(in_geom_mode > 0.5)
-    {
-        // Put in a test for the projection with a flat plane to compare 
-        // with the distorted coordinate to scale out to the edges of the flat plane
-        // Also helps with cyndrilical projection where the sides shift in towards the center
-        vec2 ctr_curved_coord =  hrg_get_curved_video_uv_coords_and_tangent_matrix( in_coord,
-                                                                                        eye_pos_local, 
-                                                                                        output_pixel_size, 
-                                                                                        output_aspect,
-                                                                                        in_geom_mode, 
-                                                                                        geom_radius_scaled,
-                                                                                        in_geom_view_dist,
-                                                                                        global_to_local, 
-                                                                                        pixel_to_video_uv) - 0.5;
-
-        // Curvature can cause the screen to shrink so we want to scale it back out so it is the same width & height
-        // Especially helps with cylindrical projection which shrinks a lot 
-        // Right Edge should end up at 1, we scale it back out so it hits 1
-        // Only do this when not using tilt so we don't mess up what the perspective is doing
-        if (in_geom_tilt_angle_x == 0 && in_geom_tilt_angle_y == 0)
-        {
-            vec2 right_edge_curved_ctr_coord =  hrg_get_curved_video_uv_coords_and_tangent_matrix(vec2(1, 0.5),
-                                                                                            eye_pos_local, 
-                                                                                            output_pixel_size, 
-                                                                                            output_aspect,
-                                                                                            in_geom_mode, 
-                                                                                            geom_radius_scaled,
-                                                                                            in_geom_view_dist,
-                                                                                            global_to_local, 
-                                                                                            pixel_to_video_uv) - 0.5;
-
-            vec2 bottom_edge_curved_ctr_coord =  hrg_get_curved_video_uv_coords_and_tangent_matrix(vec2(0.5, 1),
-                                                                                            eye_pos_local, 
-                                                                                            output_pixel_size, 
-                                                                                            output_aspect,
-                                                                                            in_geom_mode, 
-                                                                                            geom_radius_scaled,
-                                                                                            in_geom_view_dist,
-                                                                                            global_to_local, 
-                                                                                            pixel_to_video_uv) - 0.5;
-
-            ctr_curved_coord.x = ctr_curved_coord.x * 0.5 / right_edge_curved_ctr_coord.x;
-            ctr_curved_coord.y = ctr_curved_coord.y * 0.5 / bottom_edge_curved_ctr_coord.y;
-        }
-        if (pin_inner_edge == 1)
-        {
-            if (in_geom_tilt_angle_y != 0)
-            {
-                vec2 top_edge_curved_ctr_coord =  hrg_get_curved_video_uv_coords_and_tangent_matrix(vec2(0.5, 0),
-                                                                                                    eye_pos_local, 
-                                                                                                    output_pixel_size, 
-                                                                                                    output_aspect,
-                                                                                                    in_geom_mode, 
-                                                                                                    geom_radius_scaled,
-                                                                                                    in_geom_view_dist,
-                                                                                                    global_to_local, 
-                                                                                                    pixel_to_video_uv);
-                ctr_curved_coord.y = ctr_curved_coord.y - top_edge_curved_ctr_coord.y;
-            }
-            if (in_geom_tilt_angle_x != 0)
-            {
-                vec2 left_edge_curved_ctr_coord =  hrg_get_curved_video_uv_coords_and_tangent_matrix(vec2(0, 0.5),
-                                                                                                    eye_pos_local, 
-                                                                                                    output_pixel_size, 
-                                                                                                    output_aspect,
-                                                                                                    in_geom_mode, 
-                                                                                                    geom_radius_scaled,
-                                                                                                    in_geom_view_dist,
-                                                                                                    global_to_local, 
-                                                                                                    pixel_to_video_uv);
-                ctr_curved_coord.x = ctr_curved_coord.x - left_edge_curved_ctr_coord.x;
-            }
-        }
-
-        curved_coord = ctr_curved_coord + 0.5;
-    }
-    else
-    {
-        curved_coord = in_coord;
-        pixel_to_video_uv = mat2x2( output_pixel_size.x,    0, 
-                                    0,                      output_pixel_size.y);
-    }
-
-    return curved_coord;
-}
-
-
diff --git a/bezel/Mega_Bezel/shaders/base/delinearize.slang b/bezel/Mega_Bezel/shaders/base/delinearize.slang
deleted file mode 100644
index 301eb27fc8..0000000000
--- a/bezel/Mega_Bezel/shaders/base/delinearize.slang
+++ /dev/null
@@ -1,48 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "common/globals-and-screen-scale-params.inc"
-#include "common/common-functions.inc"
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = HSM_Delinearize(texture(Source, vTexCoord), HSM_GAMMA_OUT_CRT);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/intro-potato.slang b/bezel/Mega_Bezel/shaders/base/intro-potato.slang
deleted file mode 100644
index c965909de0..0000000000
--- a/bezel/Mega_Bezel/shaders/base/intro-potato.slang
+++ /dev/null
@@ -1,9 +0,0 @@
-#version 450
-
-#define IS_POTATO_PRESET
-
-#include "common/globals-and-screen-scale-params.inc"
-#include "common/helper-functions.inc"
-#include "common/base-functions.inc"
-#include "common/params-5-intro.inc"
-#include "intro.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/intro.inc b/bezel/Mega_Bezel/shaders/base/intro.inc
deleted file mode 100644
index 23eff99873..0000000000
--- a/bezel/Mega_Bezel/shaders/base/intro.inc
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-// Import so all the mega bezel parameters are the first in the parameter list
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#ifndef IS_POTATO_PRESET
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-layout(set = 0, binding = 4) uniform sampler2D OriginalHistory2;
-layout(set = 0, binding = 5) uniform sampler2D OriginalHistory3;
-layout(set = 0, binding = 7) uniform sampler2D IntroImage;
-#endif
-
-layout(set = 0, binding = 8) uniform sampler2D InfoCachePass;
-
-layout(set = 0, binding = 10) uniform sampler2D TextPass;
-
-#define eps 1e-3
-
-#ifndef IS_POTATO_PRESET
-vec4 AntiFlicker(vec2 in_coord, vec4 current)
-{
-	// sample the textures
-	vec4 prev1 = texture(OriginalHistory1, in_coord);
-	vec4 prev2 = texture(OriginalHistory2, in_coord);
-	vec4 prev3 = texture(OriginalHistory3, in_coord);
-	
-	// get luma for comparison
-	float cur_lum = dot(current.rgb, vec3(0.2125, 0.7154, 0.0721));
-	float prev1_lum = dot(prev1.rgb, vec3(0.2125, 0.7154, 0.0721));
-	float prev2_lum = dot(prev2.rgb, vec3(0.2125, 0.7154, 0.0721));
-	float prev3_lum = dot(prev3.rgb, vec3(0.2125, 0.7154, 0.0721));
-	
-	// Test whether the luma difference between the pixel in the current frame and that of
-	// the previous frame exceeds the threshold while the difference between the current frame
-	// and 2 frames previous is below the threshold.
-	// Repeat the process for the previous frame's pixel to reduce false-positives
-	bool flicker = (abs(cur_lum - prev1_lum) > HSM_ANTI_FLICKER_THRESHOLD && abs(cur_lum - prev2_lum) < HSM_ANTI_FLICKER_THRESHOLD) &&
-		(abs(prev1_lum - prev2_lum) > HSM_ANTI_FLICKER_THRESHOLD && abs(prev1_lum - prev3_lum) < HSM_ANTI_FLICKER_THRESHOLD);
-	
-	// Average the current frame with the previous frame in linear color space to avoid over-darkening
-	vec4 blended = (pow(current, vec4(2.2)) + pow(prev1, vec4(2.2))) / 2.0;
-	
-	// delinearize the averaged result
-	blended = pow(blended, vec4(1.0 / 2.2));
-	
-	return (!flicker) ? current : blended;
-}
-
-// -----------------------------------------------------------------------------
-// TV Startup Static Animation
-// -----------------------------------------------------------------------------
-vec4 GetColorWithIntro(vec4 in_color, vec2 in_coord, in sampler2D in_logo_image_sampler2d)
-{
-   vec4 out_color = in_color;
-
-   // If we are out of the region of time the intro plays just give back the same color
-   if (CURRENT_FRAME_FROM_CACHE_INFO > (HSM_INTRO_SOLID_COLOR_HOLD + 
-                                       HSM_INTRO_SOLID_COLOR_FADE_OUT + 
-                                       HSM_INTRO_LOGO_WAIT + 
-                                       HSM_INTRO_LOGO_FADE_IN +
-                                       HSM_INTRO_LOGO_HOLD +
-                                       HSM_INTRO_LOGO_FADE_OUT +
-                                       HSM_INTRO_NOISE_HOLD +
-                                       HSM_INTRO_NOISE_FADE_OUT + 
-                                       HSM_INTRO_SOLID_BLACK_HOLD +
-                                       HSM_INTRO_SOLID_BLACK_FADE_OUT) / HSM_INTRO_SPEED)
-      return out_color;
-
-   in_coord.y = HSM_FLIP_VIEWPORT_VERTICAL * HSM_FLIP_CORE_VERTICAL * in_coord.y;
-   in_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * HSM_FLIP_CORE_HORIZONTAL * in_coord.x;
-
-   if (abs(HSM_ROTATE_CORE_IMAGE) == 1)
-   {
-      in_coord.xy = in_coord.yx;
-
-      if (HSM_ROTATE_CORE_IMAGE == 1)
-         in_coord.y = (in_coord.y - 0.5) * -1 + 0.5;
-      else if (HSM_ROTATE_CORE_IMAGE == -1)
-         in_coord.x = (in_coord.x - 0.5) * -1 + 0.5;
-   }
-
-   float frame_count = HSM_INTRO_WHEN_TO_SHOW == 2 ? CURRENT_FRAME_FROM_CACHE_INFO : global.FrameCount;
-
-   float mask_wait = 20 / HSM_INTRO_SPEED;
-   
-	float mask_fade_horizontal = 40 / HSM_INTRO_SPEED;
-	float mask_fade_vertical = 60 / HSM_INTRO_SPEED;
-	float mask_vert_wait = mask_fade_horizontal * 0.4;
-
-   vec4 solid_color = vec4(HSM_HSVtoRGB(vec3(HSM_INTRO_SOLID_COLOR_HUE, HSM_INTRO_SOLID_COLOR_SAT, HSM_INTRO_SOLID_COLOR_VALUE)), 1);
-   // vec4 solid_color = HSM_Linearize(vec4(HSM_HSVtoRGB(vec3(HSM_BZL_COLOR_HUE, HSM_BZL_COLOR_SATURATION, HSM_BZL_COLOR_VALUE)), 1), DEFAULT_SRGB_GAMMA).rgb;
-
-	float solid_color_hold = HSM_INTRO_SOLID_COLOR_HOLD / HSM_INTRO_SPEED;
-	float solid_color_fade_out = HSM_INTRO_SOLID_COLOR_FADE_OUT / HSM_INTRO_SPEED;
-
-   float intro_logo_wait = HSM_INTRO_LOGO_WAIT / HSM_INTRO_SPEED;
-   float intro_logo_fade_in = HSM_INTRO_LOGO_FADE_IN / HSM_INTRO_SPEED;
-   float intro_logo_hold = HSM_INTRO_LOGO_HOLD / HSM_INTRO_SPEED;
-   float intro_logo_fade_out = HSM_INTRO_LOGO_FADE_OUT / HSM_INTRO_SPEED;
-
-	float noise_hold = HSM_INTRO_NOISE_HOLD / HSM_INTRO_SPEED;
-	float noise_fade_out = HSM_INTRO_NOISE_FADE_OUT / HSM_INTRO_SPEED;
-
-   // Black Hold starts from end of Static Hold
-   float black_hold = HSM_INTRO_SOLID_BLACK_HOLD / HSM_INTRO_SPEED;
-	float black_fade_out = HSM_INTRO_SOLID_BLACK_FADE_OUT / HSM_INTRO_SPEED;
-
-   float power_on_seq_length = mask_wait + mask_vert_wait + mask_fade_vertical;
-   float fade_out_seq_length = max(noise_fade_out, black_hold + black_fade_out);
-   float logo_seq_length     = intro_logo_wait + intro_logo_fade_in + intro_logo_hold + intro_logo_fade_out;
-   float full_seq_length     = max(power_on_seq_length + noise_hold + fade_out_seq_length, logo_seq_length);
-
-   // Loop the animation so we can see the results
-   if (HSM_INTRO_WHEN_TO_SHOW == 3)
-      frame_count = mod(frame_count, full_seq_length + 15);
-
-	if (frame_count <= full_seq_length)
-	{
-      vec2 noise_res = global.SourceSize.xy;
-      noise_res = min(noise_res, vec2(640, 480));
-
-      if (abs(HSM_ROTATE_CORE_IMAGE) > 0.5)
-         noise_res.xy = noise_res.yx;
-
-		vec2 quantized_coord = vec2(floor((in_coord.x + 0.01) * noise_res.x) / noise_res.x, floor((in_coord.y + 0.01) * noise_res.y) / noise_res.y);
-
-		float width = (frame_count - mask_wait) / (mask_fade_horizontal/2);
-		float height = (clamp((frame_count - mask_wait - mask_vert_wait) / mask_fade_vertical, 0, 1) + 0.005) * 2;
-		float mask = abs(in_coord.x - 0.5) > width * 0.5 ? 0 : 1;
-		mask *= HHLP_EasePowerOut(abs(in_coord.y - 0.5), 1.5) > height ? 0 : 1;
-
-		float area = width * height;
-
-      float black_opacity = HHLP_EasePowerIn(clamp(1 - (frame_count - (power_on_seq_length + noise_hold + black_hold)) / black_fade_out, 0, 1), 1.5);
-      out_color = mix(out_color, vec4(0, 0, 0, 1), black_opacity);
-
-		float solid_color_opacity = HHLP_EasePowerIn(clamp(1 - (frame_count - (mask_wait + mask_fade_horizontal/2.5 + solid_color_hold)) / solid_color_fade_out * 2, 0, 1), 1.5);
-      // out_color = mix(out_color, vec4(0, 0, 0, 1), solid_color_opacity);
-
-		float noise_opacity =  1 - clamp((frame_count - (power_on_seq_length + noise_hold)) / noise_fade_out, 0, 1);
-		noise_opacity = HHLP_EasePowerInOut(noise_opacity, 4);
-
-		// Calculate Static Noise
-		float e = 2.7182818284590452353602874713527;
-		float G = e + (mod(frame_count, 30)/30 + 1000);
-		vec2 r = (G * sin(G * quantized_coord.xy));
-		vec4 noise_color = vec4(fract(r.x * r.y * (1.0 + quantized_coord.x)));
-		noise_color.a = 1;
-
-		noise_color.rgb *= 0.60;
-
-		out_color = HSM_BlendModeLayerMix(out_color, noise_color, HSM_INTRO_NOISE_BLEND_MODE, noise_opacity);
-
-      vec2 intro_image_res = textureSize(in_logo_image_sampler2d, 0);
-      float intro_image_aspect = intro_image_res.x/intro_image_res.y;
-
-      float intro_logo_height = HSM_INTRO_LOGO_HEIGHT;
-      if (intro_logo_height == 0)
-         intro_logo_height = abs(HSM_ROTATE_CORE_IMAGE) > 0.5 ? intro_image_res.y / global.OriginalSize.y
-                                                         : intro_image_res.y / global.OriginalSize.x;
-
-      vec2 intro_image_scale = vec2(intro_logo_height * intro_image_aspect / SCREEN_ASPECT, intro_logo_height) * min(SCREEN_ASPECT, 1);
-      intro_image_scale = floor(intro_image_scale * global.SourceSize.xy) / global.SourceSize.xy;
-
-      if (HSM_DUALSCREEN_MODE > 0.5)
-      {
-         if (HSM_GetCoreImageSplitDirection() == 1)
-         {
-            in_coord.y = in_coord.y * 2 - MAX_NEGATIVE_CROP;
-         }
-         if (HSM_GetCoreImageSplitDirection() == 2)
-         {
-            in_coord.x = in_coord.x * 2 - MAX_NEGATIVE_CROP;
-         }
-      }
-
-      in_coord.x -= HSM_INTRO_LOGO_POS_X;
-      in_coord.y += HSM_INTRO_LOGO_POS_Y;
-
-      // Center
-      vec2 coord_in_intro_image = (in_coord - 0.5) / intro_image_scale + 0.5;
-      // Top Left
-      if (HSM_INTRO_LOGO_PLACEMENT == 1)
-         coord_in_intro_image = in_coord / intro_image_scale;
-      // Top Right
-      if (HSM_INTRO_LOGO_PLACEMENT == 2)
-         coord_in_intro_image = (in_coord - vec2(1 - intro_image_scale.x, 0)) / intro_image_scale;
-      // Bottom Left
-      if (HSM_INTRO_LOGO_PLACEMENT == 3)
-         coord_in_intro_image = (in_coord - vec2(0, 1 - intro_image_scale.y)) / intro_image_scale;
-      // Bottom Right
-      if (HSM_INTRO_LOGO_PLACEMENT == 4)
-         coord_in_intro_image = (in_coord - (1 - intro_image_scale)) / intro_image_scale;
-
-      // Quilez gives a better rescaling weighted more to the center of the pixel like bicubic
-      vec4 intro_image = HSM_TextureQuilez(IntroImage, intro_image_res, coord_in_intro_image);
-      float logo_opacity = 1 - HHLP_EasePowerOut(clamp(1 - (frame_count - mask_wait - mask_fade_horizontal/4) / intro_logo_fade_in, 0, 1), 1.5);
-      logo_opacity *=  clamp(clamp((frame_count - intro_logo_wait) / intro_logo_fade_in, 0, 1) - 
-                              clamp((frame_count - (intro_logo_wait + intro_logo_fade_in + intro_logo_hold)) / intro_logo_fade_out, 0, 1), 
-                              0, 1);
-
-      // Logo UNDER solid color
-      if (HSM_INTRO_LOGO_OVER_SOLID_COLOR == 0)
-         out_color = HSM_BlendModeLayerMix(out_color, intro_image, HSM_INTRO_LOGO_BLEND_MODE, logo_opacity);
-
-		out_color = HSM_BlendModeLayerMix(out_color, solid_color, HSM_INTRO_SOLID_COLOR_BLEND_MODE, solid_color_opacity);
-
-      // Logo OVER solid color
-      if (HSM_INTRO_LOGO_OVER_SOLID_COLOR == 1)
-         out_color = HSM_BlendModeLayerMix(out_color, intro_image, HSM_INTRO_LOGO_BLEND_MODE, logo_opacity);
-
-		out_color *= mask;
-
-      HSM_Delinearize(out_color, DEFAULT_SRGB_GAMMA);
-	}
-   return out_color;
-}
-#endif
-
-// vec4 GetCropOverlay(vec2 viewport_coord)
-// {
-//    vec4 out_color = vec4(0);
-//    vec4 screen_color = vec4(1, 0, 0, 1);
-   
-//    for (int i=1; i < 3; i++)
-//    {
-//       vec2 cropped_rotated_size = vec2(0);
-//       vec2 cropped_rotated_size_with_res_mult = vec2(0);
-//       vec2 cropped_sample_area_start_pixel_coord = vec2(0);
-//       HSM_GetCroppedRotatedSizeAndPixelSampleAreaStart(i, Source, cropped_rotated_size, cropped_rotated_size_with_res_mult, cropped_sample_area_start_pixel_coord);
-
-//       vec2 crop_scale = cropped_rotated_size / ROTATED_CORE_PREPPED_SIZE;
-//       vec2 mask_coord = viewport_coord - cropped_sample_area_start_pixel_coord / ROTATED_CORE_PREPPED_SIZE;
-//       mask_coord = mask_coord / crop_scale;
-      
-//       if (i == 2)
-//          screen_color = vec4(0, 1, 0, 1);
-
-//       out_color += screen_color * HSM_GetCornerMask(mask_coord, cropped_rotated_size.x/cropped_rotated_size.y, 0, 0.90);
-//    }
-
-//    return clamp(out_color, 0, 1);
-// }
-
-void main()
-{
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	// Flip the coordinate vertically if desired
-   vec2 viewport_coord_adjusted = vTexCoord;
-	viewport_coord_adjusted.x = HSM_FLIP_VIEWPORT_HORIZONTAL * HSM_FLIP_CORE_HORIZONTAL * (viewport_coord_adjusted.x - 0.5) + 0.5;
-	viewport_coord_adjusted.y = HSM_FLIP_VIEWPORT_VERTICAL * HSM_FLIP_CORE_VERTICAL * (viewport_coord_adjusted.y - 0.5) + 0.5;
-
-   FragColor = texture(Source, viewport_coord_adjusted);
-
-#ifndef IS_POTATO_PRESET
-   // if (HSM_ANTI_FLICKER_ON == 1)
-   //    FragColor = AntiFlicker(viewport_coord_adjusted, FragColor);
-
-   if (HSM_INTRO_WHEN_TO_SHOW > 0)
-      FragColor = GetColorWithIntro(FragColor, viewport_coord_adjusted, IntroImage);
-#endif
-
-   bool cache_info_changed = CACHE_INFO_CHANGED;
-   bool show_update_indicator = cache_info_changed && ( HSM_CACHE_UPDATE_INDICATOR_MODE == 1 || HSM_CACHE_GRAPHICS_ON < 0.5 && HSM_CACHE_UPDATE_INDICATOR_MODE == 2);
-
-	if (show_update_indicator)
-	{
-		float final_aspect = SCREEN_ASPECT;
-		// vec2 corner_offset = vec2(MAX_NEGATIVE_CROP * 2 * 0.8, MAX_NEGATIVE_CROP * 2 * 0.8);
-		vec2 corner_offset = vec2(0.1, 0.1);
-		vec2 center_coord = vec2(1 - corner_offset.x * final_aspect, 1 - corner_offset.y);
-		vec2 test_coord = vec2(1 - (1 - viewport_coord_adjusted.x) * final_aspect, viewport_coord_adjusted.y);
-		float distance =  length(test_coord - center_coord);
-
-		if (distance < 0.04)
-		{
-			float modulation = clamp(0.4 + abs(mod(global.FrameCount, 90) / 90 - 0.5) * 1.2, 0, 1);
-			modulation = HHLP_EasePowerInOut(modulation, 2);
-			FragColor *= 1 - modulation;
-			FragColor += modulation * vec4(1, 0, 0, 1);
-		}
-	}
-   
-   // vec4 overlay_color = GetCropOverlay(vTexCoord);
-   // FragColor *= 1 - 0.7 * overlay_color.a;
-   // FragColor += 1 * 0.7 * overlay_color;
-
-   //////// Draw text to show resolutions ////////// 
-   if (HSM_RESOLUTION_DEBUG_ON == 1)
-   {
-      vec2 ps = global.DerezedPassSize.zw;
-		vec2 outline_offset_mult = ps;
-		outline_offset_mult.x *= max(floor(global.DerezedPassSize.x / 240 + 0.01), 1);
-		outline_offset_mult.y *= max(floor(global.DerezedPassSize.y / 200 + 0.01), 1);
-
-      vec4 text_rgba = vec4(0);
-      text_rgba = texture(TextPass, vTexCoord);
-      text_rgba.rgb *= vec3(1, 1, 0);
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(1, 0)).a;
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(0, 1)).a;
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(1, 1)).a;
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(-1, 1)).a;
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(-1, 0)).a;
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(0, -1)).a;
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(-1, -1)).a;
-      text_rgba.a += texture(TextPass, vTexCoord + outline_offset_mult * vec2(1, -1)).a;
-      text_rgba = clamp(text_rgba, 0, 1);
-      FragColor = HSM_PreMultAlphaBlend(FragColor, text_rgba);
-   }
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/intro.slang b/bezel/Mega_Bezel/shaders/base/intro.slang
deleted file mode 100644
index a1207bb0dc..0000000000
--- a/bezel/Mega_Bezel/shaders/base/intro.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "common/globals-and-screen-scale-params.inc"
-#include "common/helper-functions.inc"
-#include "common/base-functions.inc"
-#include "common/params-5-intro.inc"
-#include "intro.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/linearize-crt-hdr.slang b/bezel/Mega_Bezel/shaders/base/linearize-crt-hdr.slang
deleted file mode 100644
index bfa0b82597..0000000000
--- a/bezel/Mega_Bezel/shaders/base/linearize-crt-hdr.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#define IS_HDR_PRESET
-
-#include "linearize-crt.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/linearize-crt.inc b/bezel/Mega_Bezel/shaders/base/linearize-crt.inc
deleted file mode 100644
index cf19874cb4..0000000000
--- a/bezel/Mega_Bezel/shaders/base/linearize-crt.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-// HSM_REFLECT_SHOW_TUBE_FX_AMOUNT
-#include "common/globals-and-reflection-params.inc"
-#include "common/helper-functions.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "../../../../include/compat_macros.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 blur_dxdy;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-
-	const vec2 dxdy_scale = global.SourceSize.xy * global.OutputSize.zw;
-	blur_dxdy = dxdy_scale * global.SourceSize.zw;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D CRTPass;
-layout(set = 0, binding = 3) uniform sampler2D PostCRTPass;
-
-#include "../../../../include/blur-functions.h"
-
-void main()
-{
-    // FragColor = vec4(tex2Dblur9x9(PostCRTPass, vTexCoord, blur_dxdy), 1);
-    // In the HDR preset sampling from the PostCRTPass results in sort of colorful garbabe
-    // Grabbing from the CRTPass instead
-#ifdef IS_HDR_PRESET
-    FragColor = textureLod(CRTPass, vTexCoord, 2);
-    FragColor = HSM_ApplyGamma(FragColor, DEFAULT_SRGB_GAMMA);
-#else
-    vec4 crt_rgba = textureLod(CRTPass, vTexCoord, 2);
-    vec4 post_crt_rgba = textureLod(PostCRTPass, vTexCoord, 2);
-    FragColor = mix(crt_rgba, post_crt_rgba, HSM_REFLECT_SHOW_TUBE_FX_AMOUNT);
-#endif
-
-    FragColor = HSM_ApplyGamma(FragColor, DEFAULT_SRGB_GAMMA/DEFAULT_CRT_GAMMA - 0.05);
-    FragColor = clamp(FragColor, 0, 1);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/linearize-crt.slang b/bezel/Mega_Bezel/shaders/base/linearize-crt.slang
deleted file mode 100644
index 95015f30d7..0000000000
--- a/bezel/Mega_Bezel/shaders/base/linearize-crt.slang
+++ /dev/null
@@ -1,3 +0,0 @@
-#version 450
-
-#include "linearize-crt.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/linearize.slang b/bezel/Mega_Bezel/shaders/base/linearize.slang
deleted file mode 100644
index a49e77160b..0000000000
--- a/bezel/Mega_Bezel/shaders/base/linearize.slang
+++ /dev/null
@@ -1,62 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "common/globals-and-screen-scale-params.inc"
-#include "common/helper-functions.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-// layout(std140, set = 0, binding = 0) uniform UBO
-// {
-// 	mat4 MVP;
-// } global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = HSM_Linearize(texture(Source, vTexCoord), GAMMA_INPUT);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/output-hdr.slang b/bezel/Mega_Bezel/shaders/base/output-hdr.slang
deleted file mode 100644
index b32326a236..0000000000
--- a/bezel/Mega_Bezel/shaders/base/output-hdr.slang
+++ /dev/null
@@ -1,95 +0,0 @@
-#version 450
-
-/*
-    HDR Output - All color work by MajorPainTheCactus
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-*/
-
-// Pass HDR color format
-#pragma format A2B10G10R10_UNORM_PACK32
-
-/////////////// IMPORTS ///////////////
-#include "../megatron/include/parameters-hdr-color.h"
-#include "../megatron/include/gamma_correct.h"
-#include "../megatron/include/inverse_tonemap.h"
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 6) out vec2 vTexCoord;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage fragment
-
-layout(location = 6) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-
-
-layout(set = 0, binding = 1) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-layout(set = 0, binding = 3) uniform sampler2D OutputPassFeedback;
-#define PassFeedback OutputPassFeedback
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						TUBE_DIFFUSE_ASPECT, 
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-
-
-	if (HHLP_IsOutsideCoordSpace(BEZEL_OUTSIDE_COORD))
-	{
-		vec4 feedback_color_test = texture(PassFeedback, vec2(1, 1));
-		if (HSM_CACHE_GRAPHICS_ON > 0.5 && feedback_color_test.a < 0 && !CACHE_INFO_CHANGED)
-		{
-			FragColor = texture(PassFeedback, vTexCoord);
-			return;
-		}
-	}
-
-	vec3 output_colour = vec3(0);
-	LinearToOutputColor(texture(Source, vTexCoord).rgb, output_colour);
-	FragColor = vec4(output_colour, 1.0f);
-
-	// If we have calculated an image then set -1 as a flag to show that we have
-	if (vTexCoord.x > (1 - 2 / global.OutputSize.x) && vTexCoord.y > ( 1 - 2 / global.OutputSize.y))
-		FragColor.a = -1;
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/output-sdr.slang b/bezel/Mega_Bezel/shaders/base/output-sdr.slang
deleted file mode 100644
index db6dc84b01..0000000000
--- a/bezel/Mega_Bezel/shaders/base/output-sdr.slang
+++ /dev/null
@@ -1,68 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 6) out vec2 vTexCoord;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage fragment
-
-layout(location = 6) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-
-
-layout(set = 0, binding = 1) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-layout(set = 0, binding = 3) uniform sampler2D OutputPassFeedback;
-#define PassFeedback OutputPassFeedback
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						TUBE_DIFFUSE_ASPECT, 
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-
-
-	if (HHLP_IsOutsideCoordSpace(BEZEL_OUTSIDE_COORD))
-	{
-		vec4 feedback_color_test = texture(PassFeedback, vec2(1, 1));
-		if (HSM_CACHE_GRAPHICS_ON > 0.5 && feedback_color_test.a < 0 && !CACHE_INFO_CHANGED)
-		{
-			FragColor = texture(PassFeedback, vTexCoord);
-			return;
-		}
-	}
-
-	FragColor = HSM_Delinearize(texture(Source, vTexCoord), DEFAULT_SRGB_GAMMA);
-
-	// If we have calculated an image then set -1 as a flag to show that we have
-	if (vTexCoord.x > (1 - 2 / global.OutputSize.x) && vTexCoord.y > ( 1 - 2 / global.OutputSize.y))
-		FragColor.a = -1;
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/phosphor-persistence.slang b/bezel/Mega_Bezel/shaders/base/phosphor-persistence.slang
deleted file mode 100644
index ddd56ae37a..0000000000
--- a/bezel/Mega_Bezel/shaders/base/phosphor-persistence.slang
+++ /dev/null
@@ -1,107 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "common/globals.inc"
-#include "params-0-screen-scale.inc"
-#include "common/common-functions.inc"
-
-//---------------------------------------------------------------------------------------------------
-//    PHOSPHOR PERSISTENCE
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_PERSISTENCE_TITLE						"[ PHOSPHOR PERSISTENCE ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_PHOSPHOR_PERSISTENCE_BLEND          	"          Amount" 0 0 100 2
-#define HSM_PHOSPHOR_PERSISTENCE_BLEND global.HSM_PHOSPHOR_PERSISTENCE_BLEND / 100
-
-#pragma parameter HSM_PHOSPHOR_PERSISTENCE_RED          	"          Red Persistence" 50 0 100 5
-#define HSM_PHOSPHOR_PERSISTENCE_RED global.HSM_PHOSPHOR_PERSISTENCE_RED / 100
-
-#pragma parameter HSM_PHOSPHOR_PERSISTENCE_GREEN          	"          Green Persistence" 50 0 100 5
-#define HSM_PHOSPHOR_PERSISTENCE_GREEN global.HSM_PHOSPHOR_PERSISTENCE_GREEN / 100
-
-#pragma parameter HSM_PHOSPHOR_PERSISTENCE_BLUE          	"          Blue Persistence" 50 0 100 5
-#define HSM_PHOSPHOR_PERSISTENCE_BLUE global.HSM_PHOSPHOR_PERSISTENCE_BLUE / 100
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PersistencePassFeedback;
-
-#define previous_pass_feedback PersistencePassFeedback
-#define eps 1e-3
-
-vec4 HSM_ApplyPhosphorPersistence(vec4 in_color, vec4 prev_color, vec2 in_coord)
-{
-	if (HSM_PHOSPHOR_PERSISTENCE_RED == 0 && HSM_PHOSPHOR_PERSISTENCE_GREEN == 0 && HSM_PHOSPHOR_PERSISTENCE_BLUE == 0) 
-		return in_color;
-
-	vec3 persistence = vec3(HSM_PHOSPHOR_PERSISTENCE_RED, HSM_PHOSPHOR_PERSISTENCE_GREEN, HSM_PHOSPHOR_PERSISTENCE_BLUE);
-
-	float delta_time_red = clamp(5 - 5 * HHLP_EasePowerIn(abs(HSM_PHOSPHOR_PERSISTENCE_RED), 2) + 0.1, 0, 1);
-	float delta_time_green = clamp(5 - 5 * HHLP_EasePowerIn(abs(HSM_PHOSPHOR_PERSISTENCE_GREEN), 2) + 0.1, 0, 1);
-	float delta_time_blue = clamp(5 - 5 * HHLP_EasePowerIn(abs(HSM_PHOSPHOR_PERSISTENCE_BLUE), 2) + 0.1, 0, 1);
-
-	prev_color.r *= pow(persistence.r, delta_time_red);
-	prev_color.g *= pow(persistence.g, delta_time_green);
-	prev_color.b *= pow(persistence.b, delta_time_blue);
-
-   prev_color *= HSM_PHOSPHOR_PERSISTENCE_BLEND;
-
-	vec4 out_color = in_color;
-	out_color.r = max(prev_color.r, out_color.r);
-	out_color.g = max(prev_color.g, out_color.g);
-	out_color.b = max(prev_color.b, out_color.b);
-
-	return out_color;
-}
-
-void main()
-{
-   FragColor = texture(Source, vTexCoord);
-   FragColor = HSM_Linearize(FragColor, DEFAULT_SRGB_GAMMA);
-
-	vec4 prev_color = texture(previous_pass_feedback, vTexCoord);
-   prev_color = HSM_Linearize(prev_color, DEFAULT_SRGB_GAMMA);
-
-   // Phosphor Persistence
-   FragColor = HSM_ApplyPhosphorPersistence(FragColor, prev_color, vTexCoord);
-
-   // FragColor = mix(texture(previous_pass_feedback, vTexCoord), texture(Source, vTexCoord), 0.5);
-   FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-glass.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-glass.slang
deleted file mode 100644
index 598d1f57b7..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-glass.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-glass-params.inc"
-#include "common/common-functions.inc"
-#include "post-crt-prep.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-image-layers.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-image-layers.slang
deleted file mode 100644
index e6959dbe00..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-image-layers.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-image-layers-params.inc"
-#include "common/common-functions.inc"
-#include "post-crt-prep.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-glass.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-glass.slang
deleted file mode 100644
index 8679e92e94..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-glass.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-glass-params.inc"
-#include "common/common-functions.inc"
-#include "post-crt-prep-minimum.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-no-reflect.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-no-reflect.slang
deleted file mode 100644
index 15ebd95905..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-no-reflect.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-
-#include "common/globals-and-bezel-params.inc"
-#include "common/common-functions.inc"
-#include "post-crt-prep-minimum.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-std.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-std.slang
deleted file mode 100644
index 403d9b6a9b..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum-std.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-bezel-params.inc"
-#include "common/common-functions.inc"
-#include "post-crt-prep-minimum.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum.inc b/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum.inc
deleted file mode 100644
index dd19740ca7..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-minimum.inc
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2021 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 7) out vec2 UNFLIPPED_VIEWPORT_COORD;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.00001;
-
-	UNFLIPPED_VIEWPORT_COORD = vTexCoord;
-}
-
-#pragma stage fragment
-
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 7) in vec2 UNFLIPPED_VIEWPORT_COORD;
-
-layout(location = 0) out vec4 FragColor;
-
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-layout(set = 0, binding = 2) uniform sampler2D InfoCachePass;
-
-layout(set = 0, binding = 7) uniform sampler2D BackgroundImage;
-layout(set = 0, binding = 8) uniform sampler2D BackgroundVertImage;
-
-layout(set = 0, binding = 11) uniform sampler2D PostCRTPassFeedback;
-#define PassFeedback PostCRTPassFeedback
-
-vec4 HSM_GetPostCrtPreppedColorPotato(vec4 in_color_linear, vec2 VIEWPORT_COORD, vec2 VIEWPORT_COORD_TRANSFORMED, vec2 screen_curved_coord, in sampler2D BackgroundImage, in sampler2D BackgroundVertImage)
-{ 
-	vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-	float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-
-	TUBE_MASK = HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-
-#ifdef USE_MONOCHROME
-	if (HSM_MONOCHROME_MODE > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_MONOCHROME_DUALSCREEN_VIS_MODE))
-		in_color_linear = HSM_ApplyMonochrome(in_color_linear);
-#endif
-
-	vec4 out_color = in_color_linear;
-	
-	out_color *= HSM_POST_CRT_BRIGHTNESS;
-
-	vec2 mirrored_screen_coord = HSM_GetMirrorWrappedCoord(screen_curved_coord);
-	float black_edge_corner_radius = HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	float screen_mask = HSM_GetCornerMask((screen_curved_coord - 0.5) * 0.999 + 0.5, SCREEN_ASPECT, black_edge_corner_radius, 0.9);
-	vec2 tube_diffuse_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 0);
-	float tube_diffuse_mask =  HSM_GetCornerMask(tube_diffuse_curved_coord, TUBE_DIFFUSE_ASPECT, black_edge_corner_radius, 0.99);
-
-#ifdef USE_VIGNETTE
-	if (HSM_GetUseScreenVignette())
-	{
-		float vignette_factor = HSM_GetScreenVignetteFactor(mirrored_screen_coord);
-
-		if (HSM_SCREEN_VIGNETTE_IN_REFLECTION < 0.5)
-			vignette_factor = screen_mask * vignette_factor + (1 - screen_mask);
-
-		out_color.rgb *= vignette_factor;
-	}
-#endif
-
-	out_color.rgb *= screen_mask;
-	out_color *= TUBE_MASK;
-	out_color *= tube_diffuse_mask;
-
-	out_color = clamp(out_color, 0, 1);
-	
-#ifdef USE_BG
-	if (HSM_BG_OPACITY > 0)
-	{
-		//-----------------------------------------------------------------------------------------
-		// Background
-		//-----------------------------------------------------------------------------------------
-		vec2 bg_coord = VIEWPORT_COORD_TRANSFORMED;
-		bool bg_use_vert_image = SCREEN_ASPECT < 1 && textureSize(BackgroundVertImage, 0).y > 16 ? true : false; 
-		vec2 bg_size = bg_use_vert_image ? textureSize(BackgroundVertImage, 0) : textureSize(BackgroundImage, 0);
-
-		vec4 bg_layer = vec4(0);
-
-		if (bg_size.y > 16)
-		{
-			// Correct image coordinate for image aspect ratio
-			bg_coord.x = (bg_coord.x - 0.5) / ((bg_size.x / bg_size.y) / (global.FinalViewportSize.x/global.FinalViewportSize.y)) + 0.5;
-
-			if (bg_use_vert_image)
-				bg_layer = texture(BackgroundVertImage, bg_coord);
-			else
-				bg_layer = texture(BackgroundImage, bg_coord);
-			bg_layer = HSM_Linearize(bg_layer, DEFAULT_SRGB_GAMMA);
-
-			vec3 bg_gel = HSM_POTATO_COLORIZE_CRT_WITH_BG * bg_layer.rgb * HSM_POTATO_COLORIZE_BRIGHTNESS + (1 - HSM_POTATO_COLORIZE_CRT_WITH_BG);
-
-			bg_layer.rgb *= HSM_GLOBAL_GRAPHICS_BRIGHTNESS;
-			bg_layer.rgb = pow(bg_layer.rgb, vec3(1/HSM_STATIC_LAYERS_GAMMA));
-
-			bg_layer *= HSM_BG_BRIGHTNESS;
-
-			if (HSM_POTATO_SHOW_BG_OVER_SCREEN == 1)
-			{
-				out_color.rgb *= bg_gel.rgb;
-				out_color = HSM_BlendModeLayerMix(out_color, bg_layer, HSM_BG_BLEND_MODE, HSM_BG_OPACITY);
-			}
-			else
-			{
-				bg_layer.rgb *= HSM_BG_OPACITY;
-				out_color = HSM_BlendModeLayerMix(bg_layer, out_color, HSM_CRT_SCREEN_BLEND_MODE, 1);
-			}
-		}
-	}
-#endif
-
-	if (HSM_SINDEN_BORDER_ON > 0.5)
-	{
-		out_color = HSM_Apply_Sinden_Lightgun_Border(out_color, tube_diffuse_curved_coord, tube_diffuse_mask, black_edge_corner_radius);
-	}
-
-	return out_color;
-}
-
-void main()
-{
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-	
-	if (HHLP_IsOutsideCoordSpace(SCREEN_COORD))
-	{
-		vec4 feedback_color_test = texture(PassFeedback, vec2(0,0));
-		if (HSM_CACHE_GRAPHICS_ON > 0.5 && feedback_color_test.a < 0 && !CACHE_INFO_CHANGED)
-		{
-			FragColor = texture(PassFeedback, UNFLIPPED_VIEWPORT_COORD);
-			return;
-		}
-	}
-
-	FragColor = texture(Source, UNFLIPPED_VIEWPORT_COORD);
-
-	vec2 screen_curved_coord = HSM_GetCurvedCoord(SCREEN_COORD, HSM_CRT_CURVATURE_SCALE, SCREEN_ASPECT);
-	FragColor = HSM_GetPostCrtPreppedColorPotato(FragColor, vTexCoord, viewportCoordTransformed, screen_curved_coord, BackgroundImage, BackgroundVertImage);
-
-// #ifndef IS_MEGATRON_PRESET
-// 	FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA);
-// #endif
-}
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-no-reflect.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-no-reflect.slang
deleted file mode 100644
index 0a75f78e13..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-no-reflect.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-
-#include "common/globals-and-image-layers-params.inc"
-#include "common/common-functions.inc"
-#include "post-crt-prep.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato-megatron.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato-megatron.slang
deleted file mode 100644
index c21a7026f8..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato-megatron.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#define IS_MEGATRON_PRESET
-
-#include "post-crt-prep-potato.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.inc b/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.inc
deleted file mode 100644
index bc7a65448d..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.inc
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2021 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "common/globals-and-potato-params.inc"
-#include "common/common-functions.inc"
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 7) out vec2 UNFLIPPED_VIEWPORT_COORD;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.00001;
-
-	UNFLIPPED_VIEWPORT_COORD = vTexCoord;
-}
-
-#pragma stage fragment
-
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 7) in vec2 UNFLIPPED_VIEWPORT_COORD;
-
-layout(location = 0) out vec4 FragColor;
-
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-layout(set = 0, binding = 2) uniform sampler2D InfoCachePass;
-
-layout(set = 0, binding = 7) uniform sampler2D BackgroundImage;
-layout(set = 0, binding = 8) uniform sampler2D BackgroundVertImage;
-
-layout(set = 0, binding = 11) uniform sampler2D PostCRTPassFeedback;
-#define PassFeedback PostCRTPassFeedback
-
-vec4 HSM_GetPostCrtPreppedColorPotato(vec4 in_color_linear, vec2 VIEWPORT_COORD, vec2 VIEWPORT_COORD_TRANSFORMED, vec2 screen_curved_coord, in sampler2D BackgroundImage, in sampler2D BackgroundVertImage)
-{ 
-	vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-	float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-
-	TUBE_MASK = HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-
-	if (HSM_MONOCHROME_MODE > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_MONOCHROME_DUALSCREEN_VIS_MODE))
-		in_color_linear = HSM_ApplyMonochrome(in_color_linear);
-
-	vec4 out_color = in_color_linear;
-	
-	out_color *= HSM_POST_CRT_BRIGHTNESS;
-
-	vec2 mirrored_screen_coord = HSM_GetMirrorWrappedCoord(screen_curved_coord);
-	float black_edge_corner_radius = HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	float screen_mask = HSM_GetCornerMask((screen_curved_coord - 0.5) * 0.999 + 0.5, SCREEN_ASPECT, black_edge_corner_radius, 0.9);
-	vec2 tube_diffuse_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 0);
-	float tube_diffuse_mask =  HSM_GetCornerMask(tube_diffuse_curved_coord, TUBE_DIFFUSE_ASPECT, black_edge_corner_radius, 0.99);
-
-	if (HSM_GetUseScreenVignette())
-	{
-		float vignette_factor = HSM_GetScreenVignetteFactor(mirrored_screen_coord);
-
-		if (HSM_SCREEN_VIGNETTE_IN_REFLECTION < 0.5)
-			vignette_factor = screen_mask * vignette_factor + (1 - screen_mask);
-
-		out_color.rgb *= vignette_factor;
-	}
-
-	out_color.rgb *= screen_mask;
-	out_color *= TUBE_MASK;
-	out_color *= tube_diffuse_mask;
-
-	out_color = clamp(out_color, 0, 1);
-	
-	if (HSM_BG_OPACITY > 0)
-	{
-		//-----------------------------------------------------------------------------------------
-		// Background
-		//-----------------------------------------------------------------------------------------
-		vec2 bg_coord = VIEWPORT_COORD_TRANSFORMED;
-		bool bg_use_vert_image = SCREEN_ASPECT < 1 && textureSize(BackgroundVertImage, 0).y > 16 ? true : false; 
-		vec2 bg_size = bg_use_vert_image ? textureSize(BackgroundVertImage, 0) : textureSize(BackgroundImage, 0);
-
-		vec4 bg_layer = vec4(0);
-
-		if (bg_size.y > 16)
-		{
-			// Correct image coordinate for image aspect ratio
-			bg_coord.x = (bg_coord.x - 0.5) / ((bg_size.x / bg_size.y) / (global.FinalViewportSize.x/global.FinalViewportSize.y)) + 0.5;
-
-			if (bg_use_vert_image)
-				bg_layer = texture(BackgroundVertImage, bg_coord);
-			else
-				bg_layer = texture(BackgroundImage, bg_coord);
-			bg_layer = HSM_Linearize(bg_layer, DEFAULT_SRGB_GAMMA);
-
-			vec3 bg_gel = HSM_POTATO_COLORIZE_CRT_WITH_BG * bg_layer.rgb * HSM_POTATO_COLORIZE_BRIGHTNESS + (1 - HSM_POTATO_COLORIZE_CRT_WITH_BG);
-
-			bg_layer.rgb *= HSM_GLOBAL_GRAPHICS_BRIGHTNESS;
-			bg_layer.rgb = pow(bg_layer.rgb, vec3(1/HSM_STATIC_LAYERS_GAMMA));
-
-			bg_layer *= HSM_BG_BRIGHTNESS;
-
-			if (HSM_POTATO_SHOW_BG_OVER_SCREEN == 1)
-			{
-				out_color.rgb *= bg_gel.rgb;
-				out_color = HSM_BlendModeLayerMix(out_color, bg_layer, HSM_BG_BLEND_MODE, HSM_BG_OPACITY);
-			}
-			else
-			{
-				bg_layer.rgb *= HSM_BG_OPACITY;
-				out_color = HSM_BlendModeLayerMix(bg_layer, out_color, HSM_CRT_SCREEN_BLEND_MODE, 1);
-			}
-		}
-	}
-
-	if (HSM_SINDEN_BORDER_ON > 0.5)
-	{
-		out_color = HSM_Apply_Sinden_Lightgun_Border(out_color, tube_diffuse_curved_coord, tube_diffuse_mask, black_edge_corner_radius);
-	}
-
-	return out_color;
-}
-
-void main()
-{
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-	
-	if (HHLP_IsOutsideCoordSpace(SCREEN_COORD))
-	{
-		vec4 feedback_color_test = texture(PassFeedback, vec2(0,0));
-		if (HSM_CACHE_GRAPHICS_ON > 0.5 && feedback_color_test.a < 0 && !CACHE_INFO_CHANGED)
-		{
-			FragColor = texture(PassFeedback, UNFLIPPED_VIEWPORT_COORD);
-			return;
-		}
-	}
-
-	FragColor = texture(Source, UNFLIPPED_VIEWPORT_COORD);
-
-	vec2 screen_curved_coord = HSM_GetCurvedCoord(SCREEN_COORD, HSM_CRT_CURVATURE_SCALE, SCREEN_ASPECT);
-	FragColor = HSM_GetPostCrtPreppedColorPotato(FragColor, vTexCoord, viewportCoordTransformed, screen_curved_coord, BackgroundImage, BackgroundVertImage);
-
-#ifndef IS_MEGATRON_PRESET
-	FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA);
-#endif
-}
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.slang
deleted file mode 100644
index 1b0463f2e0..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.slang
+++ /dev/null
@@ -1,3 +0,0 @@
-#version 450
-
-#include "post-crt-prep-potato.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep.inc b/bezel/Mega_Bezel/shaders/base/post-crt-prep.inc
deleted file mode 100644
index 90cfd4d881..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep.inc
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2021 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "../base/common/common-functions-bezel.inc"
-
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 7) out vec2 UNFLIPPED_VIEWPORT_COORD;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.00001;
-
-	UNFLIPPED_VIEWPORT_COORD = vTexCoord;
-}
-
-#pragma stage fragment
-
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 7) in vec2 UNFLIPPED_VIEWPORT_COORD;
-
-layout(location = 0) out vec4 FragColor;
-
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-layout(set = 0, binding = 2) uniform sampler2D InfoCachePass;
-
-layout(set = 0, binding = 4) uniform sampler2D TubeDiffuseImage;
-layout(set = 0, binding = 5) uniform sampler2D TubeShadowImage;
-layout(set = 0, binding = 6) uniform sampler2D TubeColoredGelImage;
-layout(set = 0, binding = 7) uniform sampler2D TubeStaticReflectionImage;
-
-layout(set = 0, binding = 8) uniform sampler2D BackgroundImage;
-layout(set = 0, binding = 9) uniform sampler2D BackgroundVertImage;
-
-layout(set = 0, binding = 10) uniform sampler2D NightLightingImage;
-layout(set = 0, binding = 11) uniform sampler2D NightLighting2Image;
-layout(set = 0, binding = 12) uniform sampler2D DerezedPass;
-
-layout(set = 0, binding = 13) uniform sampler2D PostCRTPassFeedback;
-#define PassFeedback PostCRTPassFeedback
-
-// Torridgristle - ScanlineSimple pass - Public domain
-
-vec4 HSM_GetTubeHighlight(vec2 tube_curved_coord, bool apply_to_mirror, in sampler2D TubeStaticReflectionImage)
-{
-	tube_curved_coord = HSM_GetViewportCoordWithFlip(tube_curved_coord);
-	vec4 out_color = vec4(0);
-
-	vec2 mirrored_tube_coord = tube_curved_coord;
-	if (apply_to_mirror)
-		mirrored_tube_coord = HSM_GetMirrorWrappedCoord(tube_curved_coord);
-
-	float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0)
-		bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * DEFAULT_SCREEN_CORNER_RADIUS;
-
-	vec2 tube_highlight_coord = (mirrored_tube_coord - 0.5) / vec2(HSM_TUBE_STATIC_SCALE * HSM_TUBE_STATIC_SCALE_X, HSM_TUBE_STATIC_SCALE) + 0.5;
-	tube_highlight_coord = (tube_highlight_coord - 0.5) / vec2(HSM_TUBE_STATIC_SCALE_X, 1) + 0.5;
-
-	tube_highlight_coord.x = (tube_highlight_coord.x + HSM_TUBE_STATIC_POS_X - 0.5) * HSM_FLIP_VIEWPORT_HORIZONTAL + 0.5;
-	tube_highlight_coord.y = (tube_highlight_coord.y + HSM_TUBE_STATIC_POS_Y - 0.5) * HSM_FLIP_VIEWPORT_VERTICAL + 0.5;
-
-	// Mask the very outer edge of the tube for a very small shadowing effect
-	float tube_highlight_mask = HSM_GetCornerMask((tube_curved_coord - 0.5) + 0.5 , TUBE_DIFFUSE_ASPECT, HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS, 0.9);
-
-	vec4 tube_highlight_image = vec4(0);
-
-	if (HSM_TUBE_STATIC_DITHER_SAMPLES > 0)
-	{
-		// Dithering for the glass reflection if needed to reduce banding
-		tube_highlight_image = HSM_GetStoichaicBlurredSample(TubeStaticReflectionImage, tube_highlight_coord, HSM_TUBE_STATIC_DITHER_SAMPLES, HSM_TUBE_STATIC_DITHER_DISTANCE, HSM_TUBE_STATIC_DITHER_AMOUNT);
-	}
-	else
-	{
-		tube_highlight_image = HSM_GetMipmappedTexSample(TubeStaticReflectionImage, tube_highlight_coord, TUBE_SCALE, 0);
-	}
-	tube_highlight_image = HSM_Linearize(tube_highlight_image, DEFAULT_SRGB_GAMMA) * tube_highlight_mask;
-
-	out_color = HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY * tube_highlight_image * tube_highlight_image.a;
-	out_color.rgb *= HSM_GLOBAL_GRAPHICS_BRIGHTNESS;
-
-	return out_color;
-}
-
-vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_linear, vec2 VIEWPORT_COORD, vec2 screen_curved_coord, in sampler2D source_pass, in sampler2D TubeDiffuseImage, in sampler2D TubeColoredGelImage, in sampler2D TubeStaticReflectionImage, in sampler2D BackgroundImage, in sampler2D BackgroundVertImage, in sampler2D NightLightingImage, in sampler2D NightLighting2Image)
-{
-	if (HSM_MONOCHROME_MODE > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_MONOCHROME_DUALSCREEN_VIS_MODE))
-		in_color_linear = HSM_ApplyMonochrome(in_color_linear);
-
-	vec4 crt_color = in_color_linear;
-
-	crt_color *= HSM_POST_CRT_BRIGHTNESS;
-
-	vec2 mirrored_screen_coord = HSM_GetMirrorWrappedCoord(screen_curved_coord);
-
-	vec4 out_color = vec4(0);
-
-	// TODO we see artifacts of the reflection at the edge of the screen when there is extra tube thickness and the reflection is scaled
-	float screen_mask = HSM_GetCornerMask((screen_curved_coord - 0.5) * 0.999 + 0.5, SCREEN_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_SCREEN_CORNER_RADIUS_SCALE, 0.9);
-						
-	vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-	vec2 mirrored_tube_coord = HSM_GetMirrorWrappedCoord(tube_curved_coord);
-	
-	float vignette_factor = HSM_GetScreenVignetteFactor(mirrored_tube_coord);
-	if (HSM_GetUseScreenVignette())
-	{
-		float vignette_factor_outside_screen = HSM_SCREEN_VIGNETTE_IN_REFLECTION * vignette_factor + (1 - HSM_SCREEN_VIGNETTE_IN_REFLECTION) * 1;
-		vignette_factor = screen_mask * vignette_factor + (1 - screen_mask) * vignette_factor_outside_screen;
-
-		crt_color *= vignette_factor;
-	}
-
-	if (HSM_AB_COMPARE_SHOW_MODE == 1 && HSM_GetIsInABCompareArea(VIEWPORT_COORD))
-	{
-		vec2 ab_screen_coord = HSM_CRT_CURVATURE_SCALE * screen_curved_coord + (1 - HSM_CRT_CURVATURE_SCALE) * SCREEN_COORD;
-		ab_screen_coord = HSM_GetMirrorWrappedCoord(ab_screen_coord);
-
-		vec4 source_color = HSM_GetCroppedTexSample(source_pass, ab_screen_coord);
-
-		source_color = HSM_Linearize(source_color, GAMMA_INPUT);
-
-		crt_color = source_color;
-	}
-	
-	float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0)
-		bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * DEFAULT_SCREEN_CORNER_RADIUS;
-
-	float tube_mask =  HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-	float screen_to_tube_mask_invert = 1 - (tube_mask - screen_mask);
-
-	float black_edge_corner_radius = HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	vec2 tube_diffuse_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 0);
-	float tube_diffuse_mask =  HSM_GetCornerMask(tube_diffuse_curved_coord, TUBE_DIFFUSE_ASPECT, black_edge_corner_radius, 0.99);
-
-	float black_edge_mask_invert = 1 - (tube_mask - tube_diffuse_mask);
-
-	crt_color.rgb *= screen_to_tube_mask_invert;
-
-	// AMBIENT LIGHTING IMAGES
-	vec4 ambient_lighting_image = vec4(1);
-	vec4 ambient2_lighting_image = vec4(1);
-	HSM_Fill_Ambient_Images(VIEWPORT_COORD, 
-							VIEWPORT_UNSCALED_COORD, 
-							TUBE_DIFFUSE_COORD_MIXED_POS, 
-							TUBE_DIFFUSE_SCALE_1ST_SCREEN, 
-							HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE, 
-							NightLightingImage, 
-							NightLighting2Image, 
-							ambient_lighting_image, 
-							ambient2_lighting_image);
-
-	vec3 tube_shadow = vec3(1);
-	if (HSM_TUBE_SHADOW_IMAGE_ON > 0.5 && (HSM_GetUseTubeDiffuseImage() || HSM_GetUseTubeColoredGelImage() || HSM_GetUseTubeStaticReflection()))
-	{
-		vec2 shadow_coord = tube_diffuse_curved_coord;
-		shadow_coord = HSM_GetMirrorWrappedCoord(shadow_coord);
-
-		// TODO Shadow Coordinate isn't right with 3D Curvature
-
-		shadow_coord.x = (shadow_coord.x - HSM_TUBE_SHADOW_IMAGE_POS_X - 0.5) / HSM_TUBE_SHADOW_IMAGE_SCALE_X + 0.5;
-		shadow_coord.y = (shadow_coord.y + HSM_TUBE_SHADOW_IMAGE_POS_Y) / HSM_TUBE_SHADOW_IMAGE_SCALE_Y;
-
-		vec2 curvature_values = HSM_TUBE_SHADOW_CURVATURE_SCALE * HSM_GetCurvatureValues(TUBE_DIFFUSE_ASPECT);
-		shadow_coord = HSM_Get2DCurvedCoord(shadow_coord, curvature_values);
-
-		shadow_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * (shadow_coord.x - 0.5) + 0.5;
-		shadow_coord.y = HSM_FLIP_VIEWPORT_VERTICAL * (shadow_coord.y - 0.5) + 0.5;
-		
-
-		vec4 tube_shadow_sample = HSM_GetMipmappedTexSample(TubeShadowImage, shadow_coord, TUBE_SCALE * vec2(HSM_TUBE_SHADOW_IMAGE_SCALE_X, HSM_TUBE_SHADOW_IMAGE_SCALE_Y), 0);
-		tube_shadow_sample = HSM_GLOBAL_GRAPHICS_BRIGHTNESS * HSM_GetPreMultipliedColorLinear(tube_shadow_sample, SOURCE_MATTE_PREMULTIPLIED, DEFAULT_SRGB_GAMMA);
-
-		tube_shadow = (1 - HSM_TUBE_SHADOW_IMAGE_OPACITY) + HSM_TUBE_SHADOW_IMAGE_OPACITY * tube_shadow_sample.rgb;
-	}
-
-	// If the crt blend mode is multiply then use the diffuse image
-	float tube_diffuse_mode = HSM_CRT_BLEND_MODE == 2 ? 1 : HSM_TUBE_DIFFUSE_MODE;
-	vec4 tube_diffuse = vec4(0, 0, 0, tube_mask);
-	float adjusted_tube_diffuse_amount = HSM_TUBE_DIFFUSE_MODE == 0 ? 0 : HSM_TUBE_DIFFUSE_IMAGE_AMOUNT;
-
-	if (tube_diffuse_mode == 2)
-	{
-		// Do something if the tube is supposed to be transparent here
-	}
-	if (tube_diffuse_mode == 1)
-	{
-		// TubeDiffuseImage
-		if (adjusted_tube_diffuse_amount > 0 || HSM_CRT_BLEND_MODE == 2)
-		{
-			vec2 diffuse_coord = tube_diffuse_curved_coord;
-
-			diffuse_coord = HSM_GetMirrorWrappedCoord(diffuse_coord);
-			diffuse_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * (diffuse_coord.x - 0.5) + 0.5;
-			diffuse_coord.y = HSM_FLIP_VIEWPORT_VERTICAL * (diffuse_coord.y - 0.5) + 0.5;
-
-			diffuse_coord = (diffuse_coord - 0.5) / (HSM_TUBE_DIFFUSE_IMAGE_SCALE * vec2(HSM_TUBE_DIFFUSE_IMAGE_SCALE_X, 1)) + 0.5;
-
-			// HSM_RotateCoordinate(diffuse_coord, HSM_TUBE_DIFFUSE_IMAGE_ROTATION)
-			tube_diffuse = HSM_GetMipmappedTexSample(TubeDiffuseImage, HSM_RotateCoordinate(diffuse_coord, HSM_TUBE_DIFFUSE_IMAGE_ROTATION), TUBE_SCALE * HSM_TUBE_DIFFUSE_IMAGE_SCALE, 0);
-			tube_diffuse.rgb = HSM_GLOBAL_GRAPHICS_BRIGHTNESS * HSM_GetPreMultipliedColorLinear(vec4(tube_diffuse.rgb, 1), SOURCE_MATTE_PREMULTIPLIED, DEFAULT_SRGB_GAMMA).rgb;
-			tube_diffuse.rgb = HSM_ApplyHSVAdjustment(tube_diffuse.rgb, HSM_TUBE_DIFFUSE_IMAGE_HUE, HSM_TUBE_DIFFUSE_IMAGE_SATURATION, HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS, HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON, HSM_TUBE_DIFFUSE_IMAGE_GAMMA);
-			tube_diffuse.rgb *= HSM_TUBE_DIFFUSE_IMAGE_AMOUNT;
-
-			tube_diffuse.rgb *= tube_shadow;
-		}
-
-		// If CRT Blend Mode is Multiply (2) then the tube must be fully opaque
-		tube_diffuse.rgb = HSM_ApplyAmbientImage(tube_diffuse.rgb, ambient_lighting_image.rgb, HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING);
-		tube_diffuse.rgb = HSM_ApplyAmbientImage(tube_diffuse.rgb, ambient2_lighting_image.rgb, HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING);
-	}
-
-	tube_diffuse *= HSM_GetTubeOpacity();
-	tube_diffuse.a *= tube_mask;
-
-	out_color = tube_diffuse;
-	out_color.rgb += crt_color.rgb;
-
-	// Don't apply the CRT images
-	if (HSM_CRT_BLEND_MODE == 0)
-		out_color = tube_diffuse;
-
-	// Apply the CRT image additively to the tube diffuse color
-	if (HSM_CRT_BLEND_MODE == 1)
-		// out_color = HSM_BlendModeLayerMix(tube_diffuse, out_color, BLEND_MODE_ADD, HSM_CRT_BLEND_AMOUNT);
-		out_color.rgb += tube_diffuse.rgb;
-
-	// Apply the CRT image with multiply blending
-	if (HSM_CRT_BLEND_MODE == 2)
-	{	
-		out_color = clamp(out_color, 0, 1);
-		out_color = HSM_BlendModeLayerMix(tube_diffuse, out_color, BLEND_MODE_MULTIPLY, HSM_CRT_BLEND_AMOUNT);
-	}
-
-	// Add a Colored Gel image on top of the screen, this is what colors games like space invaders or battlezone
-	if (HSM_GetUseTubeColoredGelImage())
-	{
-		vec2 gel_coord = HSM_GetMirrorWrappedCoord(tube_diffuse_curved_coord);
-		gel_coord.x = HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL * (gel_coord.x - 0.5) + 0.5;
-		gel_coord.y = HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL * (gel_coord.y - 0.5) + 0.5;
-		gel_coord = (gel_coord - 0.5) / HSM_TUBE_COLORED_GEL_IMAGE_SCALE + 0.5;
-		vec4 gel_image = HSM_GetMipmappedTexSample(TubeColoredGelImage, gel_coord, TUBE_SCALE, 0);
-
-		gel_image = HSM_GLOBAL_GRAPHICS_BRIGHTNESS * HSM_Linearize(gel_image, DEFAULT_SRGB_GAMMA);
-
-		if (HSM_TUBE_COLORED_GEL_IMAGE_MULTIPLY_AMOUNT > 0)
-			out_color.rgb = mix(out_color.rgb, out_color.rgb * gel_image.rgb, HSM_TUBE_COLORED_GEL_IMAGE_MULTIPLY_AMOUNT);
-
-		if (HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT > 0)
-			out_color.rgb = mix(out_color.rgb, out_color.rgb + gel_image.rgb, HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT);
-
-		if (HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT > 0)
-		{
-			gel_image.a = clamp( gel_image.a - HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD, 0, 1 ) / (1 - HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD);
-			gel_image.rgb *= HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS;
-			gel_image.rgb *= tube_shadow;
-
-			if (HSM_TUBE_COLORED_GEL_IMAGE_FAKE_SCANLINE_AMOUNT > 0.001)
-				gel_image.rgb = HSM_ApplyScanlineMask(gel_image, SCREEN_SCALE, SCREEN_COORD, screen_curved_coord, tube_curved_coord, HSM_TUBE_COLORED_GEL_IMAGE_FAKE_SCANLINE_AMOUNT).rgb;
-
-			gel_image.rgb = HSM_ApplyAmbientImage(gel_image.rgb, ambient_lighting_image.rgb, HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING);
-			gel_image.rgb = HSM_ApplyAmbientImage(gel_image.rgb, ambient2_lighting_image.rgb, HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING);
-
-			gel_image = HSM_BlendModeLayerMix(gel_image, vec4(vec3(vignette_factor), 1), BLEND_MODE_MULTIPLY, HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_VIGNETTE);
-
-			if ( HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL == 0 )
-				out_color = HSM_BlendModeLayerMix(out_color, gel_image, BLEND_MODE_NORMAL, HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT);
-			
-			if ( HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL == 1 )
-			{
-				gel_image.rgb *= tube_shadow;
-				vec4 normal_blended = HSM_BlendModeLayerMix(vec4(0, 0, 0, 1), gel_image, BLEND_MODE_NORMAL, HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT);
-				out_color = normal_blended + out_color;
-			}
-		}
-	}
-
-	#ifndef IS_NO_REFLECT_PRESET
-
-	out_color.rgb *= black_edge_mask_invert;
-
-	#else
-
-	out_color.rgb *= tube_diffuse_mask;
-	out_color *= tube_mask;
-
-	#endif
-
-	if (HSM_GetUseTubeStaticReflection())
-	{
-		vec3 tube_highlight_image = HSM_GetTubeHighlight(tube_curved_coord, false, TubeStaticReflectionImage).rgb;
-		tube_highlight_image = HSM_ApplyAmbientImage(tube_highlight_image.rgb, ambient_lighting_image.rgb, HSM_TUBE_STATIC_AMBIENT_LIGHTING);
-		tube_highlight_image = HSM_ApplyAmbientImage(tube_highlight_image.rgb, ambient2_lighting_image.rgb, HSM_TUBE_STATIC_AMBIENT2_LIGHTING);
-
-		tube_highlight_image.rgb *= HSM_TUBE_STATIC_SHADOW_OPACITY * tube_shadow + (1 - HSM_TUBE_STATIC_SHADOW_OPACITY);
-
-		tube_highlight_image = clamp(HSM_TUBE_STATIC_BLACK_LEVEL * (tube_highlight_image - 1) + 1, 0, 1);
-
-		tube_highlight_image *= 1 - HSM_TUBE_STATIC_OPACITY_DIFFUSE_MULTIPLY + HSM_TUBE_STATIC_OPACITY_DIFFUSE_MULTIPLY * adjusted_tube_diffuse_amount;
-
-		out_color.rgb += tube_highlight_image * HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY;
-	}
-	
-	if (HSM_SINDEN_BORDER_ON > 0.5)
-	{
-		out_color = HSM_Apply_Sinden_Lightgun_Border(out_color, tube_diffuse_curved_coord, tube_diffuse_mask, black_edge_corner_radius);
-	}
-
-	return out_color;
-}
-
-void main()
-{
-	if (HSM_AB_COMPARE_FREEZE_CRT_TUBE == 1 && HSM_GetIsInABCompareArea(vTexCoord))
-	{
-		FragColor = texture(PassFeedback, vTexCoord);
-		return;
-	}
-
-	VIEWPORT_UNSCALED_COORD = HSM_GetViewportCoordWithFlip(vTexCoord);
-
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = TUBE_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_NO_REFLECT_PRESET
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	vec2 bezel_outside_flat_coord;
-	vec2 frame_outside_flat_coord;
-	HSM_GetSimpleBezelCoords(TUBE_DIFFUSE_COORD, 
-							TUBE_DIFFUSE_SCALE, 
-							TUBE_SCALE, 
-							SCREEN_ASPECT,
-							bezel_outside_flat_coord, 
-							frame_outside_flat_coord);
-	cache_bounds_coord = (bezel_outside_flat_coord - 0.5) * 0.9 + 0.5;
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-			FragColor = vec4(0);
-			return;
-	}
-
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						SCREEN_ASPECT, 
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-
-	vec2 screen_curved_coord = HSM_GetCurvedCoord(SCREEN_COORD, 1, SCREEN_ASPECT);
-
-	FragColor = texture(Source, UNFLIPPED_VIEWPORT_COORD);
-
-	FragColor = HSM_GetPostCrtPreppedColor(FragColor, vTexCoord, screen_curved_coord, DerezedPass, TubeDiffuseImage, TubeColoredGelImage, TubeStaticReflectionImage, BackgroundImage, BackgroundVertImage, NightLightingImage, NightLighting2Image);
-}
diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep.slang b/bezel/Mega_Bezel/shaders/base/post-crt-prep.slang
deleted file mode 100644
index 5156f86874..0000000000
--- a/bezel/Mega_Bezel/shaders/base/post-crt-prep.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-bezel-params.inc"
-#include "common/common-functions.inc"
-#include "post-crt-prep.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/reflection-glass-hdr.slang b/bezel/Mega_Bezel/shaders/base/reflection-glass-hdr.slang
deleted file mode 100644
index fd0175f87d..0000000000
--- a/bezel/Mega_Bezel/shaders/base/reflection-glass-hdr.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_HDR_PRESET
-
-#include "common/globals-and-glass-params.inc"
-#include "common/common-functions.inc"
-#include "reflection.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/reflection-glass.slang b/bezel/Mega_Bezel/shaders/base/reflection-glass.slang
deleted file mode 100644
index a08f21038b..0000000000
--- a/bezel/Mega_Bezel/shaders/base/reflection-glass.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-glass-params.inc"
-#include "common/common-functions.inc"
-#include "reflection.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/reflection.inc b/bezel/Mega_Bezel/shaders/base/reflection.inc
deleted file mode 100644
index bd6fa0bba1..0000000000
--- a/bezel/Mega_Bezel/shaders/base/reflection.inc
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-// Float format so we can avoid banding
-#pragma format R16G16B16A16_SFLOAT
-
-/////////////// IMPORTS ///////////////
-#include "common/common-functions-bezel.inc"
-
-vec2 VIEWPORT_COORD = vec2(0.5);
-
-/////////////// Helper Functions ///////////////
-
-layout(push_constant) uniform Push
-{
-	vec4 BR_MirrorBlurredPassSize;
-	vec4 BR_MirrorReflectionDiffusedPassSize;
-	vec4 BR_MirrorFullscreenGlowPassSize;
-	
-} params;
-
-//TODO remove this and replace with simpler calls
-float GetFade(float current_position, float corner_position, float fade_distance)
-{
-	return smoothstep(corner_position + fade_distance / 2, corner_position - fade_distance / 2, current_position);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 6) out vec2 vTexCoord;
-layout(location = 7) out vec2 UNFLIPPED_VIEWPORT_COORD;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-
-	UNFLIPPED_VIEWPORT_COORD = vTexCoord * 1.0001;
-	vTexCoord * 1.0001;
-
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma stage fragment
-
-layout(location = 6) in vec2 vTexCoord;
-layout(location = 7) in vec2 UNFLIPPED_VIEWPORT_COORD;
-
-layout(location = 0) out vec4 FragColor;
-
-// Pass Framebuffer Textures
-layout(set = 0, binding = 1) uniform sampler2D InfoCachePass;
-
-layout(set = 0, binding = 2) uniform sampler2D BackgroundImage;
-layout(set = 0, binding = 3) uniform sampler2D ReflectionMaskImage;
-
-layout(set = 0, binding = 4) uniform sampler2D BR_MirrorLowResPass;
-layout(set = 0, binding = 5) uniform sampler2D PostCRTPass;
-layout(set = 0, binding = 6) uniform sampler2D BR_MirrorBlurredPass;
-layout(set = 0, binding = 7) uniform sampler2D BR_MirrorReflectionDiffusedPass;
-layout(set = 0, binding = 8) uniform sampler2D BR_MirrorFullscreenGlowPass;
-
-layout(set = 0, binding = 9) uniform sampler2D ReflectionPassFeedback;
-#define PassFeedback ReflectionPassFeedback
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-void main()
-{
-	
-	if (HSM_AB_COMPARE_FREEZE_CRT_TUBE == 1 && HSM_GetIsInABCompareArea(vTexCoord))
-	{
-		FragColor = texture(PassFeedback, vTexCoord);
-		return;
-	}
-
-	VIEWPORT_UNSCALED_COORD = HSM_GetViewportCoordWithFlip(vTexCoord);
-	VIEWPORT_COORD = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						TUBE_DIFFUSE_ASPECT, 
-						true,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-
-	if (HHLP_IsOutsideCoordSpace(BEZEL_OUTSIDE_COORD))
-	{
-		FragColor = vec4(0);
-		return;
-	}
-
-	float avg_lum_mult = smoothstep(0.01, 0.5, pow(AVERAGE_LUMA, 1.3));
-
-	//----------------------------------------------------
-	// CRT Pass
-	//----------------------------------------------------
-	// Get the CRT pass and make it in linear space & mask the area outside the screen
-	vec4 crt_linear = texture(PostCRTPass, UNFLIPPED_VIEWPORT_COORD.xy);
-
-	vec4 blurred_reflection_color = HHLP_GetBilinearTextureSample(BR_MirrorBlurredPass, UNFLIPPED_VIEWPORT_COORD.xy, params.BR_MirrorBlurredPassSize);
-
-	vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-	vec2 tube_curved_coord_ctr = tube_curved_coord - 0.5;
-	vec2 edge_mask_coord = tube_curved_coord_ctr * (1 - (HSM_BZL_INNER_EDGE_THICKNESS / vec2(TUBE_DIFFUSE_ASPECT, 1))) + 0.5;
-
-	float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-	if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0)
-		bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS;
-
-	float edge_mask =  HSM_GetCornerMask(edge_mask_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, HSM_BZL_INNER_EDGE_SHARPNESS);
-
-	float outside_tube_mask = 1 - HSM_GetCornerMask((tube_curved_coord - 0.5) * 1.002 + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99);
-	TUBE_MASK = 1 - outside_tube_mask;
-
-	OUTSIDE_BEZEL_MASK = 1 - HSM_GetCornerMask(BEZEL_OUTSIDE_CURVED_COORD, TUBE_DIFFUSE_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_BZL_OUTER_CORNER_RADIUS_SCALE, 0.9);
-
-	//----------------------------------------------------
-	//  Calculate Outside mapping Coords
-	//----------------------------------------------------
-	/* This first big chunk is to get a mapping of the space outside of the screen which is continuous
-	This is more complicated than you would expect because since we are using curved coordinates 
-	there are discontinuities outside the normal screen corners, e.g. where x > 1 and y > 1
-	So instead of trying to use the coordinates from the screen/tube we use a larger space 
-	and subtract the screen space to see how far we are outside of the sreen
-	*/
-
-	// Additional scale to be applied to the tube scale to create an expanded mapping area 
-	float outermap_scale = 2.3;
-
-	// Get a range width from the outer tube edge to the outer edge of the outermap
-	float outermap_range = 0.5 * outermap_scale * 0.7;
-	vec2 outermap_screen_size_from_center = vec2(0.5, 0.5);
-	vec2 outermap_warped_outside_screen_vector = (tube_curved_coord_ctr - clamp(tube_curved_coord_ctr, -0.490, 0.490)) * vec2(1 / TUBE_DIFFUSE_ASPECT, 1);
-	float output_aspect = global.OutputSize.x / global.OutputSize.y;
-	float outside_ratio_warped = clamp(length(outermap_warped_outside_screen_vector) / outermap_range, 0, 1);
-	vec2 outermap_screen_corner_ctr_coord = vec2(0.5, -0.5);
-
-	// Get a coordinate offset so it is centered around the corner
-	vec2 outermap_coord_warped_ctr_at_screen_corner = abs(tube_curved_coord_ctr) - vec2(0.5);
-
-	//----------------------------------------------------
-	//  Calculate Corner Highlight Mask
-	//----------------------------------------------------
-	const float pi = 3.1415;
-
-	// Get amount to shift the point at the outer corner to match the overall position offset
-	vec2 pos_shift_offset = vec2(0, HSM_BZL_OUTER_POSITION_Y) * TUBE_DIFFUSE_SCALE.y / outermap_scale;
-	pos_shift_offset *= tube_curved_coord.y > 0.5 ? 1 : -1;
-
-	// Get the direction vector from the inner corner of the bezel pointing at the outer corner 
-	vec2 corner_crease_dir = (outermap_screen_corner_ctr_coord + pos_shift_offset) / vec2(HSM_BZL_HEIGHT + 1, HSM_BZL_WIDTH + 1) - (outermap_screen_corner_ctr_coord) ;
-	corner_crease_dir *= vec2(TUBE_DIFFUSE_ASPECT, 1);
-
-	float aspect_corner_length_scale_offset = TUBE_DIFFUSE_ASPECT > 1 ? 0.9 : 1.5;
-	float corner_crease_length = length(corner_crease_dir * aspect_corner_length_scale_offset);
-
-	// A hack to adjust the angle offset, because without it the corner angle isn't pointing exactly at the corner
-	// This offset is the opposite direction for vertical and horizontal aspect ratio
-	float corner_rotation_offset = (SCREEN_COORD.y < 0.5) ? -HSM_REFLECT_CORNER_ROTATION_OFFSET_TOP : -HSM_REFLECT_CORNER_ROTATION_OFFSET_BOTTOM;
-
-	if (HSM_CURVATURE_MODE == 0)
-		// If we are using a 3d Curvature no offset is necessary
-		corner_rotation_offset += (TUBE_DIFFUSE_ASPECT > 1) ? 2 : 3;
-
-	// Convert direction vector to an angle so we can rotate the corner crease direction
-	float corner_angle_degrees = atan(corner_crease_dir.y / corner_crease_dir.x) / (2 * pi) * 360;
-
-	corner_angle_degrees += corner_rotation_offset;
-	float corner_angle_radians = corner_angle_degrees / 360 * 2 * pi;
-	corner_crease_dir = vec2(cos(corner_angle_radians), sin(corner_angle_radians));
-
-	// Get the distance perpendicular to the crease direction so we can use it to fade later
-	float distance_from_crease = HHLP_GetDistanceToLine(outermap_coord_warped_ctr_at_screen_corner.x, outermap_coord_warped_ctr_at_screen_corner.y, 1, corner_crease_dir.y / corner_crease_dir.x, 0 );
-
-	float fade_out_to_corner = HHLP_QuadraticBezier(clamp(length(outermap_warped_outside_screen_vector) / (corner_crease_length * 2), 0, 1), vec2(0.5, HSM_REFLECT_CORNER_SPREAD_FALLOFF / 100));
-
-	float corner_fade_width_inner = HSM_REFLECT_CORNER_INNER_SPREAD * (TUBE_DIFFUSE_SCALE.x + TUBE_DIFFUSE_SCALE.y) * bezel_corner_radius / 10 / 250 * 1.2;
-	float corner_fade_width_outer = HSM_REFLECT_CORNER_OUTER_SPREAD * (TUBE_DIFFUSE_SCALE.x + TUBE_DIFFUSE_SCALE.y) * HSM_GLOBAL_CORNER_RADIUS * HSM_BZL_OUTER_CORNER_RADIUS_SCALE / 10 / 250 * 1.6;
-	float corner_fade_width = (corner_fade_width_inner + fade_out_to_corner * (corner_fade_width_outer - corner_fade_width_inner));
-
-	// Get a vector perpendicular to the crease that we can shift the crease to blend between bottom/top and sides
-	vec2 corner_crease_perp_dir = normalize(vec2(corner_crease_dir.y, corner_crease_dir.x));
-	vec2 corner_coord_shifted = outermap_coord_warped_ctr_at_screen_corner - corner_crease_perp_dir * corner_fade_width / 2;
-	vec2 corner_crease_dir_shifted = corner_crease_dir - corner_crease_perp_dir * corner_fade_width / 2;
-
-	// Get the distance to this shifted crease
-	float distance_from_crease_shifted = HHLP_GetDistanceToLine(corner_coord_shifted.x, corner_coord_shifted.y, 1, corner_crease_dir_shifted.y / corner_crease_dir_shifted.x, 0 );
-
-	float top_half_mask = smoothstep(0.55, 0.5, tube_curved_coord.y);
-
-	// Get a mask which transitions between sides and top/bottom at the corner crease  
-	float top_bottom_vs_sides_mask = dot(normalize(corner_coord_shifted), normalize(corner_crease_dir_shifted)) > 0 ? 1 - smoothstep(0, corner_fade_width / 2, distance_from_crease_shifted) : 1;
-
-	// Masks isolating specific parts
-	float sides_mask = 1 - top_bottom_vs_sides_mask;
-	float top_mask = top_half_mask * top_bottom_vs_sides_mask;
-	float bottom_mask = (1 -top_half_mask) * top_bottom_vs_sides_mask;
-
-	float corner_mask = smoothstep(corner_fade_width / 2, 0, distance_from_crease);
-
-	float top_corner_mask = corner_mask * top_half_mask;
-	float bottom_corner_mask = corner_mask * (1 - top_half_mask);
-
-	float frame_inner_edge_mask = (HSM_FRM_INNER_EDGE_THICKNESS == 0) ? 0 : 1 - HSM_GetCornerMask(	(BEZEL_OUTSIDE_CURVED_COORD - 0.5) * (1 + (HSM_FRM_INNER_EDGE_THICKNESS / vec2(TUBE_DIFFUSE_ASPECT, 1))) + 0.5, 
-																										TUBE_DIFFUSE_ASPECT, 
-																										HSM_GLOBAL_CORNER_RADIUS * HSM_BZL_OUTER_CORNER_RADIUS_SCALE, 
-																										0.9);
-	float outside_tube_mask_wider = 1 - HSM_GetCornerMask(tube_curved_coord_ctr * 0.996 + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.9);
-	float tube_shadow_mask = HSM_GetCornerMask(tube_curved_coord_ctr + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0);
-	float tube_edge_shadow_mult = HSM_BZL_INNER_EDGE_SHADOW * (tube_shadow_mask) + (1 - HSM_BZL_INNER_EDGE_SHADOW);
-
-	crt_linear.rgb *= tube_edge_shadow_mult * (1 - outside_tube_mask_wider);
-
-	float edge_highlight_mask = 0;
-
-	// ----------------------------------------------------
-	// Generated Bezel
-	// ----------------------------------------------------
-
-	float hmbz_bezel_highlight_edge = 0.9;
-	float hmbz_bezel_highlight_top = 0.2;
-	float hmbz_bezel_highlight_bottom = 0.3;
-	float hmbz_bezel_highlight_sides = 0.2;
-
-	float hmbz_bezel_edge_highlight_width = 0.8;
-	if (HSM_GLASS_BORDER_ON == 1)
-		hmbz_bezel_edge_highlight_width = 0.55;
-
-	float edge_top_center_highlight_mask 		= hmbz_bezel_highlight_top * top_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.8, 0));
-	float edge_bottom_center_highlight_mask 	= hmbz_bezel_highlight_bottom * bottom_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.8, 0));
-	float edge_sides_highlight_mask 			= hmbz_bezel_highlight_sides * sides_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.y)), vec2(0.8, 0));
-
-	if (HSM_GLASS_BORDER_ON == 1)
-	{
-		edge_top_center_highlight_mask 		= 0.6 * top_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.8, 1));
-		edge_bottom_center_highlight_mask 	= bottom_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.x)), vec2(0.8, 1));
-		edge_sides_highlight_mask 			= 0.7 * sides_mask * HHLP_QuadraticBezier(smoothstep(hmbz_bezel_edge_highlight_width, 0, abs(tube_curved_coord_ctr.y)), vec2(0.8, 1));
-	}
-
-	edge_highlight_mask = hmbz_bezel_highlight_edge * edge_mask * (edge_top_center_highlight_mask + edge_bottom_center_highlight_mask + edge_sides_highlight_mask);
-
-	//----------------------------------------------------
-	// Reflection
-	//----------------------------------------------------
-	vec4 reflection_color = vec4(0);
-	vec4 edge_reflection_color = vec4(0);
-	vec4 glass_border_edge_color = vec4(0);
-	vec4 edge_fullscreen_glow = vec4(0);
-	if (HSM_REFLECT_GLOBAL_AMOUNT > 0)
-	{
-		// Corner Mask for Specular highlights
-		float fade_out_to_corner = smoothstep(0 + HSM_REFLECT_CORNER_FADE_DISTANCE / 2, 0 - HSM_REFLECT_CORNER_FADE_DISTANCE / 2, outside_ratio_warped);
-		float corner_fade_mask = (top_corner_mask + bottom_corner_mask) * (HSM_REFLECT_CORNER_FADE) * fade_out_to_corner * 2;
-
-		corner_fade_mask *= 1 - frame_inner_edge_mask;
-
-		// Radial fade - fading away from the edges of the screen
-		float radial_fade_speed = 100;
-		float radial_fade_sides = 1 - HHLP_QuadraticBezier(clamp((outside_ratio_warped / (HSM_REFLECT_RADIAL_FADE_WIDTH)), 0, 1), vec2(1 - (radial_fade_speed / 100), 1));
-		float radial_fade_top_bottom = 1 - HHLP_QuadraticBezier(clamp((outside_ratio_warped / (HSM_REFLECT_RADIAL_FADE_HEIGHT)), 0, 1), vec2(1 - (radial_fade_speed / 100), 1));
-		float radial_fade_mask = clamp((1 - sides_mask) * radial_fade_top_bottom
-									+ sides_mask * radial_fade_sides, 0, 1);
-
-		float radial_inner_fade_mask = clamp(0.3 + 0.7 * HHLP_QuadraticBezier(smoothstep(0.01, 0.3, outside_ratio_warped / (HSM_REFLECT_RADIAL_FADE_WIDTH)), vec2(0.1, 0.3)), 0, 1);
-
-		// Lateral fade - Fading left to right across the bottom or top to bottom along the sides 
-		float distance_ratio = smoothstep(0, 0.075, outside_ratio_warped);
-		float lateral_outer_fade_distance = HSM_REFLECT_LATERAL_OUTER_FADE_DISTANCE;
-		lateral_outer_fade_distance = 0.5 * lateral_outer_fade_distance + distance_ratio * 0.5 * lateral_outer_fade_distance;
-		float lateral_fade_mask = (1 - sides_mask) * GetFade(abs(tube_curved_coord_ctr.x) + (HSM_REFLECT_LATERAL_OUTER_FADE_POSITION) / TUBE_DIFFUSE_ASPECT, 
-																	outermap_screen_size_from_center.x,
-																	outermap_screen_size_from_center.x * lateral_outer_fade_distance)
-										+  sides_mask * GetFade(abs(tube_curved_coord_ctr.y) + (HSM_REFLECT_LATERAL_OUTER_FADE_POSITION) / TUBE_DIFFUSE_ASPECT, 
-																outermap_screen_size_from_center.y, 
-																outermap_screen_size_from_center.y * lateral_outer_fade_distance); 
-
-		vec2 screen_coord_ctr = SCREEN_COORD - 0.5;
-
-		float combined_fade_mask = radial_fade_mask * lateral_fade_mask;
-
-		// Put all the fades together into one mask
-		float final_fade_mask = clamp(HSM_REFLECT_FADE_AMOUNT * combined_fade_mask, 0, 1) + 1 - HSM_REFLECT_FADE_AMOUNT;
-
-		float stoichaic_blur_samples = HSM_REFLECT_NOISE_SAMPLES;
-		float noise_falloff = 0.3;
-		float stoichaic_blur_max = HHLP_QuadraticBezier(outside_ratio_warped, vec2(0, noise_falloff)) * 3;
-		float stoichaic_blur_amount = HSM_REFLECT_NOISE_SAMPLE_DISTANCE;
-
-		// vec4 fullscreen_blurred_sampled_color = HSM_GetStoichaicBlurredSample(BR_MirrorFullscreenGlowPass, VIEWPORT_COORD.xy, stoichaic_blur_samples, (1 - corner_mask) * stoichaic_blur_max * 3, stoichaic_blur_amount);
-		vec4 fullscreen_blurred_sampled_color = HHLP_GetBilinearTextureSample(BR_MirrorFullscreenGlowPass, UNFLIPPED_VIEWPORT_COORD.xy, params.BR_MirrorFullscreenGlowPassSize);
-
-		vec4 corner_reflection_color = fullscreen_blurred_sampled_color;
-		
-		vec4 fullscreen_glow_color = pow(fullscreen_blurred_sampled_color, vec4(HSM_REFLECT_FULLSCREEN_GLOW_GAMMA));
-		
-		vec4 diffused_reflection_color = HHLP_GetBilinearTextureSample(BR_MirrorReflectionDiffusedPass, UNFLIPPED_VIEWPORT_COORD.xy, params.BR_MirrorReflectionDiffusedPassSize);
-		vec4 diffused_reflection_scatter_color = HSM_GetStoichaicBlurredSample(BR_MirrorReflectionDiffusedPass, UNFLIPPED_VIEWPORT_COORD.xy, stoichaic_blur_samples, stoichaic_blur_max, stoichaic_blur_amount);
-		vec4 diffused_reflection_blended_color = mix(diffused_reflection_color, diffused_reflection_scatter_color, HSM_REFLECT_NOISE_AMOUNT);
-
-		vec4 blurred_reflection_scatter_color = HSM_GetStoichaicBlurredSample(BR_MirrorBlurredPass, UNFLIPPED_VIEWPORT_COORD.xy, stoichaic_blur_samples, stoichaic_blur_max, stoichaic_blur_amount);
-		vec4 blurred_reflection_blended_color = mix(blurred_reflection_color, blurred_reflection_scatter_color, HSM_REFLECT_NOISE_AMOUNT);
-
-		// Add Fullscreen Glow
-		float lateral_fade_outer_mask_for_glow = (lateral_fade_mask - 1) * 0.8 + 1;
-
-		//Combine diffused and undiffused reflection
-		
-		vec4 bezel_reflection_color = (HSM_REFLECT_DIRECT_AMOUNT * blurred_reflection_blended_color + HSM_REFLECT_DIFFUSED_AMOUNT * diffused_reflection_blended_color) * final_fade_mask;
-
-		// Add Reflection from corners which is sampled from the fullscreen glow
-		bezel_reflection_color += HSM_REFLECT_CORNER_FADE * 100 * corner_reflection_color * corner_fade_mask;
-
-		// Add Fullscreen Glow
-		bezel_reflection_color += HSM_REFLECT_FULLSCREEN_GLOW * 1.5 * fullscreen_glow_color * radial_inner_fade_mask * lateral_fade_outer_mask_for_glow;
-
-		// Add Bezel and Edge reflection together
-		edge_reflection_color = 1.25 * HSM_REFLECT_BEZEL_INNER_EDGE_AMOUNT * (blurred_reflection_color + 0.50 * diffused_reflection_color);
-		float reflection_area_mask = outside_tube_mask;
-
-		// Edge Reflection
-		if (HSM_GLASS_BORDER_ON == 1)
-		{
-			float vignette_shadow_mask = 0.75 * HHLP_QuadraticBezier(1 - HSM_GetVignetteFactor(VIEWPORT_COORD, HSM_REFLECT_VIGNETTE_AMOUNT, HSM_REFLECT_VIGNETTE_SIZE), vec2(1, 0.5));
-			vignette_shadow_mask += 0.5 * HSM_REFLECT_VIGNETTE_AMOUNT * HHLP_QuadraticBezier(smoothstep(outside_ratio_warped, 0, 0.1), vec2(1, 0.5));
-			reflection_color += (1 - vignette_shadow_mask) * bezel_reflection_color;
-			reflection_area_mask *= outside_tube_mask_wider;
-		}
-		else
-		{
-			reflection_color += (1 - edge_mask) * bezel_reflection_color;
-			reflection_color += edge_mask * (edge_reflection_color + HHLP_EasePowerIn(corner_mask, 1) * corner_reflection_color);
-		}
-
-		reflection_color = HSM_REFLECT_GLOBAL_AMOUNT * pow(reflection_color, vec4(HSM_REFLECT_GLOBAL_GAMMA_ADJUST));
-
-		// Mask reflection to only appear inside the bezel
-		reflection_color = clamp(reflection_color, 0, 1) * clamp(reflection_area_mask, 0, 1);
-
-		if (HSM_GLASS_BORDER_ON == 1)
-		{
-			glass_border_edge_color = HSM_REFLECT_GLOBAL_AMOUNT * pow(edge_reflection_color, vec4(HSM_REFLECT_GLOBAL_GAMMA_ADJUST));
-			reflection_color = mix(reflection_color, glass_border_edge_color, edge_mask * outside_tube_mask);
-		}
-		// Edge Full Screen Glow
-		// Add Small amount of static glow on the edge (So when the screen is dark there is some highlight) as well as dynamic light
-		edge_fullscreen_glow = HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW * edge_highlight_mask * outside_tube_mask * (vec4(0.005) 
-									+ (avg_lum_mult  + 0.5) * (2 * fullscreen_glow_color + vec4(0.01)));
-		
-		// Add Diffused reflection on top of the glass inner edge
-		if (HSM_GLASS_BORDER_ON == 1)
-			edge_fullscreen_glow += HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW * 0.5 * edge_highlight_mask * outside_tube_mask * diffused_reflection_color;
-
-		reflection_color += clamp(edge_fullscreen_glow, 0, 1);
-		reflection_color.a = 1;
-
-		// Modulate amount of refleciton on frame inner edge
-		reflection_color.rgb *= (1 - HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT) * (1 - frame_inner_edge_mask) + HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT;
-	}
-
-	crt_linear.rgb *= TUBE_MASK;
-	crt_linear = clamp(crt_linear, 0, 1);
-
-#ifdef IS_GLASS_PRESET
-	vec4 bg_image = HSM_GetMipmappedTexSample(BackgroundImage, VIEWPORT_COORD, vec2(1), 0);
-	
-	bg_image = HSM_Linearize(bg_image, DEFAULT_SRGB_GAMMA);
-
-	bg_image.a *= outside_tube_mask_wider * (1 - edge_mask);
-
-	vec4 frag_color_linear = crt_linear;
-	frag_color_linear = HSM_BlendModeLayerMix(frag_color_linear, bg_image, HSM_BG_BLEND_MODE, HSM_BG_OPACITY);
-	frag_color_linear += reflection_color;
-
-	FragColor = frag_color_linear;
-
-// Apply output gamma if this not an HDR preset because it is the last pass
-#ifndef IS_HDR_PRESET
-	FragColor = HSM_Delinearize(frag_color_linear, DEFAULT_SRGB_GAMMA);
-#endif
-
-// #ifdef IS_HDR_PRESET
-// 	vec3 output_colour = vec3(0);
-// 	LinearToOutputColor(FragColor.rgb, output_colour);
-// 	FragColor = vec4(output_colour, 1.0f);
-// #endif
-
-	return;
-#endif
-
-FragColor = crt_linear;
-FragColor.rgb += reflection_color.rgb;
-FragColor *= 1 - OUTSIDE_BEZEL_MASK;
-return;
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/reflection.slang b/bezel/Mega_Bezel/shaders/base/reflection.slang
deleted file mode 100644
index fb9a8aba30..0000000000
--- a/bezel/Mega_Bezel/shaders/base/reflection.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-reflection-params.inc"
-#include "common/common-functions.inc"
-#include "reflection.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/stock.inc b/bezel/Mega_Bezel/shaders/base/stock.inc
deleted file mode 100644
index e504d51473..0000000000
--- a/bezel/Mega_Bezel/shaders/base/stock.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(texture(Source, vTexCoord).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/stock.slang b/bezel/Mega_Bezel/shaders/base/stock.slang
deleted file mode 100644
index c03e16226b..0000000000
--- a/bezel/Mega_Bezel/shaders/base/stock.slang
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#include "stock.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/text-adv-glass.slang b/bezel/Mega_Bezel/shaders/base/text-adv-glass.slang
deleted file mode 100644
index 0eef4beefc..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text-adv-glass.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_STD_PRESET
-
-#include "common/globals-and-glass-params.inc"
-#include "common/base-functions.inc"
-#include "text.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/text-adv-no-reflect.slang b/bezel/Mega_Bezel/shaders/base/text-adv-no-reflect.slang
deleted file mode 100644
index 0eb02875db..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text-adv-no-reflect.slang
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 450
-
-#define IS_ADV_PRESET
-#define IS_NO_REFLECT_PRESET
-
-#include "common/globals-and-image-layers-params.inc"
-#include "common/base-functions.inc"
-#include "text.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/text-adv.slang b/bezel/Mega_Bezel/shaders/base/text-adv.slang
deleted file mode 100644
index dedfa01d88..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text-adv.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_ADV_PRESET
-
-#include "common/globals-and-all-params.inc"
-#include "common/base-functions.inc"
-#include "text.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/text-potato.slang b/bezel/Mega_Bezel/shaders/base/text-potato.slang
deleted file mode 100644
index dad58107f9..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text-potato.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "common/globals-and-potato-params.inc"
-#include "common/base-functions.inc"
-#include "text.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/text-std-glass.slang b/bezel/Mega_Bezel/shaders/base/text-std-glass.slang
deleted file mode 100644
index 0eef4beefc..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text-std-glass.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_STD_PRESET
-
-#include "common/globals-and-glass-params.inc"
-#include "common/base-functions.inc"
-#include "text.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/text-std-no-reflect.slang b/bezel/Mega_Bezel/shaders/base/text-std-no-reflect.slang
deleted file mode 100644
index ed2ff07b87..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text-std-no-reflect.slang
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 450
-
-#define IS_STD_PRESET
-#define IS_NO_REFLECT_PRESET
-
-#include "common/globals-and-image-layers-params.inc"
-#include "common/base-functions.inc"
-#include "text.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/base/text-std.slang b/bezel/Mega_Bezel/shaders/base/text-std.slang
deleted file mode 100644
index dfcb412a23..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text-std.slang
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 450
-
-#define IS_STD_PRESET
-
-#include "common/globals-and-all-params.inc"
-#include "common/base-functions.inc"
-#include "text.inc"
-
diff --git a/bezel/Mega_Bezel/shaders/base/text.inc b/bezel/Mega_Bezel/shaders/base/text.inc
deleted file mode 100644
index 0599ff1b48..0000000000
--- a/bezel/Mega_Bezel/shaders/base/text.inc
+++ /dev/null
@@ -1,655 +0,0 @@
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2021 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma alias TextPass
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-
-layout(set = 0, binding = 2) uniform sampler2D TextPassFeedback;
-#define PassFeedback TextPassFeedback
-
-layout(set = 0, binding = 8) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 9) uniform sampler2D InfoCachePassFeedback;
-
-/*
-    Text code is from the Shadertoy "96-bit 8x12" Font by Flyguy
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#define MAX_INT_DIGITS 4
-
-#define CHAR_SIZE vec2(6, 7)
-#define CHAR_SPACING vec2(6, 11)
-
-#define STRWIDTH(c) (c * CHAR_SPACING.x)
-#define STRHEIGHT(c) (c * CHAR_SPACING.y)
-
-#define DOWN_SCALE 2.0
-
-/*
-Top left pixel is the most significant bit.
-Bottom right pixel is the least significant bit.
-
- ███  |
-â–ˆ   â–ˆ |
-â–ˆ   â–ˆ |
-â–ˆ   â–ˆ |
-█████ |
-â–ˆ   â–ˆ |
-â–ˆ   â–ˆ |
-
-011100
-100010
-100010
-100010
-111110
-100010
-100010
-
-011100 (upper 21 bits)
-100010 -> 011100 100010 100010 100 -> 935188
-100010
-100
-   010 (lower 21 bits)
-111110 -> 010 111110 100010 100010 -> 780450
-100010
-100010
-
-vec2(935188.0,780450.0)
-*/
-
-//Automatically generated from the sprite sheet here: http://uzebox.org/wiki/index.php?title=File:Font6x8.png
-vec2 ch_spc = vec2(0.0,0.0);
-vec2 ch_exc = vec2(276705.0,32776.0);
-vec2 ch_quo = vec2(1797408.0,0.0);
-vec2 ch_hsh = vec2(10738.0,1134484.0);
-vec2 ch_dol = vec2(538883.0,19976.0);
-vec2 ch_pct = vec2(1664033.0,68006.0);
-vec2 ch_amp = vec2(545090.0,174362.0);
-vec2 ch_apo = vec2(798848.0,0.0);
-vec2 ch_lbr = vec2(270466.0,66568.0);
-vec2 ch_rbr = vec2(528449.0,33296.0);
-vec2 ch_ast = vec2(10471.0,1688832.0);
-vec2 ch_crs = vec2(4167.0,1606144.0);
-vec2 ch_per = vec2(0.0,1560.0);
-vec2 ch_dsh = vec2(7.0,1572864.0);
-vec2 ch_com = vec2(0.0,1544.0);
-vec2 ch_lsl = vec2(1057.0,67584.0);
-vec2 ch_0 = vec2(935221.0,731292.0);
-vec2 ch_1 = vec2(274497.0,33308.0);
-vec2 ch_2 = vec2(934929.0,1116222.0);
-vec2 ch_3 = vec2(934931.0,1058972.0);
-vec2 ch_4 = vec2(137380.0,1302788.0);
-vec2 ch_5 = vec2(2048263.0,1058972.0);
-vec2 ch_6 = vec2(401671.0,1190044.0);
-vec2 ch_7 = vec2(2032673.0,66576.0);
-vec2 ch_8 = vec2(935187.0,1190044.0);
-vec2 ch_9 = vec2(935187.0,1581336.0);
-vec2 ch_col = vec2(195.0,1560.0);
-vec2 ch_scl = vec2(195.0,1544.0);
-vec2 ch_les = vec2(135300.0,66052.0);
-vec2 ch_equ = vec2(496.0,3968.0);
-vec2 ch_grt = vec2(528416.0,541200.0);
-vec2 ch_que = vec2(934929.0,1081352.0);
-vec2 ch_ats = vec2(935285.0,714780.0);
-vec2 ch_A = vec2(935188.0,780450.0);
-vec2 ch_B = vec2(1983767.0,1190076.0);
-vec2 ch_C = vec2(935172.0,133276.0);
-vec2 ch_D = vec2(1983764.0,665788.0);
-vec2 ch_E = vec2(2048263.0,1181758.0);
-vec2 ch_F = vec2(2048263.0,1181728.0);
-vec2 ch_G = vec2(935173.0,1714334.0);
-vec2 ch_H = vec2(1131799.0,1714338.0);
-vec2 ch_I = vec2(921665.0,33308.0);
-vec2 ch_J = vec2(66576.0,665756.0);
-vec2 ch_K = vec2(1132870.0,166178.0);
-vec2 ch_L = vec2(1065220.0,133182.0);
-vec2 ch_M = vec2(1142100.0,665762.0);
-vec2 ch_N = vec2(1140052.0,1714338.0);
-vec2 ch_O = vec2(935188.0,665756.0);
-vec2 ch_P = vec2(1983767.0,1181728.0);
-vec2 ch_Q = vec2(935188.0,698650.0);
-vec2 ch_R = vec2(1983767.0,1198242.0);
-vec2 ch_S = vec2(935171.0,1058972.0);
-vec2 ch_T = vec2(2035777.0,33288.0);
-vec2 ch_U = vec2(1131796.0,665756.0);
-vec2 ch_V = vec2(1131796.0,664840.0);
-vec2 ch_W = vec2(1131861.0,699028.0);
-vec2 ch_X = vec2(1131681.0,84130.0);
-vec2 ch_Y = vec2(1131794.0,1081864.0);
-vec2 ch_Z = vec2(1968194.0,133180.0);
-vec2 ch_lsb = vec2(925826.0,66588.0);
-vec2 ch_rsl = vec2(16513.0,16512.0);
-vec2 ch_rsb = vec2(919584.0,1065244.0);
-vec2 ch_pow = vec2(272656.0,0.0);
-vec2 ch_usc = vec2(0.0,62.0);
-vec2 ch_a = vec2(224.0,649374.0);
-vec2 ch_b = vec2(1065444.0,665788.0);
-vec2 ch_c = vec2(228.0,657564.0);
-vec2 ch_d = vec2(66804.0,665758.0);
-vec2 ch_e = vec2(228.0,772124.0);
-vec2 ch_f = vec2(401543.0,1115152.0);
-vec2 ch_g = vec2(244.0,665474.0);
-vec2 ch_h = vec2(1065444.0,665762.0);
-vec2 ch_i = vec2(262209.0,33292.0);
-vec2 ch_j = vec2(131168.0,1066252.0);
-vec2 ch_k = vec2(1065253.0,199204.0);
-vec2 ch_l = vec2(266305.0,33292.0);
-vec2 ch_m = vec2(421.0,698530.0);
-vec2 ch_n = vec2(452.0,1198372.0);
-vec2 ch_o = vec2(228.0,665756.0);
-vec2 ch_p = vec2(484.0,667424.0);
-vec2 ch_q = vec2(244.0,665474.0);
-vec2 ch_r = vec2(354.0,590904.0);
-vec2 ch_s = vec2(228.0,114844.0);
-vec2 ch_t = vec2(8674.0,66824.0);
-vec2 ch_u = vec2(292.0,1198868.0);
-vec2 ch_v = vec2(276.0,664840.0);
-vec2 ch_w = vec2(276.0,700308.0);
-vec2 ch_x = vec2(292.0,1149220.0);
-vec2 ch_y = vec2(292.0,1163824.0);
-vec2 ch_z = vec2(480.0,1148988.0);
-vec2 ch_lpa = vec2(401542.0,66572.0);
-vec2 ch_bar = vec2(266304.0,33288.0);
-vec2 ch_rpa = vec2(788512.0,1589528.0);
-vec2 ch_tid = vec2(675840.0,0.0);
-vec2 ch_lar = vec2(8387.0,1147904.0);
-
-float TEXT_MASK = 0;
-vec2 CUR_UV = vec2(0);
-
-#define _spc TEXT_MASK += char_px(ch_spc, CUR_UV);
-#define _exc TEXT_MASK += char_px(ch_exc, CUR_UV);
-#define _quo TEXT_MASK += char_px(ch_quo, CUR_UV);
-#define _hsh TEXT_MASK += char_px(ch_hsh, CUR_UV);
-#define _dol TEXT_MASK += char_px(ch_dol, CUR_UV);
-#define _pct TEXT_MASK += char_px(ch_pct, CUR_UV);
-#define _amp TEXT_MASK += char_px(ch_amp, CUR_UV);
-#define _apo TEXT_MASK += char_px(ch_apo, CUR_UV);
-#define _lbr TEXT_MASK += char_px(ch_lbr, CUR_UV);
-#define _rbr TEXT_MASK += char_px(ch_rbr, CUR_UV);
-#define _ast TEXT_MASK += char_px(ch_ast, CUR_UV);
-#define _crs TEXT_MASK += char_px(ch_crs, CUR_UV);
-#define _per TEXT_MASK += char_px(ch_per, CUR_UV);
-#define _dsh TEXT_MASK += char_px(ch_dsh, CUR_UV);
-#define _com TEXT_MASK += char_px(ch_com, CUR_UV);
-#define _lsl TEXT_MASK += char_px(ch_lsl, CUR_UV);
-#define _0 TEXT_MASK += char_px(ch_0, CUR_UV);
-#define _1 TEXT_MASK += char_px(ch_1, CUR_UV);
-#define _2 TEXT_MASK += char_px(ch_2, CUR_UV);
-#define _3 TEXT_MASK += char_px(ch_3, CUR_UV);
-#define _4 TEXT_MASK += char_px(ch_4, CUR_UV);
-#define _5 TEXT_MASK += char_px(ch_5, CUR_UV);
-#define _6 TEXT_MASK += char_px(ch_6, CUR_UV);
-#define _7 TEXT_MASK += char_px(ch_7, CUR_UV);
-#define _8 TEXT_MASK += char_px(ch_8, CUR_UV);
-#define _9 TEXT_MASK += char_px(ch_9, CUR_UV);
-#define _col TEXT_MASK += char_px(ch_col, CUR_UV);
-#define _scl TEXT_MASK += char_px(ch_scl, CUR_UV);
-#define _les TEXT_MASK += char_px(ch_les, CUR_UV);
-#define _equ TEXT_MASK += char_px(ch_equ, CUR_UV);
-#define _grt TEXT_MASK += char_px(ch_grt, CUR_UV);
-#define _que TEXT_MASK += char_px(ch_que, CUR_UV);
-#define _ats TEXT_MASK += char_px(ch_ats, CUR_UV);
-#define _A TEXT_MASK += char_px(ch_A, CUR_UV);
-#define _B TEXT_MASK += char_px(ch_B, CUR_UV);
-#define _C TEXT_MASK += char_px(ch_C, CUR_UV);
-#define _D TEXT_MASK += char_px(ch_D, CUR_UV);
-#define _E TEXT_MASK += char_px(ch_E, CUR_UV);
-#define _F TEXT_MASK += char_px(ch_F, CUR_UV);
-#define _G TEXT_MASK += char_px(ch_G, CUR_UV);
-#define _H TEXT_MASK += char_px(ch_H, CUR_UV);
-#define _I TEXT_MASK += char_px(ch_I, CUR_UV);
-#define _J TEXT_MASK += char_px(ch_J, CUR_UV);
-#define _K TEXT_MASK += char_px(ch_K, CUR_UV);
-#define _L TEXT_MASK += char_px(ch_L, CUR_UV);
-#define _M TEXT_MASK += char_px(ch_M, CUR_UV);
-#define _N TEXT_MASK += char_px(ch_N, CUR_UV);
-#define _O TEXT_MASK += char_px(ch_O, CUR_UV);
-#define _P TEXT_MASK += char_px(ch_P, CUR_UV);
-#define _Q TEXT_MASK += char_px(ch_Q, CUR_UV);
-#define _R TEXT_MASK += char_px(ch_R, CUR_UV);
-#define _S TEXT_MASK += char_px(ch_S, CUR_UV);
-#define _T TEXT_MASK += char_px(ch_T, CUR_UV);
-#define _U TEXT_MASK += char_px(ch_U, CUR_UV);
-#define _V TEXT_MASK += char_px(ch_V, CUR_UV);
-#define _W TEXT_MASK += char_px(ch_W, CUR_UV);
-#define _X TEXT_MASK += char_px(ch_X, CUR_UV);
-#define _Y TEXT_MASK += char_px(ch_Y, CUR_UV);
-#define _Z TEXT_MASK += char_px(ch_Z, CUR_UV);
-#define _lsb TEXT_MASK += char_px(ch_lsb, CUR_UV);
-#define _rsl TEXT_MASK += char_px(ch_rsl, CUR_UV);
-#define _rsb TEXT_MASK += char_px(ch_rsb, CUR_UV);
-#define _pow TEXT_MASK += char_px(ch_pow, CUR_UV);
-#define _usc TEXT_MASK += char_px(ch_usc, CUR_UV);
-#define _a TEXT_MASK += char_px(ch_a, CUR_UV);
-#define _b TEXT_MASK += char_px(ch_b, CUR_UV);
-#define _c TEXT_MASK += char_px(ch_c, CUR_UV);
-#define _d TEXT_MASK += char_px(ch_d, CUR_UV);
-#define _e TEXT_MASK += char_px(ch_e, CUR_UV);
-#define _f TEXT_MASK += char_px(ch_f, CUR_UV);
-#define _g TEXT_MASK += char_px(ch_g, CUR_UV);
-#define _h TEXT_MASK += char_px(ch_h, CUR_UV);
-#define _i TEXT_MASK += char_px(ch_i, CUR_UV);
-#define _j TEXT_MASK += char_px(ch_j, CUR_UV);
-#define _k TEXT_MASK += char_px(ch_k, CUR_UV);
-#define _l TEXT_MASK += char_px(ch_l, CUR_UV);
-#define _m TEXT_MASK += char_px(ch_m, CUR_UV);
-#define _n TEXT_MASK += char_px(ch_n, CUR_UV);
-#define _o TEXT_MASK += char_px(ch_o, CUR_UV);
-#define _p TEXT_MASK += char_px(ch_p, CUR_UV);
-#define _q TEXT_MASK += char_px(ch_q, CUR_UV);
-#define _r TEXT_MASK += char_px(ch_r, CUR_UV);
-#define _s TEXT_MASK += char_px(ch_s, CUR_UV);
-#define _t TEXT_MASK += char_px(ch_t, CUR_UV);
-#define _u TEXT_MASK += char_px(ch_u, CUR_UV);
-#define _v TEXT_MASK += char_px(ch_v, CUR_UV);
-#define _w TEXT_MASK += char_px(ch_w, CUR_UV);
-#define _x TEXT_MASK += char_px(ch_x, CUR_UV);
-#define _y TEXT_MASK += char_px(ch_y, CUR_UV);
-#define _z TEXT_MASK += char_px(ch_z, CUR_UV);
-#define _lpa TEXT_MASK += char_px(ch_lpa, CUR_UV);
-#define _bar TEXT_MASK += char_px(ch_bar, CUR_UV);
-#define _rpa TEXT_MASK += char_px(ch_rpa, CUR_UV);
-#define _tid TEXT_MASK += char_px(ch_tid, CUR_UV);
-#define _lar TEXT_MASK += char_px(ch_lar, CUR_UV);
-
-vec2 res;
-vec2 print_pos = vec2(0);
-
-//Extracts bit b from the given number.
-//Shifts bits right (num / 2^bit) then ANDs the result with 1 (mod(result,2.0)).
-float extract_bit(float n, float b)
-{
-    b = clamp(b,-1.0,22.0); //Fixes small artefacts on my nexus 7
-	return floor(mod(floor(n / pow(2.0,floor(b))),2.0));
-}
-
-//Returns the pixel at uv in the given bit-packed sprite.
-float sprite(vec2 spr, vec2 size, vec2 uv)
-{
-    uv = floor(uv);
-    //Calculate the bit to extract (x + y * width) (flipped on x-axis)
-    float bit = (size.x-uv.x-1.0) + uv.y * size.x;
-
-    //Clipping bound to remove garbage outside the sprite's boundaries.
-    bool bounds = all(greaterThanEqual(uv,vec2(0)));
-    bounds = bounds && all(lessThan(uv,size));
-
-    return bounds ? extract_bit(spr.x, bit - 21.0)+extract_bit(spr.y, bit) : 0.0;
-
-}
-
-//Prints a character and moves the print position forward by 1 character width.
-float char_px(vec2 ch, vec2 uv)
-{
-    float px = sprite(ch, CHAR_SIZE, uv - print_pos);
-    print_pos.x += CHAR_SPACING.x;
-    return px;
-}
-
-//Returns the digit sprite for the given number.
-vec2 get_digit(float d)
-{
-    d = floor(d);
-
-    if(d == 0.0) return ch_0;
-    if(d == 1.0) return ch_1;
-    if(d == 2.0) return ch_2;
-    if(d == 3.0) return ch_3;
-    if(d == 4.0) return ch_4;
-    if(d == 5.0) return ch_5;
-    if(d == 6.0) return ch_6;
-    if(d == 7.0) return ch_7;
-    if(d == 8.0) return ch_8;
-    if(d == 9.0) return ch_9;
-    return vec2(0.0);
-}
-
-//Prints out the given number starting at pos.
-float print_number(float number,vec2 pos, vec2 uv)
-{
-	vec2 dec_pos = pos;
-    float result = 0.0;
-
-	for(int i = 3; i >= -2; i--)
-    {
-        float clip = float(abs(number) > pow(10.0, float(i)) || i == 0); //Clip off leading zeros.
-
-        float digit = mod(number / pow(10.0, float(i)),10.0);
-
-        if(i == -1)
-        {
-            result += sprite(ch_per,CHAR_SIZE, uv - dec_pos) * clip;
-            dec_pos.x += CHAR_SPACING.x * clip;
-        }
-        result += sprite(get_digit(digit),CHAR_SIZE, uv - dec_pos) * clip;
-
-
-        dec_pos.x += CHAR_SPACING.x * clip;
-    }
-
-    return result;
-}
-
-float print_integer(float number, int zeros, vec2 uv)
-{
-    float result = 0.0;
-
-	for(int i = MAX_INT_DIGITS; i >= 0; i--)
-    {
-        float digit = mod( number / pow(10.0, float(i)) , 10.0);
-
-        if(abs(number) > pow(10.0, float(i)) || zeros > i  || i == 0) //Clip off leading zeros.
-        {
-        	result += char_px(get_digit(digit), uv);
-        }
-    }
-    return result;
-}
-
-#define eps 1e-3
-
-float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec4 screen_region, vec2 derezed_size, vec2 negative_crop_added_size, vec2 cropped_original_size, vec2 sampling_res, vec2 int_mult)
-{
-    float col = 0.0;
-
-    float current_line_index = 0;
-    float margin = STRHEIGHT(1);
-
-    // Resolution Text
-    print_pos = vec2(margin, 0);
-
-    // Viewport Resolution ----------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   TEXT_MASK = 0;
-   CUR_UV = uv;
-   _V _i _e _w _p _o _r _t _spc _dsh _dsh _dsh _dsh _dsh _dsh _spc
-   TEXT_MASK += print_integer(viewport_size.x, 0, uv);
-   _spc _x _spc
-   TEXT_MASK += print_integer(viewport_size.y, 0, uv);
-
-    // Screen Region ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   _S _c _r _e _e _n _spc _R _e _g _i _o _n _spc _dsh _spc
-   TEXT_MASK += print_integer(screen_region.x, 0, uv);
-   _spc
-   TEXT_MASK += print_integer(screen_region.y, 0, uv);
-   _spc
-   TEXT_MASK += print_integer(screen_region.z, 0, uv);
-   _spc
-   TEXT_MASK += print_integer(screen_region.w, 0, uv);
-
-    // Screen Resolution ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   _S _c _r _e _e _n _spc _dsh _dsh _dsh _dsh _dsh _dsh _dsh _dsh _spc
-   TEXT_MASK += print_integer(screen_size.x, 0, uv);
-   _spc _x _spc
-   TEXT_MASK += print_integer(screen_size.y, 0, uv);
-
-    // Final Aspect Ratio ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   _F _i _n _a _l _spc _A _s _p _e _c _t _spc _dsh _dsh _spc
-   TEXT_MASK += print_number(screen_size.x/screen_size.y > 1 ? screen_size.x/screen_size.y : screen_size.y/screen_size.x, print_pos, uv);
-
-    // Non-Int Scale Percent ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-    _N _o _n _spc _I _n _t _spc _S _c _l _spc _pct _dsh _dsh _spc
-    TEXT_MASK += print_number(screen_size.y / viewport_size.y * 100, print_pos, uv);
-
-    // Int Scale Vertical ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   _I _n _t _spc _S _c _l _spc _V _e _r _t _spc _dsh _dsh _spc
-
-    if (fract(int_mult.y) < 0.01)
-        TEXT_MASK += print_integer(int_mult.y, 0, uv);
-    else
-        TEXT_MASK += print_number(int_mult.y, print_pos, uv);
-
-    // Int Scale Horizontal ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   _I _n _t _spc _S _c _l _spc _H _o _r _z _spc _dsh _dsh _spc
-
-    if (fract(int_mult.x) < 0.01)
-        TEXT_MASK += print_integer(int_mult.x, 0, uv);
-    else
-        TEXT_MASK += print_number(int_mult.x, print_pos, uv);
-
-    // Sampling Resolution ----------------------------------------------------------
-    if (cropped_original_size.x != sampling_res.x || cropped_original_size.y != sampling_res.y)
-    {
-      print_pos.x = margin;
-      print_pos.y += STRHEIGHT(1);
-
-      _S _a _m _p _l _i _n _g _spc _R _e _s _spc _dsh _dsh _spc
-
-      TEXT_MASK += print_integer(sampling_res.x, 0, uv);
-      _spc _x _spc
-      TEXT_MASK += print_integer(sampling_res.y, 0, uv);
-    }
-
-
-    // CROPPED Resolution ----------------------------------------------------------
-    if (cropped_original_size.x != ROTATED_CORE_PREPPED_SIZE.x || cropped_original_size.y != ROTATED_CORE_PREPPED_SIZE.y)
-    {
-        print_pos.x = margin;
-        print_pos.y += STRHEIGHT(1);
-
-      _C _r _o _p _p _e _d _spc _dsh _dsh _dsh _dsh _dsh _dsh _dsh _spc
-
-      TEXT_MASK += print_integer(cropped_original_size.x, 0, uv);
-      _spc _x _spc
-      TEXT_MASK += print_integer(cropped_original_size.y, 0, uv);
-    }
-
-
-    // Negative Crop Resolution ----------------------------------------------------------
-    if (derezed_size.x != ROTATED_CORE_PREPPED_SIZE.x || derezed_size.y != ROTATED_CORE_PREPPED_SIZE.y)
-    {
-      print_pos.x = margin;
-      print_pos.y += STRHEIGHT(1);
-
-      _N _e _g _dsh _C _r _o _p _spc _A _d _d _spc _dsh _dsh _spc
-
-      TEXT_MASK += print_integer(ROTATED_CORE_PREPPED_SIZE.x, 0, uv);
-      _spc _x _spc
-      TEXT_MASK += print_integer(ROTATED_CORE_PREPPED_SIZE.y, 0, uv);
-    }
-
-
-    // DEREZ Resolution ----------------------------------------------------------
-    if (derezed_size.x != ROTATED_CORE_ORIGINAL_SIZE.x || derezed_size.y != ROTATED_CORE_ORIGINAL_SIZE.y)
-    {
-        print_pos.x = margin;
-        print_pos.y += STRHEIGHT(1);
-
-      _D _e _r _e _z _e _d _spc _dsh _dsh _dsh _dsh _dsh _dsh _dsh _spc
-
-      TEXT_MASK += print_integer(derezed_size.x, 0, uv);
-      _spc _x _spc
-      TEXT_MASK +=  print_integer(derezed_size.y, 0, uv);
-    }
-
-
-    // CORE Resolution ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   _C _o _r _e _spc _dsh _dsh _dsh _dsh _dsh _dsh _dsh _dsh _dsh _dsh _spc
-
-   TEXT_MASK += print_integer(ROTATED_CORE_ORIGINAL_SIZE.x, 0, uv);
-   _spc _x _spc
-   TEXT_MASK += print_integer(ROTATED_CORE_ORIGINAL_SIZE.y, 0, uv);
-
-    // Line 03 Preset Type ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(2);
-
-#ifdef IS_ADV_PRESET
-   _A _D _V _A _N _C _E _D
-#endif
-
-#ifdef IS_STD_PRESET
-   _S _T _A _N _D _A _R _D
-#endif
-
-#ifdef IS_GLASS_PRESET
-   _spc _G _L _A _S _S
-#endif
-
-#ifdef IS_NO_REFLECT_PRESET
-   _spc _N _O _spc _R _E _F _L _E _C _T
-#endif
-
-#ifdef IS_POTATO_PRESET
-   _P _O _T _A _T _O
-#endif
-
-    // Version ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   // Text Version V1.17.2_2024-05-18
-   // Version
-   _1 _per _1 _7 _per _2 _spc
-   // Date
-   _2 _0 _2 _4 _dsh _0 _5 _dsh _1 _8
-
-    // Title ----------------------------------------------------------
-    print_pos.x = margin;
-    print_pos.y += STRHEIGHT(1);
-
-   _M _E _G _A _spc _B _E _Z _E _L _spc
-
-    return TEXT_MASK;
-}
-
-vec2 GetIntegerScaleMult(vec2 screen_size, vec2 cropped_size)
-{
-	float epsilon = 0.01;
-	vec2 integer_scale = screen_size / cropped_size;
-	integer_scale = vec2(abs(integer_scale.x - round(integer_scale.x)) < epsilon ? round(integer_scale.x) : integer_scale.x,
-						 abs(integer_scale.y - round(integer_scale.y)) < epsilon ? round(integer_scale.y) : integer_scale.y);
-	return integer_scale;
-}
-
-vec4 GetScreenRegion(vec2 screen_size)
-{
-    vec2 position_offset = SCREEN_POS_OFFSET * global.FinalViewportSize.xy * HSM_VIEWPORT_ZOOM +
-                           vec2(-HSM_VIEWPORT_POSITION_X, HSM_VIEWPORT_POSITION_Y) * HSM_VIEWPORT_ZOOM * global.FinalViewportSize.xy;
-
-    vec2 top_left = global.FinalViewportSize.xy / 2 - screen_size / 2 + position_offset;
-
-    vec2 bottom_right = global.FinalViewportSize.xy / 2 + screen_size / 2 + position_offset;
-
-    vec4 out_region = round(vec4(top_left, bottom_right));
-    return out_region;
-}
-
-float GetText(vec2 in_coord)
-{
-   in_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * HSM_FLIP_CORE_HORIZONTAL * (in_coord.x - 0.5) + 0.5;
-   in_coord.y = HSM_FLIP_VIEWPORT_VERTICAL * HSM_FLIP_CORE_VERTICAL * (in_coord.y - 0.5) + 0.5;
-
-    vec2 int_mult = GetIntegerScaleMult(SCREEN_SIZE, CROPPED_ROTATED_SIZE);
-    vec2 canvas_size = global.DerezedPassSize.xy;
-
-    in_coord = (in_coord - 0.5) * vec2(1, -1) + 0.5;
-
-    vec2 downscale = vec2(1, 1);
-    downscale.x = max(max(floor(canvas_size.x / 240), 1), 1);
-    downscale.y = max(max(ceil(canvas_size.y / 200), 1), 1);
-
-    vec2 uv = global.OutputSize.xy * in_coord;
-	vec2 downscaled_uv = floor(global.OutputSize.xy * in_coord / downscale);
-
-    vec4 screen_region = GetScreenRegion(SCREEN_SIZE);
-
-	float pixel = DrawResolutions(downscaled_uv, global.FinalViewportSize.xy, SCREEN_SIZE, screen_region, ROTATED_DEREZED_SIZE, ROTATED_CORE_PREPPED_SIZE, CROPPED_ROTATED_SIZE, CROPPED_ROTATED_SIZE_WITH_RES_MULT, int_mult);
-
-    vec3 col = vec3(1);
-    pixel *= (1 - distance(mod(uv, vec2(1.0)), vec2(0.65))) * 1.2;
-    col *= mix(vec3(0), vec3(1, 1, 1), pixel);
-
-	return col.r;
-}
-
-void main()
-{
-	vec2 UNFLIPPED_VIEWPORT_COORD = vTexCoord;
-    vec2 VIEWPORT_COORD = vTexCoord;
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-   if (!CACHE_INFO_CHANGED)
-   {
-      FragColor = texture(PassFeedback, UNFLIPPED_VIEWPORT_COORD);
-      return;
-   }
-
-   // Flip the coordinate vertically if desired
-   VIEWPORT_COORD.y = HSM_FLIP_VIEWPORT_VERTICAL * HSM_FLIP_CORE_VERTICAL * (VIEWPORT_COORD.y - 0.5) + 0.5;
-   VIEWPORT_COORD.x = HSM_FLIP_VIEWPORT_HORIZONTAL * HSM_FLIP_CORE_HORIZONTAL * (VIEWPORT_COORD.x - 0.5) + 0.5;
-
-   //////// Draw text to show resolutions //////////
-   FragColor = vec4(GetText(VIEWPORT_COORD - vec2(MAX_NEGATIVE_CROP, -MAX_NEGATIVE_CROP)));
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-1-before.slang b/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-1-before.slang
deleted file mode 100644
index 3ab723c120..0000000000
--- a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-1-before.slang
+++ /dev/null
@@ -1,74 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "../base/common/helper-functions.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float SGPT_BLEND_OPTION;
-   float HSM_DEDITHER_BRIGHTNESS_BIAS;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_SGENPT_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter HSM_SGENPT_TITLE          "[ --- HYLLIAN SGENPT-MIX DE-DITHERING --- ]:" 0 0 0.01 0.01
-
-#pragma parameter SGPT_BLEND_OPTION         "          Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0  0.0 3.0  1.0
-#define SGPT_BLEND_OPTION                   params.SGPT_BLEND_OPTION
-
-#pragma parameter HSM_DEDITHER_BRIGHTNESS_BIAS "          Transparency Brightness Bias"	100 10 300 5
-#define HSM_DEDITHER_BRIGHTNESS_BIAS  params.HSM_DEDITHER_BRIGHTNESS_BIAS * 0.013
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = texture(Source, vTexCoord);
-   if (SGPT_BLEND_OPTION > 0.5)
-      FragColor = HSM_Linearize(texture(Source, vTexCoord), HSM_DEDITHER_BRIGHTNESS_BIAS);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-2-after.slang b/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-2-after.slang
deleted file mode 100644
index fd496cbe47..0000000000
--- a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-2-after.slang
+++ /dev/null
@@ -1,74 +0,0 @@
-#version 450
-
-/*
-    Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel
-    Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com
-
-    Incorporates much great feedback from the libretro forum, and thanks 
-    to Hunterk who helped me get started
-
-    See more at the libretro forum
-    https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "../base/common/helper-functions.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float SGPT_BLEND_OPTION;
-   float HSM_DEDITHER_BRIGHTNESS_BIAS;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_SGENPT_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter HSM_SGENPT_TITLE          "[ --- HYLLIAN SGENPT-MIX DE-DITHERING --- ]:" 0 0 0.01 0.01
-
-#pragma parameter SGPT_BLEND_OPTION         "          Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0  0.0 3.0  1.0
-#define SGPT_BLEND_OPTION                   params.SGPT_BLEND_OPTION
-
-#pragma parameter HSM_DEDITHER_BRIGHTNESS_BIAS "          Transparency Brightness Bias"	100 10 300 5
-#define HSM_DEDITHER_BRIGHTNESS_BIAS  params.HSM_DEDITHER_BRIGHTNESS_BIAS * 0.013
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{  
-   FragColor = texture(Source, vTexCoord);
-   if (SGPT_BLEND_OPTION > 0.5)
-      FragColor = HSM_Delinearize(texture(Source, vTexCoord), HSM_DEDITHER_BRIGHTNESS_BIAS);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/dogway/grade_orig.slang b/bezel/Mega_Bezel/shaders/dogway/grade_orig.slang
deleted file mode 100644
index 1543f5e710..0000000000
--- a/bezel/Mega_Bezel/shaders/dogway/grade_orig.slang
+++ /dev/null
@@ -1,978 +0,0 @@
-#version 450
-
-/*
-   Grade - CRT emulation and color manipulation shader
-
-   Copyright (C) 2020-2023 Dogway (Jose Linares)
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    float g_signal_type;
-    float g_crtgamut;
-    float g_space_out;
-    float g_hue_degrees;
-    float g_U_SHIFT;
-    float g_V_SHIFT;
-    float g_U_MUL;
-    float g_V_MUL;
-    float g_CRT_b;
-    float g_CRT_c;
-    float g_CRT_l;
-    float g_lum_fix;
-    float g_vstr;
-    float g_vpower;
-    float g_sat;
-    float g_vibr;
-    float g_lum;
-    float g_cntrst;
-    float g_mid;
-    float g_lift;
-    float blr;
-    float blg;
-    float blb;
-    float wlr;
-    float wlg;
-    float wlb;
-    float rg;
-    float rb;
-    float gr;
-    float gb;
-    float br;
-    float bg;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float g_vignette;
-    float g_Dark_to_Dim;
-    float g_GCompress;
-    float wp_temperature;
-    float g_analog;
-    float g_digital;
-    float g_sfixes;
-    float g_MD_Pal;
-    float g_SMS_bl;
-    float g_CRT_br;
-    float g_CRT_bg;
-    float g_CRT_bb;
-    float g_CRT_rf;
-    float g_CRT_sl;
-    float g_satr;
-    float g_satg;
-    float g_satb;
-    float LUT_Size1;
-    float LUT1_toggle;
-    float LUT_Size2;
-    float LUT2_toggle;
-} global;
-
-/*
-   Grade (26-08-2023)
-   > See settings decriptions at: https://forums.libretro.com/t/dogways-grading-shader-slang/27148/442
-
-   > Ubershader grouping some monolithic color related shaders:
-    ::color-mangler (hunterk), ntsc color tuning knobs (Doriphor), white_point (hunterk, Dogway), RA Reshade LUT.
-   > and the addition of:
-    ::analogue color emulation, phosphor gamut, color space + TRC support, vibrance, HUE vs SAT, vignette (shared by Syh), black level, rolled gain and sigmoidal contrast.
-
-   **Thanks to those that helped me out keep motivated by continuous feedback and bug reports:
-   **Syh, Nesguy, hunterk, and the libretro forum members.
-
-
-    #####################################...STANDARDS...######################################
-    ##########################################################################################
-    ###                                                                                    ###
-    ###    PAL                                                                             ###
-    ###        Phosphor: 470BG (#3)                                                        ###
-    ###        WP: D65 (6504K)               (in practice more like 7000K-7500K range)     ###
-    ###        Saturation: -0.02                                                           ###
-    ###                                                                                    ###
-    ###    NTSC-U                                                                          ###
-    ###        Phosphor: P22/SMPTE-C (#1 #-3)(or a SMPTE-C based CRT phosphor gamut)       ###
-    ###        WP: D65 (6504K)               (in practice more like 7000K-7500K range)     ###
-    ###                                                                                    ###
-    ###    NTSC-J (Default)                                                                ###
-    ###        Phosphor: NTSC-J (#2)         (or a NTSC-J based CRT phosphor gamut)        ###
-    ###        WP: 9300K+27MPCD (8945K)      (CCT from x:0.281 y:0.311)(in practice ~8500K)###
-    ###                                                                                    ###
-    ###                                                                                    ###
-    ##########################################################################################
-    ##########################################################################################
-*/
-
-
-#pragma parameter g_signal_type  "Signal Type (0:RGB 1:Composite)"                            1.0  0.0 1.0 1.0
-#pragma parameter g_crtgamut     "Phosphor (-2:CRT-95s -1:P22-80s 1:P22-90s 2:NTSC-J 3:PAL)"  2.0 -3.0 3.0 1.0
-#pragma parameter g_space_out    "Diplay Color Space (-1:709 0:sRGB 1:P3-D65 2:2020 3:Adobe)" 0.0 -1.0 3.0 1.0
-#pragma parameter g_Dark_to_Dim  "Dark to Dim adaptation"                                     1.0  0.0 1.0 1.0
-#pragma parameter g_GCompress    "Gamut Compression"                                          1.0  0.0 1.0 1.0
-
-// Analogue controls
-#pragma parameter g_analog       "// ANALOG CONTROLS //"      0.0    0.0   1.0  1.0
-#pragma parameter wp_temperature "White Point"                8504.0 5004.0 12004.0 100.0
-#pragma parameter g_CRT_l        "CRT Gamma"                  2.50   2.30  2.60 0.01
-#pragma parameter g_CRT_b        "CRT Brightness"            50.0    0.0 100.0  1.0
-#pragma parameter g_CRT_c        "CRT Contrast"              50.0    0.0 100.0  1.0
-#pragma parameter g_hue_degrees  "CRT Hue"                    0.0 -180.0 180.0  1.0
-#pragma parameter g_U_SHIFT      "CRT U Shift"                0.0   -0.2   0.2  0.01
-#pragma parameter g_V_SHIFT      "CRT V Shift"                0.0   -0.2   0.2  0.01
-#pragma parameter g_U_MUL        "CRT U Multiplier"           1.0    0.0   2.0  0.01
-#pragma parameter g_V_MUL        "CRT V Multiplier"           1.0    0.0   2.0  0.01
-#pragma parameter g_CRT_br       "CRT Beam Red"               1.0    0.0   1.2  0.01
-#pragma parameter g_CRT_bg       "CRT Beam Green"             1.0    0.0   1.2  0.01
-#pragma parameter g_CRT_bb       "CRT Beam Blue"              1.0    0.0   1.2  0.01
-#pragma parameter g_CRT_rf       "CRT Lambert Refl. in %"     5.0    2.0   5.0  0.1
-#pragma parameter g_CRT_sl       "Surround Luminance -nits-" 34.0    0.0 100.0  1.0
-#pragma parameter g_vignette     "Vignette Toggle"            1.0    0.0   1.0  1.0
-#pragma parameter g_vstr         "Vignette Strength"          50.0   0.0  50.0  1.0
-#pragma parameter g_vpower       "Vignette Power"             0.50   0.0   0.5  0.01
-
-// Sega related fixes
-#pragma parameter g_sfixes       "// SEGA FIXES //"           0.0  0.0 1.0 1.0
-#pragma parameter g_lum_fix      "Sega Luma Fix"              0.0  0.0 1.0 1.0
-#pragma parameter g_MD_Pal       "MD Palette"                 0.0  0.0 1.0 1.0
-#pragma parameter g_SMS_bl       "SMS Blue Lift"              0.0  0.0 1.0 1.0
-
-// Digital controls
-#pragma parameter g_digital      "// DIGITAL CONTROLS //"     0.0  0.0 1.0 1.0
-#pragma parameter g_lum          "Brightness"                 0.0 -0.5 1.0 0.01
-#pragma parameter g_cntrst       "Contrast"                   0.0 -1.0 1.0 0.05
-#pragma parameter g_mid          "Contrast Pivot"             0.5  0.0 1.0 0.01
-#pragma parameter g_sat          "Saturation"                 0.0 -1.0 1.0 0.01
-#pragma parameter g_vibr         "Dullness/Vibrance"          0.0 -1.0 1.0 0.05
-#pragma parameter g_satr         "Hue vs Sat Red"             0.0 -1.0 1.0 0.01
-#pragma parameter g_satg         "Hue vs Sat Green"           0.0 -1.0 1.0 0.01
-#pragma parameter g_satb         "Hue vs Sat Blue"            0.0 -1.0 1.0 0.01
-#pragma parameter g_lift         "Black Level"                0.0 -15.0 15.0 1.0
-#pragma parameter blr            "Black-Red Tint"             0.0  0.0 1.0 0.01
-#pragma parameter blg            "Black-Green Tint"           0.0  0.0 1.0 0.01
-#pragma parameter blb            "Black-Blue Tint"            0.0  0.0 1.0 0.01
-#pragma parameter wlr            "White-Red Tint"             1.0  0.0 2.0 0.01
-#pragma parameter wlg            "White-Green Tint"           1.0  0.0 2.0 0.01
-#pragma parameter wlb            "White-Blue Tint"            1.0  0.0 2.0 0.01
-#pragma parameter rg             "Red-Green Tint"             0.0 -1.0 1.0 0.005
-#pragma parameter rb             "Red-Blue Tint"              0.0 -1.0 1.0 0.005
-#pragma parameter gr             "Green-Red Tint"             0.0 -1.0 1.0 0.005
-#pragma parameter gb             "Green-Blue Tint"            0.0 -1.0 1.0 0.005
-#pragma parameter br             "Blue-Red Tint"              0.0 -1.0 1.0 0.005
-#pragma parameter bg             "Blue-Green Tint"            0.0 -1.0 1.0 0.005
-#pragma parameter LUT_Size1      "LUT Size 1"                 32.0 8.0 64.0 16.0
-#pragma parameter LUT1_toggle    "LUT 1 Toggle"               0.0  0.0 1.0 1.0
-#pragma parameter LUT_Size2      "LUT Size 2"                 64.0 0.0 64.0 16.0
-#pragma parameter LUT2_toggle    "LUT 2 Toggle"               0.0  0.0 1.0 1.0
-
-
-#define M_PI            3.1415926535897932384626433832795/180.0         // 1º (one degree) in radians
-#define RW              vec3(0.950457397565471, 1.0, 1.089436035930324) // D65 Reference White
-#define signal          params.g_signal_type
-#define crtgamut        params.g_crtgamut
-#define SPC             params.g_space_out
-#define hue_degrees     params.g_hue_degrees
-#define U_SHIFT         params.g_U_SHIFT
-#define V_SHIFT         params.g_V_SHIFT
-#define U_MUL           params.g_U_MUL
-#define V_MUL           params.g_V_MUL
-#define CRT_l           -(100000.*log((72981.-500000./(3.*max(2.3,params.g_CRT_l)))/9058.))/945461.
-#define wp_temp         global.wp_temperature
-#define lum_fix         params.g_lum_fix
-#define SMS_bl          global.g_SMS_bl
-#define MD_Palette      global.g_MD_Pal
-#define vignette        global.g_vignette
-#define GCompress       global.g_GCompress
-#define vstr            params.g_vstr
-#define vpower          params.g_vpower
-#define g_sat           params.g_sat
-#define vibr            params.g_vibr
-#define beamr           global.g_CRT_br
-#define beamg           global.g_CRT_bg
-#define beamb           global.g_CRT_bb
-#define satr            global.g_satr
-#define satg            global.g_satg
-#define satb            global.g_satb
-#define lum             params.g_lum
-#define cntrst          params.g_cntrst
-#define mid             params.g_mid
-// lift goes from -15 to 15 points on an 8-bit scale (0-255)
-#define lift            (SPC==0.0 ? moncurve_f(abs(params.g_lift)/255.0,2.4,0.055) : pow(abs(params.g_lift)/255.0,SPC==3.0?2.199:2.4)) * sign(params.g_lift)
-#define blr             params.blr
-#define blg             params.blg
-#define blb             params.blb
-#define wlr             params.wlr
-#define wlg             params.wlg
-#define wlb             params.wlb
-#define rg              params.rg
-#define rb              params.rb
-#define gr              params.gr
-#define gb              params.gb
-#define br              params.br
-#define bg              params.bg
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D SamplerLUT1;
-layout(set = 0, binding = 4) uniform sampler2D SamplerLUT2;
-
-
-
-
-
-
-///////////////////////// Color Space Transformations //////////////////////////
-
-// 'D65' based
-mat3 RGB_to_XYZ_mat(mat3 primaries) {
-
-    vec3 T  = RW * inverse(primaries);
-
-    mat3 TB = mat3(
-                T.x, 0.0, 0.0,
-                0.0, T.y, 0.0,
-                0.0, 0.0, T.z);
-
-    return TB * primaries;
- }
-
-
-vec3 RGB_to_XYZ(vec3 RGB, mat3 primaries) {
-
-    return RGB *         RGB_to_XYZ_mat(primaries);
- }
-
-vec3 XYZ_to_RGB(vec3 XYZ, mat3 primaries) {
-
-    return XYZ * inverse(RGB_to_XYZ_mat(primaries));
- }
-
-
-vec3 XYZtoYxy(vec3 XYZ) {
-
-    float XYZrgb =  XYZ.r+XYZ.g+XYZ.b;
-    float Yxyg   = (XYZrgb <= 0.0) ? 0.3805 : XYZ.r / XYZrgb;
-    float Yxyb   = (XYZrgb <= 0.0) ? 0.3769 : XYZ.g / XYZrgb;
-    return vec3(XYZ.g, Yxyg, Yxyb);
- }
-
-vec3 YxytoXYZ(vec3 Yxy) {
-
-    float Xs  =  Yxy.r * (Yxy.g/Yxy.b);
-    float Xsz = (Yxy.r <= 0.0) ? 0.0 : 1.0;
-    vec3 XYZ  = vec3(Xsz,Xsz,Xsz) * vec3(Xs, Yxy.r, (Xs/Yxy.g)-Xs-Yxy.r);
-    return XYZ;
- }
-
-
-///////////////////////// White Point Mapping /////////////////////////
-//
-//
-// PAL: D65        NTSC-U: D65       NTSC-J: CCT 9300K+27MPCD
-// PAL: 6503.512K  NTSC-U: 6503.512K NTSC-J: ~8945.436K
-// [x:0.31266142   y:0.3289589]      [x:0.281 y:0.311]
-
-// For NTSC-J there's not a common agreed value, measured consumer units span from 8229.87K to 8945.623K with accounts for 8800K as well.
-// Recently it's been standardized to 9300K which is closer to what master monitors (and not consumer units) were (x=0.2838 y=0.2984) (~9177.98K)
-
-// "RGB to XYZ -> Temperature -> XYZ to RGB" joint matrix
-vec3 wp_adjust(vec3 RGB, float temperature, mat3 primaries, mat3 display) {
-
-    float temp3 = 1000.       /     temperature;
-    float temp6 = 1000000.    / pow(temperature, 2.0);
-    float temp9 = 1000000000. / pow(temperature, 3.0);
-
-    vec3 wp = vec3(1.0);
-
-    wp.x = (temperature < 5500.) ? 0.244058 + 0.0989971 * temp3 + 2.96545 * temp6 - 4.59673 * temp9 : \
-           (temperature < 8000.) ? 0.200033 + 0.9545630 * temp3 - 2.53169 * temp6 + 7.08578 * temp9 : \
-                                   0.237045 + 0.2437440 * temp3 + 1.94062 * temp6 - 2.11004 * temp9 ;
-
-    wp.y = -0.275275 + 2.87396 * wp.x - 3.02034 * pow(wp.x,2.0) + 0.0297408 * pow(wp.x,3.0);
-    wp.z =  1.0 - wp.x - wp.y;
-
-    const mat3 CAT16 = mat3(
-     0.401288,-0.250268, -0.002079,
-     0.650173, 1.204414,  0.048952,
-    -0.051461, 0.045854,  0.953127);
-
-    vec3 VKV = (vec3(wp.x/wp.y,1.,wp.z/wp.y) * CAT16) / (RW * CAT16);
-
-    mat3 VK = mat3(
-                VKV.x, 0.0, 0.0,
-                0.0, VKV.y, 0.0,
-                0.0, 0.0, VKV.z);
-
-    mat3 CAM  = CAT16 * (VK * inverse(CAT16));
-
-    mat3 mata = RGB_to_XYZ_mat(primaries);
-    mat3 matb = RGB_to_XYZ_mat(display);
-
-    return RGB.rgb * ((mata * CAM) * inverse(matb));
- }
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-// CRT EOTF Function
-//----------------------------------------------------------------------
-
-float EOTF_1886a(float color, float bl, float brightness, float contrast) {
-
-    // Defaults:
-    //  Black Level = 0.1
-    //  Brightness  = 0
-    //  Contrast    = 100
-
-    const float wl = 100.0;
-          float b  = pow(bl, 1./2.4);
-          float a  = pow(wl, 1./2.4)-b;
-                b  = (brightness-50.) / 250. + b/a;                   // -0.20 to +0.20
-                a  = contrast!=50. ? pow(2.,(contrast-50.)/50.) : 1.; //  0.50 to +2.00
-
-    const float Vc = 0.35;                           // Offset
-          float Lw = wl/100. * a;                    // White level
-          float Lb = min( b  * a,Vc);                // Black level
-    const float a1 = 2.6;                            // Shoulder gamma
-    const float a2 = 3.0;                            // Knee gamma
-          float k  = Lw /pow(1. + Lb,    a1);
-          float sl = k * pow(Vc + Lb, a1-a2);        // Slope for knee gamma
-
-    color = color >= Vc ? k * pow(color + Lb, a1 ) : sl * pow(color + Lb, a2 );
-
-    // Black lift compensation
-    float bc = 0.00446395*pow(bl,1.23486);
-    color    = min(max(color-bc,0.0)*(1.0/(1.0-bc)), 1.0);  // Undo Lift
-    color    = pow(color,1.0-0.00843283*pow(bl,1.22744));   // Restore Gamma from 'Undo Lift'
-
-    return color;
- }
-
-vec3 EOTF_1886a_f3( vec3 color, float BlackLevel, float brightness, float contrast) {
-
-    color.r = EOTF_1886a( color.r, BlackLevel, brightness, contrast);
-    color.g = EOTF_1886a( color.g, BlackLevel, brightness, contrast);
-    color.b = EOTF_1886a( color.b, BlackLevel, brightness, contrast);
-    return color.rgb;
- }
-
-
-
-// Monitor Curve Functions: https://github.com/ampas/aces-dev
-//----------------------------------------------------------------------
-
-
-float moncurve_f( float color, float gamma, float offs) {
-
-    // Forward monitor curve
-    color    = clamp(color, 0.0, 1.0);
-    float fs = (( gamma - 1.0) / offs) * pow( offs * gamma / ( ( gamma - 1.0) * ( 1.0 + offs)), gamma);
-    float xb = offs / ( gamma - 1.0);
-
-    color = ( color > xb) ? pow( ( color + offs) / ( 1.0 + offs), gamma) : color * fs;
-    return color;
- }
-
-
-vec3 moncurve_f_f3( vec3 color, float gamma, float offs) {
-
-    color.r = moncurve_f( color.r, gamma, offs);
-    color.g = moncurve_f( color.g, gamma, offs);
-    color.b = moncurve_f( color.b, gamma, offs);
-    return color.rgb;
- }
-
-
-float moncurve_r( float color, float gamma, float offs) {
-
-    // Reverse monitor curve
-    color = clamp(color, 0.0, 1.0);
-    float yb = pow( offs * gamma / ( ( gamma - 1.0) * ( 1.0 + offs)), gamma);
-    float rs = pow( ( gamma - 1.0) / offs, gamma - 1.0) * pow( ( 1.0 + offs) / gamma, gamma);
-
-    color = ( color > yb) ? ( 1.0 + offs) * pow( color, 1.0 / gamma) - offs : color * rs;
-    return color;
- }
-
-
-vec3 moncurve_r_f3( vec3 color, float gamma, float offs) {
-
-    color.r = moncurve_r( color.r, gamma, offs);
-    color.g = moncurve_r( color.g, gamma, offs);
-    color.b = moncurve_r( color.b, gamma, offs);
-    return color.rgb;
- }
-
-
-//-------------------------- Luma Functions ----------------------------
-
-
-//  Performs better in gamma encoded space
-float contrast_sigmoid(float color, float cont, float pivot) {
-
-    cont = pow(cont + 1., 3.);
-
-    float knee  = 1. / (1. + exp(cont *  pivot));
-    float shldr = 1. / (1. + exp(cont * (pivot - 1.)));
-
-    color       =(1. / (1. + exp(cont * (pivot - color))) - knee) / (shldr - knee);
-
-    return color;
- }
-
-
-//  Performs better in gamma encoded space
-float contrast_sigmoid_inv(float color, float cont, float pivot) {
-
-    cont = pow(cont - 1., 3.);
-
-    float knee  = 1. / (1. + exp (cont *  pivot));
-    float shldr = 1. / (1. + exp (cont * (pivot - 1.)));
-
-    color = pivot - log(1. / (color * (shldr - knee) + knee) - 1.) / cont;
-
-    return color;
- }
-
-
-float rolled_gain(float color, float gain) {
-
-    float gx   = abs(gain) + 0.001;
-    float anch = (gain > 0.0) ? 0.5 / (gx / 2.0) : 0.5 / gx;
-    color      = (gain > 0.0) ? color * ((color - anch) / (1.0 - anch)) : color * ((1.0 - anch) / (color - anch)) * (1.0 - gain);
-
-    return color;
- }
-
-
-vec3 rolled_gain_v3(vec3 color, float gain) {
-
-    color.r = rolled_gain(color.r, gain);
-    color.g = rolled_gain(color.g, gain);
-    color.b = rolled_gain(color.b, gain);
-
-    return color.rgb;
- }
-
-
-float SatMask(float color_r, float color_g, float color_b) {
-
-    float max_rgb = max(color_r, max(color_g, color_b));
-    float min_rgb = min(color_r, min(color_g, color_b));
-    float msk = clamp((max_rgb - min_rgb) / (max_rgb + min_rgb), 0.0, 1.0);
-    return msk;
- }
-
-
-//  This shouldn't be necessary but it seems some undefined values can
-//  creep in and each GPU vendor handles that differently. This keeps
-//  all values within a safe range
-vec3 mixfix(vec3 a, vec3 b, float c) {
-    return (a.z < 1.0) ? mix(a, b, c) : a;
- }
-
-
-vec4 mixfix_v4(vec4 a, vec4 b, float c) {
-    return (a.z < 1.0) ? mix(a, b, c) : a;
- }
-
-
-
-//---------------------- Gamut Compression -------------------
-
-
-// RGB 'Desaturate' Gamut Compression (by Jed Smith: https://github.com/jedypod/gamut-compress)
-vec3 GamutCompression (vec3 rgb, float grey) {
-
-    // Limit/Thres order is Cyan, Magenta, Yellow
-    vec3  beam = max(vec3(0.0),vec3(beamg,(beamb+beamr)/2.,(beamr+beamg)/2.));
-    vec3  sat  = max(vec3(0.0),vec3(satg, (satb +satr) /2.,(satr +satg) /2.)+1.); // center at 1
-    float temp = max(0.0,abs(wp_temp-7000.)-1000.)/825.+1.;                       // center at 1
-    vec3  WPD  = wp_temp < 7000. ? vec3(1.,temp,(temp-1.)/2.+1.) : vec3((temp-1.)/2.+1.,temp,1.);
-          sat  = max(0.0,g_sat+1.0)*(sat*beam) * WPD;
-
-    mat2x3 LimThres =    mat2x3( 0.100000,0.100000,0.100000,
-                                 0.125000,0.125000,0.125000);
-    if (SPC < 1.0) {
-
-       LimThres = \
-       crtgamut == 3.0 ? mat2x3( 0.000000,0.044065,0.000000,
-                                 0.000000,0.095638,0.000000) : \
-       crtgamut == 2.0 ? mat2x3( 0.006910,0.092133,0.000000,
-                                 0.039836,0.121390,0.000000) : \
-       crtgamut == 1.0 ? mat2x3( 0.018083,0.059489,0.017911,
-                                 0.066570,0.105996,0.066276) : \
-       crtgamut ==-1.0 ? mat2x3( 0.014947,0.098571,0.017911,
-                                 0.060803,0.123793,0.066276) : \
-       crtgamut ==-2.0 ? mat2x3( 0.004073,0.030307,0.012697,
-                                 0.028222,0.083075,0.056029) : \
-       crtgamut ==-3.0 ? mat2x3( 0.018424,0.053469,0.016841,
-                                 0.067146,0.102294,0.064393) : LimThres;
-    } else if (SPC==1.0) {
-
-       LimThres = \
-       crtgamut == 3.0 ? mat2x3( 0.000000,0.234229,0.007680,
-                                 0.000000,0.154983,0.042446) : \
-       crtgamut == 2.0 ? mat2x3( 0.078526,0.108432,0.006143,
-                                 0.115731,0.127194,0.037039) : \
-       crtgamut == 1.0 ? mat2x3( 0.021531,0.237184,0.013466,
-                                 0.072018,0.155438,0.057731) : \
-       crtgamut ==-1.0 ? mat2x3( 0.051640,0.103332,0.013550,
-                                 0.101092,0.125474,0.057912) : \
-       crtgamut ==-2.0 ? mat2x3( 0.032717,0.525361,0.023928,
-                                 0.085609,0.184491,0.075381) : \
-       crtgamut ==-3.0 ? mat2x3( 0.000000,0.377522,0.043076,
-                                 0.000000,0.172390,0.094873) : LimThres;
-    }
-
-    // Amount of outer gamut to affect
-    vec3 th = 1.0-vec3(LimThres[1])*(0.4*sat+0.3);
-
-    // Distance limit: How far beyond the gamut boundary to compress
-    vec3 dl = 1.0+vec3(LimThres[0])*sat;
-
-    // Calculate scale so compression function passes through distance limit: (x=dl, y=1)
-    vec3 s = (vec3(1.0)-th)/sqrt(max(vec3(1.001), dl)-1.0);
-
-    // Achromatic axis
-    float ac = max(rgb.x, max(rgb.y, rgb.z));
-
-    // Inverse RGB Ratios: distance from achromatic axis
-    vec3 d = ac==0.0?vec3(0.0):(ac-rgb)/abs(ac);
-
-    // Compressed distance. Parabolic compression function: https://www.desmos.com/calculator/nvhp63hmtj
-    vec3 cd;
-    vec3 sf = s*sqrt(d-th+s*s/4.0)-s*sqrt(s*s/4.0)+th;
-    cd.x = (d.x < th.x) ? d.x : sf.x;
-    cd.y = (d.y < th.y) ? d.y : sf.y;
-    cd.z = (d.z < th.z) ? d.z : sf.z;
-
-    // Inverse RGB Ratios to RGB
-    // and Mask with "luma"
-    return mix(rgb, ac-cd.xyz*abs(ac), pow(grey,1.0/params.g_CRT_l));
-    }
-
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-
-// Matrices in column-major
-
-
-//----------------------- Y'UV color model -----------------------
-
-
-//  0-235 YUV PAL
-//  0-235 YUV NTSC-J
-// 16-235 YUV NTSC
-
-
-// Bymax 0.885515
-// Rymax 0.701088
-// R'G'B' full range to Decorrelated Intermediate (Y,B-Y,R-Y)
-// Rows should sum to 0, except first one which sums 1
-const mat3 YByRy = mat3(
-    0.298912, 0.586603, 0.114485,
-   -0.298912,-0.586603, 0.885515,
-    0.701088,-0.586603,-0.114485);
-
-
-// Umax 0.435812284313725
-// Vmax 0.615857694117647
-// R'G'B' full to Y'UV limited
-// YUV is defined with headroom and footroom (TV range),
-// UV excursion is limited to Umax and Vmax
-// Y  excursion is limited to 16-235 for NTSC-U and 0-235 for PAL and NTSC-J
-vec3 r601_YUV(vec3 RGB, float NTSC_U) {
-
-    const float sclU = ((0.5*(235.-16.)+16.)/255.); // This yields Luma   grey  at around 0.49216 or 125.5 in 8-bit
-    const float sclV =       (240.-16.)     /255. ; // This yields Chroma range at around 0.87843 or 224   in 8-bit
-
-    mat3 conv_mat = mat3(
-                 vec3(YByRy[0]),
-    vec3(sclU) * vec3(YByRy[1]),
-    vec3(sclV) * vec3(YByRy[2]));
-
-// -0.147111592156863  -0.288700692156863   0.435812284313725
-//  0.615857694117647  -0.515290478431373  -0.100567215686275
-
-    vec3 YUV   = RGB.rgb * conv_mat;
-         YUV.x = NTSC_U==1.0 ? YUV.x * 219.0 + 16.0 : YUV.x * 235.0;
-    return vec3(YUV.x/255.0,YUV.yz);
- }
-
-
-// Y'UV limited to R'G'B' full
-vec3 YUV_r601(vec3 YUV, float NTSC_U) {
-
-const mat3 conv_mat = mat3(
-    1.0000000, -0.000000029378826483,  1.1383928060531616,
-    1.0000000, -0.396552562713623050, -0.5800843834877014,
-    1.0000000,  2.031872510910034000,  0.0000000000000000);
-
-    YUV.x = (YUV.x - (NTSC_U == 1.0 ? 16.0/255.0 : 0.0 )) * (255.0/(NTSC_U == 1.0 ? 219.0 : 235.0));
-    return YUV.xyz * conv_mat;
- }
-
-
-// FP32 to 8-bit mid-tread uniform quantization
-float Quantize8(float col) {
-    col = min(255.0,floor(col * 255.0 + 0.5));
-    return col;
- }
-
-vec3 Quantize8_f3(vec3 col) {
-    col.r = Quantize8(col.r);
-    col.g = Quantize8(col.g);
-    col.b = Quantize8(col.b);
-    return col.rgb;
- }
-
-
-
-//------------------------- LMS --------------------------
-
-
-// Hunt-Pointer-Estevez D65 cone response
-// modification for IPT model
-const mat3 LMS = mat3(
- 0.4002, 0.7075, -0.0807,
--0.2280, 1.1500,  0.0612,
- 0.0000, 0.0000,  0.9184);
-
-const mat3 IPT = mat3(
- 0.4000,  0.4000, 0.2000,
- 4.4550, -4.8510, 0.3960,
- 0.8056, 0.3572, -1.1628);
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-//----------------------- Phosphor Gamuts -----------------------
-
-////// STANDARDS ///////
-// SMPTE RP 145-1994 (SMPTE-C), 170M-1999
-// SMPTE-C - Standard Phosphor (Rec.601 NTSC)
-// Standardized in 1982 (as CCIR Rec.601-1) after "Conrac Corp. & RCA" P22 phosphors (circa 1969) for consumer CRTs
-// ILLUMINANT: D65->[0.31266142,0.3289589]
-const mat3 SMPTE170M_ph = mat3(
-     0.630, 0.310, 0.155,
-     0.340, 0.595, 0.070,
-     0.030, 0.095, 0.775);
-
-// ITU-R BT.470/601 (B/G)
-// EBU Tech.3213 PAL - Standard Phosphor for Studio Monitors (also used in Sony BVMs and Higher-end PVMs)
-// ILLUMINANT: D65->[0.31266142,0.3289589]
-const mat3 SMPTE470BG_ph = mat3(
-     0.640, 0.290, 0.150,
-     0.330, 0.600, 0.060,
-     0.030, 0.110, 0.790);
-
-// NTSC-J P22
-// Mix between averaging KV-20M20, KDS VS19, Dell D93, 4-TR-B09v1_0.pdf and Phosphor Handbook 'P22'
-// Phosphors based on 1975's EBU Tech.3123-E (formerly known as JEDEC-P22)
-// Typical P22 phosphors used in Japanese consumer CRTs with 9300K+27MPCD white point
-// ILLUMINANT: D93->[0.281000,0.311000] (CCT of 8945.436K)
-// ILLUMINANT: D97->[0.285000,0.285000] (CCT of 9696K) for Nanao MS-2930s series (around 10000.0K for wp_adjust() daylight fit)
-const mat3 P22_J_ph = mat3(
-     0.625, 0.280, 0.152,
-     0.350, 0.605, 0.062,
-     0.025, 0.115, 0.786);
-
-
-
-////// P22 ///////
-// You can run any of these P22 primaries either through D65 or D93 indistinctly but typically these were D65 based.
-// P22_80 is roughly the same as the old P22 gamut in Grade 2020. P22 1979-1994 meta measurement.
-// ILLUMINANT: D65->[0.31266142,0.3289589]
-const mat3 P22_80s_ph = mat3(
-     0.6470, 0.2820, 0.1472,
-     0.3430, 0.6200, 0.0642,
-     0.0100, 0.0980, 0.7886);
-
-// P22 improved with tinted phosphors (Use this for NTSC-U 16-bits, and above for 8-bits)
-const mat3 P22_90s_ph = mat3(
-     0.6661, 0.3134, 0.1472,
-     0.3329, 0.6310, 0.0642,
-     0.0010, 0.0556, 0.7886);
-
-// RPTV (Rear Projection TV) for NTSC-U late 90s, early 00s
-const mat3 RPTV_95s_ph = mat3(
-     0.640, 0.341, 0.150,
-     0.335, 0.586, 0.070,
-     0.025, 0.073, 0.780);
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-//----------------------- Display Primaries -----------------------
-
-// sRGB (IEC 61966-2-1) and ITU-R BT.709-6 (originally CCIR Rec.709)
-const mat3 sRGB_prims = mat3(
-     0.640, 0.300, 0.150,
-     0.330, 0.600, 0.060,
-     0.030, 0.100, 0.790);
-
-// Adobe RGB (1998)
-const mat3 Adobe_prims = mat3(
-     0.640, 0.210, 0.150,
-     0.330, 0.710, 0.060,
-     0.030, 0.080, 0.790);
-
-// BT-2020/BT-2100 (from 630nm, 532nm and 467nm)
-const mat3 rec2020_prims = mat3(
-     0.707917792, 0.170237195, 0.131370635,
-     0.292027109, 0.796518542, 0.045875976,
-     0.000055099, 0.033244263, 0.822753389);
-
-// SMPTE RP 432-2 (DCI-P3)
-const mat3 DCIP3_prims = mat3(
-     0.680, 0.265, 0.150,
-     0.320, 0.690, 0.060,
-     0.000, 0.045, 0.790);
-
-
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-
-
-void main()
-{
-
-// Retro Sega Systems: Genesis, 32x, CD and Saturn 2D had color palettes designed in TV levels to save on transformations.
-    float lum_exp = (lum_fix == 1.0) ? (255.0/239.0) : 1.0;
-
-    vec3 src = texture(Source, vTexCoord.xy).rgb * lum_exp;
-
-// Adding Sega Master System 1 non-linear blue "lift": https://github.com/ekeeke/Genesis-Plus-GX/issues/345#issuecomment-820885780
-         src = SMS_bl     > 0.0 ? pow(src, vec3(1.0,1.0,1.0/1.16)) : src;
-
-// Reproduce the Sega MegaDrive palette (same as the BlastEm core output so don't use for this core): https://github.com/ekeeke/Genesis-Plus-GX/issues/345
-         src = MD_Palette > 0.0 ? vec3(contrast_sigmoid_inv(src.r,2.578419881,0.520674), \
-                                       contrast_sigmoid_inv(src.g,2.578419881,0.520674), \
-                                       contrast_sigmoid_inv(src.b,2.578419881,0.520674)) : src;
-
-// Clipping Logic / Gamut Limiting
-    bool NTSC_U = crtgamut < 2.0;
-
-    vec2 UVmax  = vec2(Quantize8(0.435812284313725), Quantize8(0.615857694117647));
-    vec2 Ymax   = NTSC_U ? vec2(16.0, 235.0) : vec2(0.0, 235.0);
-
-
-// Assumes framebuffer in Rec.601 full range with baked gamma
-// Quantize to 8-bit to replicate CRT's circuit board arithmetics
-    vec3 col = clamp(Quantize8_f3(r601_YUV(src, NTSC_U ? 1.0 : 0.0)), vec3(Ymax.x,  -UVmax.x, -UVmax.y),      \
-                                                                      vec3(Ymax.y,   UVmax.x,  UVmax.y))/255.0;
-
-// YUV Analogue Color Controls (HUE + Color Shift + Color Burst)
-    float hue_radians = hue_degrees * M_PI;
-    float hue         = hue_radians + (col.z==0.0 && col.y==0.0 ? 0.0 : atan(col.z, col.y));
-    float chroma = sqrt(col.z * col.z + col.y * col.y);  // Euclidean Distance
-
-    col.y    = (mod((chroma * cos(hue) + 1.0) + U_SHIFT, 2.0) - 1.0) * U_MUL;
-    col.z    = (mod((chroma * sin(hue) + 1.0) + V_SHIFT, 2.0) - 1.0) * V_MUL;
-
-// Back to R'G'B' full
-    col      = signal > 0.0 ? max(Quantize8_f3(YUV_r601(col.xyz, NTSC_U ? 1.0 : 0.0))/255.0, 0.0) : src;
-
-// Look LUT - (in SPC space)
-    float red   = (col.r * (global.LUT_Size1 - 1.0) + 0.4999) / (global.LUT_Size1 * global.LUT_Size1);
-    float green = (col.g * (global.LUT_Size1 - 1.0) + 0.4999) /  global.LUT_Size1;
-    float blue1 = (floor(col.b * (global.LUT_Size1 - 1.0))    /  global.LUT_Size1) + red;
-    float blue2 =  (ceil(col.b * (global.LUT_Size1 - 1.0))    /  global.LUT_Size1) + red;
-    float mixer = clamp(max((col.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-    vec3 color1 = texture(SamplerLUT1, vec2(blue1, green)).rgb;
-    vec3 color2 = texture(SamplerLUT1, vec2(blue2, green)).rgb;
-    vec3 vcolor = (global.LUT1_toggle == 0.0) ? col : mixfix(color1, color2, mixer);
-
-
-// CRT EOTF. To Display Referred Linear: Undo developer baked CRT gamma (from 2.40 at default 0.1 CRT black level, to 2.60 at 0.0 CRT black level)
-    col = EOTF_1886a_f3(vcolor, CRT_l, params.g_CRT_b, params.g_CRT_c);
-
-
-//_   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _
-// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \
-
-
-
-// HUE vs HUE
-    vec4 screen = vec4(max(col, 0.0), 1.0);
-
-                   //  r    g    b  alpha ; alpha does nothing for our purposes
-    mat4 color = mat4(wlr, rg,  rb,   0.0,              //red tint
-                      gr,  wlg, gb,   0.0,              //green tint
-                      br,  bg,  wlb,  0.0,              //blue tint
-                      blr/20., blg/20., blb/20., 0.0);  //black tint
-
-    screen *= transpose(color);
-
-
-// CRT Phosphor Gamut (0.0 is sRGB/noop)
-    mat3 m_in;
-
-    if (crtgamut == -3.0) { m_in = SMPTE170M_ph;         } else
-    if (crtgamut == -2.0) { m_in = RPTV_95s_ph;          } else
-    if (crtgamut == -1.0) { m_in = P22_80s_ph;           } else
-    if (crtgamut ==  1.0) { m_in = P22_90s_ph;           } else
-    if (crtgamut ==  2.0) { m_in = P22_J_ph;             } else
-    if (crtgamut ==  3.0) { m_in = SMPTE470BG_ph;        } else
-                          { m_in = sRGB_prims;           }
-
-    m_in = (global.LUT1_toggle == 0.0) ? m_in : sRGB_prims;
-
-// Display color space
-    mat3 m_ou;
-
-    if (SPC      ==  1.0) { m_ou = DCIP3_prims;          } else
-    if (SPC      ==  2.0) { m_ou = rec2020_prims;        } else
-    if (SPC      ==  3.0) { m_ou = Adobe_prims;          } else
-                          { m_ou = sRGB_prims;           }
-
-
-// White Point Mapping
-    col = (signal==0.0) && (m_in==m_ou) && (6499. < wp_temp) && (wp_temp < 6505.) ? screen.rgb : \
-                            wp_adjust(screen.rgb,   wp_temp,   m_in,   m_ou);
-
-
-//  SAT + HUE vs SAT (in IPT space)
-    vec3 coeff = RGB_to_XYZ_mat(m_in)[1];
-
-    vec3 src_h = RGB_to_XYZ(screen.rgb, m_in) * LMS;
-    src_h.x = src_h.x >= 0.0 ? pow(src_h.x, 0.43) : -pow(-src_h.x, 0.43);
-    src_h.y = src_h.y >= 0.0 ? pow(src_h.y, 0.43) : -pow(-src_h.y, 0.43);
-    src_h.z = src_h.z >= 0.0 ? pow(src_h.z, 0.43) : -pow(-src_h.z, 0.43);
-
-    src_h.xyz *= IPT;
-
-    float hue_at = atan(src_h.z, src_h.y);
-    chroma       = sqrt(src_h.z * src_h.z + src_h.y * src_h.y);
-
-    //  red 320º green 220º blue 100º
-    float hue_radians_r = 320.0 * M_PI;
-    float hue_r = cos(hue_at + hue_radians_r);
-
-    float hue_radians_g = 220.0 * M_PI;
-    float hue_g = cos(hue_at + hue_radians_g);
-
-    float hue_radians_b = 100.0 * M_PI;
-    float hue_b = cos(hue_at + hue_radians_b);
-
-    float msk = dot(clamp(vec3(hue_r, hue_g, hue_b) * chroma * 2.0, 0.0, 1.0), -vec3(satr, satg, satb));
-    src_h = mix(col, vec3(dot(coeff, col)), msk);
-
-    float sat_msk = (vibr < 0.0) ? 1.0 - abs(SatMask(src_h.x, src_h.y, src_h.z) - 1.0) * abs(vibr) : \
-                                   1.0 -    (SatMask(src_h.x, src_h.y, src_h.z)        *     vibr) ;
-
-    float sat   = g_sat + 1.0;
-    float msat  = 1.0 - sat;
-    float msatx = msat * coeff.x;
-    float msaty = msat * coeff.y;
-    float msatz = msat * coeff.z;
-
-    mat3 adjust = mat3(msatx + sat, msatx      , msatx       ,
-                       msaty      , msaty + sat, msaty       ,
-                       msatz      , msatz      , msatz + sat);
-
-
-    src_h  = mix(src_h, adjust * src_h, clamp(sat_msk, 0.0, 1.0));
-    src_h *= vec3(beamr,beamg,beamb);
-
-
-// RGB 'Desaturate' Gamut Compression (by Jed Smith: https://github.com/jedypod/gamut-compress)
-    coeff = RGB_to_XYZ_mat(m_ou)[1];
-    src_h = GCompress==1.0 ? clamp(GamutCompression(src_h, dot(coeff.xyz, src_h)), 0.0, 1.0) : clamp(src_h, 0.0, 1.0);
-
-
-// Sigmoidal Luma Contrast under 'Yxy' decorrelated model (in gamma space)
-    vec3 Yxy = XYZtoYxy(RGB_to_XYZ(src_h, m_ou));
-    float toGamma = clamp(moncurve_r(Yxy.r, 2.40, 0.055), 0.0, 1.0);
-    toGamma = (Yxy.r > 0.5) ? contrast_sigmoid_inv(toGamma, 2.3, 0.5) : toGamma;
-    float sigmoid = (cntrst > 0.0) ? contrast_sigmoid(toGamma, cntrst, mid) : contrast_sigmoid_inv(toGamma, cntrst, mid);
-    vec3 contrast = vec3(moncurve_f(sigmoid, 2.40, 0.055), Yxy.g, Yxy.b);
-    vec3 XYZsrgb = XYZ_to_RGB(YxytoXYZ(contrast), m_ou);
-    contrast = (cntrst == 0.0) ? src_h : XYZsrgb;
-
-
-// Lift + Gain -PP Digital Controls- (Could do in Yxy but performance reasons)
-    src_h = clamp(rolled_gain_v3(contrast, clamp(lum, -0.49, 0.99)), 0.0, 1.0);
-    src_h += lift * (1.0 - contrast);
-
-
-// Vignetting (in linear space, so after EOTF^-1 it's power shaped; 0.5 thres converts to ~0.75)
-    vec2 vpos = vTexCoord*(global.OriginalSize.xy/global.SourceSize.xy);
-
-    vpos *= 1.0 - vpos.xy;
-    float vig = vpos.x * vpos.y * vstr;
-    vig = min(pow(vig, vpower), 1.0);
-    vig = vig >= 0.5 ? smoothstep(0.0,1.0,vig) : vig;
-
-    src_h *= (vignette == 1.0) ? vig : 1.0;
-
-
-// Dark to Dim adaptation OOTF; for 709, P3-D65 and 2020
-    float DtD = global.g_Dark_to_Dim > 0.0 ? 1.0/0.9811 : 1.0;
-
-// EOTF^-1 - Inverted Electro-Optical Transfer Function
-    vec3 TRC  = (SPC == 3.0) ?     clamp(pow(src_h, vec3(1./ (563./256.))),        0., 1.) : \
-                (SPC == 0.0) ? moncurve_r_f3(src_h,           2.20 + 0.20,         0.0550) : \
-                               clamp(pow(    src_h, vec3(1./((2.20 + 0.20)*DtD))), 0., 1.) ;
-
-// External Flare for Surround Illuminant 2700K (Soft White) at F0 (Lambertian reflectance); defines offset thus also black lift
-    vec3 Flare = 0.01 * (global.g_CRT_rf/5.0)*(0.049433*global.g_CRT_sl - 0.188367) * vec3(0.459993/0.410702,1.0,0.129305/0.410702);
-    TRC = global.g_CRT_sl > 0.0 ? min(TRC+Flare,1.0) : TRC;
-
-
-// Technical LUT - (in SPC space)
-    float red_2   = (TRC.r * (global.LUT_Size2 - 1.0) + 0.4999) / (global.LUT_Size2 * global.LUT_Size2);
-    float green_2 = (TRC.g * (global.LUT_Size2 - 1.0) + 0.4999) /  global.LUT_Size2;
-    float blue1_2 = (floor(TRC.b * (global.LUT_Size2 - 1.0))    /  global.LUT_Size2) + red_2;
-    float blue2_2 =  (ceil(TRC.b * (global.LUT_Size2 - 1.0))    /  global.LUT_Size2) + red_2;
-    float mixer_2 = clamp(max((TRC.b - blue1_2) / (blue2_2 - blue1_2), 0.0), 0.0, 32.0);
-    vec3 color1_2 = texture(SamplerLUT2, vec2(blue1_2, green_2)).rgb;
-    vec3 color2_2 = texture(SamplerLUT2, vec2(blue2_2, green_2)).rgb;
-    vec3 LUT2_output = mixfix(color1_2, color2_2, mixer_2);
-
-    LUT2_output = (global.LUT2_toggle == 0.0) ? TRC : LUT2_output;
-
-
-    FragColor = vec4(LUT2_output, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/dogway/hsm-grade.slang b/bezel/Mega_Bezel/shaders/dogway/hsm-grade.slang
deleted file mode 100644
index 2d2ddc6498..0000000000
--- a/bezel/Mega_Bezel/shaders/dogway/hsm-grade.slang
+++ /dev/null
@@ -1,1047 +0,0 @@
-#version 450
-
-/*
-   Grade - CRT emulation and color manipulation shader
-
-   Copyright (C) 2020-2023 Dogway (Jose Linares)
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-
-layout(push_constant) uniform Push
-{
-    float g_signal_type;
-    float g_crtgamut;
-    float g_space_out;
-    float g_hue_degrees;
-    float g_U_SHIFT;
-    float g_V_SHIFT;
-    float g_U_MUL;
-    float g_V_MUL;
-    float g_CRT_b;
-    float g_CRT_c;
-    float g_CRT_l;
-    float g_lum_fix;
-    // float g_vstr;
-    // float g_vpower;
-    float g_sat;
-    float g_vibr;
-    float g_lum;
-    float g_cntrst;
-    float g_mid;
-    float g_lift;
-    float blr;
-    float blg;
-    float blb;
-    float wlr;
-    float wlg;
-    float wlb;
-    float rg;
-    float rb;
-    float gr;
-    float gb;
-    float br;
-    float bg;
-} params;
-
-// layout(std140, set = 0, binding = 0) uniform UBO
-// {
-//     mat4 MVP;
-//     vec4 SourceSize;
-//     vec4 OriginalSize;
-//     vec4 OutputSize;
-//     uint FrameCount;
-//     float g_vignette;
-//     float g_Dark_to_Dim;
-//     float g_GCompress;
-//     float wp_temperature;
-//     float g_analog;
-//     float g_digital;
-//     float g_sfixes;
-//     float g_MD_Pal;
-//     float g_SMS_bl;
-//     float g_CRT_br;
-//     float g_CRT_bg;
-//     float g_CRT_bb;
-//     float g_CRT_rf;
-//     float g_CRT_sl;
-//     float g_satr;
-//     float g_satg;
-//     float g_satb;
-//     float LUT_Size1;
-//     float LUT1_toggle;
-//     float LUT_Size2;
-//     float LUT2_toggle;
-// } global;
-
-/*
-   Grade (26-08-2023)
-   > See settings decriptions at: https://forums.libretro.com/t/dogways-grading-shader-slang/27148/442
-
-   > Ubershader grouping some monolithic color related shaders:
-    ::color-mangler (hunterk), ntsc color tuning knobs (Doriphor), white_point (hunterk, Dogway), RA Reshade LUT.
-   > and the addition of:
-    ::analogue color emulation, phosphor gamut, color space + TRC support, vibrance, HUE vs SAT, vignette (shared by Syh), black level, rolled gain and sigmoidal contrast.
-
-   **Thanks to those that helped me out keep motivated by continuous feedback and bug reports:
-   **Syh, Nesguy, hunterk, and the libretro forum members.
-
-
-    #####################################...STANDARDS...######################################
-    ##########################################################################################
-    ###                                                                                    ###
-    ###    PAL                                                                             ###
-    ###        Phosphor: 470BG (#3)                                                        ###
-    ###        WP: D65 (6504K)               (in practice more like 7000K-7500K range)     ###
-    ###        Saturation: -0.02                                                           ###
-    ###                                                                                    ###
-    ###    NTSC-U                                                                          ###
-    ###        Phosphor: P22/SMPTE-C (#1 #-3)(or a SMPTE-C based CRT phosphor gamut)       ###
-    ###        WP: D65 (6504K)               (in practice more like 7000K-7500K range)     ###
-    ###                                                                                    ###
-    ###    NTSC-J (Default)                                                                ###
-    ###        Phosphor: NTSC-J (#2)         (or a NTSC-J based CRT phosphor gamut)        ###
-    ###        WP: 9300K+27MPCD (8945K)      (CCT from x:0.281 y:0.311)(in practice ~8500K)###
-    ###                                                                                    ###
-    ###                                                                                    ###
-    ##########################################################################################
-    ##########################################################################################
-*/
-
-
-#pragma parameter DG_EMPTY_LINE		    " " 0 0 0.001 0.001
-#pragma parameter DG_TITLE              "[ --- COLOR CORRECTION - GRADE by DOGWAY --- ]:" 0 0 0 1
-
-#pragma parameter g_grade_on            "          Grade ON" 1 0 1 1
-
-#pragma parameter DG_COLOR_SPACE_EMPTY_LINE " " 0 0 0.001 0.001
-#pragma parameter DG_SIGNAL_CSPACE_TITLE "[ SIGNAL & COLOR SPACE ]:" 0 0 0 1
-#pragma parameter dg_support1           "[ Phosphor Gamuts for the different Regions/Eras: ]"                   0.0  0.0 0.0001 0.0001
-#pragma parameter dg_support2           "[ -3:SMPTE 170M  -2:Rear Proj TV 95  -1:P22 80s  0:sRGB Prims ]"       0.0  0.0 0.0001 0.0001
-#pragma parameter dg_support3           "[  1: P22 90s     2: P22 NTSC-J       3: SMPTE 470BG ]"                0.0  0.0 0.0001 0.0001
-#pragma parameter g_crtgamut            "   Phosphor Gamut"                                                     1.0 -3.0 3.0 1.0  // Dogway Default was 2 NTSC-J
-#pragma parameter g_space_out           "   Diplay Color Space (-1:709 0:sRGB 1:P3-D65 2:2020 3:Adobe)"         0.0 -1.0 3.0 1.0
-#pragma parameter g_signal_type         "   Signal Type (0:RGB 1:Composite)"                                    1.0  0.0 1.0 1.0
-#pragma parameter g_Dark_to_Dim         "   Dark to Dim adaptation"                                             1.0  0.0 1.0 1.0
-#pragma parameter g_GCompress           "   Gamut Compression"                                                  1.0  0.0 1.0 1.0
-
-// Analogue controls
-#pragma parameter DG_ANALOG_EMPTY_LINE	" " 0 0 0.001 0.001
-#pragma parameter g_analog              "[ ANALOG CONTROLS ]"      0.0    0.0   1.0  1.0
-#pragma parameter wp_temperature        "          White Point"                7200.0 5000.0 12000.0 100.0  // Dogway Default was 8504
-#pragma parameter g_CRT_l               "          CRT Gamma"                  2.50   2.30  2.60 0.01
-#pragma parameter g_CRT_b               "          CRT Brightness"            50.0    0.0 100.0  1.0
-#pragma parameter g_CRT_c               "          CRT Contrast"              50.0    0.0 100.0  1.0
-#pragma parameter g_hue_degrees         "          CRT Hue (Composite Signal Type Only)"                    0.0 -180.0 180.0  1.0
-#pragma parameter g_U_SHIFT             "          CRT U Shift (Composite Signal Type Only)"                0.0   -0.2   0.2  0.01
-#pragma parameter g_V_SHIFT             "          CRT V Shift (Composite Signal Type Only)"                0.0   -0.2   0.2  0.01
-#pragma parameter g_U_MUL               "          CRT U Multiplier (Composite Signal Type Only)"           1.0    0.0   2.0  0.01
-#pragma parameter g_V_MUL               "          CRT V Multiplier (Composite Signal Type Only)"           1.0    0.0   2.0  0.01
-#pragma parameter g_CRT_br              "          CRT Beam Red"               1.0    0.0   1.2  0.01
-#pragma parameter g_CRT_bg              "          CRT Beam Green"             1.0    0.0   1.2  0.01
-#pragma parameter g_CRT_bb              "          CRT Beam Blue"              1.0    0.0   1.2  0.01
-#pragma parameter g_CRT_rf              "          CRT Lambert Reflection % from Surround Luminance"     5.0    2.0   5.0  0.1
-#pragma parameter g_CRT_sl              "          Surround Luminance -nits-" 34.0    0.0 100.0  1.0
-
-// #pragma parameter g_vignette     "Vignette Toggle"            1.0    0.0   1.0  1.0
-// #pragma parameter g_vstr         "Vignette Strength"          50.0   0.0  50.0  1.0
-// #pragma parameter g_vpower       "Vignette Power"             0.50   0.0   0.5  0.01
-
-// Sega related fixes
-#pragma parameter DG_SEGA_EMPTY_LINE    " "        0 0  0.001 0.001
-#pragma parameter g_sfixes              "[ SEGA FIXES ]"           0.0  0.0 1.0 1.0
-#pragma parameter g_lum_fix             "          Sega Luma Fix"              0.0  0.0 1.0 1.0
-#pragma parameter g_MD_Pal              "          MD Palette"                 0.0  0.0 1.0 1.0
-#pragma parameter g_SMS_bl              "          SMS Blue Lift"              0.0  0.0 1.0 1.0
-
-// Digital controls
-#pragma parameter DG_GIGITAL_EMPTY_LINE	" " 0 0 0.001 0.001
-#pragma parameter g_digital             "[ DIGITAL CONTROLS ]"     0.0  0.0 1.0 1.0
-#pragma parameter g_lum                 "          Brightness"                 0.0 -0.5 1.0 0.01
-#pragma parameter g_cntrst              "          Contrast"                   0.0 -1.0 1.0 0.05
-#pragma parameter g_mid                 "          Contrast Pivot"             0.5  0.0 1.0 0.01
-#pragma parameter g_lift                "          Black Level"                0.0 -100.0 100.0 1.0 // Dogway original range was -15 to 15
-
-#pragma parameter g_sat                 "          Saturation"                 0.0 -1.0 1.0 0.01
-#pragma parameter g_vibr                "          Dullness/Vibrance"          0.0 -1.0 1.0 0.05
-
-#pragma parameter DG_HVS_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter DG_HUE_VS_SAT_TITLE   "[ HUE VS SATURATION ]:" 0 0 0 1
-#pragma parameter g_satr                "          Hue vs Sat Red"             0.0 -1.0 1.0 0.01
-#pragma parameter g_satg                "          Hue vs Sat Green"           0.0 -1.0 1.0 0.01
-#pragma parameter g_satb                "          Hue vs Sat Blue"            0.0 -1.0 1.0 0.01
-
-#pragma parameter DG_BLACKTINT_EMPTY_LINE   " " 0 0 0.001 0.001
-#pragma parameter DG_BLACKTINT_TITLE    "[ BLACK TINT ]:" 0 0 0 1
-#pragma parameter blr                   "          Black-Red Tint"             0.0  0.0 1.0 0.01
-#pragma parameter blg                   "          Black-Green Tint"           0.0  0.0 1.0 0.01
-#pragma parameter blb                   "          Black-Blue Tint"            0.0  0.0 1.0 0.01
-
-#pragma parameter DG_WHITETINT_EMPTY_LINE    " " 0 0 0.001 0.001
-#pragma parameter DG_WHITETINT_TITLE    "[ WHITE TINT ]:" 0 0 0 1
-#pragma parameter wlr                   "          White-Red Tint"             1.0  0.0 2.0 0.01
-#pragma parameter wlg                   "          White-Green Tint"           1.0  0.0 2.0 0.01
-#pragma parameter wlb                   "          White-Blue Tint"            1.0  0.0 2.0 0.01
-
-#pragma parameter DG_REDTINT_EMPTY_LINE	  " " 0 0 0.001 0.001
-#pragma parameter DG_REDTINT_TITLE      "[ RED TINT ]:" 0 0 0 1
-#pragma parameter rg                    "          Red-Green Tint"             0.0 -1.0 1.0 0.005
-#pragma parameter rb                    "          Red-Blue Tint"              0.0 -1.0 1.0 0.005
-
-#pragma parameter DG_GREENTINT_EMPTY_LINE   " " 0 0 0.001 0.001
-#pragma parameter DG_GREENTINT_TITLE    "[ GREEN TINT ]:" 0 0 0 1
-#pragma parameter gr                    "          Green-Red Tint"             0.0 -1.0 1.0 0.005
-#pragma parameter gb                    "          Green-Blue Tint"            0.0 -1.0 1.0 0.005
-
-#pragma parameter DG_BLUETINT_EMPTY_LINE   " " 0 0 0.001 0.001
-#pragma parameter DG_BLUETINT_TITLE     "[ BLUE TINT ]:" 0 0 0 1
-#pragma parameter br                    "          Blue-Red Tint"              0.0 -1.0 1.0 0.005
-#pragma parameter bg                    "          Blue-Green Tint"            0.0 -1.0 1.0 0.005
-
-// #pragma parameter LUT_Size1      "          LUT Size 1"                 32.0 8.0 64.0 16.0
-// #pragma parameter LUT1_toggle    "          LUT 1 Toggle"               0.0  0.0 1.0 1.0
-// #pragma parameter LUT_Size2      "          LUT Size 2"                 64.0 0.0 64.0 16.0
-// #pragma parameter LUT2_toggle    "          LUT 2 Toggle"               0.0  0.0 1.0 1.0
-
-#define g_grade_on     global.g_grade_on
-#define M_PI            3.1415926535897932384626433832795/180.0         // 1º (one degree) in radians
-#define RW              vec3(0.950457397565471, 1.0, 1.089436035930324) // D65 Reference White
-#define signal          params.g_signal_type
-#define crtgamut        params.g_crtgamut
-#define SPC             params.g_space_out
-#define hue_degrees     params.g_hue_degrees
-#define U_SHIFT         params.g_U_SHIFT
-#define V_SHIFT         params.g_V_SHIFT
-#define U_MUL           params.g_U_MUL
-#define V_MUL           params.g_V_MUL
-#define CRT_l           -(100000.*log((72981.-500000./(3.*max(2.3,params.g_CRT_l)))/9058.))/945461.
-#define wp_temp         global.wp_temperature
-#define lum_fix         params.g_lum_fix
-#define SMS_bl          global.g_SMS_bl
-#define MD_Palette      global.g_MD_Pal
-#define GCompress       global.g_GCompress
-// #define vignette        global.g_vignette
-// #define vstr            params.g_vstr
-// #define vpower          params.g_vpower
-#define g_sat           params.g_sat
-#define vibr            params.g_vibr
-#define beamr           global.g_CRT_br
-#define beamg           global.g_CRT_bg
-#define beamb           global.g_CRT_bb
-#define satr            global.g_satr
-#define satg            global.g_satg
-#define satb            global.g_satb
-#define lum             params.g_lum
-#define cntrst          params.g_cntrst
-#define mid             params.g_mid
-// lift goes from -15 to 15 points on an 8-bit scale (0-255)
-#define lift            (SPC==0.0 ? moncurve_f(abs(params.g_lift)/255.0,2.4,0.055) : pow(abs(params.g_lift)/255.0,SPC==3.0?2.199:2.4)) * sign(params.g_lift)
-#define blr             params.blr
-#define blg             params.blg
-#define blb             params.blb
-#define wlr             params.wlr
-#define wlg             params.wlg
-#define wlb             params.wlb
-#define rg              params.rg
-#define rb              params.rb
-#define gr              params.gr
-#define gb              params.gb
-#define br              params.br
-#define bg              params.bg
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D SamplerLUT1;
-layout(set = 0, binding = 4) uniform sampler2D SamplerLUT2;
-
-
-
-
-
-
-///////////////////////// Color Space Transformations //////////////////////////
-
-// 'D65' based
-mat3 RGB_to_XYZ_mat(mat3 primaries) {
-
-    vec3 T  = RW * inverse(primaries);
-
-    mat3 TB = mat3(
-                T.x, 0.0, 0.0,
-                0.0, T.y, 0.0,
-                0.0, 0.0, T.z);
-
-    return TB * primaries;
- }
-
-
-vec3 RGB_to_XYZ(vec3 RGB, mat3 primaries) {
-
-    return RGB *         RGB_to_XYZ_mat(primaries);
- }
-
-vec3 XYZ_to_RGB(vec3 XYZ, mat3 primaries) {
-
-    return XYZ * inverse(RGB_to_XYZ_mat(primaries));
- }
-
-
-vec3 XYZtoYxy(vec3 XYZ) {
-
-    float XYZrgb =  XYZ.r+XYZ.g+XYZ.b;
-    float Yxyg   = (XYZrgb <= 0.0) ? 0.3805 : XYZ.r / XYZrgb;
-    float Yxyb   = (XYZrgb <= 0.0) ? 0.3769 : XYZ.g / XYZrgb;
-    return vec3(XYZ.g, Yxyg, Yxyb);
- }
-
-vec3 YxytoXYZ(vec3 Yxy) {
-
-    float Xs  =  Yxy.r * (Yxy.g/Yxy.b);
-    float Xsz = (Yxy.r <= 0.0) ? 0.0 : 1.0;
-    vec3 XYZ  = vec3(Xsz,Xsz,Xsz) * vec3(Xs, Yxy.r, (Xs/Yxy.g)-Xs-Yxy.r);
-    return XYZ;
- }
-
-
-///////////////////////// White Point Mapping /////////////////////////
-//
-//
-// PAL: D65        NTSC-U: D65       NTSC-J: CCT 9300K+27MPCD
-// PAL: 6503.512K  NTSC-U: 6503.512K NTSC-J: ~8945.436K
-// [x:0.31266142   y:0.3289589]      [x:0.281 y:0.311]
-
-// For NTSC-J there's not a common agreed value, measured consumer units span from 8229.87K to 8945.623K with accounts for 8800K as well.
-// Recently it's been standardized to 9300K which is closer to what master monitors (and not consumer units) were (x=0.2838 y=0.2984) (~9177.98K)
-
-// "RGB to XYZ -> Temperature -> XYZ to RGB" joint matrix
-vec3 wp_adjust(vec3 RGB, float temperature, mat3 primaries, mat3 display) {
-
-    float temp3 = 1000.       /     temperature;
-    float temp6 = 1000000.    / pow(temperature, 2.0);
-    float temp9 = 1000000000. / pow(temperature, 3.0);
-
-    vec3 wp = vec3(1.0);
-
-    wp.x = (temperature < 5500.) ? 0.244058 + 0.0989971 * temp3 + 2.96545 * temp6 - 4.59673 * temp9 : \
-           (temperature < 8000.) ? 0.200033 + 0.9545630 * temp3 - 2.53169 * temp6 + 7.08578 * temp9 : \
-                                   0.237045 + 0.2437440 * temp3 + 1.94062 * temp6 - 2.11004 * temp9 ;
-
-    wp.y = -0.275275 + 2.87396 * wp.x - 3.02034 * pow(wp.x,2.0) + 0.0297408 * pow(wp.x,3.0);
-    wp.z =  1.0 - wp.x - wp.y;
-
-    const mat3 CAT16 = mat3(
-     0.401288,-0.250268, -0.002079,
-     0.650173, 1.204414,  0.048952,
-    -0.051461, 0.045854,  0.953127);
-
-    vec3 VKV = (vec3(wp.x/wp.y,1.,wp.z/wp.y) * CAT16) / (RW * CAT16);
-
-    mat3 VK = mat3(
-                VKV.x, 0.0, 0.0,
-                0.0, VKV.y, 0.0,
-                0.0, 0.0, VKV.z);
-
-    mat3 CAM  = CAT16 * (VK * inverse(CAT16));
-
-    mat3 mata = RGB_to_XYZ_mat(primaries);
-    mat3 matb = RGB_to_XYZ_mat(display);
-
-    return RGB.rgb * ((mata * CAM) * inverse(matb));
- }
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-// CRT EOTF Function
-//----------------------------------------------------------------------
-
-float EOTF_1886a(float color, float bl, float brightness, float contrast) {
-
-    // Defaults:
-    //  Black Level = 0.1
-    //  Brightness  = 0
-    //  Contrast    = 100
-
-    const float wl = 100.0;
-          float b  = pow(bl, 1./2.4);
-          float a  = pow(wl, 1./2.4)-b;
-                b  = (brightness-50.) / 250. + b/a;                   // -0.20 to +0.20
-                a  = contrast!=50. ? pow(2.,(contrast-50.)/50.) : 1.; //  0.50 to +2.00
-
-    const float Vc = 0.35;                           // Offset
-          float Lw = wl/100. * a;                    // White level
-          float Lb = min( b  * a,Vc);                // Black level
-    const float a1 = 2.6;                            // Shoulder gamma
-    const float a2 = 3.0;                            // Knee gamma
-          float k  = Lw /pow(1. + Lb,    a1);
-          float sl = k * pow(Vc + Lb, a1-a2);        // Slope for knee gamma
-
-    color = color >= Vc ? k * pow(color + Lb, a1 ) : sl * pow(color + Lb, a2 );
-
-    // Black lift compensation
-    float bc = 0.00446395*pow(bl,1.23486);
-    color    = min(max(color-bc,0.0)*(1.0/(1.0-bc)), 1.0);  // Undo Lift
-    color    = pow(color,1.0-0.00843283*pow(bl,1.22744));   // Restore Gamma from 'Undo Lift'
-
-    return color;
- }
-
-vec3 EOTF_1886a_f3( vec3 color, float BlackLevel, float brightness, float contrast) {
-
-    color.r = EOTF_1886a( color.r, BlackLevel, brightness, contrast);
-    color.g = EOTF_1886a( color.g, BlackLevel, brightness, contrast);
-    color.b = EOTF_1886a( color.b, BlackLevel, brightness, contrast);
-    return color.rgb;
- }
-
-
-
-// Monitor Curve Functions: https://github.com/ampas/aces-dev
-//----------------------------------------------------------------------
-
-
-float moncurve_f( float color, float gamma, float offs) {
-
-    // Forward monitor curve
-    color    = clamp(color, 0.0, 1.0);
-    float fs = (( gamma - 1.0) / offs) * pow( offs * gamma / ( ( gamma - 1.0) * ( 1.0 + offs)), gamma);
-    float xb = offs / ( gamma - 1.0);
-
-    color = ( color > xb) ? pow( ( color + offs) / ( 1.0 + offs), gamma) : color * fs;
-    return color;
- }
-
-
-vec3 moncurve_f_f3( vec3 color, float gamma, float offs) {
-
-    color.r = moncurve_f( color.r, gamma, offs);
-    color.g = moncurve_f( color.g, gamma, offs);
-    color.b = moncurve_f( color.b, gamma, offs);
-    return color.rgb;
- }
-
-
-float moncurve_r( float color, float gamma, float offs) {
-
-    // Reverse monitor curve
-    color = clamp(color, 0.0, 1.0);
-    float yb = pow( offs * gamma / ( ( gamma - 1.0) * ( 1.0 + offs)), gamma);
-    float rs = pow( ( gamma - 1.0) / offs, gamma - 1.0) * pow( ( 1.0 + offs) / gamma, gamma);
-
-    color = ( color > yb) ? ( 1.0 + offs) * pow( color, 1.0 / gamma) - offs : color * rs;
-    return color;
- }
-
-
-vec3 moncurve_r_f3( vec3 color, float gamma, float offs) {
-
-    color.r = moncurve_r( color.r, gamma, offs);
-    color.g = moncurve_r( color.g, gamma, offs);
-    color.b = moncurve_r( color.b, gamma, offs);
-    return color.rgb;
- }
-
-
-//-------------------------- Luma Functions ----------------------------
-
-
-//  Performs better in gamma encoded space
-float contrast_sigmoid(float color, float cont, float pivot) {
-
-    cont = pow(cont + 1., 3.);
-
-    float knee  = 1. / (1. + exp(cont *  pivot));
-    float shldr = 1. / (1. + exp(cont * (pivot - 1.)));
-
-    color       =(1. / (1. + exp(cont * (pivot - color))) - knee) / (shldr - knee);
-
-    return color;
- }
-
-
-//  Performs better in gamma encoded space
-float contrast_sigmoid_inv(float color, float cont, float pivot) {
-
-    cont = pow(cont - 1., 3.);
-
-    float knee  = 1. / (1. + exp (cont *  pivot));
-    float shldr = 1. / (1. + exp (cont * (pivot - 1.)));
-
-    color = pivot - log(1. / (color * (shldr - knee) + knee) - 1.) / cont;
-
-    return color;
- }
-
-
-float rolled_gain(float color, float gain) {
-
-    float gx   = abs(gain) + 0.001;
-    float anch = (gain > 0.0) ? 0.5 / (gx / 2.0) : 0.5 / gx;
-    color      = (gain > 0.0) ? color * ((color - anch) / (1.0 - anch)) : color * ((1.0 - anch) / (color - anch)) * (1.0 - gain);
-
-    return color;
- }
-
-
-vec3 rolled_gain_v3(vec3 color, float gain) {
-
-    color.r = rolled_gain(color.r, gain);
-    color.g = rolled_gain(color.g, gain);
-    color.b = rolled_gain(color.b, gain);
-
-    return color.rgb;
- }
-
-
-float SatMask(float color_r, float color_g, float color_b) {
-
-    float max_rgb = max(color_r, max(color_g, color_b));
-    float min_rgb = min(color_r, min(color_g, color_b));
-    float msk = clamp((max_rgb - min_rgb) / (max_rgb + min_rgb), 0.0, 1.0);
-    return msk;
- }
-
-
-//  This shouldn't be necessary but it seems some undefined values can
-//  creep in and each GPU vendor handles that differently. This keeps
-//  all values within a safe range
-vec3 mixfix(vec3 a, vec3 b, float c) {
-    return (a.z < 1.0) ? mix(a, b, c) : a;
- }
-
-
-vec4 mixfix_v4(vec4 a, vec4 b, float c) {
-    return (a.z < 1.0) ? mix(a, b, c) : a;
- }
-
-
-
-//---------------------- Gamut Compression -------------------
-
-
-// RGB 'Desaturate' Gamut Compression (by Jed Smith: https://github.com/jedypod/gamut-compress)
-vec3 GamutCompression (vec3 rgb, float grey) {
-
-    // Limit/Thres order is Cyan, Magenta, Yellow
-    vec3  beam = max(vec3(0.0),vec3(beamg,(beamb+beamr)/2.,(beamr+beamg)/2.));
-    vec3  sat  = max(vec3(0.0),vec3(satg, (satb +satr) /2.,(satr +satg) /2.)+1.); // center at 1
-    float temp = max(0.0,abs(wp_temp-7000.)-1000.)/825.+1.;                       // center at 1
-    vec3  WPD  = wp_temp < 7000. ? vec3(1.,temp,(temp-1.)/2.+1.) : vec3((temp-1.)/2.+1.,temp,1.);
-          sat  = max(0.0,g_sat+1.0)*(sat*beam) * WPD;
-
-    mat2x3 LimThres =    mat2x3( 0.100000,0.100000,0.100000,
-                                 0.125000,0.125000,0.125000);
-    if (SPC < 1.0) {
-
-       LimThres = \
-       crtgamut == 3.0 ? mat2x3( 0.000000,0.044065,0.000000,
-                                 0.000000,0.095638,0.000000) : \
-       crtgamut == 2.0 ? mat2x3( 0.006910,0.092133,0.000000,
-                                 0.039836,0.121390,0.000000) : \
-       crtgamut == 1.0 ? mat2x3( 0.018083,0.059489,0.017911,
-                                 0.066570,0.105996,0.066276) : \
-       crtgamut ==-1.0 ? mat2x3( 0.014947,0.098571,0.017911,
-                                 0.060803,0.123793,0.066276) : \
-       crtgamut ==-2.0 ? mat2x3( 0.004073,0.030307,0.012697,
-                                 0.028222,0.083075,0.056029) : \
-       crtgamut ==-3.0 ? mat2x3( 0.018424,0.053469,0.016841,
-                                 0.067146,0.102294,0.064393) : LimThres;
-    } else if (SPC==1.0) {
-
-       LimThres = \
-       crtgamut == 3.0 ? mat2x3( 0.000000,0.234229,0.007680,
-                                 0.000000,0.154983,0.042446) : \
-       crtgamut == 2.0 ? mat2x3( 0.078526,0.108432,0.006143,
-                                 0.115731,0.127194,0.037039) : \
-       crtgamut == 1.0 ? mat2x3( 0.021531,0.237184,0.013466,
-                                 0.072018,0.155438,0.057731) : \
-       crtgamut ==-1.0 ? mat2x3( 0.051640,0.103332,0.013550,
-                                 0.101092,0.125474,0.057912) : \
-       crtgamut ==-2.0 ? mat2x3( 0.032717,0.525361,0.023928,
-                                 0.085609,0.184491,0.075381) : \
-       crtgamut ==-3.0 ? mat2x3( 0.000000,0.377522,0.043076,
-                                 0.000000,0.172390,0.094873) : LimThres;
-    }
-
-    // Amount of outer gamut to affect
-    vec3 th = 1.0-vec3(LimThres[1])*(0.4*sat+0.3);
-
-    // Distance limit: How far beyond the gamut boundary to compress
-    vec3 dl = 1.0+vec3(LimThres[0])*sat;
-
-    // Calculate scale so compression function passes through distance limit: (x=dl, y=1)
-    vec3 s = (vec3(1.0)-th)/sqrt(max(vec3(1.001), dl)-1.0);
-
-    // Achromatic axis
-    float ac = max(rgb.x, max(rgb.y, rgb.z));
-
-    // Inverse RGB Ratios: distance from achromatic axis
-    vec3 d = ac==0.0?vec3(0.0):(ac-rgb)/abs(ac);
-
-    // Compressed distance. Parabolic compression function: https://www.desmos.com/calculator/nvhp63hmtj
-    vec3 cd;
-    vec3 sf = s*sqrt(d-th+s*s/4.0)-s*sqrt(s*s/4.0)+th;
-    cd.x = (d.x < th.x) ? d.x : sf.x;
-    cd.y = (d.y < th.y) ? d.y : sf.y;
-    cd.z = (d.z < th.z) ? d.z : sf.z;
-
-    // Inverse RGB Ratios to RGB
-    // and Mask with "luma"
-    return mix(rgb, ac-cd.xyz*abs(ac), pow(grey,1.0/params.g_CRT_l));
-    }
-
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-
-// Matrices in column-major
-
-
-//----------------------- Y'UV color model -----------------------
-
-
-//  0-235 YUV PAL
-//  0-235 YUV NTSC-J
-// 16-235 YUV NTSC
-
-
-// Bymax 0.885515
-// Rymax 0.701088
-// R'G'B' full range to Decorrelated Intermediate (Y,B-Y,R-Y)
-// Rows should sum to 0, except first one which sums 1
-const mat3 YByRy = mat3(
-    0.298912, 0.586603, 0.114485,
-   -0.298912,-0.586603, 0.885515,
-    0.701088,-0.586603,-0.114485);
-
-
-// Umax 0.435812284313725
-// Vmax 0.615857694117647
-// R'G'B' full to Y'UV limited
-// YUV is defined with headroom and footroom (TV range),
-// UV excursion is limited to Umax and Vmax
-// Y  excursion is limited to 16-235 for NTSC-U and 0-235 for PAL and NTSC-J
-vec3 r601_YUV(vec3 RGB, float NTSC_U) {
-
-    const float sclU = ((0.5*(235.-16.)+16.)/255.); // This yields Luma   grey  at around 0.49216 or 125.5 in 8-bit
-    const float sclV =       (240.-16.)     /255. ; // This yields Chroma range at around 0.87843 or 224   in 8-bit
-
-    mat3 conv_mat = mat3(
-                 vec3(YByRy[0]),
-    vec3(sclU) * vec3(YByRy[1]),
-    vec3(sclV) * vec3(YByRy[2]));
-
-// -0.147111592156863  -0.288700692156863   0.435812284313725
-//  0.615857694117647  -0.515290478431373  -0.100567215686275
-
-    vec3 YUV   = RGB.rgb * conv_mat;
-         YUV.x = NTSC_U==1.0 ? YUV.x * 219.0 + 16.0 : YUV.x * 235.0;
-    return vec3(YUV.x/255.0,YUV.yz);
- }
-
-
-// Y'UV limited to R'G'B' full
-vec3 YUV_r601(vec3 YUV, float NTSC_U) {
-
-const mat3 conv_mat = mat3(
-    1.0000000, -0.000000029378826483,  1.1383928060531616,
-    1.0000000, -0.396552562713623050, -0.5800843834877014,
-    1.0000000,  2.031872510910034000,  0.0000000000000000);
-
-    YUV.x = (YUV.x - (NTSC_U == 1.0 ? 16.0/255.0 : 0.0 )) * (255.0/(NTSC_U == 1.0 ? 219.0 : 235.0));
-    return YUV.xyz * conv_mat;
- }
-
-
-// FP32 to 8-bit mid-tread uniform quantization
-float Quantize8(float col) {
-    col = min(255.0,floor(col * 255.0 + 0.5));
-    return col;
- }
-
-vec3 Quantize8_f3(vec3 col) {
-    col.r = Quantize8(col.r);
-    col.g = Quantize8(col.g);
-    col.b = Quantize8(col.b);
-    return col.rgb;
- }
-
-
-
-//------------------------- LMS --------------------------
-
-
-// Hunt-Pointer-Estevez D65 cone response
-// modification for IPT model
-const mat3 LMS = mat3(
- 0.4002, 0.7075, -0.0807,
--0.2280, 1.1500,  0.0612,
- 0.0000, 0.0000,  0.9184);
-
-const mat3 IPT = mat3(
- 0.4000,  0.4000, 0.2000,
- 4.4550, -4.8510, 0.3960,
- 0.8056, 0.3572, -1.1628);
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-//----------------------- Phosphor Gamuts -----------------------
-
-////// STANDARDS ///////
-// SMPTE RP 145-1994 (SMPTE-C), 170M-1999
-// SMPTE-C - Standard Phosphor (Rec.601 NTSC)
-// Standardized in 1982 (as CCIR Rec.601-1) after "Conrac Corp. & RCA" P22 phosphors (circa 1969) for consumer CRTs
-// ILLUMINANT: D65->[0.31266142,0.3289589]
-const mat3 SMPTE170M_ph = mat3(
-     0.630, 0.310, 0.155,
-     0.340, 0.595, 0.070,
-     0.030, 0.095, 0.775);
-
-// ITU-R BT.470/601 (B/G)
-// EBU Tech.3213 PAL - Standard Phosphor for Studio Monitors (also used in Sony BVMs and Higher-end PVMs)
-// ILLUMINANT: D65->[0.31266142,0.3289589]
-const mat3 SMPTE470BG_ph = mat3(    
-     0.640, 0.290, 0.150,
-     0.330, 0.600, 0.060,
-     0.030, 0.110, 0.790);
-
-// NTSC-J P22
-// Mix between averaging KV-20M20, KDS VS19, Dell D93, 4-TR-B09v1_0.pdf and Phosphor Handbook 'P22'
-// Phosphors based on 1975's EBU Tech.3123-E (formerly known as JEDEC-P22)
-// Typical P22 phosphors used in Japanese consumer CRTs with 9300K+27MPCD white point
-// ILLUMINANT: D93->[0.281000,0.311000] (CCT of 8945.436K)
-// ILLUMINANT: D97->[0.285000,0.285000] (CCT of 9696K) for Nanao MS-2930s series (around 10000.0K for wp_adjust() daylight fit)
-const mat3 P22_J_ph = mat3(
-     0.625, 0.280, 0.152,
-     0.350, 0.605, 0.062,
-     0.025, 0.115, 0.786);
-
-
-
-////// P22 ///////
-// You can run any of these P22 primaries either through D65 or D93 indistinctly but typically these were D65 based.
-// P22_80 is roughly the same as the old P22 gamut in Grade 2020. P22 1979-1994 meta measurement.
-// ILLUMINANT: D65->[0.31266142,0.3289589]
-const mat3 P22_80s_ph = mat3(
-     0.6470, 0.2820, 0.1472,
-     0.3430, 0.6200, 0.0642,
-     0.0100, 0.0980, 0.7886);
-
-// P22 improved with tinted phosphors (Use this for NTSC-U 16-bits, and above for 8-bits)
-const mat3 P22_90s_ph = mat3(
-     0.6661, 0.3134, 0.1472,
-     0.3329, 0.6310, 0.0642,
-     0.0010, 0.0556, 0.7886);
-
-// RPTV (Rear Projection TV) for NTSC-U late 90s, early 00s
-const mat3 RPTV_95s_ph = mat3(
-     0.640, 0.341, 0.150,
-     0.335, 0.586, 0.070,
-     0.025, 0.073, 0.780);
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-//----------------------- Display Primaries -----------------------
-
-// sRGB (IEC 61966-2-1) and ITU-R BT.709-6 (originally CCIR Rec.709)
-const mat3 sRGB_prims = mat3(
-     0.640, 0.300, 0.150,
-     0.330, 0.600, 0.060,
-     0.030, 0.100, 0.790);
-
-// Adobe RGB (1998)
-const mat3 Adobe_prims = mat3(
-     0.640, 0.210, 0.150,
-     0.330, 0.710, 0.060,
-     0.030, 0.080, 0.790);
-
-// BT-2020/BT-2100 (from 630nm, 532nm and 467nm)
-const mat3 rec2020_prims = mat3(
-     0.707917792, 0.170237195, 0.131370635,
-     0.292027109, 0.796518542, 0.045875976,
-     0.000055099, 0.033244263, 0.822753389);
-
-// SMPTE RP 432-2 (DCI-P3)
-const mat3 DCIP3_prims = mat3(
-     0.680, 0.265, 0.150,
-     0.320, 0.690, 0.060,
-     0.000, 0.045, 0.790);
-
-
-
-
-//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
-
-
-
-
-void main()
-{
-
-// Retro Sega Systems: Genesis, 32x, CD and Saturn 2D had color palettes designed in TV levels to save on transformations.
-    float lum_exp = (lum_fix == 1.0) ? (255.0/239.0) : 1.0;
-
-    //HSM Added
-    vec4 src_rgba = texture(Source, vTexCoord.xy);
-
-    /* HSM Removed
-    vec3 src = texture(Source, vTexCoord.xy).rgb * lum_exp;
-    */
-
-    vec3 src = src_rgba.rgb * lum_exp;
-
-    if (g_grade_on == 0)
-    {
-        FragColor = src_rgba;
-        return;
-    }
-    // End Addition
-
-// Adding Sega Master System 1 non-linear blue "lift": https://github.com/ekeeke/Genesis-Plus-GX/issues/345#issuecomment-820885780
-         src = SMS_bl     > 0.0 ? pow(src, vec3(1.0,1.0,1.0/1.16)) : src;
-
-// Reproduce the Sega MegaDrive palette (same as the BlastEm core output so don't use for this core): https://github.com/ekeeke/Genesis-Plus-GX/issues/345
-         src = MD_Palette > 0.0 ? vec3(contrast_sigmoid_inv(src.r,2.578419881,0.520674), \
-                                       contrast_sigmoid_inv(src.g,2.578419881,0.520674), \
-                                       contrast_sigmoid_inv(src.b,2.578419881,0.520674)) : src;
-
-// Clipping Logic / Gamut Limiting
-    bool NTSC_U = crtgamut < 2.0;
-
-    vec2 UVmax  = vec2(Quantize8(0.435812284313725), Quantize8(0.615857694117647));
-    vec2 Ymax   = NTSC_U ? vec2(16.0, 235.0) : vec2(0.0, 235.0);
-
-
-// Assumes framebuffer in Rec.601 full range with baked gamma
-// Quantize to 8-bit to replicate CRT's circuit board arithmetics
-    vec3 col = clamp(Quantize8_f3(r601_YUV(src, NTSC_U ? 1.0 : 0.0)), vec3(Ymax.x,  -UVmax.x, -UVmax.y),      \
-                                                                      vec3(Ymax.y,   UVmax.x,  UVmax.y))/255.0;
-
-// YUV Analogue Color Controls (HUE + Color Shift + Color Burst)
-    float hue_radians = hue_degrees * M_PI;
-    float hue         = hue_radians + (col.z==0.0 && col.y==0.0 ? 0.0 : atan(col.z, col.y));
-    float chroma = sqrt(col.z * col.z + col.y * col.y);  // Euclidean Distance
-
-    col.y    = (mod((chroma * cos(hue) + 1.0) + U_SHIFT, 2.0) - 1.0) * U_MUL;
-    col.z    = (mod((chroma * sin(hue) + 1.0) + V_SHIFT, 2.0) - 1.0) * V_MUL;
-
-// Back to R'G'B' full
-    col      = signal > 0.0 ? max(Quantize8_f3(YUV_r601(col.xyz, NTSC_U ? 1.0 : 0.0))/255.0, 0.0) : src;
-
-/* HSM Removed
-// Look LUT - (in SPC space)
-    float red   = (col.r * (global.LUT_Size1 - 1.0) + 0.4999) / (global.LUT_Size1 * global.LUT_Size1);
-    float green = (col.g * (global.LUT_Size1 - 1.0) + 0.4999) /  global.LUT_Size1;
-    float blue1 = (floor(col.b * (global.LUT_Size1 - 1.0))    /  global.LUT_Size1) + red;
-    float blue2 =  (ceil(col.b * (global.LUT_Size1 - 1.0))    /  global.LUT_Size1) + red;
-    float mixer = clamp(max((col.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-    vec3 color1 = texture(SamplerLUT1, vec2(blue1, green)).rgb;
-    vec3 color2 = texture(SamplerLUT1, vec2(blue2, green)).rgb;
-    vec3 vcolor = (global.LUT1_toggle == 0.0) ? col : mixfix(color1, color2, mixer);
-*/
-
-// CRT EOTF. To Display Referred Linear: Undo developer baked CRT gamma (from 2.40 at default 0.1 CRT black level, to 2.60 at 0.0 CRT black level)
-    // col = EOTF_1886a_f3(vcolor, CRT_l, params.g_CRT_b, params.g_CRT_c);
-
-    // HSM added
-    col = EOTF_1886a_f3(col, CRT_l, params.g_CRT_b, params.g_CRT_c);
-
-
-//_   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _   _
-// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ 
-
-
-
-// HUE vs HUE
-    vec4 screen = vec4(max(col, 0.0), 1.0);
-
-                   //  r    g    b  alpha ; alpha does nothing for our purposes
-    mat4 color = mat4(wlr, rg,  rb,   0.0,              //red tint
-                      gr,  wlg, gb,   0.0,              //green tint
-                      br,  bg,  wlb,  0.0,              //blue tint
-                      blr/20., blg/20., blb/20., 0.0);  //black tint
-
-    screen *= transpose(color);
-
-
-// CRT Phosphor Gamut (0.0 is sRGB/noop)
-    mat3 m_in;
-
-    if (crtgamut == -3.0) { m_in = SMPTE170M_ph;         } else
-    if (crtgamut == -2.0) { m_in = RPTV_95s_ph;          } else
-    if (crtgamut == -1.0) { m_in = P22_80s_ph;           } else
-    if (crtgamut ==  1.0) { m_in = P22_90s_ph;           } else
-    if (crtgamut ==  2.0) { m_in = P22_J_ph;             } else
-    if (crtgamut ==  3.0) { m_in = SMPTE470BG_ph;        } else
-                          { m_in = sRGB_prims;           }
-
-/* HSM Removed
-    m_in = (global.LUT1_toggle == 0.0) ? m_in : sRGB_prims;
-*/
-
-// Display color space
-    mat3 m_ou;
-
-    if (SPC      ==  1.0) { m_ou = DCIP3_prims;          } else
-    if (SPC      ==  2.0) { m_ou = rec2020_prims;        } else
-    if (SPC      ==  3.0) { m_ou = Adobe_prims;          } else
-                          { m_ou = sRGB_prims;           }
-
-
-// White Point Mapping
-    col = (signal==0.0) && (m_in==m_ou) && (6499. < wp_temp) && (wp_temp < 6505.) ? screen.rgb : \
-                            wp_adjust(screen.rgb,   wp_temp,   m_in,   m_ou);
-
-
-//  SAT + HUE vs SAT (in IPT space)
-    vec3 coeff = RGB_to_XYZ_mat(m_in)[1];
-
-    vec3 src_h = RGB_to_XYZ(screen.rgb, m_in) * LMS;
-    src_h.x = src_h.x >= 0.0 ? pow(src_h.x, 0.43) : -pow(-src_h.x, 0.43);
-    src_h.y = src_h.y >= 0.0 ? pow(src_h.y, 0.43) : -pow(-src_h.y, 0.43);
-    src_h.z = src_h.z >= 0.0 ? pow(src_h.z, 0.43) : -pow(-src_h.z, 0.43);
-
-    src_h.xyz *= IPT;
-
-    float hue_at = atan(src_h.z, src_h.y);
-    chroma       = sqrt(src_h.z * src_h.z + src_h.y * src_h.y);
-
-    //  red 320º green 220º blue 100º
-    float hue_radians_r = 320.0 * M_PI;
-    float hue_r = cos(hue_at + hue_radians_r);
-
-    float hue_radians_g = 220.0 * M_PI;
-    float hue_g = cos(hue_at + hue_radians_g);
-
-    float hue_radians_b = 100.0 * M_PI;
-    float hue_b = cos(hue_at + hue_radians_b);
-
-    float msk = dot(clamp(vec3(hue_r, hue_g, hue_b) * chroma * 2.0, 0.0, 1.0), -vec3(satr, satg, satb));
-    src_h = mix(col, vec3(dot(coeff, col)), msk);
-
-    float sat_msk = (vibr < 0.0) ? 1.0 - abs(SatMask(src_h.x, src_h.y, src_h.z) - 1.0) * abs(vibr) : \
-                                   1.0 -    (SatMask(src_h.x, src_h.y, src_h.z)        *     vibr) ;
-
-    float sat   = g_sat + 1.0;
-    float msat  = 1.0 - sat;
-    float msatx = msat * coeff.x;
-    float msaty = msat * coeff.y;
-    float msatz = msat * coeff.z;
-
-    mat3 adjust = mat3(msatx + sat, msatx      , msatx       ,
-                       msaty      , msaty + sat, msaty       ,
-                       msatz      , msatz      , msatz + sat);
-
-
-    src_h  = mix(src_h, adjust * src_h, clamp(sat_msk, 0.0, 1.0));
-    src_h *= vec3(beamr,beamg,beamb);
-
-
-// RGB 'Desaturate' Gamut Compression (by Jed Smith: https://github.com/jedypod/gamut-compress)
-    coeff = RGB_to_XYZ_mat(m_ou)[1];
-    src_h = GCompress==1.0 ? clamp(GamutCompression(src_h, dot(coeff.xyz, src_h)), 0.0, 1.0) : clamp(src_h, 0.0, 1.0);
-
-
-
-// Sigmoidal Luma Contrast under 'Yxy' decorrelated model (in gamma space)
-    vec3 Yxy = XYZtoYxy(RGB_to_XYZ(src_h, m_ou));
-    float toGamma = clamp(moncurve_r(Yxy.r, 2.40, 0.055), 0.0, 1.0);
-    toGamma = (Yxy.r > 0.5) ? contrast_sigmoid_inv(toGamma, 2.3, 0.5) : toGamma;
-    float sigmoid = (cntrst > 0.0) ? contrast_sigmoid(toGamma, cntrst, mid) : contrast_sigmoid_inv(toGamma, cntrst, mid);
-    vec3 contrast = vec3(moncurve_f(sigmoid, 2.40, 0.055), Yxy.g, Yxy.b);
-    vec3 XYZsrgb = XYZ_to_RGB(YxytoXYZ(contrast), m_ou);
-    contrast = (cntrst == 0.0) ? src_h : XYZsrgb;
-
-        // HSM TODO use Post Brightness affects black level
-
-// Lift + Gain -PP Digital Controls- (Could do in Yxy but performance reasons)
-
-    src_h = clamp(rolled_gain_v3(contrast, clamp(lum, -0.49, 0.99)), 0.0, 1.0);
-
-    // adjust lift so the black level will not increase with post brightness when desired
-    float post_compensation_multiplier = mix(1 / HSM_POST_CRT_BRIGHTNESS, 1, HSM_POST_CRT_BRIGHTNESS_AFFECT_BLACK_LEVEL);
-    float adjusted_lift = lift * post_compensation_multiplier;
-    // adjusted_lift substituted for lift
-    src_h += adjusted_lift * (1.0 - contrast); 
-
-/* HSM Removed - Removed Vignette in Grade
-// Vignetting (in linear space, so after EOTF^-1 it's power shaped; 0.5 thres converts to ~0.75)
-    vec2 vpos = vTexCoord*(global.OriginalSize.xy/global.SourceSize.xy);
-
-    vpos *= 1.0 - vpos.xy;
-    float vig = vpos.x * vpos.y * vstr;
-    vig = min(pow(vig, vpower), 1.0);
-    vig = vig >= 0.5 ? smoothstep(0.0,1.0,vig) : vig;
-
-    src_h *= (vignette == 1.0) ? vig : 1.0;
-*/
-
-// Dark to Dim adaptation OOTF; for 709, P3-D65 and 2020
-    float DtD = global.g_Dark_to_Dim > 0.0 ? 1.0/0.9811 : 1.0;
-
-// EOTF^-1 - Inverted Electro-Optical Transfer Function
-    vec3 TRC  = (SPC == 3.0) ?     clamp(pow(src_h, vec3(1./ (563./256.))),        0., 1.) : \
-                (SPC == 0.0) ? moncurve_r_f3(src_h,           2.20 + 0.20,         0.0550) : \
-                               clamp(pow(    src_h, vec3(1./((2.20 + 0.20)*DtD))), 0., 1.) ;
-
-// External Flare for Surround Illuminant 2700K (Soft White) at F0 (Lambertian reflectance); defines offset thus also black lift
-    vec3 Flare = 0.01 * (global.g_CRT_rf/5.0)*(0.049433*global.g_CRT_sl - 0.188367) * vec3(0.459993/0.410702,1.0,0.129305/0.410702);
-    Flare *= post_compensation_multiplier;
-    TRC = global.g_CRT_sl > 0.0 ? min(TRC+Flare,1.0) : TRC;
-
-
-    /* HSM Removed
-// Technical LUT - (in SPC space)
-    float red_2   = (TRC.r * (global.LUT_Size2 - 1.0) + 0.4999) / (global.LUT_Size2 * global.LUT_Size2);
-    float green_2 = (TRC.g * (global.LUT_Size2 - 1.0) + 0.4999) /  global.LUT_Size2;
-    float blue1_2 = (floor(TRC.b * (global.LUT_Size2 - 1.0))    /  global.LUT_Size2) + red_2;
-    float blue2_2 =  (ceil(TRC.b * (global.LUT_Size2 - 1.0))    /  global.LUT_Size2) + red_2;
-    float mixer_2 = clamp(max((TRC.b - blue1_2) / (blue2_2 - blue1_2), 0.0), 0.0, 32.0);
-    vec3 color1_2 = texture(SamplerLUT2, vec2(blue1_2, green_2)).rgb;
-    vec3 color2_2 = texture(SamplerLUT2, vec2(blue2_2, green_2)).rgb;
-    vec3 LUT2_output = mixfix(color1_2, color2_2, mixer_2);
-
-    LUT2_output = (global.LUT2_toggle == 0.0) ? TRC : LUT2_output;
-
-
-    FragColor = vec4(LUT2_output, 1.0);
-    */
-    
-    FragColor = vec4(TRC, src_rgba.a);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_horiz.slang b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_horiz.slang
deleted file mode 100644
index 2178d69b6f..0000000000
--- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_horiz.slang
+++ /dev/null
@@ -1,49 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#include "hsm-crt-easymode-blur_params.inc"
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec3 col = vec3(0.0);
-	float dx = params.SourceSize.z;
-
-	float k_total = 0.0;
-	for (int i = -TAPS; i <= TAPS; i++)
-		{
-		float k = kernel(i);
-		k_total += k;
-		col += k * texture(Source, vTexCoord + vec2(float(i) * dx, 0.0)).rgb;
-		}
-   FragColor = vec4(col / k_total, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_params.inc b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_params.inc
deleted file mode 100644
index 5f7cfd7657..0000000000
--- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_params.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-// Higher value, more centered glow.
-// Lower values might need more taps.
-#define GLOW_FALLOFF 0.35
-#define TAPS 4
diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_vert.slang b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_vert.slang
deleted file mode 100644
index bb1d1bd215..0000000000
--- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-blur_vert.slang
+++ /dev/null
@@ -1,49 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#include "hsm-crt-easymode-blur_params.inc"
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec3 col = vec3(0.0);
-	float dy = params.SourceSize.w;
-
-	float k_total = 0.0;
-	for (int i = -TAPS; i <= TAPS; i++)
-		{
-		float k = kernel(i);
-		k_total += k;
-		col += k * texture(Source, vTexCoord + vec2(0.0, float(i) * dy)).rgb;
-		}
-   FragColor = vec4(col / k_total, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation-basic-border.slang b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation-basic-border.slang
deleted file mode 100644
index efddcf3c2b..0000000000
--- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation-basic-border.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-basic-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-crt-easymode-halation.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation.inc b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation.inc
deleted file mode 100644
index f60343e066..0000000000
--- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation.inc
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
-CRT Shader by EasyMode with addition of scaling functions from hsm-mega-screen-scale
-License: GPL
-
-Addition of hsm-mega-screen-scale by HyperspaceMadness remimcgill@hotmail.com
-*/
-
-layout(push_constant) uniform Push
-{
-	// HSM Removed
-    // float GAMMA_OUTPUT;
-	float ESM_SHARPNESS_H;
-	float ESM_SHARPNESS_V;
-	float ESM_MASK_TYPE;
-	float ESM_MASK_STRENGTH_MIN;
-	float ESM_MASK_STRENGTH_MAX;
-	float ESM_MASK_SIZE;
-	float ESM_SCANLINE_STRENGTH_MIN;
-	float ESM_SCANLINE_STRENGTH_MAX;
-	float ESM_SCANLINE_BEAM_MIN;
-	float ESM_SCANLINE_BEAM_MAX;
-    // HSM Removed
-	// float GEOM_CURVATURE;
-	// float GEOM_WARP;
-	// float GEOM_CORNER_SIZE;
-	// float GEOM_CORNER_SMOOTH;
-	float ESM_INTERLACING_TOGGLE;
-	float ESM_HALATION;
-	float ESM_DIFFUSION;
-	float ESM_BRIGHTNESS;
-} params;
-
-// HSM Removed
-// #pragma parameter GAMMA_OUTPUT          "    Gamma Output" 2.2 0.1 5.0 0.01
-#pragma parameter ESM_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter ESM_EASYMODE_TITLE        "[ --- EASYMODE--- ]:" 0 0 0 1
-#pragma parameter ESM_SCANLINE_TITLE        "[ SCANLINE ]:" 0 0 0 1
-// #pragma parameter ESM_INTERLACING_TOGGLE    "[EASYMODE SCANLINE]  Interlace ON" 0 0.0 1.0 1.0
-#pragma parameter ESM_SCANLINE_STRENGTH_MIN "          Strength Min." 0.2 0.0 1.0 0.05
-#pragma parameter ESM_SCANLINE_STRENGTH_MAX "          Strength Max." 0.4 0.0 1.0 0.05
-#pragma parameter ESM_SCANLINE_BEAM_MIN     "          Beam Min." 1.0 0.25 5.0 0.05
-#pragma parameter ESM_SCANLINE_BEAM_MAX     "          Beam Max." 1.0 0.25 5.0 0.05
-
-#pragma parameter ESM_SHARPNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter ESM_SHARPNESS_TITLE       "[ SHARPNESS ]:" 0 0 0 1
-#pragma parameter ESM_SHARPNESS_H           "          Horizontal" 0.6 0.0 1.0 0.05
-#pragma parameter ESM_SHARPNESS_V           "          Vertical" 1.0 0.0 1.0 0.05
-
-#pragma parameter ESM_MASK_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter ESM_MASK_TITLE            "[ MASK ]:" 0 0 0 1
-#pragma parameter ESM_MASK_TYPE             "          Type" 4.0 0.0 7.0 1.0
-#pragma parameter ESM_MASK_SIZE             "          Size - 0:Auto, 1:2K, 2:4K" 0 0 100 1
-#pragma parameter ESM_MASK_STRENGTH_MIN     "          Strength Min." 0.2 0.0 0.5 0.01
-#pragma parameter ESM_MASK_STRENGTH_MAX     "          Strength Max." 0.2 0.0 0.5 0.01
-
-#pragma parameter ESM_GLOW_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter ESM_GLOW_TITLE            "[ GLOW ]:" 0 0 0 1
-#pragma parameter ESM_HALATION              "          Halation" 0.03 0.0 1.0 0.01
-#pragma parameter ESM_DIFFUSION             "          Diffusion" 0.0 0.0 1.0 0.01
-#pragma parameter ESM_BRIGHTNESS            "          Brightness" 0.73 0.0 2.0 0.01
-
-// HSM Removed
-// #pragma parameter GEOM_CURVATURE "Geom Curvature" 0.0 0.0 0.1 0.01
-// #pragma parameter GEOM_WARP "Geom Warp" 0.0 0.0 0.1 0.01
-// #pragma parameter GEOM_CORNER_SIZE "Geom Corner Size" 0.0 0.0 0.1 0.01
-// #pragma parameter GEOM_CORNER_SMOOTH "Geom Corner Smoothness" 150.0 50.0 1000.0 25.0
-// #pragma parameter ESM_INTERLACING_TOGGLE    "    Interlacing Toggle" 1.0 0.0 1.0 1.0
-
-// HSM REMOVED
-/* Removed the following
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	uint FrameCount;
-	vec4 OriginalSize;
-	vec4 ORIG_LINEARIZEDSize;
-} global;
-*/
-
-/*
-    CRT Shader by EasyMode
-    License: GPL
-*/
-
-#define FIX(c) max(abs(c), 1e-5)
-#define PI 3.141592653589
-
-// HSM Removed
-// #define TEX2D(c) texture(tex, c)
-
-// HSM Added
-#define TEX2D(c) HSM_GetCroppedTexSample(tex, c)
-
-float curve_distance(float x, float sharp)
-{
-    float x_step = step(0.5, x);
-    float curve = 0.5 - sqrt(0.25 - (x - x_step) * (x - x_step)) * sign(0.5 - x);
-
-    return mix(x, curve, sharp);
-}
-
-mat4x4 get_color_matrix(sampler2D tex, vec2 co, vec2 dx)
-{
-    return mat4x4(TEX2D(co - dx), TEX2D(co), TEX2D(co + dx), TEX2D(co + 2.0 * dx));
-}
-
-vec4 filter_lanczos(vec4 coeffs, mat4x4 color_matrix)
-{
-    vec4 col = color_matrix * coeffs;
-    vec4 sample_min = min(color_matrix[1], color_matrix[2]);
-    vec4 sample_max = max(color_matrix[1], color_matrix[2]);
-
-    col = clamp(col, sample_min, sample_max);
-
-    return col;
-}
-
-vec3 get_scanline_weight(float pos, float beam, float strength)
-{
-    float weight = 1.0 - pow(cos(pos * 2.0 * PI) * 0.5 + 0.5, beam);
-    
-    weight = weight * strength * 2.0 + (1.0 - strength);
-    
-    return vec3(weight);
-}
-
-/* HSM Removed
-vec2 curve_coordinate(vec2 co, float curvature)
-{
-    vec2 curve = vec2(curvature, curvature * 0.75);
-    vec2 co2 = co + co * curve - curve / 2.0;
-    vec2 co_weight = vec2(co.y, co.x) * 2.0 - 1.0;
-
-    co = mix(co, co2, co_weight * co_weight);
-
-    return co;
-}
-
-float get_corner_weight(vec2 co, vec2 corner, float smoothfunc)
-{
-    float corner_weight;
-    
-    co = min(co, vec2(1.0) - co) * vec2(1.0, 0.75);
-    co = (corner - min(co, corner));
-    corner_weight = clamp((corner.x - sqrt(dot(co, co))) * smoothfunc, 0.0, 1.0);
-    corner_weight = mix(1.0, corner_weight, ceil(corner.x));
-    
-    return corner_weight;
-}
-*/
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-layout(set = 0, binding = 2) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 4) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 5) uniform sampler2D AvgLumPass;
-
-void main()
-{
-    /* HSM Removed
-    vec2 tex_size = global.SourceSize.xy;
-    */
-
-    // TODO implement Cropping
-    // HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-    vec2 tex_size = CROPPED_ROTATED_SIZE_WITH_RES_MULT;
-    // End Addition
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// // If it's the potato preset render the whole frame
-// #ifndef IS_POTATO_PRESET
-// #ifndef IS_NO_REFLECT_PRESET
-// 	vec2 bezel_outside_flat_coord;
-// 	vec2 frame_outside_flat_coord;
-// 	HSM_GetSimpleBezelCoords(TUBE_DIFFUSE_COORD, 
-// 							TUBE_DIFFUSE_SCALE, 
-// 							TUBE_SCALE, 
-// 							SCREEN_ASPECT,
-// 							bezel_outside_flat_coord, 
-// 							frame_outside_flat_coord);
-// 	cache_bounds_coord = (frame_outside_flat_coord - 0.5) * 0.9 + 0.5;
-// #endif
-// #endif
-
-// 	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-// 	{
-// 			FragColor = vec4(0);
-// 			return;
-// 	}
-
-    vec2 midpoint = vec2(0.5, 0.5);
-    float scan_offset = 0;
-    float timer = vec2(global.FrameCount, global.FrameCount).x;
-
-    /* HSM Removed
-    if (params.ESM_INTERLACING_TOGGLE > 0.5 && global.SourceSize.y >= 400)
-    {
-        tex_size.y *= 0.5;
-
-        if (mod(timer, 2.0) > 0.0)
-        {
-            midpoint.y = 0.75;
-            scan_offset = 0.5;
-        }        
-        else midpoint.y = 0.25;
-    }
-
-    vec2 co = vTexCoord * tex_size * global.SourceSize.zw;
-    vec2 xy = curve_coordinate(co, params.GEOM_WARP);
-    float corner_weight = get_corner_weight(curve_coordinate(co, params.GEOM_CURVATURE), vec2(params.GEOM_CORNER_SIZE), params.GEOM_CORNER_SMOOTH);
-    Not sure why params.GEOM_WARP was used for the main coordinate and params.GEOM_CURVATURE was used for the corner
-    */
-
-    // HSM Added
-
-
-    vec2 co = SCREEN_COORD;
-    vec2 screen_coord = co;
-
-	// HSM Added
-	float raster_bloom_avg_lum = texture(AvgLumPass, vec2(0.5,0.5)).a;
-	vec2 screen_curved_coord = vec2(0.5);
-
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetCrtShaderFinalCoord(SCREEN_COORD,
-		SCREEN_SCALE,
-		raster_bloom_avg_lum,
-		screen_curved_coord);
-
-	vec2 xy = screen_curved_coord_with_overscan_and_mirror;
-	// End Addition
-
-    // HSM Removed
-    // float corner_weight = 1;
-
-    vec2 dx = vec2(1.0 / tex_size.x, 0.0);
-    vec2 dy = vec2(0.0, 1.0 / tex_size.y);
-    vec2 pix_co = xy * tex_size - midpoint;
-    vec2 tex_co = (floor(pix_co) + midpoint) / tex_size;
-    vec2 dist = fract(pix_co);
-    float curve_x, curve_y;
-    vec3 col, col2, diff;
-
-    curve_x = curve_distance(dist.x, params.ESM_SHARPNESS_H * params.ESM_SHARPNESS_H);
-    curve_y = curve_distance(dist.y, params.ESM_SHARPNESS_V * params.ESM_SHARPNESS_V);
-
-    vec4 coeffs_x = PI * vec4(1.0 + curve_x, curve_x, 1.0 - curve_x, 2.0 - curve_x);
-    vec4 coeffs_y = PI * vec4(1.0 + curve_y, curve_y, 1.0 - curve_y, 2.0 - curve_y);
-
-    coeffs_x = FIX(coeffs_x);
-    coeffs_x = 2.0 * sin(coeffs_x) * sin(coeffs_x / 2.0) / (coeffs_x * coeffs_x);
-    coeffs_x /= dot(coeffs_x, vec4(1.0));
-
-    coeffs_y = FIX(coeffs_y);
-    coeffs_y = 2.0 * sin(coeffs_y) * sin(coeffs_y / 2.0) / (coeffs_y * coeffs_y);
-    coeffs_y /= dot(coeffs_y, vec4(1.0));
-
-    mat4x4 color_matrix;
-
-    color_matrix[0] = filter_lanczos(coeffs_x, get_color_matrix(LinearizePass, tex_co - dy, dx));
-    color_matrix[1] = filter_lanczos(coeffs_x, get_color_matrix(LinearizePass, tex_co, dx));
-    color_matrix[2] = filter_lanczos(coeffs_x, get_color_matrix(LinearizePass, tex_co + dy, dx));
-    color_matrix[3] = filter_lanczos(coeffs_x, get_color_matrix(LinearizePass, tex_co + 2.0 * dy, dx));
-
-    col = filter_lanczos(coeffs_y, color_matrix).rgb;
-    diff = HSM_GetCroppedTexSample(Source, xy).rgb;
-
-    float rgb_max = max(col.r, max(col.g, col.b));
-
-    /* HSM Removed
-    float sample_offset = (global.SourceSize.y * global.OutputSize.w) * 0.5;
-    */
-
-    // HSM Added the Following
-    float sample_offset = (tex_size.y * global.OutputSize.w * SCREEN_SCALE.y) * 0.5;
-    // End Addition
-
-    float scan_pos = xy.y * tex_size.y + scan_offset;
-    float scan_strength = mix(params.ESM_SCANLINE_STRENGTH_MAX, params.ESM_SCANLINE_STRENGTH_MIN, rgb_max);
-    float scan_beam = clamp(rgb_max * params.ESM_SCANLINE_BEAM_MAX, params.ESM_SCANLINE_BEAM_MIN, params.ESM_SCANLINE_BEAM_MAX);
-    vec3 scan_weight = vec3(0.0);
-
-    float mask_colors;
-    float mask_dot_width;
-    float mask_dot_height;
-    float mask_stagger;
-    float mask_dither;
-    vec4 mask_config;
-
-    if      (params.ESM_MASK_TYPE == 1) mask_config = vec4(2.0, 1.0, 1.0, 0.0);
-    else if (params.ESM_MASK_TYPE == 2) mask_config = vec4(3.0, 1.0, 1.0, 0.0);
-    else if (params.ESM_MASK_TYPE == 3) mask_config = vec4(2.1, 1.0, 1.0, 0.0);
-    else if (params.ESM_MASK_TYPE == 4) mask_config = vec4(3.1, 1.0, 1.0, 0.0);
-    else if (params.ESM_MASK_TYPE == 5) mask_config = vec4(2.0, 1.0, 1.0, 1.0);
-    else if (params.ESM_MASK_TYPE == 6) mask_config = vec4(3.0, 2.0, 1.0, 3.0);
-    else if (params.ESM_MASK_TYPE == 7) mask_config = vec4(3.0, 2.0, 2.0, 3.0);
-
-    mask_colors = floor(mask_config.x);
-    mask_dot_width = mask_config.y;
-    mask_dot_height = mask_config.z;
-    mask_stagger = mask_config.w;
-    mask_dither = fract(mask_config.x) * 10.0;
-
-    /* HSM Removed
-    vec2 mod_fac = floor(vTexCoord * global.OutputSize.xy * global.SourceSize.xy / (global.SourceSize.xy * vec2(params.ESM_MASK_SIZE, mask_dot_height * params.ESM_MASK_SIZE)));
-    */
-
-    // HSM Added
-    	// HSM Added
-	float final_mask_size = params.ESM_MASK_SIZE;
-	// If using automatic Mask Size
-	if (final_mask_size < 0.5)
-	{
-		final_mask_size = (global.FinalViewportSize.x + global.FinalViewportSize.y) / 3 > 1900 ? 2 : 1;
-	}
-
-    vec2 mod_fac = floor(SCREEN_COORD * global.OutputSize.xy * SCREEN_SCALE * tex_size.xy / (tex_size.xy * vec2(final_mask_size, mask_dot_height * final_mask_size)));
-    // End Addition
-
-    int dot_no = int(mod((mod_fac.x + mod(mod_fac.y, 2.0) * mask_stagger) / mask_dot_width, mask_colors));
-    float dither = mod(mod_fac.y + mod(floor(mod_fac.x / mask_colors), 2.0), 2.0);
-
-    float mask_strength = mix(params.ESM_MASK_STRENGTH_MAX, params.ESM_MASK_STRENGTH_MIN, rgb_max);
-    float mask_dark, mask_bright, mask_mul;
-    vec3 mask_weight;
-
-    mask_dark = 1.0 - mask_strength;
-    mask_bright = 1.0 + mask_strength * 2.0;
-
-    if (dot_no == 0) mask_weight = mix(vec3(mask_bright, mask_bright, mask_bright), vec3(mask_bright, mask_dark, mask_dark), mask_colors - 2.0);
-    else if (dot_no == 1) mask_weight = mix(vec3(mask_dark, mask_dark, mask_dark), vec3(mask_dark, mask_bright, mask_dark), mask_colors - 2.0);
-    else mask_weight = vec3(mask_dark, mask_dark, mask_bright);
-
-    if (dither > 0.9) mask_mul = mask_dark;
-    else mask_mul = mask_bright;
-
-    mask_weight *= mix(1.0, mask_mul, mask_dither);
-    mask_weight = mix(vec3(1.0), mask_weight, clamp(params.ESM_MASK_TYPE, 0.0, 1.0));
-
-    col2 = (col * mask_weight);
-    col2 *= params.ESM_BRIGHTNESS;
-
-    scan_weight = get_scanline_weight(scan_pos - sample_offset, scan_beam, scan_strength);
-    col = clamp(col2 * scan_weight, 0.0, 1.0);
-    scan_weight = get_scanline_weight(scan_pos, scan_beam, scan_strength);
-    col += clamp(col2 * scan_weight, 0.0, 1.0);
-    scan_weight = get_scanline_weight(scan_pos + sample_offset, scan_beam, scan_strength);
-    col += clamp(col2 * scan_weight, 0.0, 1.0);
-    col /= 3.0;
-
-    /* HSM Removed
-    col *= vec3(corner_weight);
-    col += diff * mask_weight * params.ESM_HALATION * vec3(corner_weight);
-    col += diff * params.ESM_DIFFUSION * vec3(corner_weight);
-    col = pow(col, vec3(1.0 / params.GAMMA_OUTPUT));
-    */
-
-    // HSM Added
-    col += diff * mask_weight * params.ESM_HALATION;
-    col += diff * params.ESM_DIFFUSION;
-    
-    FragColor = vec4(col, 1);
-
-	// Apply gamma offset mimicking the difference in incoming siglnal and CRT image output
-	FragColor = pow(FragColor, vec4(1 / (HSM_GAMMA_OUT_CRT / DEFAULT_SRGB_GAMMA)));
-}
diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation.slang b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation.slang
deleted file mode 100644
index de5ffecddf..0000000000
--- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-crt-easymode-halation.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-threshold.slang b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-threshold.slang
deleted file mode 100644
index 9422769774..0000000000
--- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-threshold.slang
+++ /dev/null
@@ -1,37 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D LinearizePass;
-
-void main()
-{
-vec3 diff = clamp(texture(Source, vTexCoord).rgb - texture(LinearizePass, vTexCoord).rgb, 0.0, 1.0);
-   FragColor = vec4(diff, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/fxaa/fxaa.slang b/bezel/Mega_Bezel/shaders/fxaa/fxaa.slang
deleted file mode 100644
index 2e5d2042fa..0000000000
--- a/bezel/Mega_Bezel/shaders/fxaa/fxaa.slang
+++ /dev/null
@@ -1,285 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-    float HSM_FXAA_ON;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/**
- * @license
- * Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
- *
- * TO  THE MAXIMUM  EXTENT PERMITTED  BY APPLICABLE  LAW, THIS SOFTWARE  IS PROVIDED
- * *AS IS*  AND NVIDIA AND  ITS SUPPLIERS DISCLAIM  ALL WARRANTIES,  EITHER  EXPRESS
- * OR IMPLIED, INCLUDING, BUT NOT LIMITED  TO, NONINFRINGEMENT,IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL  NVIDIA 
- * OR ITS SUPPLIERS BE  LIABLE  FOR  ANY  DIRECT, SPECIAL,  INCIDENTAL,  INDIRECT,  OR  
- * CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION,  DAMAGES FOR LOSS 
- * OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY 
- * OTHER PECUNIARY LOSS) ARISING OUT OF THE  USE OF OR INABILITY  TO USE THIS SOFTWARE, 
- * EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
-FXAA_PRESET - Choose compile-in knob preset 0-5.
-------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD - The minimum amount of local contrast required 
-                      to apply algorithm.
-                      1.0/3.0  - too little
-                      1.0/4.0  - good start
-                      1.0/8.0  - applies to more edges
-                      1.0/16.0 - overkill
-------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD_MIN - Trims the algorithm from processing darks.
-                          Perf optimization.
-                          1.0/32.0 - visible limit (smaller isn't visible)
-                          1.0/16.0 - good compromise
-                          1.0/12.0 - upper limit (seeing artifacts)
-------------------------------------------------------------------------------
-FXAA_SEARCH_STEPS - Maximum number of search steps for end of span.
-------------------------------------------------------------------------------
-FXAA_SEARCH_THRESHOLD - Controls when to stop searching.
-                        1.0/4.0 - seems to be the best quality wise
-------------------------------------------------------------------------------
-FXAA_SUBPIX_TRIM - Controls sub-pixel aliasing removal.
-                   1.0/2.0 - low removal
-                   1.0/3.0 - medium removal
-                   1.0/4.0 - default removal
-                   1.0/8.0 - high removal
-                   0.0 - complete removal
-------------------------------------------------------------------------------
-FXAA_SUBPIX_CAP - Insures fine detail is not completely removed.
-                  This is important for the transition of sub-pixel detail,
-                  like fences and wires.
-                  3.0/4.0 - default (medium amount of filtering)
-                  7.0/8.0 - high amount of filtering
-                  1.0 - no capping of sub-pixel aliasing removal
-*/
-
-#ifndef FXAA_PRESET
-    #define FXAA_PRESET 5
-#endif
-#if (FXAA_PRESET == 3)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/16.0)
-    #define FXAA_SEARCH_STEPS        16
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 4)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        24
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 5)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        32
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-
-#define FXAA_SUBPIX_TRIM_SCALE (1.0/(1.0 - FXAA_SUBPIX_TRIM))
-
-// Return the luma, the estimation of luminance from rgb inputs.
-// This approximates luma using one FMA instruction,
-// skipping normalization and tossing out blue.
-// FxaaLuma() will range 0.0 to 2.963210702.
-float FxaaLuma(vec3 rgb) {
-    return rgb.y * (0.587/0.299) + rgb.x;
-}
-
-vec3 FxaaLerp3(vec3 a, vec3 b, float amountOfA) {
-    return (vec3(-amountOfA) * b) + ((a * vec3(amountOfA)) + b);
-}
-
-vec4 FxaaTexOff(sampler2D tex, vec2 pos, ivec2 off, vec2 rcpFrame) {
-    float x = pos.x + float(off.x) * rcpFrame.x;
-    float y = pos.y + float(off.y) * rcpFrame.y;
-    return texture(tex, vec2(x, y));
-}
-
-// pos is the output of FxaaVertexShader interpolated across screen.
-// xy -> actual texture position {0.0 to 1.0}
-// rcpFrame should be a uniform equal to  {1.0/frameWidth, 1.0/frameHeight}
-vec3 FxaaPixelShader(vec2 pos, sampler2D tex, vec2 rcpFrame)
-{
-    vec3 rgbN = FxaaTexOff(tex, pos.xy, ivec2( 0,-1), rcpFrame).xyz;
-    vec3 rgbW = FxaaTexOff(tex, pos.xy, ivec2(-1, 0), rcpFrame).xyz;
-    vec3 rgbM = FxaaTexOff(tex, pos.xy, ivec2( 0, 0), rcpFrame).xyz;
-    vec3 rgbE = FxaaTexOff(tex, pos.xy, ivec2( 1, 0), rcpFrame).xyz;
-    vec3 rgbS = FxaaTexOff(tex, pos.xy, ivec2( 0, 1), rcpFrame).xyz;
-    
-    float lumaN = FxaaLuma(rgbN);
-    float lumaW = FxaaLuma(rgbW);
-    float lumaM = FxaaLuma(rgbM);
-    float lumaE = FxaaLuma(rgbE);
-    float lumaS = FxaaLuma(rgbS);
-    float rangeMin = min(lumaM, min(min(lumaN, lumaW), min(lumaS, lumaE)));
-    float rangeMax = max(lumaM, max(max(lumaN, lumaW), max(lumaS, lumaE)));
-    
-    float range = rangeMax - rangeMin;
-    if(range < max(FXAA_EDGE_THRESHOLD_MIN, rangeMax * FXAA_EDGE_THRESHOLD))
-    {
-        return rgbM;
-    }
-    
-    vec3 rgbL = rgbN + rgbW + rgbM + rgbE + rgbS;
-    
-    float lumaL = (lumaN + lumaW + lumaE + lumaS) * 0.25;
-    float rangeL = abs(lumaL - lumaM);
-    float blendL = max(0.0, (rangeL / range) - FXAA_SUBPIX_TRIM) * FXAA_SUBPIX_TRIM_SCALE; 
-    blendL = min(FXAA_SUBPIX_CAP, blendL);
-    
-    vec3 rgbNW = FxaaTexOff(tex, pos.xy, ivec2(-1,-1), rcpFrame).xyz;
-    vec3 rgbNE = FxaaTexOff(tex, pos.xy, ivec2( 1,-1), rcpFrame).xyz;
-    vec3 rgbSW = FxaaTexOff(tex, pos.xy, ivec2(-1, 1), rcpFrame).xyz;
-    vec3 rgbSE = FxaaTexOff(tex, pos.xy, ivec2( 1, 1), rcpFrame).xyz;
-    rgbL += (rgbNW + rgbNE + rgbSW + rgbSE);
-    rgbL *= vec3(1.0/9.0);
-    
-    float lumaNW = FxaaLuma(rgbNW);
-    float lumaNE = FxaaLuma(rgbNE);
-    float lumaSW = FxaaLuma(rgbSW);
-    float lumaSE = FxaaLuma(rgbSE);
-    
-    float edgeVert = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaN) + (0.25 * lumaNE)) +
-        abs((0.50 * lumaW ) + (-1.0 * lumaM) + (0.50 * lumaE )) +
-        abs((0.25 * lumaSW) + (-0.5 * lumaS) + (0.25 * lumaSE));
-    float edgeHorz = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaW) + (0.25 * lumaSW)) +
-        abs((0.50 * lumaN ) + (-1.0 * lumaM) + (0.50 * lumaS )) +
-        abs((0.25 * lumaNE) + (-0.5 * lumaE) + (0.25 * lumaSE));
-        
-    bool horzSpan = edgeHorz >= edgeVert;
-    float lengthSign = horzSpan ? -rcpFrame.y : -rcpFrame.x;
-    
-    if(!horzSpan)
-    {
-        lumaN = lumaW;
-        lumaS = lumaE;
-    }
-    
-    float gradientN = abs(lumaN - lumaM);
-    float gradientS = abs(lumaS - lumaM);
-    lumaN = (lumaN + lumaM) * 0.5;
-    lumaS = (lumaS + lumaM) * 0.5;
-    
-    if (gradientN < gradientS)
-    {
-        lumaN = lumaS;
-        lumaN = lumaS;
-        gradientN = gradientS;
-        lengthSign *= -1.0;
-    }
-    
-    vec2 posN;
-    posN.x = pos.x + (horzSpan ? 0.0 : lengthSign * 0.5);
-    posN.y = pos.y + (horzSpan ? lengthSign * 0.5 : 0.0);
-    
-    gradientN *= FXAA_SEARCH_THRESHOLD;
-    
-    vec2 posP = posN;
-    vec2 offNP = horzSpan ? vec2(rcpFrame.x, 0.0) : vec2(0.0, rcpFrame.y); 
-    float lumaEndN = lumaN;
-    float lumaEndP = lumaN;
-    bool doneN = false;
-    bool doneP = false;
-    posN += offNP * vec2(-1.0, -1.0);
-    posP += offNP * vec2( 1.0,  1.0);
-    
-    for(int i = 0; i < FXAA_SEARCH_STEPS; i++) {
-        if(!doneN)
-        {
-            lumaEndN = FxaaLuma(texture(tex, posN.xy).xyz);
-        }
-        if(!doneP)
-        {
-            lumaEndP = FxaaLuma(texture(tex, posP.xy).xyz);
-        }
-        
-        doneN = doneN || (abs(lumaEndN - lumaN) >= gradientN);
-        doneP = doneP || (abs(lumaEndP - lumaN) >= gradientN);
-        
-        if(doneN && doneP)
-        {
-            break;
-        }
-        if(!doneN)
-        {
-            posN -= offNP;
-        }
-        if(!doneP)
-        {
-            posP += offNP;
-        }
-    }
-    
-    float dstN = horzSpan ? pos.x - posN.x : pos.y - posN.y;
-    float dstP = horzSpan ? posP.x - pos.x : posP.y - pos.y;
-    bool directionN = dstN < dstP;
-    lumaEndN = directionN ? lumaEndN : lumaEndP;
-    
-    if(((lumaM - lumaN) < 0.0) == ((lumaEndN - lumaN) < 0.0))
-    {
-        lengthSign = 0.0;
-    }
- 
-
-    float spanLength = (dstP + dstN);
-    dstN = directionN ? dstN : dstP;
-    float subPixelOffset = (0.5 + (dstN * (-1.0/spanLength))) * lengthSign;
-    vec3 rgbF = texture(tex, vec2(
-        pos.x + (horzSpan ? 0.0 : subPixelOffset),
-        pos.y + (horzSpan ? subPixelOffset : 0.0))).xyz;
-    return FxaaLerp3(rgbL, rgbF, blendL); 
-}
-
-#pragma parameter HSM_FXAA_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter HSM_FXAA_TITLE          "[ --- FXAA - ANTIALIASING --- ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_FXAA_ON         "          FXAA ON" 0 0 1 1
-#define HSM_FXAA_ON                   params.HSM_FXAA_ON
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    if (HSM_FXAA_ON < 0.5)
-    {
-        FragColor = texture(Source, vTexCoord);
-        return;
-    }
-
-   FragColor = vec4(FxaaPixelShader(vTexCoord, Source, vec2(params.SourceSize.z, params.SourceSize.w)), 1.0) * 1.0;
-}
diff --git a/bezel/Mega_Bezel/shaders/gtu/config.h b/bezel/Mega_Bezel/shaders/gtu/config.h
deleted file mode 100644
index 818a448add..0000000000
--- a/bezel/Mega_Bezel/shaders/gtu/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma parameter GTU_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter GTU_TITLE		            "[ --- TV PROCESS GTU --- ]:" 0 0 0.01 0.01
-#pragma parameter GTU_ON                    "          GTU ON" 0 0 1 1
-#pragma parameter compositeConnection       "          Composite Connection Enable" 0.0 0.0 1.0 1.0
-
-#define FIXNUM 6
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/gtu/hsm-gtu-pass1.slang b/bezel/Mega_Bezel/shaders/gtu/hsm-gtu-pass1.slang
deleted file mode 100644
index ccfbaa8dc3..0000000000
--- a/bezel/Mega_Bezel/shaders/gtu/hsm-gtu-pass1.slang
+++ /dev/null
@@ -1,58 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 OriginalSize;
-	vec4 SourceSize;
-	float GTU_ON;
-	float compositeConnection;
-} params;
-
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-////////////////////////////////////////////////////////
-// GTU version 0.50
-// Author: aliaspider - aliaspider@gmail.com
-// License: GPLv3
-////////////////////////////////////////////////////////
-
-#include "config.h"
-
-#define RGB_to_YIQ 	mat3x3( 0.299 , 0.595716 , 0.211456 ,	0.587    , -0.274453 , -0.522591 ,		0.114    , -0.321263 , 0.311135 )
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec4	c	=	texture(Source, vTexCoord);
-	// If GTU is off return the color from the last pass
-	if (params.GTU_ON < 1)
-	{
-		FragColor = c;
-		return;
-	}
-
-	if(params.compositeConnection > 0.0)
-		c.rgb	=	c.rgb * RGB_to_YIQ;
-   FragColor = c;
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/gtu/hsm-gtu-pass2.slang b/bezel/Mega_Bezel/shaders/gtu/hsm-gtu-pass2.slang
deleted file mode 100644
index 34608399ed..0000000000
--- a/bezel/Mega_Bezel/shaders/gtu/hsm-gtu-pass2.slang
+++ /dev/null
@@ -1,100 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 OriginalSize;
-	vec4 SourceSize;
-   float GTU_ON;
-	float signalResolution;
-	float signalResolutionI;
-	float signalResolutionQ;
-	float compositeConnection;
-} params;
-
-#pragma parameter signalResolution     "          Signal Resolution Y" 256.0 16.0 1024.0 16.0
-#pragma parameter signalResolutionI    "          Signal Resolution I" 83.0 1.0 350.0 2.0
-#pragma parameter signalResolutionQ    "          Signal Resolution Q" 25.0 1.0 350.0 2.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-////////////////////////////////////////////////////////
-// GTU version 0.50
-// Author: aliaspider - aliaspider@gmail.com
-// License: GPLv3
-////////////////////////////////////////////////////////
-
-#include "config.h"
-
-#define YIQ_to_RGB 	mat3x3( 1.0   , 1.0      , 1.0      ,	0.9563   , -0.2721   , -1.1070   ,		0.6210   , -0.6474   , 1.7046   )
-#define pi        3.14159265358
-#define a(x) abs(x)
-#define d(x,b) (pi*b*min(a(x)+0.5,1.0/b))
-#define e(x,b) (pi*b*min(max(a(x)-0.5,-1.0/b),1.0/b))
-#define STU(x,b) ((d(x,b)+sin(d(x,b))-e(x,b)-sin(e(x,b)))/(2.0*pi))
-//#define X(i) (offset-(i))
-#define GETC (texture(Source, vec2(vTexCoord.x - X * params.SourceSize.z, vTexCoord.y)).rgb)
-
-#define VAL_composite vec3((c.x*STU(X,(params.signalResolution * params.SourceSize.z))),(c.y*STU(X,(params.signalResolutionI * params.SourceSize.z))),(c.z*STU(X,(params.signalResolutionQ * params.SourceSize.z))))
-#define VAL (c*STU(X,(params.signalResolution * params.SourceSize.z)))
-
-#define PROCESS(i) X=(offset-(i));c=GETC;tempColor+=VAL;
-#define PROCESS_composite(i) X=(offset-(i));c=GETC;tempColor+=VAL_composite;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   // If GTU is off return the color from the last pass
-	if (params.GTU_ON < 1)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	float offset   = fract((vTexCoord.x * params.SourceSize.x) - 0.5);
-	vec3	tempColor = vec3(0.0);
-	float	X;
-	vec3	c;
-	float range;
-	if (params.compositeConnection > 0.0)
-      range=ceil(0.5+params.SourceSize.x/min(min(params.signalResolution,params.signalResolutionI),params.signalResolutionQ));
-   else
-      range=ceil(0.5+params.SourceSize.x/params.signalResolution);
-	  
-	float i;
-   if(params.compositeConnection > 0.0){
-      for (i=-range;i<range+2.0;i++){
-         PROCESS_composite((offset-(i)))
-      }
-   }
-   else{
-      for (i=-range;i<range+2.0;i++){
-         PROCESS((offset-(i)))
-      }
-   }
-   if(params.compositeConnection > 0.0)
-      tempColor=clamp(tempColor * YIQ_to_RGB,0.0,1.0);
-   else
-      tempColor=clamp(tempColor,0.0,1.0);
-
-   // tempColor=clamp(tempColor,0.0,1.0);
-   FragColor = vec4(tempColor, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-drez-g-sharp_resampler.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
deleted file mode 100644
index 1811bf6d4f..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-drez-g-sharp_resampler.slang
+++ /dev/null
@@ -1,158 +0,0 @@
-#version 450
-
-/*
-   G-sharp resampler - dynamic range, resizable
-   
-   Copyright (C) 2020 - 2021 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-   Anti-Ringing inspired by Hyllian
-   
-*/ 
-
-#include "../../base/common/globals-and-screen-scale-params.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float HSM_DREZ_GSHARP_ON;
-	float HSM_DREZ_SIGMA_HV;
-	float HSM_DREZ_HSHARP0;
-	float HSM_DREZ_HAR;
-	float HSM_DREZ_SHAR;
-	float HSM_DREZ_THRESHOLD_RATIO;
-} params;
-
-#pragma parameter HSM_GSHARP_DREZ_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter GSHARP_DREZ_TITLE 	"[ --- DREZ DOWNSAMPLE FILTER - GUEST.R G-SHARP RESAMPLER --- ]:"  0 0 0.01 0.01
-
-#pragma parameter HSM_DREZ_GSHARP_ON 	"          G-SHARP ON" 	  1 0 1 1
-#define HSM_DREZ_GSHARP_ON params.HSM_DREZ_GSHARP_ON
-	
-#pragma parameter HSM_DREZ_THRESHOLD_RATIO 	"         Downsample Threshold (Original Res Vs Downsampled Res)" 	  1.5 1 4 0.1
-#define HSM_DREZ_THRESHOLD_RATIO params.HSM_DREZ_THRESHOLD_RATIO
-
-
-// Default was 1.2, now set to 2.3 to match smoothing in Hyllian b-spline
-#pragma parameter HSM_DREZ_HSHARP0 		"          Filter Range"  2.3 1.0 6.0 0.1
-#define HSM_DREZ_HSHARP0 params.HSM_DREZ_HSHARP0
-
-// Default was 0.75
-#pragma parameter HSM_DREZ_SIGMA_HV 		"          Gaussian Blur Sigma" 0.75 0.1 7.0 0.05
-#define HSM_DREZ_SIGMA_HV params.HSM_DREZ_SIGMA_HV
-
-// Default was 0.5
-#pragma parameter HSM_DREZ_SHAR 			"          Sharpness Definition" 0.5 0.0 2.0 0.05
-#define HSM_DREZ_SHAR params.HSM_DREZ_SHAR
-
-// Default was 0.5
-#pragma parameter HSM_DREZ_HAR 			"          Anti-Ringing" 0.5 0.0 1.0 0.10
-#define HSM_DREZ_HAR params.HSM_DREZ_HAR
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Original;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define SourceSize params.OriginalSize
-#define OutputSize params.OutputSize
-#define Source Original
-
-float invsqrsigma_h = 1.0/(2.0*HSM_DREZ_SIGMA_HV*HSM_DREZ_SIGMA_HV);
-
-float gaussian(float x, float y)
-{
-	return exp(-(x*x + y*y)*invsqrsigma_h);
-}
-
-void main()
-{
-	// If the effext is disabled or the downsample ratio is below the threshold, just sample the texture
-	if (HSM_DREZ_GSHARP_ON == 0 || SourceSize.y / OutputSize.y < HSM_DREZ_THRESHOLD_RATIO)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-	
-	vec2 f = fract(SourceSize.xy * vTexCoord.xy);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize.xy * vTexCoord)*SourceSize.zw + 0.5*SourceSize.zw;
-	vec2 dx  = vec2(SourceSize.z, 0.0);	
-	vec2 dy  = vec2(0.0, SourceSize.w);
-
-	vec3 colorx = 0.0.xxx;
-	vec3 colory = 0.0.xxx;
-	float wx, wy;
-	float wsumx = 0.0;
-	float wsumy = 0.0;
-	vec3 pixel;
-	float x;
-
-	vec3 xcmax = 0.0.xxx;
-	vec3 xcmin = 1.0.xxx;
-
-	float sharp = gaussian(HSM_DREZ_HSHARP0, 0.0);
-	float maxsharp = 0.07;
-	float FPR = HSM_DREZ_HSHARP0;
-	float fpx = 1.0;
-
-	float LOOPSIZE = ceil(2.0*FPR);
-	float y = -LOOPSIZE;
-
-	do
-	{
-		x = -LOOPSIZE;
-	
-		do
-		{
-			pixel  = COMPAT_TEXTURE(Source, tex + x*dx + y*dy).rgb;
-			
-			wx = gaussian(x+f.x, y+f.y) - sharp; 
-			fpx = (sqrt(dot(vec2(x+f.x,y+f.y),vec2(x+f.x,y+f.y)))-FPR)/FPR;
-			if (((x*x) + (y*y)) < 1.25*FPR) { xcmax = max(xcmax, pixel); xcmin = min(xcmin, pixel); }
-			if (wx < 0.0) wx = clamp(wx, mix(-maxsharp, 0.0, pow(abs(fpx), HSM_DREZ_SHAR)), 0.0);
-			colorx = colorx + wx * pixel;
-			wsumx  = wsumx + wx;
-			x = x + 1.0;
-			
-		} while (x <= LOOPSIZE);
-		
-		y = y + 1.0;
-		
-	} while (y <= LOOPSIZE);
-
-	vec3 color = colorx/wsumx;
-	
-	color = mix(clamp(color, 0.0, 1.0), clamp(color, xcmin, xcmax), HSM_DREZ_HAR);
-	
-	FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-drez-none.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-drez-none.slang
deleted file mode 100644
index 4370574753..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-drez-none.slang
+++ /dev/null
@@ -1,40 +0,0 @@
-#version 450
-
-/*
-   Mega Bezel - Get the Original Pass and Output it
-   
-*/ 
-
-#include "../../base/common/globals-and-screen-scale-params.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Original;
-
-
-void main()
-{
-	FragColor = texture(Original, vTexCoord);
-	return;
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-fetch-drez-output.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-fetch-drez-output.slang
deleted file mode 100644
index 19a9ff8991..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-fetch-drez-output.slang
+++ /dev/null
@@ -1,41 +0,0 @@
-#version 450
-
-/*
-   Mega Bezel, Used after the cache pass, to fetch the Dres pass (which is before the cache pass)
-   to pass it down the chain
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D DerezedPass;
-
-void main()
-{
-	FragColor = texture(DerezedPass, vTexCoord);
-	return;
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-g-sharp_resampler.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-g-sharp_resampler.slang
deleted file mode 100644
index 8a5edf722c..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-g-sharp_resampler.slang
+++ /dev/null
@@ -1,152 +0,0 @@
-#version 450
-
-/*
-   G-sharp resampler - dynamic range, resizable
-   
-   Copyright (C) 2020 - 2021 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-   Anti-Ringing inspired by Hyllian
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float GSHARP_ON;
-	float SIGMA_HV;
-	float HSHARP0;
-	float HAR;
-	float SHAR;
-} params;
-
-#pragma parameter HSM_GSHARP_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter GSHARP_TITLE 	"[ --- G-SHARP RESAMPLER --- ]:"  0 0 0.01 0.01
-
-#pragma parameter GSHARP_ON 	"          G-SHARP ON" 	  0 0 1 1
-#define GSHARP_ON params.GSHARP_ON
-
-// Default was 1.2
-#pragma parameter HSHARP0 		"          Filter Range"  1 1.0 6.0 0.1
-#define HSHARP0 params.HSHARP0
-
-// Default was 0.75
-#pragma parameter SIGMA_HV 		"          Gaussian Blur Sigma" 1 0.1 7.0 0.05
-#define SIGMA_HV params.SIGMA_HV
-
-// Default was 0.5
-#pragma parameter SHAR 			"          Sharpness Definition" 1.5 0.0 2.0 0.05
-#define SHAR params.SHAR
-
-// Default was 0.5
-#pragma parameter HAR 			"          Anti-Ringing" 1 0.0 1.0 0.10
-#define HAR params.HAR
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define SourceSize params.SourceSize
-
-float invsqrsigma_h = 1.0/(2.0*SIGMA_HV*SIGMA_HV);
-
-float gaussian(float x, float y)
-{
-	return exp(-(x*x + y*y)*invsqrsigma_h);
-}
-
-void main()
-{
-	if (GSHARP_ON == 0)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-	
-	vec2 f = fract(SourceSize.xy * vTexCoord.xy);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize.xy * vTexCoord)*SourceSize.zw + 0.5*SourceSize.zw;
-	vec2 dx  = vec2(SourceSize.z, 0.0);	
-	vec2 dy  = vec2(0.0, SourceSize.w);
-
-	vec3 colorx = 0.0.xxx;
-	vec3 colory = 0.0.xxx;
-	float wx, wy;
-	float wsumx = 0.0;
-	float wsumy = 0.0;
-	vec3 pixel;
-	float x;
-
-	vec3 xcmax = 0.0.xxx;
-	vec3 xcmin = 1.0.xxx;
-
-	float sharp = gaussian(HSHARP0, 0.0);
-	float maxsharp = 0.07;
-	float FPR = HSHARP0;
-	float fpx = 1.0;
-
-	float LOOPSIZE = ceil(2.0*FPR);
-	float y = -LOOPSIZE;
-
-	do
-	{
-		x = -LOOPSIZE;
-	
-		do
-		{
-			pixel  = COMPAT_TEXTURE(Source, tex + x*dx + y*dy).rgb;
-			
-			wx = gaussian(x+f.x, y+f.y) - sharp; 
-			fpx = (sqrt(dot(vec2(x+f.x,y+f.y),vec2(x+f.x,y+f.y)))-FPR)/FPR;
-			if (((x*x) + (y*y)) < 1.25*FPR) { xcmax = max(xcmax, pixel); xcmin = min(xcmin, pixel); }
-			if (wx < 0.0) wx = clamp(wx, mix(-maxsharp, 0.0, pow(abs(fpx), SHAR)), 0.0);
-			colorx = colorx + wx * pixel;
-			wsumx  = wsumx + wx;
-			x = x + 1.0;
-			
-		} while (x <= LOOPSIZE);
-		
-		y = y + 1.0;
-		
-	} while (y <= LOOPSIZE);
-
-	vec3 color = colorx/wsumx;
-	
-	color = mix(clamp(color, 0.0, 1.0), clamp(color, xcmin, xcmax), HAR);
-	
-	FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-no-reflect.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-no-reflect.slang
deleted file mode 100644
index 808f10f76d..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-no-reflect.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-#include "../../base/common/globals-and-screen-scale-params.inc"
-#include "../../base/common/common-functions.inc"
-#include "hsm-screen-scale-g-sharp_resampler.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-potato.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-potato.slang
deleted file mode 100644
index 66ef8fd68a..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler-potato.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "../../base/common/globals-and-potato-params.inc"
-#include "../../base/common/common-functions.inc"
-#include "hsm-screen-scale-g-sharp_resampler.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.inc b/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.inc
deleted file mode 100644
index 1bfec0938e..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.inc
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-   G-sharp resampler - dynamic range, resizable
-   
-   Copyright (C) 2020 - 2021 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-   Anti-Ringing inspired by Hyllian
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float HSM_SCREEN_SCALE_GSHARP_MODE;
-	float HSM_SCREEN_SCALE_SIGMA_HV;
-	float HSM_SCREEN_SCALE_HSHARP0;
-	float HSM_SCREEN_SCALE_HAR;
-	float HSM_SCREEN_SCALE_SHAR;
-	float HSM_SCREEN_SCALE_THRESHOLD_RATIO;
-} params;
-
-#pragma parameter HSM_GSHARP_SCREEN_SCALE_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter GSHARP_SCREEN_SCALE_TITLE 	"[ --- SCREEN SCALE G-SHARP RESAMPLER by Guest.r --- ]:"  0 0 0.01 0.01
-
-#pragma parameter HSM_SCREEN_SCALE_GSHARP_MODE 	"          G-SHARP MODE: OFF | SHARP | EDITABLE" 	  1 0 2 1
-#define HSM_SCREEN_SCALE_GSHARP_MODE params.HSM_SCREEN_SCALE_GSHARP_MODE
-
-// Default was 1.2, now set to 2.3 to match smoothing in Hyllian b-spline
-#pragma parameter HSM_SCREEN_SCALE_HSHARP0 		"          Filter Range"  1.0 1.0 6.0 0.1
-#define HSM_SCREEN_SCALE_HSHARP0 (HSM_SCREEN_SCALE_GSHARP_MODE == 2 ? params.HSM_SCREEN_SCALE_HSHARP0 : 1)
-
-// Default was 0.75
-#pragma parameter HSM_SCREEN_SCALE_SIGMA_HV 	"          Gaussian Blur Sigma" 0.25 0.1 7.0 0.05
-#define HSM_SCREEN_SCALE_SIGMA_HV (HSM_SCREEN_SCALE_GSHARP_MODE == 2 ? params.HSM_SCREEN_SCALE_SIGMA_HV : 0.1)
-
-// Default was 0.5
-#pragma parameter HSM_SCREEN_SCALE_SHAR 		"          Sharpness Definition" 0 0.0 2.0 0.05
-#define HSM_SCREEN_SCALE_SHAR params.HSM_SCREEN_SCALE_SHAR
-
-// Default was 0.5
-#pragma parameter HSM_SCREEN_SCALE_HAR 			"          Anti-Ringing" 0.5 0.0 1.0 0.10
-#define HSM_SCREEN_SCALE_HAR params.HSM_SCREEN_SCALE_HAR
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D InfoCachePass;
-// layout(set = 0, binding = 4) uniform sampler2D AvgLumPass;
-
-// HSM Removed
-// #define COMPAT_TEXTURE(c,d) texture(c,d)
-
-// HSM Added
-#define COMPAT_TEXTURE(c,d) HSM_GetCroppedTexSample(c,d)
-// End Addition
-
-#define SourceSize params.SourceSize
-#define OutputSize params.OutputSize
-
-float invsqrsigma_h = 1.0/(2.0*HSM_SCREEN_SCALE_SIGMA_HV*HSM_SCREEN_SCALE_SIGMA_HV);
-
-float gaussian(float x, float y)
-{
-	return exp(-(x*x + y*y)*invsqrsigma_h);
-}
-
-void main()
-{
-    // HSM Added
-	// vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						SCREEN_ASPECT, 
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-	cache_bounds_coord = (BEZEL_OUTSIDE_COORD - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-		FragColor = vec4(0);
-		return;
-	}
-
-	// HSM Added
-	float raster_bloom_avg_lum = 0.5; //texture(AvgLumPass, vec2(0.5,0.5)).a;
-	vec2 screen_curved_coord = vec2(0.5);
-
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetCrtShaderFinalCoord(SCREEN_COORD,
-		SCREEN_SCALE,
-		raster_bloom_avg_lum,
-		screen_curved_coord);
-
-	vec2 curved_coord = screen_curved_coord_with_overscan_and_mirror;
-
-    // End Addition
-	
-	if (HSM_SCREEN_SCALE_GSHARP_MODE == 0)
-	{
-		FragColor = texture(Source, curved_coord);
-		return;
-	}
-
-	vec2 f = fract(SourceSize.xy * curved_coord.xy);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize.xy * curved_coord)*SourceSize.zw + 0.5*SourceSize.zw;
-	vec2 dx  = vec2(SourceSize.z, 0.0);	
-	vec2 dy  = vec2(0.0, SourceSize.w);
-
-	vec3 colorx = 0.0.xxx;
-	vec3 colory = 0.0.xxx;
-	float wx, wy;
-	float wsumx = 0.0;
-	float wsumy = 0.0;
-	vec3 pixel;
-	float x;
-
-	vec3 xcmax = 0.0.xxx;
-	vec3 xcmin = 1.0.xxx;
-
-	float sharp = gaussian(HSM_SCREEN_SCALE_HSHARP0, 0.0);
-	float maxsharp = 0.07;
-	float FPR = HSM_SCREEN_SCALE_HSHARP0;
-	float fpx = 1.0;
-
-	float LOOPSIZE = ceil(2.0*FPR);
-	float y = -LOOPSIZE;
-
-	do
-	{
-		x = -LOOPSIZE;
-	
-		do
-		{
-			pixel  = COMPAT_TEXTURE(Source, tex + x*dx + y*dy).rgb;
-			
-			wx = gaussian(x+f.x, y+f.y) - sharp; 
-			fpx = (sqrt(dot(vec2(x+f.x,y+f.y),vec2(x+f.x,y+f.y)))-FPR)/FPR;
-			if (((x*x) + (y*y)) < 1.25*FPR) { xcmax = max(xcmax, pixel); xcmin = min(xcmin, pixel); }
-			if (wx < 0.0) wx = clamp(wx, mix(-maxsharp, 0.0, pow(abs(fpx), HSM_SCREEN_SCALE_SHAR)), 0.0);
-			colorx = colorx + wx * pixel;
-			wsumx  = wsumx + wx;
-			x = x + 1.0;
-			
-		} while (x <= LOOPSIZE);
-		
-		y = y + 1.0;
-		
-	} while (y <= LOOPSIZE);
-
-	vec3 color = colorx/wsumx;
-	
-	color = mix(clamp(color, 0.0, 1.0), clamp(color, xcmin, xcmax), HSM_SCREEN_SCALE_HAR);
-	
-	FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
deleted file mode 100644
index 94301c6984..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-screen-scale-g-sharp_resampler.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../../base/common/globals-and-screen-scale-params.inc"
-#include "../../base/common/common-functions.inc"
-#include "../../base/common/params-2-bezel.inc"
-#include "../../base/common/common-functions-bezel.inc"
-#include "hsm-screen-scale-g-sharp_resampler.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-sharpsmoother.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-sharpsmoother.slang
deleted file mode 100644
index 9ab0ad2b21..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-sharpsmoother.slang
+++ /dev/null
@@ -1,138 +0,0 @@
-#version 450
-
-/*
-   Sharpsmoother shader
-   
-   Copyright (C) 2005-2017 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float max_w;
-	float min_w;
-	float smoot;
-	float lumad;
-	float mtric;
-	float SHARPSMOOTHER_ON;
-} params;
-
-// Original Values:
-// max_w = "0.1"
-// min_w = "-0.07"
-// smoot = "0.55"
-// lumad = "0.3"
-// mtric = "0.7"
-
-// New default values tuned by Hyllian
-#pragma parameter HSM_SHARPSMOOTHER_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter SHARPSMOOTHER_TITLE     "[ --- SHARPSMOOTHER by Guest.r --- ] "  0  0 0.0.001 0.001
-#pragma parameter SHARPSMOOTHER_ON        "          SharpSmoother ON"     0     0 1 1
-#define SHARPSMOOTHER_ON params.SHARPSMOOTHER_ON
-
-#pragma parameter max_w                   "          Max filter weight"    0.05  0.00 0.20 0.01
-#pragma parameter min_w                   "          Min filter weight"    0.00 -0.15 0.05 0.01
-#pragma parameter smoot                   "          Smoothing strength"   0.4   0.00 1.50 0.01
-#pragma parameter lumad                   "          Effects smoothing"    0.5   0.10 5.00 0.10
-#pragma parameter mtric                   "          Metric Used"          0.3   0.10 2.00 0.10
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-vec3 dt = vec3(1.0, 1.0, 1.0);
-
-
-float wt(vec3 A, vec3 B)
-{	
-	return clamp(params.smoot - ((6.0+params.lumad)/pow(3.0,params.mtric))*pow(dot(pow(abs(A-B),vec3(1.0/params.mtric)),dt),params.mtric)/(dot(A+B,dt)+params.lumad), params.min_w, params.max_w);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-
-   if (SHARPSMOOTHER_ON < 0.5)
-   {
-      return;
-   }
-   
-   float x = 1.0 * (1.0 / params.SourceSize.x);
-   float y = 1.0 * (1.0 / params.SourceSize.y);
-   vec2 dg1 = vec2( x, y);
-   vec2 dg2 = vec2(-x, y);
-   vec2 dx = vec2(x, 0.0);
-   vec2 dy = vec2(0.0, y);
-   t1 = vec4(vTexCoord.xy-dg1,vTexCoord.xy-dy);
-   t2 = vec4(vTexCoord.xy-dg2,vTexCoord.xy+dx);
-   t3 = vec4(vTexCoord.xy+dg1,vTexCoord.xy+dy);
-   t4 = vec4(vTexCoord.xy+dg2,vTexCoord.xy-dx);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   if (SHARPSMOOTHER_ON < 0.5)
-   {
-      FragColor = texture(Source, vTexCoord);
-      return;
-   }
-   
-   vec3 c00 = texture(Source, t1.xy).xyz; 
-   vec3 c10 = texture(Source, t1.zw).xyz; 
-   vec3 c20 = texture(Source, t2.xy).xyz; 
-   vec3 c01 = texture(Source, t4.zw).xyz; 
-   vec3 c11 = texture(Source, vTexCoord.xy).xyz; 
-   vec3 c21 = texture(Source, t2.zw).xyz; 
-   vec3 c02 = texture(Source, t4.xy).xyz; 
-   vec3 c12 = texture(Source, t3.zw).xyz; 
-   vec3 c22 = texture(Source, t3.xy).xyz;
-       
-   float w10 = wt(c11,c10);
-   float w21 = wt(c11,c21);
-   float w12 = wt(c11,c12);
-   float w01 = wt(c11,c01);
-   float w00 = wt(c11,c00)*0.75;
-   float w22 = wt(c11,c22)*0.75;
-   float w20 = wt(c11,c20)*0.75;
-   float w02 = wt(c11,c02)*0.75;
-
-   FragColor = vec4(w10*c10+w21*c21+w12*c12+w01*c01+w00*c00+w22*c22+w20*c20+w02*c02+(1.0-w10-w21-w12-w01-w00-w22-w20-w02)*c11, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-afterglow0.slang b/bezel/Mega_Bezel/shaders/guest/hsm-afterglow0.slang
deleted file mode 100644
index d51f740f6f..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-afterglow0.slang
+++ /dev/null
@@ -1,91 +0,0 @@
-#version 450
-
-/*
-   Phosphor Afterglow Shader pass 0
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-   vec4 DerezedPassSize;
-   float PR, PG, PB;
-} params;
-
-#pragma parameter GDV_XX_LINE					" " 0 0 0.001 0.001
-#pragma parameter GDV_GDV_ADV_TITLE 		"[ --- GUEST ADVANCED --- ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter GDV_AFTERGLOW_LINE		" " 0 0 0.001 0.001
-#pragma parameter bogus_afterglow         "[ AFTERGLOW ]:" 0.0 0.0 1.0 1.0
-#pragma parameter PR                      "          Persistence Red -- PR" 0.32 0.0 0.50 0.01
-#pragma parameter PG                      "          Persistence Green -- PG"  0.32 0.0 0.50 0.01
-#pragma parameter PB                      "          Persistence Blue -- PB"  0.32 0.0 0.50 0.01
-
-#define PR params.PR
-#define PG params.PG
-#define PB params.PB
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D PreCRTPass;
-layout(set = 0, binding = 3) uniform sampler2D AfterglowPassFeedback;
-
-#define TEX0 vTexCoord
-
-
-void main()
-{
-	vec2 dx = vec2(params.DerezedPassSize.z, 0.0);
-	vec2 dy = vec2(0.0, params.DerezedPassSize.w);
-	
-	vec3 color0  = COMPAT_TEXTURE(PreCRTPass, TEX0.xy).rgb;
-	vec3 color1  = COMPAT_TEXTURE(PreCRTPass, TEX0.xy - dx).rgb;
-	vec3 color2  = COMPAT_TEXTURE(PreCRTPass, TEX0.xy + dx).rgb;
-	vec3 color3  = COMPAT_TEXTURE(PreCRTPass, TEX0.xy - dy).rgb;
-	vec3 color4  = COMPAT_TEXTURE(PreCRTPass, TEX0.xy + dy).rgb;	
-
-	vec3 color = (2.5 * color0 + color1 + color2 + color3 + color4)/6.5;
-	
-	vec3 accumulate = COMPAT_TEXTURE(AfterglowPassFeedback, TEX0.xy).rgb;
-
-	float w = 1.0;
-	if ((color0.r + color0.g + color0.b < 5.0/255.0)) { w = 0.0; }
-
-	vec3 result = mix( max(mix(color, accumulate, 0.49 + vec3(PR, PG, PB))- 1.25/255.0, 0.0), color, w);
-
-	FragColor = vec4(result, w);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-afterglow0_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-afterglow0_orig.slang
deleted file mode 100644
index dfd02c446b..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-afterglow0_orig.slang
+++ /dev/null
@@ -1,90 +0,0 @@
-#version 450
-
-/*
-   Phosphor Afterglow Shader pass 0
-   
-   Copyright (C) 2020 - 2022 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 OriginalSize;
-   vec4 OutputSize;
-   uint FrameCount;
-   float PR, PG, PB;
-} params;
-
-#pragma parameter bogus_afterglow "[ AFTERGLOW SETTINGS ]:" 0.0 0.0 1.0 1.0
-#pragma parameter PR "          Persistence Red" 0.32 0.0 0.50 0.01
-#pragma parameter PG "          Persistence Green"  0.32 0.0 0.50 0.01
-#pragma parameter PB "          Persistence Blue"  0.32 0.0 0.50 0.01
-
-#define PR params.PR
-#define PG params.PG
-#define PB params.PB
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D OriginalHistory0;
-layout(set = 0, binding = 3) uniform sampler2D AfterglowPassFeedback;
-
-#define TEX0 vTexCoord
-
-
-void main()
-{
-	vec2 dx = vec2(params.OriginalSize.z, 0.0);
-	vec2 dy = vec2(0.0, params.OriginalSize.w);
-	
-	vec3 color0  = COMPAT_TEXTURE(OriginalHistory0, TEX0.xy).rgb;
-	vec3 color1  = COMPAT_TEXTURE(OriginalHistory0, TEX0.xy - dx).rgb;
-	vec3 color2  = COMPAT_TEXTURE(OriginalHistory0, TEX0.xy + dx).rgb;
-	vec3 color3  = COMPAT_TEXTURE(OriginalHistory0, TEX0.xy - dy).rgb;
-	vec3 color4  = COMPAT_TEXTURE(OriginalHistory0, TEX0.xy + dy).rgb;	
-
-	vec3 color = (2.5 * color0 + color1 + color2 + color3 + color4)/6.5;
-	
-	vec3 accumulate = COMPAT_TEXTURE(AfterglowPassFeedback, TEX0.xy).rgb;
-
-	float w = 1.0;
-	if ((color0.r + color0.g + color0.b < 5.0/255.0)) { w = 0.0; }
-
-	vec3 result = mix( max(mix(color, accumulate, 0.49 + vec3(PR, PG, PB))- 1.25/255.0, 0.0), color, w);
-
-	FragColor = vec4(result, w);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-avg-lum.slang b/bezel/Mega_Bezel/shaders/guest/hsm-avg-lum.slang
deleted file mode 100644
index 1e142d9054..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-avg-lum.slang
+++ /dev/null
@@ -1,111 +0,0 @@
-#version 450
-
-/*
-   Average Luminance Shader, Smart Edge Interpolation Coefficients Calculation
-   
-   Copyright (C) 2018-2022 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-   Thanks to HunterK for the mipmap hint. :D  
-*/
-
-layout(push_constant) uniform Push
-{
-	uint FrameCount;
-	vec4 SourceSize;
-	float lsmooth;
-} params;
-
-// #pragma parameter lsmooth "Raster Bloom Effect Smoothing" 0.70 0.50 0.99 0.01
-
-// #define lsmooth params.lsmooth
-
-#define lsmooth 0.7
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define SourceSize params.SourceSize
-#define TEX0 vTexCoord
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source; 
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPassFeedback;
-
-// Reference: http://www.compuphase.com/cmetric.htm
-// Reference: ScaleFX, author Sp00kyFox
-
-float dist(vec3 A, vec3 B)
-{
-	float r = 0.5 * (A.r + B.r);
-	vec3 d = A - B;
-	vec3 c = vec3(2. + r, 4., 3. - r);
-
-	return sqrt(dot(c*d, d)) / 3.;
-} 
-
-void main()
-{
-	float m = max(log2(SourceSize.x), log2(SourceSize.y));
-	m = floor(max(m, 1.0))-1.0;
-
-	vec2 dx = vec2(1.0/SourceSize.x, 0.0); 
-	vec2 dy = vec2(0.0, 1.0/SourceSize.y);
-	vec2 y2 = 2.0*dy;
-	vec2 x2 = 2.0*dx;
-	
-	float ltotal = 0.0;
-	
-	ltotal+= length(textureLod(Source, vec2(0.3, 0.3), m).rgb);
-	ltotal+= length(textureLod(Source, vec2(0.3, 0.7), m).rgb);
-	ltotal+= length(textureLod(Source, vec2(0.7, 0.3), m).rgb);
-	ltotal+= length(textureLod(Source, vec2(0.7, 0.7), m).rgb);
-	
-	ltotal*=0.25;
-	
-	ltotal = pow(0.577350269 * ltotal, 0.70);
-	
-	float lhistory = texture(AvgLumPassFeedback, vec2(0.5,0.5)).a;
-
-	ltotal = mix(ltotal, lhistory, lsmooth);	
-
-	vec3 l1 = COMPAT_TEXTURE(Source, TEX0.xy           ).rgb;	   
-	vec3 r1 = COMPAT_TEXTURE(Source, TEX0.xy +dx       ).rgb;
-	vec3 l2 = COMPAT_TEXTURE(Source, TEX0.xy -dx       ).rgb;
-	vec3 r2 = COMPAT_TEXTURE(Source, TEX0.xy +x2       ).rgb;
-
-	float c1 = dist(l2,l1);
-	float c2 = dist(l1,r1);
-	float c3 = dist(r2,r1);
-	
-	FragColor = vec4(c1,c2,c3,ltotal);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-avg-lum_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-avg-lum_orig.slang
deleted file mode 100644
index 6e83180dbf..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-avg-lum_orig.slang
+++ /dev/null
@@ -1,110 +0,0 @@
-#version 450
-
-/*
-   Average Luminance Shader, Smart Edge Interpolation Coefficients Calculation
-   
-   Copyright (C) 2018-2022 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-   Thanks to HunterK for the mipmap hint. :D  
-*/
-
-layout(push_constant) uniform Push
-{
-	uint FrameCount;
-	vec4 SourceSize;
-	float lsmooth;
-	float sth;
-} params;
-
-#pragma parameter lsmooth "Raster Bloom Effect Smoothing" 0.70 0.50 0.99 0.01
-
-#define lsmooth params.lsmooth
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define SourceSize params.SourceSize
-#define TEX0 vTexCoord
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source; 
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPassFeedback;
-
-// Reference: http://www.compuphase.com/cmetric.htm
-// Reference: ScaleFX, author Sp00kyFox
-
-float dist(vec3 A, vec3 B)
-{
-	float r = 0.5 * (A.r + B.r);
-	vec3 d = A - B;
-	vec3 c = vec3(2. + r, 4., 3. - r);
-
-	return sqrt(dot(c*d, d)) / 3.;
-} 
-
-void main()
-{
-	float m = max(log2(SourceSize.x), log2(SourceSize.y));
-	m = floor(max(m, 1.0))-1.0;
-
-	vec2 dx = vec2(1.0/SourceSize.x, 0.0); 
-	vec2 dy = vec2(0.0, 1.0/SourceSize.y);
-	vec2 y2 = 2.0*dy;
-	vec2 x2 = 2.0*dx;
-	
-	float ltotal = 0.0;
-	
-	ltotal+= length(textureLod(Source, vec2(0.3, 0.3), m).rgb);
-	ltotal+= length(textureLod(Source, vec2(0.3, 0.7), m).rgb);
-	ltotal+= length(textureLod(Source, vec2(0.7, 0.3), m).rgb);
-	ltotal+= length(textureLod(Source, vec2(0.7, 0.7), m).rgb);
-	
-	ltotal*=0.25;
-	
-	ltotal = pow(0.577350269 * ltotal, 0.70);
-	
-	float lhistory = texture(AvgLumPassFeedback, vec2(0.5,0.5)).a;
-
-	ltotal = mix(ltotal, lhistory, lsmooth);	
-
-	vec3 l1 = COMPAT_TEXTURE(Source, TEX0.xy           ).rgb;	   
-	vec3 r1 = COMPAT_TEXTURE(Source, TEX0.xy +dx       ).rgb;
-	vec3 l2 = COMPAT_TEXTURE(Source, TEX0.xy -dx       ).rgb;
-	vec3 r2 = COMPAT_TEXTURE(Source, TEX0.xy +x2       ).rgb;
-
-	float c1 = dist(l2,l1);
-	float c2 = dist(l1,r1);
-	float c3 = dist(r2,r1);
-	
-	FragColor = vec4(c1,c2,c3,ltotal);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_horizontal.slang b/bezel/Mega_Bezel/shaders/guest/hsm-bloom_horizontal.slang
deleted file mode 100644
index 896f07c242..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_horizontal.slang
+++ /dev/null
@@ -1,103 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - horizontal pass, dynamic range, resizable
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 DerezedPassSize;
-	float SIZEHB;
-	float SIGMA_HB;
-	float FINE_BLOOM;
-} params;
-
-#pragma parameter GDV_BLOOM_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_bloom "[ BLOOM/HALATION/(GLOW) PASS SETTINGS ]:" 0 0 0.001 0.001
-
-#pragma parameter FINE_BLOOM "          Fine Bloom/Halation Sampling" 1.0 1.0 4.0 1.0 
-#define FINE_BLOOM params.FINE_BLOOM
-
-#pragma parameter SIZEHB 		"          Horizontal Bloom/Halation Radius -- SIZEHB" 3.0 1.0 50.0 1.0 
-#define SIZEHB params.SIZEHB
-
-#pragma parameter SIGMA_HB 		"         Horizontal Bloom/Halation Sigma -- SIGMA_HB" 0.75 0.25 15.0 0.025
-#define SIGMA_HB params.SIGMA_HB
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_HB*SIGMA_HB);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{
-	vec4 SourceSize1 = params.DerezedPassSize * mix(1.0.xxxx, vec4(FINE_BLOOM, FINE_BLOOM, 1.0/FINE_BLOOM, 1.0/FINE_BLOOM), min(FINE_BLOOM-1.0,1.0));
-	float f = fract(SourceSize1.x * vTexCoord.x);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec4 color = vec4(0.0);
-	vec2 dx  = vec2(SourceSize1.z, 0.0);
-
-	float w;
-	float wsum = 0.0;
-	vec4 pixel;
-	float n = -SIZEHB;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(LinearizePass, tex + n*dx);
-		w = gaussian(n+f);
-		pixel.a = max(max(pixel.r, pixel.g),pixel.b);
-		pixel.a*=pixel.a*pixel.a;
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEHB);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color.rgb, pow(color.a, 0.333333));
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_horizontal_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-bloom_horizontal_orig.slang
deleted file mode 100644
index 269291d62f..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_horizontal_orig.slang
+++ /dev/null
@@ -1,105 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - horizontal pass, dynamic range, resizable
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 LinearizePassSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SIZEHB;
-	float SIGMA_HB;
-	float FINE_BLOOM;
-} params;
-
-#pragma parameter bogus_bloom "[ BLOOM/HALATION/(GLOW) PASS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter FINE_BLOOM "          Fine Bloom/Halation Sampling" 1.0 1.0 5.0 1.0 
-#define FINE_BLOOM params.FINE_BLOOM
-
-#pragma parameter SIZEHB "          Horizontal Bloom/Halation Radius" 3.0 1.0 50.0 1.0 
-#define SIZEHB params.SIZEHB
-
-#pragma parameter SIGMA_HB "          Horizontal Bloom/Halation Sigma" 0.75 0.25 15.0 0.025
-#define SIGMA_HB params.SIGMA_HB
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_HB*SIGMA_HB);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{
-	vec4 SourceSize1 = params.OriginalSize * mix(1.0.xxxx, vec4(FINE_BLOOM, FINE_BLOOM, 1.0/FINE_BLOOM, 1.0/FINE_BLOOM), min(FINE_BLOOM-1.0,1.0));
-	float f = fract(SourceSize1.x * vTexCoord.x);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec4 color = vec4(0.0);
-	vec2 dx  = vec2(SourceSize1.z, 0.0);
-
-	float w;
-	float wsum = 0.0;
-	vec4 pixel;
-	float n = -SIZEHB;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(LinearizePass, tex + n*dx);
-		w = gaussian(n+f);
-		pixel.a = max(max(pixel.r, pixel.g),pixel.b);
-		pixel.a*=pixel.a*pixel.a;
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEHB);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color.rgb, pow(color.a, 0.333333));
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_vertical.slang b/bezel/Mega_Bezel/shaders/guest/hsm-bloom_vertical.slang
deleted file mode 100644
index 78246924d9..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_vertical.slang
+++ /dev/null
@@ -1,103 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - vertical pass, dynamic range, resizable
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 DerezedPassSize;
-	float SIZEVB;
-	float SIGMA_VB;
-	float FINE_BLOOM;
-} params;
-
-#pragma parameter FINE_BLOOM "          Fine Bloom/Halation Sampling" 1.0 1.0 4.0 1.0 
-#define FINE_BLOOM params.FINE_BLOOM
-
-#pragma parameter SIZEVB "          Vertical Bloom/Halation Radius  -- SIZEVB" 3.0 1.0 50.0 1.0 
-#define SIZEVB params.SIZEVB
-
-#pragma parameter SIGMA_VB "          Vertical Bloom/Halation Sigma -- SIGMA_VB" 0.60 0.25 15.0 0.025
-#define SIGMA_VB params.SIGMA_VB
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_VB*SIGMA_VB);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{
-	vec4 SourceSize1 = params.SourceSize;
-	SourceSize1.yw = params.DerezedPassSize.yw;
-	SourceSize1 = SourceSize1 * mix(1.0.xxxx, vec4(FINE_BLOOM, FINE_BLOOM, 1.0/FINE_BLOOM, 1.0/FINE_BLOOM), min(FINE_BLOOM-1.0,1.0));
-
-	float f = fract(SourceSize1.y * vTexCoord.y);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec4 color = vec4(0.0);
-	vec2 dy  = vec2(0.0, SourceSize1.w);
-
-	float w;
-	float wsum = 0.0;
-	vec4 pixel;
-	float n = -SIZEVB;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(Source, tex + n*dy);
-		w = gaussian(n+f);
-		pixel.a*=pixel.a*pixel.a;
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEVB);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color.rgb, pow(color.a, 0.175));
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_vertical_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-bloom_vertical_orig.slang
deleted file mode 100644
index ae964fe579..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-bloom_vertical_orig.slang
+++ /dev/null
@@ -1,106 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - vertical pass, dynamic range, resizable
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SIZEVB;
-	float SIGMA_VB;
-	float FINE_BLOOM;
-} params;
-
-#pragma parameter FINE_BLOOM "          Fine Bloom/Halation Sampling" 1.0 1.0 5.0 1.0 
-#define FINE_BLOOM params.FINE_BLOOM
-
-#pragma parameter SIZEVB "          Vertical Bloom/Halation Radius" 3.0 1.0 50.0 1.0 
-#define SIZEVB params.SIZEVB
-
-#pragma parameter SIGMA_VB "          Vertical Bloom/Halation Sigma" 0.60 0.25 15.0 0.025
-#define SIGMA_VB params.SIGMA_VB
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_VB*SIGMA_VB);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{
-	vec4 SourceSize1 = params.SourceSize;
-	SourceSize1.yw = params.OriginalSize.yw;
-	SourceSize1 = SourceSize1 * mix(1.0.xxxx, vec4(FINE_BLOOM, FINE_BLOOM, 1.0/FINE_BLOOM, 1.0/FINE_BLOOM), min(FINE_BLOOM-1.0,1.0));
-	
-	float f = fract(SourceSize1.y * vTexCoord.y);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec4 color = vec4(0.0);
-	vec2 dy  = vec2(0.0, SourceSize1.w);
-
-	float w;
-	float wsum = 0.0;
-	vec4 pixel;
-	float n = -SIZEVB;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(Source, tex + n*dy);
-		w = gaussian(n+f);
-		pixel.a*=pixel.a*pixel.a;
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEVB);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color.rgb, pow(color.a, 0.175));
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
deleted file mode 100644
index 594ee866ba..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#define IS_POTATO_PRESET
-
-#include "../base/common/globals-and-potato-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-crt-dariusg-gdv-mini.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini.inc b/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini.inc
deleted file mode 100644
index 3b2a0ddf6b..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini.inc
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
-   CRT - Guest - Nomask w. Curvature
-   With work by DariusG to create a cut down extra fast version
-   
-   Copyright (C) 2017-2018 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	float brightboost;
-	float saturation;
-    float scanline;
-    float beam_min;
-    float beam_max;
-    float h_sharp;
-    float shadowMask;
-    float masksize;
-    float mcut;
-    float maskDark;
-    float maskLight;
-    float CGWG;
-    // float warpX;
-    // float warpY;
-    // float gamma_out;
-    // float vignette;
-} params;
-
-// Parameter lines go here:
-#pragma parameter GDVMINI_X_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter gdv_mini_title 	"[ GDV MINI - DariusG ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter brightboost 		"          Bright boost -- brightboost" 1.0 0.5 2.0 0.05
-#define brightboost params.brightboost
-
-#pragma parameter saturation 		"          Saturation adjustment -- saturation" 1.0 0.0 2.0 0.05
-#define saturation params.saturation
-
-#pragma parameter scanline          "          Scanline Adjust -- scanline" 8.0 1.0 12.0 1.0
-#define scanline params.scanline
-
-#pragma parameter beam_min          "          Scanline Dark -- beam_min" 1.7 0.5 3.0 0.05
-#define beam_min params.beam_min
-
-#pragma parameter beam_max          "          Scanline Bright -- beam_max" 2.1 0.5 3.0 0.05
-#define beam_max params.beam_max
-
-#pragma parameter h_sharp           "          Horizontal Sharpness -- h_sharp" 2.0 1.0 5.0 0.05
-#define h_sharp params.h_sharp
-
-#pragma parameter shadowMask 		"          CRT Mask: 0:CGWG, 1-4:Lottes, 5-6:Trinitron" 0.0 -1.0 10.0 1.0
-#define shadowMask params.shadowMask
-
-#pragma parameter masksize 			"          Mask Size - 0:Auto | 2K | 4k -- masksize" 1.0 0.0 4 1.0
-#define masksize     global.masksize     // Mask Size
-
-#pragma parameter mcut 				"          Mask 5-7-10 cutoff -- mcut" 0.2 0.0 0.5 0.05
-#define mcut params.mcut
-
-#pragma parameter maskDark          "          Lottes maskDark" 0.5 0.0 2.0 0.1
-#define maskDark params.maskDark
-
-#pragma parameter maskLight 		"          Lottes maskLight" 1.5 0.0 2.0 0.1
-#define maskLight params.maskLight
-
-#pragma parameter CGWG              "          CGWG Mask Str. -- CGWG" 0.4 0.0 1.0 0.1
-#define CGWG params.CGWG
-
-// #pragma parameter warpX 			"CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-// #define warpX        params.warpX     
-
-// #pragma parameter warpY 			"CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-// #define warpY        params.warpY     
-
-// #pragma parameter vignette 			"Vignette On/Off" 0.0 0.0 1.0 1.0
-// #define vignette 	params.vignette
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in float maskFade;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-layout(set = 0, binding = 2) uniform sampler2D InfoCachePass;
-
-float sw(float x, float l)
-{
-	float d = x;
-	float bm = scanline;
-	float b = mix(beam_min,beam_max,l);
-	d = exp2(-bm*pow(d,b));
-	return d;
-}
-
-// Shadow mask (1-4 from PD CRT Lottes shader).
-vec3 Mask(vec2 pos, vec3 c)
-{
-		// HSM Added
-	float final_mask_size = masksize;
-
-	// If using automatic Mask Size
-	if (masksize < 0.5)
-		final_mask_size = global.FinalViewportSize.y > 2000 ? 2 : 1;
-	
-	final_mask_size = max(1, floor(((1 - HSM_VIEWPORT_ZOOM_MASK) + HSM_VIEWPORT_ZOOM_MASK * VIEWPORT_SCALE.y) * final_mask_size + 0.2));
-
-	pos = floor(pos / final_mask_size);
-	vec3 mask = vec3(maskDark, maskDark, maskDark);
-	
-	// No mask
-	if (shadowMask == -1.0)
-	{
-		mask = vec3(1.0);
-	}       
-	
-	// Phosphor.
-	else if (shadowMask == 0.0)
-	{
-		pos.x = fract(pos.x*0.5);
-		float mc = 1.0 - CGWG;
-		if (pos.x < 0.5) { mask.r = 1.1; mask.g = mc; mask.b = 1.1; }
-		else { mask.r = mc; mask.g = 1.1; mask.b = mc; }
-	}    
-   
-	// Very compressed TV style shadow mask.
-	else if (shadowMask == 1.0)
-	{
-		float line = maskLight;
-		float odd  = 0.0;
-
-		if (fract(pos.x/6.0) < 0.5)
-			odd = 1.0;
-		if (fract((pos.y + odd)/2.0) < 0.5)
-			line = maskDark;
-
-		pos.x = fract(pos.x/3.0);
-    
-		if      (pos.x < 0.333) mask.b = maskLight;
-		else if (pos.x < 0.666) mask.g = maskLight;
-		else                    mask.r = maskLight;
-		
-		mask*=line;  
-	} 
-
-	// Aperture-grille.
-	else if (shadowMask == 2.0)
-	{
-		pos.x = fract(pos.x/3.0);
-
-		if      (pos.x < 0.333) mask.b = maskLight;
-		else if (pos.x < 0.666) mask.g = maskLight;
-		else                    mask.r = maskLight;
-	} 
-
-	// Stretched VGA style shadow mask (same as prior shaders).
-	else if (shadowMask == 3.0)
-	{
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.333) mask.b = maskLight;
-		else if (pos.x < 0.666) mask.g = maskLight;
-		else                    mask.r = maskLight;
-	}
-
-	// VGA style shadow mask.
-	else if (shadowMask == 4.0)
-	{
-		pos.xy = floor(pos.xy*vec2(1.0, 0.5));
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.333) mask.b = maskLight;
-		else if (pos.x < 0.666) mask.g = maskLight;
-		else                    mask.r = maskLight;
-	}
-	
-	// Alternate mask 5
-	else if (shadowMask == 5.0)
-	{
-		float mx = max(max(c.r,c.g),c.b);
-		vec3 maskTmp = vec3( min( 1.25*max(mx-mcut,0.0)/(1.0-mcut) ,maskDark + 0.2*(1.0-maskDark)*mx));
-		float adj = 0.80*maskLight - 0.5*(0.80*maskLight - 1.0)*mx + 0.75*(1.0-mx);	
-		mask = maskTmp;
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.5)
-		{	mask.r  = adj;
-			mask.b  = adj;
-		}
-		else     mask.g = adj;
-	}    
-
-	// Alternate mask 6
-	else if (shadowMask == 6.0)
-	{
-		float mx = max(max(c.r,c.g),c.b);
-		vec3 maskTmp = vec3( min( 1.33*max(mx-mcut,0.0)/(1.0-mcut) ,maskDark + 0.225*(1.0-maskDark)*mx));
-		float adj = 0.80*maskLight - 0.5*(0.80*maskLight - 1.0)*mx + 0.75*(1.0-mx);
-		mask = maskTmp;
-		pos.x = fract(pos.x/3.0);
-		if      (pos.x < 0.333) mask.r = adj;
-		else if (pos.x < 0.666) mask.g = adj;
-		else                    mask.b = adj; 
-	}
-	
-	// Alternate mask 7
-	else if (shadowMask == 7.0)
-	{
-		float mc = 1.0 - CGWG;
-		float mx = max(max(c.r,c.g),c.b);
-		float maskTmp = min(1.6*max(mx-mcut,0.0)/(1.0-mcut) , mc);
-		mask = vec3(maskTmp);
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.5) mask = vec3(1.0 + 0.6*(1.0-mx));
-	}    
-	else if (shadowMask == 8.0)
-	{
-		float line = maskLight;
-		float odd  = 0.0;
-
-		if (fract(pos.x/4.0) < 0.5)
-			odd = 1.0;
-		if (fract((pos.y + odd)/2.0) < 0.5)
-			line = maskDark;
-
-		pos.x = fract(pos.x/2.0);
-    
-		if  (pos.x < 0.5) {mask.r = maskLight; mask.b = maskLight;}
-		else  mask.g = maskLight;	
-		mask*=line;  
-	} 
-	
-	else if (shadowMask == 9.0)
-    {
-        vec3 Mask = vec3(maskDark);
-
-        float bright = maskLight;
-        float left  = 0.0;
-      
-
-        if (fract(pos.x/6.0) < 0.5)
-            left = 1.0;
-          
-            
-        float m = fract(pos.x/3.0);
-    
-        if      (m < 0.3333) Mask.b = 0.9;
-        else if (m < 0.6666) Mask.g = 0.9;
-        else                 Mask.r = 0.9;
-        
-        if      (mod(pos.y,2.0)==1.0 && left == 1.0 || mod(pos.y,2.0)==0.0 && left == 0.0 ) Mask*=bright; 
-        
-        return Mask; 
-    } 
-    
-	 else if (shadowMask == 10.0)
-    {
-        vec3 Mask = vec3(maskDark);
-        float line = maskLight;
-		float odd  = 0.0;
-
-		if (fract(pos.x/6.0) < 0.5)
-			odd = 1.0;
-		if (fract((pos.y + odd)/2.0) < 0.5)
-			line = 1.0;    
-    
-        float m = fract(pos.x/3.0);
-        float y = fract(pos.y/2.0);
-        
-        if      (m > 0.3333)  {Mask.r = 1.0; Mask.b = 1.0;}
-        else if (m > 0.6666) Mask.g = 1.0;
-        else                 Mask = vec3(mcut);
-        if (m>0.333) Mask*=line; 
-        return Mask; 
-    } 
-	return mask;
-} 
-
-/* HSM Removed
-mat3 vign( float l )
-{
-    vec2 vpos = vTexCoord;
-
-    vpos *= 1.0 - vpos.xy;
-    float vig = vpos.x * vpos.y * 40.0;
-    vig = min(pow(vig, 0.2), 1.0); 
-    if (vignette == 0.0) vig=1.0;
-   
-    return mat3(vig, 0, 0,
-                 0,   vig, 0,
-                 0,    0, vig);
-
-}
-
-// Distortion of scanlines, and end of screen alpha.
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-    pos *= vec2(1.0 + (pos.y*pos.y)*warpX, 1.0 + (pos.x*pos.x)*warpY);
-	return pos*0.5 + 0.5;
-}
-*/
-
-vec3 saturationFunction (vec3 textureColor)
-{
-    float lum=length(textureColor.rgb)*0.5775;
-
-    vec3 luminanceWeighting = vec3(0.3,0.6,0.1);
-    if (lum<0.5) luminanceWeighting.rgb=(luminanceWeighting.rgb*luminanceWeighting.rgb)+(luminanceWeighting.rgb*luminanceWeighting.rgb);
-
-    float luminance = dot(textureColor.rgb, luminanceWeighting);
-    vec3 greyScaleColor = vec3(luminance);
-
-    vec3 res = vec3(mix(greyScaleColor, textureColor.rgb, saturation));
-    return res;
-}
-
-void main()
-{
-    // HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	vec2 bezel_outside_flat_coord;
-	vec2 frame_outside_flat_coord;
-	HSM_GetSimpleBezelCoords(TUBE_DIFFUSE_COORD, 
-							TUBE_DIFFUSE_SCALE, 
-							TUBE_SCALE, 
-							SCREEN_ASPECT,
-							bezel_outside_flat_coord, 
-							frame_outside_flat_coord);
-	cache_bounds_coord = (bezel_outside_flat_coord - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-			FragColor = vec4(0);
-			return;
-	}
-	
-	vec2 screen_curved_coord = HSM_GetCRTShaderCurvedCoord(SCREEN_COORD);
-	vec2 pos = HSM_GetMirrorWrappedCoord(screen_curved_coord);
-
-	// HSM Added
-	vec4 SourceSize = vec4(CROPPED_ROTATED_SIZE_WITH_RES_MULT, 1/CROPPED_ROTATED_SIZE_WITH_RES_MULT);
-
-	vec2 ps = SourceSize.zw;
-	vec2 OGL2Pos = pos * SourceSize.xy;
-	vec2 fp = fract(OGL2Pos);
-	vec2 dx = vec2(ps.x,0.0);
-	vec2 dy = vec2(0.0, ps.y);
-
-	vec2 pC4 = floor(OGL2Pos) * ps + 0.5*ps;
-	
-	// Reading the texels
-	vec3 ul = HSM_GetCroppedTexSample(Source, pC4     ).xyz; ul*=ul;
-	vec3 ur = HSM_GetCroppedTexSample(Source, pC4 + dx).xyz; ur*=ur;
-	vec3 dl = HSM_GetCroppedTexSample(Source, pC4 + dy).xyz; dl*=dl;
-	vec3 dr = HSM_GetCroppedTexSample(Source, pC4 + ps).xyz; dr*=dr;
-	
-	float lx = fp.x;        lx = pow(lx, h_sharp);
-	float rx = 1.0 - fp.x;  rx = pow(rx, h_sharp);
-	
-	vec3 color1 = (ur*lx + ul*rx)/(lx+rx);
-	vec3 color2 = (dr*lx + dl*rx)/(lx+rx);
-
-// calculating scanlines
-	
-	float f = fp.y;
-	float luma1 = length(color1)*0.57735;
-	float luma2 = length(color2)*0.57735;
-	
-	vec3 color = color1*sw(f,luma1) + color2*sw(1.0-f,luma2);
-	
-	color = min(color, 1.0);
-	color = color * Mask(vTexCoord * global.OutputSize.xy, color);
-	float lum = color.r*0.3+color.g*0.6+color.b*0.1;
-
-	// Apply difference between GAMMA_INPUT and HSM_GAMMA_OUT_CRT
-    color = pow(color, vec3(GAMMA_INPUT / HSM_GAMMA_OUT_CRT) + 0.05);
-	color*= mix(1.0,brightboost,lum);
-
-	color = saturationFunction(color);
-
-	// HSM Removed
-	// color*= vign(lum);
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini.slang
deleted file mode 100644
index 1daf4e35f9..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-#include "hsm-crt-dariusg-gdv-mini.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-no-reflect.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
deleted file mode 100644
index 74ab3bd503..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-no-reflect.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-crt-guest-advanced.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.inc b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.inc
deleted file mode 100644
index 1cb30e206b..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.inc
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-   CRT - Guest - NTSC - Pass1
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	float SIGMA_HOR;
-	float HSHARPNESS;
-	float S_SHARP;
-	float HARNG;
-	float HSHARP; 
-	float spike;
-	float MAXS;
-} params;
-
-//---------------------------------------------------------------------------------------------------
-// NTSC Filtering
-//---------------------------------------------------------------------------------------------------
-#pragma parameter HSM_NTSCPASS1_FILTERING_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter bogus_filtering "[ FILTERING OPTIONS ]: " 0 0 0.001 0.001
-
-#pragma parameter HSHARPNESS 		"          NTSC Horizontal Filter Range -- HSHARPNESS" 1.60 1.0 8.0 0.05
-#define HSHARPNESS params.HSHARPNESS
-
-#pragma parameter SIGMA_HOR 		"          Horizontal Blur Sigma -- SIGMA_HOR" 0.80 0.1 7.0 0.025
-#define SIGMA_HOR params.SIGMA_HOR
-
-#pragma parameter S_SHARP 			"          Substractive Sharpness -- S_SHARP" 1.20 0.0 3.0 0.05
-#define S_SHARP params.S_SHARP
-
-#pragma parameter HSHARP 			"          Sharpness Definition -- HSHARP" 1.20 0.0 2.0 0.10
-#define HSHARP params.HSHARP
-
-#pragma parameter MAXS 				"          Maximum Sharpness" 0.18 0.0 0.30 0.01
-#define MAXS params.MAXS 
-
-#pragma parameter HARNG 			"          Substractive Sharpness Ringing -- HARNG" 0.30 0.0 4.0 0.05
-#define HARNG params.HARNG 
-
-#pragma parameter spike 			"          Scanline Spike Removal -- spike" 1.0 0.0 2.0 0.10
-#define spike params.spike
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define TEX0 vTexCoord
-
-#define OutputSize params.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D InfoCachePass;
-
-float gaussian(float x, float xscale)
-{
-	float invsqrsigma = 1.0/(2.0*SIGMA_HOR*SIGMA_HOR*xscale*xscale);
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{	
-	vec2 prescalex = textureSize(LinearizePass, 0).xy / global.DerezedPassSize.xy;
-
-	vec4 SourceSize = global.DerezedPassSize * vec4(prescalex.x, prescalex.y, 1.0/prescalex.x, 1.0/prescalex.y);
-
-	float f = fract(SourceSize.x * vTexCoord.x);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize.xy * vTexCoord)*SourceSize.zw + 0.5*SourceSize.zw;
-	vec3 color = 0.0.xxx;
-	float scolor = 0.0;
-	vec2 dx  = vec2(SourceSize.z, 0.0);
-
-	float w = 0.0;
-	float swsum = 0.0;
-	float wsum = 0.0;
-	vec3 pixel;
-
-	float xscale = prescalex.x * 0.5;
-	
-	float hsharpness = HSHARPNESS * xscale;
-	vec3 cmax = 0.0.xxx;
-	vec3 cmin = 1.0.xxx;
-	float sharp = gaussian(hsharpness, xscale) * S_SHARP;
-	float maxsharp = MAXS;
-	float FPR = hsharpness;
-	float fpx = 0.0;
-	float sp = 0.0;
-	float sw = 0.0;
-
-	float ts = 0.025;
-	vec3 luma = vec3(0.2126, 0.7152, 0.0722); 
-
-	float LOOPSIZE = ceil(2.0*FPR);
-	float CLAMPSIZE = round(2.0*LOOPSIZE/3.0);
-	
-	float n = -LOOPSIZE;
-	
-	do
-	{
-		pixel  = COMPAT_TEXTURE(LinearizePass, tex + n*dx).rgb;
-		sp = max(max(pixel.r,pixel.g),pixel.b);
-		
-		w = gaussian(n+f, xscale) - sharp;
-		fpx = abs(n+f-sign(n)*FPR)/FPR;
-		if (abs(n) <= CLAMPSIZE) { cmax = max(cmax, pixel); cmin = min(cmin, pixel); }
-		if (w < 0.0) w = clamp(w, mix(-maxsharp, 0.0, pow(clamp(fpx,0.0,1.0), HSHARP)), 0.0);
-	
-		color = color + w * pixel;
-		wsum  = wsum + w;
-
-		sw = max(w, 0.0) * (dot(pixel,luma) + ts); 
-		scolor = scolor + sw * sp;
-		swsum = swsum + sw;
-		
-		n = n + 1.0;
-			
-	} while (n <= LOOPSIZE);
-
-	color = color / wsum;
-	scolor = scolor / swsum;
-	
-	color = clamp(mix(clamp(color, cmin, cmax), color, HARNG), 0.0, 1.0); 
-	
-	scolor = clamp(mix(max(max(color.r, color.g),color.b), scolor, spike), 0.0, 1.0);
-	
-	FragColor = vec4(color, scolor);
-} 
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
deleted file mode 100644
index e4db21f302..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-#include "hsm-crt-guest-advanced-ntsc-pass1.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1_orig.slang
deleted file mode 100644
index d19c35a472..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1_orig.slang
+++ /dev/null
@@ -1,167 +0,0 @@
-#version 450
-
-/*
-   CRT - Guest - NTSC - Pass1
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SIGMA_HOR;
-	float HSHARPNESS;
-	float S_SHARP;
-	float HARNG;
-	float HSHARP; 
-	float spike;
-	float internal_res;
-	float MAXS;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma parameter bogus_filtering "[ FILTERING OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter HSHARPNESS "          Horizontal Filter Range" 1.60 1.0 8.0 0.05
-#define HSHARPNESS params.HSHARPNESS
-
-#pragma parameter SIGMA_HOR "          Horizontal Blur Sigma" 0.80 0.1 7.0 0.025
-#define SIGMA_HOR params.SIGMA_HOR
-
-#pragma parameter S_SHARP "          Substractive Sharpness" 1.20 0.0 3.0 0.05
-#define S_SHARP params.S_SHARP
-
-#pragma parameter HSHARP "          Sharpness Definition" 1.20 0.0 2.0 0.10
-#define HSHARP params.HSHARP
-
-#pragma parameter MAXS "          Maximum Sharpness" 0.18 0.0 0.30 0.01
-#define MAXS params.MAXS 
-
-#pragma parameter HARNG "          Substractive Sharpness Ringing" 0.30 0.0 4.0 0.05
-#define HARNG params.HARNG 
-
-#pragma parameter spike "          Scanline Spike Removal" 1.0 0.0 2.0 0.10
-#define spike params.spike
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define TEX0 vTexCoord
-
-#define OutputSize params.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-
-float gaussian(float x, float xscale)
-{
-	float invsqrsigma = 1.0/(2.0*SIGMA_HOR*SIGMA_HOR*xscale*xscale);
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{	
-	vec2 prescalex = vec2(textureSize(LinearizePass, 0)) / params.OriginalSize.xy;
-
-	vec4 SourceSize = params.OriginalSize * vec4(prescalex.x, prescalex.y, 1.0/prescalex.x, 1.0/prescalex.y);
-
-	float f = fract(SourceSize.x * vTexCoord.x);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize.xy * vTexCoord)*SourceSize.zw + 0.5*SourceSize.zw;
-	vec3 color = 0.0.xxx;
-	float scolor = 0.0;
-	vec2 dx  = vec2(SourceSize.z, 0.0);
-
-	float w = 0.0;
-	float swsum = 0.0;
-	float wsum = 0.0;
-	vec3 pixel;
-
-	float xscale = prescalex.x * 0.5;
-	
-	float hsharpness = HSHARPNESS * xscale;
-	vec3 cmax = 0.0.xxx;
-	vec3 cmin = 1.0.xxx;
-	float sharp = gaussian(hsharpness, xscale) * S_SHARP;
-	float maxsharp = MAXS;
-	float FPR = hsharpness;
-	float fpx = 0.0;
-	float sp = 0.0;
-	float sw = 0.0;
-
-	float ts = 0.025;
-	vec3 luma = vec3(0.2126, 0.7152, 0.0722); 
-
-	float LOOPSIZE = ceil(2.0*FPR);
-	float CLAMPSIZE = round(2.0*LOOPSIZE/3.0);
-	
-	float n = -LOOPSIZE;
-	
-	do
-	{
-		pixel  = COMPAT_TEXTURE(LinearizePass, tex + n*dx).rgb;
-		sp = max(max(pixel.r,pixel.g),pixel.b);
-		
-		w = gaussian(n+f, xscale) - sharp;
-		fpx = abs(n+f-sign(n)*FPR)/FPR;
-		if (abs(n) <= CLAMPSIZE) { cmax = max(cmax, pixel); cmin = min(cmin, pixel); }
-		if (w < 0.0) w = clamp(w, mix(-maxsharp, 0.0, pow(clamp(fpx,0.0,1.0), HSHARP)), 0.0);
-	
-		color = color + w * pixel;
-		wsum  = wsum + w;
-
-		sw = max(w, 0.0) * (dot(pixel,luma) + ts); 
-		scolor = scolor + sw * sp;
-		swsum = swsum + sw;
-		
-		n = n + 1.0;
-			
-	} while (n <= LOOPSIZE);
-
-	color = color / wsum;
-	scolor = scolor / swsum;
-	
-	color = clamp(mix(clamp(color, cmin, cmax), color, HARNG), 0.0, 1.0); 
-	
-	scolor = clamp(mix(max(max(color.r, color.g),color.b), scolor, spike), 0.0, 1.0);
-	
-	FragColor = vec4(color, scolor);
-} 
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
deleted file mode 100644
index e8367c41e5..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-crt-guest-advanced-ntsc-pass2.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang
deleted file mode 100644
index 47d9e26ce3..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-potato-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-crt-guest-advanced-ntsc-pass2.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.inc b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.inc
deleted file mode 100644
index 615fee481a..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.inc
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
-   CRT - Guest - Advanced - NTSC
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	float IOS, OS, BLOOM, brightboost, brightboost1, gsl, scanline1, scanline2, beam_min, beam_max, beam_size,
-	h_sharp, s_sharp, warpX, warpY, glow, shadowMask, masksize, vertmask, ring, no_scanlines;
-} params;
-
-// layout(std140, set = 0, binding = 0) uniform UBO
-// {
-// 	mat4 MVP;
-// 	vec4 SourceSize;
-// 	vec4 OriginalSize;
-// 	vec4 OutputSize;
-// 	uint FrameCount;
-// 	float bloom;
-// 	float halation;
-// 	float scans;
-// 	float gamma_c;
-// 	float gamma_out;
-// 	float overscanX;
-// 	float overscanY;
-// 	float intres;
-// 	float prescalex;
-// 	float c_shape;
-// 	float scangamma;
-// 	float sborder;
-// 	float scan_falloff;
-// 	float bloom_dist;
-// } global;
-
-// #pragma parameter hiscan "          High Resolution Scanlines (prepend a scaler...)" 0.0 0.0 1.0 1.0
-// #define hiscan        params.hiscan
-
-#pragma parameter GDV_BRIGHTNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_brightness "[ BRIGHTNESS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter glow 			"          (Magic) Glow Strength -- glow" 0.08 -2.0 2.0 0.01
-#define glow         global.glow     // Glow Strength
-
-#pragma parameter bloom "          Bloom Strength -- bloom" 0.0 -2.0 2.0 0.05
-#define bloom         global.bloom     // bloom effect
-
-#pragma parameter mask_bloom 	"          Mask Bloom -- mask_bloom" 0.0 -2.0 2.0 0.05
-#define mask_bloom         global.mask_bloom     // bloom effect
-
-#pragma parameter bloom_dist 	"          Bloom Distribution -- bloom_dist" 0.0 -2.0 3.0 0.05
-#define bloom_dist         global.bloom_dist     // bloom effect distribution
-
-#pragma parameter halation "          Halation Strength -- halation" 0.0 -2.0 2.0 0.025
-#define halation         global.halation     // halation effect
-
-#pragma parameter bmask1 "          Bloom Mask Strength -- bmask1" 0.0 -1.0 1.0 0.025
-#define bmask1         global.bmask1     // bloom/halation mask strength
-
-#pragma parameter hmask1 "          Halation Mask Strength -- hmask1" 0.5 -1.0 1.0 0.025
-#define hmask1         global.hmask1     // bloom/halation mask strength
-
-#pragma parameter gamma_c "          Gamma Correct -- gamma_c" 1.0 0.50 2.0 0.025
-#define gamma_c   global.gamma_c     // adjust brightness
-
-#pragma parameter brightboost "          Bright Boost Dark Pixels -- brightboost" 1.40 0.25 10.0 0.05
-#define brightboost  global.brightboost     // adjust brightness
-
-#pragma parameter brightboost1 "          Bright Boost Bright Pixels -- brightboost1" 1.10 0.25 3.00 0.025
-#define brightboost1  global.brightboost1     // adjust brightness
-
-#pragma parameter clips "          Clip Saturated Color Beams -- clips" 0.0 -1.0 1.0 0.05
-#define clips  global.clips     // kinky effect
-
-#pragma parameter bogus_scanline "[ SCANLINE OPTIONS ]: " 0 0 0.001 0.001
-
-#pragma parameter gsl "          Scanline Type -- gsl" 0.0 -1.0 2.0 1.0
-#define gsl          global.gsl      // Alternate scanlines
-
-#pragma parameter scanline1 "          Scanline Beam Shape Center -- scanline1" 6.0 -20.0 40.0 0.5
-#define scanline1    global.scanline1      // scanline param, vertical sharpness
-
-#pragma parameter scanline2 "          Scanline Beam Shape Edges -- scanline2" 8.0 0.0 70.0 1.0
-#define scanline2    global.scanline2      // scanline param, vertical sharpness
-
-#pragma parameter beam_min "          Scanline Shape Dark Pixels -- beam_min" 1.30 0.25 10.0 0.05
-#define beam_min     global.beam_min     // dark area beam min - narrow
-
-#pragma parameter beam_max "          Scanline Shape Bright Pixels -- beam_max" 1.00 0.2 3.5 0.025
-#define beam_max     global.beam_max     // bright area beam max - wide
-
-#pragma parameter tds "          Thinner Dark Scanlines -- tds" 0.0 0. 1.0 1.0
-#define tds     global.tds     // thinner dark scanlines
-
-#pragma parameter beam_size "          Increased Bright Scanline Beam -- beam_size" 0.60 0.0 1.0 0.05
-#define beam_size    global.beam_size     // increased max. beam size
-
-#pragma parameter scans "          Scanline Saturation / Mask Falloff -- scans" 0.50 0.0 6.0 0.10
-#define scans        1.5*global.scans     // scanline saturation
-
-#pragma parameter scan_falloff "          Scanline Falloff -- scan_falloff" 1.0 0.10 2.0 0.025
-#define scan_falloff        global.scan_falloff     // scanline falloff
-
-#pragma parameter ssharp "          Smart Sharpen Scanlines" 0.0 0.0 0.30 0.01
-#define ssharp global.ssharp
-
-#pragma parameter scangamma "          Scanline Gamma -- scangamma" 2.40 0.5 5.0 0.05
-#define scangamma global.scangamma
-
-// #pragma parameter no_scanlines "          No-Scanline Mode (Guest Advanced Only)" 0.0 0.0 1.5 0.05
-// #define no_scanlines global.no_scanlines
-
-// #pragma parameter bogus_screen "[ SCREEN OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-// #pragma parameter intres "          Internal Resolution Y: 0.5...y-dowsample" 0.0 0.0 6.0 0.5 // Joint parameter with linearize pass, values must match
-
-// #pragma parameter IOS "          Integer Scaling: Odd:Y, Even:'X'+Y" 0.0 0.0 4.0 1.0
-// #define IOS          params.IOS     // Smart Integer Scaling
-
-// #pragma parameter warpX "          CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-// #define warpX        params.warpX     // Curvature X
-
-// #pragma parameter warpY "          CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-// #define warpY        params.warpY     // Curvature Y
-
-// #pragma parameter c_shape "          Curvature Shape" 0.25 0.05 0.60 0.05
-// #define c_shape        global.c_shape     // curvature shape
-
-// #pragma parameter overscanX "          Overscan X original pixels" 0.0 -200.0 200.0 1.0
-// #define overscanX        global.overscanX     // OverscanX pixels
-
-// #pragma parameter overscanY "          Overscan Y original pixels" 0.0 -200.0 200.0 1.0
-// #define overscanY        global.overscanY     // OverscanY pixels
-
-/* HSM Removed
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-*/
-
-// HSM Added
-#define COMPAT_TEXTURE(c,d) HSM_GetCroppedTexSample(c,d)
-// End Addition
-
-/* HSM Removed
-#define TEX0 vTexCoord
-*/
-
-#define OutputSize global.OutputSize
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPass;
-layout(set = 0, binding = 4) uniform sampler2D Pass1;
-layout(set = 0, binding = 6) uniform sampler2D InfoCachePass;
-
-#define eps 1e-8
-
-float st(float x)
-{
-	return exp2(-10.0*x*x);
-} 
-
-float st1(float x)
-{
-	return exp2(-8.0*x*x);
-}
-   
-vec3 sw0(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix(beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);
-	float ex = x*tmp;
-	ex = (gsl > -0.5) ? ex*ex : mix(ex*ex, ex*ex*ex, 0.4);
-	return exp2(-scanline*ex*sat);
-} 
-
-vec3 sw1(float x, float color, float scanline, vec3 c)
-{	
-	x = mix (x, beam_min*x, max(x-0.4*color,0.0));
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	float tmp = mix(1.2*beam_min, beam_max, color);
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}    
-
-vec3 sw2(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix((2.5-0.5*color)*beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	tmp = mix(beam_max, tmp, pow(x, color+0.3));
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}   
-
- 
-/* HSM Removed
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-*/
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx,dy);
-	return pos*0.5+0.5;
-} 
-
-
-vec3 gc(vec3 c)
-{
-	float mc = max(max(c.r,c.g),c.b);
-	float mg = pow(mc, 1.0/gamma_c);
-	return c * mg/(mc + eps);  
-}
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-
-void main()
-{
-	// HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	vec2 bezel_outside_flat_coord;
-	vec2 frame_outside_flat_coord;
-	HSM_GetSimpleBezelCoords(TUBE_DIFFUSE_COORD, 
-							TUBE_DIFFUSE_SCALE, 
-							TUBE_SCALE, 
-							SCREEN_ASPECT,
-							bezel_outside_flat_coord, 
-							frame_outside_flat_coord);
-	cache_bounds_coord = (bezel_outside_flat_coord - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-			FragColor = vec4(0);
-			return;
-	}
-
-	// HSM Added
-
-	// Find out if we should use no scanlines based on interlace mode, no scanlines param, & intetrlace settings
-	float no_scanlines = HSM_GetNoScanlineMode();
-
-	float prescalex = float(CROPPED_ROTATED_SIZE_WITH_RES_MULT.x / CROPPED_ROTATED_SIZE.x); 
-	vec4 SourceSize = vec4(CROPPED_ROTATED_SIZE_WITH_RES_MULT, 1 / CROPPED_ROTATED_SIZE_WITH_RES_MULT);
-
-	SourceSize*= vec4(2.0, 1.0, 0.5, 1.0);
-
-	float lum = COMPAT_TEXTURE(AvgLumPass, vec2(0.5,0.5)).a;
-	
-	float gamma_in = 1.0/COMPAT_TEXTURE(LinearizePass, vec2(0.25,0.25)).a;
-	float intera = COMPAT_TEXTURE(LinearizePass, vec2(0.75,0.25)).a;
-	bool hscan = (hiscan > 0.5);
-	bool interb  = (((intera < 0.35) || (no_scanlines > 0.025)) && !hscan);
-
-	float SourceY = SourceSize.y;	
-   	/* HSM Removed
-	float sy = 1.0;
-	if (global.intres == 1.0) sy = SourceY/224.0;
-	if (global.intres > 0.25 && global.intres != 1.0) sy = global.intres;
-	// Calculating texel coordinates
-   
-	vec2 texcoord = TEX0.xy;
-	if (IOS > 0.0 && !interb){
-		vec2 ofactor = OutputSize.xy/global.OriginalSize.xy;
-		vec2 intfactor = (IOS < 2.5) ? floor(ofactor) : ceil(ofactor);
-		vec2 diff = ofactor/intfactor;
-		float scan = diff.y;
-		texcoord = Overscan(texcoord, scan, scan);
-		if (IOS == 1.0 || IOS == 3.0) texcoord = vec2(TEX0.x, texcoord.y);
-	}
-   
-	float factor  = 1.00 + (1.0-0.5*OS)*BLOOM/100.0 - lum*BLOOM/100.0;
-	texcoord  = Overscan(texcoord, factor, factor);
-
-	texcoord = Overscan(texcoord, (global.OriginalSize.x - overscanX)/global.OriginalSize.x, (global.OriginalSize.y - overscanY)/global.OriginalSize.y);
-
-	vec2 pos  = Warp(texcoord);
-	vec2 pos0 = Warp(TEX0.xy);
-	// HSM Node Pos0 is not used anywhere
- 	*/
-
-	// HSM Added
-	vec2 screen_curved_coord = vec2(0.5);
-	vec2 screen_curved_coord_with_overscan = vec2(0.5);
-	vec2 screen_coord_with_overscan = vec2(0.5);
-	vec2 screen_scale_with_overscan = vec2(0.5);
-	float raster_bloom_avg_lum = lum;
-
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetCrtShaderFinalCoordExtraVariables(SCREEN_COORD,
-		SCREEN_SCALE,
-		raster_bloom_avg_lum,
-		screen_curved_coord, 
-		screen_curved_coord_with_overscan, 
-		screen_coord_with_overscan,
-		screen_scale_with_overscan);
-
-	vec2 pos = screen_curved_coord_with_overscan_and_mirror;
-	// End Addition
-
-	vec2 coffset = vec2(0.5, 0.5);
-
-	vec2 ps = SourceSize.zw;
-	vec2 OGL2Pos = pos * SourceSize.xy - coffset;
-	vec2 fp = fract(OGL2Pos);
-	
-	vec2 dx = vec2(ps.x,0.0);
-	vec2 dy = vec2(0.0, ps.y);
-   
-	// Reading the texels
-
-	float  f = fp.y;
-	
-	vec2 pC4 = floor(OGL2Pos) * ps + 0.5*ps;
-	pC4.x = pos.x;	
-
-	/* HSM Removed
-	if (global.intres == 0.5 && prescalex < 1.5) pC4.y = floor(pC4.y * global.OriginalSize.y)*global.OriginalSize.w + 0.5*global.OriginalSize.w;	
-	*/
-
-	if (interb && no_scanlines < 0.025 || hscan)  pC4.y = pos.y; else if (interb) pC4.y = pC4.y + smoothstep(0.40-0.5*no_scanlines, 0.60 + 0.5*no_scanlines, f)*SourceSize.w;	
-
-	vec3 color1 = COMPAT_TEXTURE(Pass1, pC4      ).rgb;
-	vec3 scolor1 = 	COMPAT_TEXTURE(Pass1, pC4      ).aaa;
-
-	if(!interb) color1 = pow(color1, vec3(scangamma/gamma_in));
-
-	pC4+=dy;
-
-	/* HSM Removed
-	if (global.intres == 0.5 && prescalex < 1.5) pC4.y = floor((pos.y + 0.33*dy.y) * global.OriginalSize.y)*global.OriginalSize.w + 0.5*global.OriginalSize.w;
-	*/
-
-	// HSM Added
-	// if (global.intres == 0.5 && prescalex < 1.5) 
-		pC4.y = floor((pos.y + 0.33 * dy.y) * SourceSize.y) * SourceSize.w + 0.5 * SourceSize.w;
-	// End Addition
-
-	vec3 color2 = COMPAT_TEXTURE(Pass1, pC4      ).rgb;
-	vec3 scolor2 = 	COMPAT_TEXTURE(Pass1, pC4      ).aaa;
-
-	if(!interb) color2 = pow(color2, vec3(scangamma/gamma_in)); 
-
-	vec3 ctmp = color1; float w3 = 1.0; vec3 color = color1;
-	vec3 one = vec3(1.0);
-
-	if (hscan) { color2 = color1; scolor2 = scolor1; }
-
-if (!interb || hscan)
-{	
-	// calculating scanlines
-	vec3 luma = vec3(0.2126, 0.7152, 0.0722);
-	float ssub = ssharp*max(abs(scolor1.x-scolor2.x), abs(dot(color1,luma)-dot(color2,luma)));
-
-	float shape1 = mix(scanline1, scanline2 + ssub * scolor1.x * 35.0, f);
-	float shape2 = mix(scanline1, scanline2 + ssub * scolor2.x * 35.0, 1.0-f);
-	
-	float wt1 = st(f);
-	float wt2 = st(1.0-f);
-
-	vec3 color00 = color1*wt1 + color2*wt2;
-	vec3 scolor0 = scolor1*wt1 + scolor2*wt2;
-	
-	ctmp = color00/(wt1+wt2);
-	vec3 sctmp = scolor0/(wt1+wt2);
-
-	vec3 w1, w2;
-	
-	vec3 cref1 = mix(sctmp, scolor1, beam_size); float creff1 = pow(max(max(cref1.r,cref1.g),cref1.b), scan_falloff);
-	vec3 cref2 = mix(sctmp, scolor2, beam_size); float creff2 = pow(max(max(cref2.r,cref2.g),cref2.b), scan_falloff);
-
-	if (tds > 0.5) { shape1 = mix(scanline2, shape1, creff1); shape2 = mix(scanline2, shape2, creff2); }
-
-	float f1 = f; 
-	float f2 = 1.0-f;
-	
-	float mc1 = max(max(color1.r,color1.g),color1.b) + eps;
-	float mc2 = max(max(color2.r,color2.g),color2.b) + eps;
-	
-	cref1 = color1 / mc1;
-	cref2 = color2 / mc2;
-
-	if (gsl <  0.5) { w1 = sw0(f1,creff1,shape1,cref1); w2 = sw0(f2,creff2,shape2,cref2);} else
-	if (gsl == 1.0) { w1 = sw1(f1,creff1,shape1,cref1); w2 = sw1(f2,creff2,shape2,cref2);} else
-	                { w1 = sw2(f1,creff1,shape1,cref1); w2 = sw2(f2,creff2,shape2,cref2);}
-
-	vec3 w3 = w1+w2;
-	float wf1 = max(max(w3.r,w3.g),w3.b);
-	if (wf1 > 1.0) {wf1 = 1.0/wf1; w1*=wf1, w2*=wf1;}
-
-	if (abs(clips) > 0.005)
-	{
-		float sy = mc1; one = (clips > 0.0) ? w1 : 1.0.xxx;
-		float sat = 1.0001-min(min(cref1.r,cref1.g),cref1.b);
-		color1 = mix(color1, plant(pow(color1, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-		sy = mc2; one = (clips > 0.0) ? w2 : 1.0.xxx;
-		sat =       1.0001-min(min(cref2.r,cref2.g),cref2.b);
-		color2 = mix(color2, plant(pow(color2, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-	}
-	
-	color = (gc(color1)*w1 + gc(color2)*w2);
-
-	color = min(color, 1.0);
-}
-	
-	if (interb)
-	{
-		color = gc(color1);
-	}
-
-	float colmx = max(max(ctmp.r,ctmp.g),ctmp.b);
-
-	if(!interb) color = pow( color, vec3(gamma_in/scangamma) );
-  
-	FragColor = vec4(color, colmx);
-
-	if (HSM_GetUseFakeScanlines())
-	{
-		vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1);
-		FragColor = HSM_ApplyScanlineMask(FragColor, screen_scale_with_overscan, screen_coord_with_overscan, screen_curved_coord_with_overscan, tube_curved_coord, HSM_FAKE_SCANLINE_OPACITY);
-	}
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
deleted file mode 100644
index ed40644f97..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-#include "hsm-crt-guest-advanced-ntsc-pass2.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2_orig.slang
deleted file mode 100644
index f757b8bef8..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass2_orig.slang
+++ /dev/null
@@ -1,402 +0,0 @@
-#version 450
-
-/*
-   CRT - Guest - Advanced - NTSC
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	float IOS, OS, BLOOM, brightboost, brightboost1, gsl, scanline1, scanline2, beam_min, beam_max, beam_size,
-	h_sharp, s_sharp, warpX, warpY, glow, shadowMask, masksize, ring, no_scanlines, tds, clips, ssharp, hiscan;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float bloom;
-	float halation;
-	float scans;
-	float gamma_c;
-	float gamma_out;
-	float overscanX;
-	float overscanY;
-	float intres;
-	float prescalex;
-	float c_shape;
-	float scangamma;
-	float sborder;
-	float scan_falloff;
-	float bloom_dist;
-	float bmask1;
-	float hmask1;
-} global;
-
-#pragma parameter hiscan "          High Resolution Scanlines (prepend a scaler...)" 0.0 0.0 1.0 1.0
-#define hiscan        params.hiscan
-
-#pragma parameter bogus_brightness "[ BRIGHTNESS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter glow "          (Magic) Glow Strength" 0.08 -2.0 2.0 0.01
-#define glow         params.glow     // Glow Strength
-
-#pragma parameter bloom "          Bloom Strength" 0.0 -2.0 2.0 0.05
-#define bloom         global.bloom     // bloom effect
-
-#pragma parameter mask_bloom "          Mask Bloom" 0.0 -2.0 2.0 0.05
-#define mask_bloom         params.mask_bloom     // bloom effect
-
-#pragma parameter bloom_dist "          Bloom Distribution" 0.0 -2.0 3.0 0.05
-#define bloom_dist         global.bloom_dist     // bloom effect distribution
-
-#pragma parameter halation "          Halation Strength" 0.0 -2.0 2.0 0.025
-#define halation         global.halation     // halation effect
-
-#pragma parameter bmask1 "          Bloom Mask Strength" 0.0 -1.0 1.0 0.025
-#define bmask1         global.bmask1     // bloom/halation mask strength
-
-#pragma parameter hmask1 "          Halation Mask Strength" 0.5 -1.0 1.0 0.025
-#define hmask1         global.hmask1     // bloom/halation mask strength
-
-#pragma parameter gamma_c "          Gamma correct" 1.0 0.50 2.0 0.025
-#define gamma_c   global.gamma_c     // adjust brightness
-
-#pragma parameter brightboost "          Bright Boost Dark Pixels" 1.40 0.25 10.0 0.05
-#define brightboost  params.brightboost     // adjust brightness
-
-#pragma parameter brightboost1 "          Bright Boost Bright Pixels" 1.10 0.25 3.00 0.025
-#define brightboost1  params.brightboost1     // adjust brightness
-
-#pragma parameter clips "          Clip Saturated Color Beams" 0.0 -1.0 1.0 0.05
-#define clips  params.clips     // kinky effect
-
-#pragma parameter bogus_scanline "[ SCANLINE OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter gsl "          Scanline Type" 0.0 -1.0 2.0 1.0
-#define gsl          params.gsl      // Alternate scanlines
-
-#pragma parameter scanline1 "          Scanline Beam Shape Center" 6.0 -20.0 40.0 0.5
-#define scanline1    params.scanline1      // scanline param, vertical sharpness
-
-#pragma parameter scanline2 "          Scanline Beam Shape Edges" 8.0 0.0 70.0 1.0 
-#define scanline2    params.scanline2      // scanline param, vertical sharpness
-
-#pragma parameter beam_min "          Scanline Shape Dark Pixels" 1.30 0.25 10.0 0.05
-#define beam_min     params.beam_min     // dark area beam min - narrow
-
-#pragma parameter beam_max "          Scanline Shape Bright Pixels" 1.00 0.2 3.5 0.025
-#define beam_max     params.beam_max     // bright area beam max - wide
-
-#pragma parameter tds "          Thinner Dark Scanlines" 0.0 0. 1.0 1.0
-#define tds     params.tds     // thinner dark scanlines
-
-#pragma parameter beam_size "          Increased Bright Scanline Beam" 0.60 0.0 1.0 0.05
-#define beam_size    params.beam_size     // increased max. beam size
-
-#pragma parameter scans "          Scanline Saturation / Mask Falloff" 0.50 0.0 6.0 0.10
-#define scans        1.5*global.scans     // scanline saturation
-
-#pragma parameter scan_falloff "          Scanline Falloff" 1.0 0.10 2.0 0.025
-#define scan_falloff        global.scan_falloff     // scanline falloff
-
-#pragma parameter ssharp "          Smart Sharpen Scanlines" 0.0 0.0 0.30 0.01
-#define ssharp params.ssharp
-
-#pragma parameter scangamma "          Scanline Gamma" 2.40 0.5 5.0 0.05
-#define scangamma global.scangamma
-
-#pragma parameter no_scanlines "          No-scanline mode" 0.0 0.0 1.5 0.05
-#define no_scanlines params.no_scanlines
-
-#pragma parameter bogus_screen "[ SCREEN OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter intres "          Internal Resolution Y: 0.5...y-dowsample" 0.0 0.0 6.0 0.5 // Joint parameter with linearize pass, values must match
-
-#pragma parameter IOS "          Integer Scaling: Odd:Y, Even:'X'+Y" 0.0 0.0 4.0 1.0
-#define IOS          params.IOS     // Smart Integer Scaling
-
-#pragma parameter OS "          R. Bloom Overscan Mode" 1.0 0.0 2.0 1.0
-#define OS           params.OS     // Do overscan
-
-#pragma parameter BLOOM "          Raster bloom %" 0.0 0.0 20.0 1.0
-#define BLOOM        params.BLOOM     // Bloom overscan percentage
-
-#pragma parameter warpX "          CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-#define warpX        params.warpX     // Curvature X
-
-#pragma parameter warpY "          CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-#define warpY        params.warpY     // Curvature Y
-
-#pragma parameter c_shape "          Curvature Shape" 0.25 0.05 0.60 0.05
-#define c_shape        global.c_shape     // curvature shape
-
-#pragma parameter overscanX "          Overscan X original pixels" 0.0 -200.0 200.0 1.0
-#define overscanX        global.overscanX     // OverscanX pixels
-
-#pragma parameter overscanY "          Overscan Y original pixels" 0.0 -200.0 200.0 1.0
-#define overscanY        global.overscanY     // OverscanY pixels
-
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define TEX0 vTexCoord
-
-#define OutputSize global.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPass;
-layout(set = 0, binding = 4) uniform sampler2D Pass1;
-
-#define eps 1e-8
-
-float st(float x)
-{
-	return exp2(-10.0*x*x);
-} 
-
-float st1(float x)
-{
-	return exp2(-8.0*x*x);
-}
-   
-vec3 sw0(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix(beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);
-	float ex = x*tmp;
-	ex = (gsl > -0.5) ? ex*ex : mix(ex*ex, ex*ex*ex, 0.4);
-	return exp2(-scanline*ex*sat);
-} 
-
-vec3 sw1(float x, float color, float scanline, vec3 c)
-{	
-	x = mix (x, beam_min*x, max(x-0.4*color,0.0));
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	float tmp = mix(1.2*beam_min, beam_max, color);
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}    
-
-vec3 sw2(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix((2.5-0.5*color)*beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	tmp = mix(beam_max, tmp, pow(x, color+0.3));
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}   
-
- 
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx,dy);
-	return pos*0.5+0.5;
-} 
-
-
-vec3 gc(vec3 c)
-{
-	float mc = max(max(c.r,c.g),c.b);
-	float mg = pow(mc, 1.0/gamma_c);
-	return c * mg/(mc + eps);  
-}
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-
-void main()
-{
-	float prescalex = float(textureSize(LinearizePass, 0).x) / (2.0*global.OriginalSize.x);
-	
-	vec4 SourceSize = global.OriginalSize * vec4(prescalex, 1.0, 1.0/prescalex, 1.0);
-	
-	SourceSize*= vec4(2.0, 1.0, 0.5, 1.0);
-	
-	float lum = COMPAT_TEXTURE(AvgLumPass, vec2(0.5,0.5)).a;
-	
-	float gamma_in = 1.0/COMPAT_TEXTURE(LinearizePass, vec2(0.25,0.25)).a;
-	float intera = COMPAT_TEXTURE(LinearizePass, vec2(0.75,0.25)).a;
-	bool hscan = (hiscan > 0.5);
-	bool interb  = (((intera < 0.35) || (no_scanlines > 0.025)) && !hscan);
-
-	float SourceY = SourceSize.y;	
-	float sy = 1.0;
-	if (global.intres == 1.0) sy = SourceY/224.0;
-	if (global.intres > 0.25 && global.intres != 1.0) sy = global.intres;
-	SourceSize*=vec4(1.0, 1.0/sy, 1.0, sy);
-	
-	// Calculating texel coordinates
-   
-	vec2 texcoord = TEX0.xy;
-	if (IOS > 0.0 && !interb){
-		vec2 ofactor = OutputSize.xy/global.OriginalSize.xy;
-		vec2 intfactor = (IOS < 2.5) ? floor(ofactor) : ceil(ofactor);
-		vec2 diff = ofactor/intfactor;
-		float scan = diff.y;
-		texcoord = Overscan(texcoord, scan, scan);
-		if (IOS == 1.0 || IOS == 3.0) texcoord = vec2(TEX0.x, texcoord.y);
-	}
-   
-	float factor  = 1.00 + (1.0-0.5*OS)*BLOOM/100.0 - lum*BLOOM/100.0;
-	texcoord  = Overscan(texcoord, factor, factor);
-
-	texcoord = Overscan(texcoord, (global.OriginalSize.x - overscanX)/global.OriginalSize.x, (global.OriginalSize.y - overscanY)/global.OriginalSize.y);
-
-	vec2 pos  = Warp(texcoord);
-	vec2 pos0 = Warp(TEX0.xy);
-
-	vec2 coffset = vec2(0.5, 0.5);
-	
-	vec2 ps = SourceSize.zw;
-	vec2 OGL2Pos = pos * SourceSize.xy - coffset;
-	vec2 fp = fract(OGL2Pos);
-	
-	vec2 dx = vec2(ps.x,0.0);
-	vec2 dy = vec2(0.0, ps.y);
-   
-	// Reading the texels
-
-	float  f = fp.y;
-	
-	vec2 pC4 = floor(OGL2Pos) * ps + 0.5*ps;
-	pC4.x = pos.x;
-
-	if (global.intres == 0.5 && prescalex < 1.5) pC4.y = floor(pC4.y * global.OriginalSize.y)*global.OriginalSize.w + 0.5*global.OriginalSize.w;
-	
-	if (interb && no_scanlines < 0.025 || hscan)  pC4.y = pos.y; else if (interb) pC4.y = pC4.y + smoothstep(0.40-0.5*no_scanlines, 0.60 + 0.5*no_scanlines, f)*SourceSize.w;	
-	
-	vec3 color1 = COMPAT_TEXTURE(Pass1, pC4      ).rgb;
-	vec3 scolor1 = 	COMPAT_TEXTURE(Pass1, pC4      ).aaa;
-
-	if(!interb) color1 = pow(color1, vec3(scangamma/gamma_in));
-  
-	pC4+=dy;
-
-	if (global.intres == 0.5 && prescalex < 1.5) pC4.y = floor((pos.y + 0.33*dy.y) * global.OriginalSize.y)*global.OriginalSize.w + 0.5*global.OriginalSize.w;
-	
-	vec3 color2 = COMPAT_TEXTURE(Pass1, pC4      ).rgb;
-	vec3 scolor2 = 	COMPAT_TEXTURE(Pass1, pC4      ).aaa;
-
-	if(!interb) color2 = pow(color2, vec3(scangamma/gamma_in)); 
-
-	vec3 ctmp = color1; float w3 = 1.0; vec3 color = color1;
-	vec3 one = vec3(1.0);
-	
-	if (hscan) { color2 = color1; scolor2 = scolor1; }
-
-if (!interb || hscan)
-{	
-	// calculating scanlines
-	vec3 luma = vec3(0.2126, 0.7152, 0.0722);
-	float ssub = ssharp*max(abs(scolor1.x-scolor2.x), abs(dot(color1,luma)-dot(color2,luma)));
-
-	float shape1 = mix(scanline1, scanline2 + ssub * scolor1.x * 35.0, f);
-	float shape2 = mix(scanline1, scanline2 + ssub * scolor2.x * 35.0, 1.0-f);
-	
-	float wt1 = st(f);
-	float wt2 = st(1.0-f);
-
-	vec3 color00 = color1*wt1 + color2*wt2;
-	vec3 scolor0 = scolor1*wt1 + scolor2*wt2;
-	
-	ctmp = color00/(wt1+wt2);
-	vec3 sctmp = scolor0/(wt1+wt2);
-	
-	vec3 w1, w2;
-	
-	vec3 cref1 = mix(sctmp, scolor1, beam_size); float creff1 = pow(max(max(cref1.r,cref1.g),cref1.b), scan_falloff);
-	vec3 cref2 = mix(sctmp, scolor2, beam_size); float creff2 = pow(max(max(cref2.r,cref2.g),cref2.b), scan_falloff);
-
-	if (tds > 0.5) { shape1 = mix(scanline2, shape1, creff1); shape2 = mix(scanline2, shape2, creff2); }
-
-	float f1 = f; 
-	float f2 = 1.0-f;
-
-	float mc1 = max(max(color1.r,color1.g),color1.b) + eps;
-	float mc2 = max(max(color2.r,color2.g),color2.b) + eps;
-	
-	cref1 = color1 / mc1;
-	cref2 = color2 / mc2;
-
-	if (gsl <  0.5) { w1 = sw0(f1,creff1,shape1,cref1); w2 = sw0(f2,creff2,shape2,cref2);} else
-	if (gsl == 1.0) { w1 = sw1(f1,creff1,shape1,cref1); w2 = sw1(f2,creff2,shape2,cref2);} else
-	                { w1 = sw2(f1,creff1,shape1,cref1); w2 = sw2(f2,creff2,shape2,cref2);}
-
-	vec3 w3 = w1+w2;
-	float wf1 = max(max(w3.r,w3.g),w3.b);
-	if (wf1 > 1.0) {wf1 = 1.0/wf1; w1*=wf1, w2*=wf1;}
-
-	if (abs(clips) > 0.005)
-	{
-		sy = mc1; one = (clips > 0.0) ? w1 : 1.0.xxx;
-		float sat = 1.0001-min(min(cref1.r,cref1.g),cref1.b);
-		color1 = mix(color1, plant(pow(color1, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-		sy = mc2; one = (clips > 0.0) ? w2 : 1.0.xxx;
-		sat =       1.0001-min(min(cref2.r,cref2.g),cref2.b);
-		color2 = mix(color2, plant(pow(color2, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-	}
-	
-	color = (gc(color1)*w1 + gc(color2)*w2);
-	
-	color = min(color, 1.0);
-}
-	
-	if (interb)
-	{
-		color = gc(color1);
-	}
-
-	float colmx = max(max(ctmp.r,ctmp.g),ctmp.b);
-
-	if(!interb) color = pow( color, vec3(gamma_in/scangamma) );
-  
-	FragColor = vec4(color, colmx);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-potato.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-potato.slang
deleted file mode 100644
index 9111884688..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-potato.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-potato-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-crt-guest-advanced.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced.inc b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced.inc
deleted file mode 100644
index 3a31fc6d6f..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced.inc
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
-   CRT - Guest - Advanced
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-// All parameter uniform values are in globals.inc 
-
-
-#pragma parameter hiscan "          High Resolution Scanlines (ScaleFx or XBR Only)" 0.0 0.0 1.0 1.0
-#define hiscan        global.hiscan
-
-#pragma parameter GDV_BRIGHTNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_brightness "[ BRIGHTNESS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter glow 			"          (Magic) Glow Strength -- glow" 0.08 -2.0 2.0 0.01
-#define glow         global.glow     // Glow Strength
-
-#pragma parameter bloom "          Bloom Strength -- bloom" 0.0 -2.0 2.0 0.05
-#define bloom         global.bloom     // bloom effect
-
-#pragma parameter mask_bloom 	"          Mask Bloom -- mask_bloom" 0.0 -2.0 2.0 0.05
-#define mask_bloom         global.mask_bloom     // bloom effect
-
-#pragma parameter bloom_dist 	"          Bloom Distribution -- bloom_dist" 0.0 -2.0 3.0 0.05
-#define bloom_dist         global.bloom_dist     // bloom effect distribution
-
-#pragma parameter halation 		"          Halation Strength -- halation" 0.0 -2.0 2.0 0.025
-#define halation         global.halation     // halation effect
-
-#pragma parameter bmask1 "          Bloom Mask Strength -- bmask1" 0.0 -1.0 1.0 0.025
-#define bmask1         global.bmask1     // bloom/halation mask strength
-
-#pragma parameter hmask1 "          Halation Mask Strength -- hmask1" 0.5 -1.0 1.0 0.025
-#define hmask1         global.hmask1     // bloom/halation mask strength
-
-#pragma parameter gamma_c "          Gamma Correct -- gamma_c" 1.0 0.50 2.0 0.025
-#define gamma_c   global.gamma_c     // adjust brightness
-
-#pragma parameter brightboost "          Bright Boost Dark Pixels -- brightboost" 1.40 0.25 10.0 0.05
-#define brightboost  global.brightboost     // adjust brightness
-
-#pragma parameter brightboost1 "          Bright Boost Bright Pixels -- brightboost1" 1.10 0.25 3.00 0.025
-#define brightboost1  global.brightboost1     // adjust brightness
-
-#pragma parameter clips "          Clip Saturated Color Beams -- clips" 0.0 -1.0 1.0 0.05
-#define clips  global.clips     // kinky effect
-
-#pragma parameter GDV_SCANLINE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_scanline "[ SCANLINE OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter gsl "          Scanline Type -- gsl" 0.0 -1.0 2.0 1.0
-#define gsl          global.gsl      // Alternate scanlines
-
-#pragma parameter scanline1 "          Scanline Beam Shape Center -- scanline1" 6.0 -20.0 40.0 0.5
-#define scanline1    global.scanline1      // scanline param, vertical sharpness
-
-#pragma parameter scanline2 "          Scanline Beam Shape Edges -- scanline2" 8.0 0.0 70.0 1.0
-#define scanline2    global.scanline2      // scanline param, vertical sharpness
-
-#pragma parameter beam_min "          Scanline Shape Dark Pixels -- beam_min" 1.30 0.25 10.0 0.05
-#define beam_min     global.beam_min     // dark area beam min - narrow
-
-#pragma parameter beam_max "          Scanline Shape Bright Pixels -- beam_max" 1.00 0.2 3.5 0.025
-#define beam_max     global.beam_max     // bright area beam max - wide
-
-#pragma parameter tds "          Thinner Dark Scanlines -- tds" 0.0 0. 1.0 1.0
-#define tds     global.tds     // thinner dark scanlines
-
-#pragma parameter beam_size "          Increased Bright Scanline Beam -- beam_size" 0.60 0.0 1.0 0.05
-#define beam_size    global.beam_size     // increased max. beam size
-
-#pragma parameter scans "          Scanline Saturation / Mask Falloff -- scans" 0.50 0.0 6.0 0.10
-#define scans        1.5*global.scans     // scanline saturation
-
-#pragma parameter scan_falloff "          Scanline Falloff -- scan_falloff" 1.0 0.10 2.0 0.025
-#define scan_falloff        global.scan_falloff     // scanline falloff
-
-#pragma parameter spike "          Scanline Spike Removal -- spike" 1.0 0.0 2.0 0.10
-#define spike global.spike
-
-#pragma parameter ssharp "          Smart Sharpen Scanlines" 0.0 0.0 0.30 0.01
-#define ssharp global.ssharp
-
-#pragma parameter scangamma "          Scanline Gamma" 2.40 0.5 10.0 0.05
-#define scangamma 	global.scangamma
-
-// #pragma parameter no_scanlines "          No-Scanline Mode (Guest Advanced Only)" 0.0 0.0 1.5 0.05
-// #define no_scanlines global.no_scanlines
-
-#pragma parameter GDV_FILTERING_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_filtering "[ FILTERING OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter h_sharp "          Horizontal sharpness -- h_sharp" 5.20 0.20 15.0 0.10
-#define h_sharp      global.h_sharp     // pixel sharpness
-
-#pragma parameter s_sharp "          Substractive sharpness (1.0 recommended) -- s_sharp" 0.50 0.0 2.0 0.10
-#define s_sharp      global.s_sharp     // substractive sharpness
-
-#pragma parameter ring "          Substractive sharpness Ringing -- ring" 0.0 0.0 3.0 0.05
-#define ring      global.ring     // substractive sharpness ringing
-
-#pragma parameter smart_ei "          Smart Edges Effect Strength -- smart_ei" 0.0 0.0 0.75 0.01
-#define smart_ei      global.smart_ei     // smart edge handling
-
-#pragma parameter ei_limit "          Smart Edges Effect Strength Limit -- ei_limit" 0.25 0.0 0.75 0.01
-#define ei_limit      global.ei_limit     // smart edge handling
-
-#pragma parameter sth     "          Smart Edges Smoothing Threshold -- sth" 0.23 0.0 1.0 0.01
-#define sth        global.sth     // corner size
-
-// #pragma parameter bogus_screen "[ SCREEN OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-// HSM the resolution scaling is controlled by HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR
-// #pragma parameter intres "          Internal Resolution Y: 0.5...y-dowsample" 0.0 0.0 6.0 0.5 // Joint parameter with linearize pass, values must match
-
-// #pragma parameter TATE "          TATE Mode" 0.0 0.0 1.0 1.0
-// #define TATE         params.TATE     // Screen orientation
-
-// #pragma parameter IOS "          Integer Scaling: Odd:Y, Even:'X'+Y" 0.0 0.0 4.0 1.0
-// #define IOS          params.IOS     // Smart Integer Scaling
-
-// #pragma parameter OS "          R. Bloom Overscan Mode" 1.0 0.0 2.0 1.0
-// #define OS           params.OS     // Do overscan
-
-// #pragma parameter BLOOM "          Raster bloom %" 0.0 0.0 20.0 1.0
-// #define BLOOM        params.BLOOM     // Bloom overscan percentage
-
-// #pragma parameter warpX "          CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-// #define warpX        params.warpX     // Curvature X
-
-// #pragma parameter warpY "          CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-// #define warpY        params.warpY     // Curvature Y
-
-// #pragma parameter c_shape "          Curvature Shape" 0.25 0.05 0.60 0.05
-// #define c_shape        global.c_shape     // curvature shape
-
-// #pragma parameter overscanX "          Overscan X original pixels" 0.0 -200.0 200.0 1.0
-// #define overscanX        global.overscanX     // OverscanX pixels
-
-// #pragma parameter overscanY "          Overscan Y original pixels" 0.0 -200.0 200.0 1.0
-// #define overscanY        global.overscanY     // OverscanY pixels
-
-
-#define COMPAT_TEXTURE(c,d) HSM_GetCroppedTexSample(c,d)
-
-#define OutputSize global.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPass;
-layout(set = 0, binding = 4) uniform sampler2D PrePass;
-layout(set = 0, binding = 6) uniform sampler2D InfoCachePass;
-
-#define eps 1e-10 
-
-float st(float x)
-{
-	return exp2(-10.0*x*x);
-} 
-
-float st1(float x)
-{
-	return exp2(-8.0*x*x);
-}
-   
-vec3 sw0(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix(beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);
-	float ex = x*tmp;
-	ex = (gsl > -0.5) ? ex*ex : mix(ex*ex, ex*ex*ex, 0.4);
-	return exp2(-scanline*ex*sat);
-} 
-
-vec3 sw1(float x, float color, float scanline, vec3 c)
-{	
-	x = mix (x, beam_min*x, max(x-0.4*color,0.0));
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	float tmp = mix(1.2*beam_min, beam_max, color);
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}    
-
-vec3 sw2(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix((2.5-0.5*color)*beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	tmp = mix(beam_max, tmp, pow(x, color+0.3));
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}   
-
-
-/* HSM Removed
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-*/
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx,dy);
-	return pos*0.5+0.5;
-} 
-
-
-vec3 gc(vec3 c)
-{
-	float mc = max(max(c.r,c.g),c.b);
-	float mg = pow(mc, 1.0/gamma_c);
-	return c * mg/(mc + eps);  
-}
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-
-void main()
-{
-	// HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	vec2 bezel_outside_flat_coord;
-	vec2 frame_outside_flat_coord;
-	HSM_GetSimpleBezelCoords(TUBE_DIFFUSE_COORD, 
-							TUBE_DIFFUSE_SCALE, 
-							TUBE_SCALE, 
-							SCREEN_ASPECT,
-							bezel_outside_flat_coord, 
-							frame_outside_flat_coord);
-	cache_bounds_coord = (bezel_outside_flat_coord - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-			FragColor = vec4(0);
-			return;
-	}
-
-	float TATE = USE_VERTICAL_SCANLINES;
-
-	// HSM Added
-	vec2 prescalex = textureSize(LinearizePass, 0).xy / global.DerezedPassSize.xy;
-
-	vec4 SourceSize = vec4(CROPPED_ROTATED_SIZE, 1 / CROPPED_ROTATED_SIZE) * mix( vec4(prescalex.x, 1.0, 1.0/prescalex.x, 1.0), vec4(1.0, prescalex.y, 1.0, 1.0/prescalex.y), TATE);
-
-	// float lum = COMPAT_TEXTURE(AvgLumPass, vec2(0.5,0.5)).a;
-
-	// HSM Added
-	// Find out if we should use no scanlines based on interlace mode, no scanlines param, & intetrlace settings
-	float no_scanlines = HSM_GetNoScanlineMode();
-
-	float gamma_in = 1.0/COMPAT_TEXTURE(LinearizePass, vec2(0.25,0.25)).a;
-	float intera = COMPAT_TEXTURE(LinearizePass, vec2(0.75,0.25)).a;
-	bool hscan = (hiscan > 0.5);
-	bool interb  = (((intera < 0.35) || (no_scanlines > 0.025)) && !hscan);
-	// bool notate  = (TATE < 0.5);
-	bool vgascan = ((abs(intera-0.5) < 0.05) && (no_scanlines == 0.0));
-
-	float SourceY = mix(SourceSize.y, SourceSize.x, TATE);
-
-	float hsm_intres = 1 / HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR;
-	float sy = hsm_intres;
-
-	/* HSM Removed
-	if (hsm_intres == 1.0) sy = SourceY/224.0;
-	if (hsm_intres > 0.25 && hsm_intres != 1.0) sy = hsm_intres;
-	*/
-	// VGA Scan Mode
-	if (vgascan) sy = 0.5; else if (abs(intera-0.75) < 0.05) sy = 1.0;
-
-	if (TATE < 0.5) SourceSize*=vec4(1.0, 1.0/sy, 1.0, sy); else SourceSize*=vec4(1.0/sy, 1.0, sy, 1.0);
-
-	/* HSM Removed
-	// Calculating texel coordinates
-   
-	vec2 texcoord = TEX0.xy;
-	if (IOS > 0.0 && !interb){
-		vec2 ofactor = OutputSize.xy/global.OriginalSize.xy;
-		vec2 intfactor = (IOS < 2.5) ? floor(ofactor) : ceil(ofactor);
-		vec2 diff = ofactor/intfactor;
-		float scan = mix(diff.y, diff.x, TATE);
-		texcoord = Overscan(texcoord, scan, scan);
-		if (IOS == 1.0 || IOS == 3.0) texcoord = mix(vec2(TEX0.x, texcoord.y), vec2(texcoord.x, TEX0.y), TATE);
-	}
-   
-	float factor  = 1.00 + (1.0-0.5*OS)*BLOOM/100.0 - lum*BLOOM/100.0;
-	texcoord  = Overscan(texcoord, factor, factor);
-
-	texcoord = Overscan(texcoord, (global.OriginalSize.x - overscanX)/global.OriginalSize.x, (global.OriginalSize.y - overscanY)/global.OriginalSize.y);
-
-	vec2 pos  = Warp(texcoord);
- 	*/
-
-	// HSM Added Raster Bloom
-	float raster_bloom_avg_lum = texture(AvgLumPass, vec2(0.5,0.5)).a;
-	vec2 screen_curved_coord = vec2(0.5);
-	vec2 screen_curved_coord_with_overscan = vec2(0.5);
-	vec2 screen_coord_with_overscan = vec2(0.5);
-	vec2 screen_scale_with_overscan = vec2(0.5);
-
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetCrtShaderFinalCoordExtraVariables(SCREEN_COORD,
-		SCREEN_SCALE,
-		raster_bloom_avg_lum,
-		screen_curved_coord, 
-		screen_curved_coord_with_overscan, 
-		screen_coord_with_overscan,
-		screen_scale_with_overscan);
-
-	vec2 pos = screen_curved_coord_with_overscan_and_mirror;
-	// End Addition
-
-	bool smarte  = (smart_ei > 0.01 && TATE < 0.5); // smart edge interpolation on / off
-
-	vec2 coffset = vec2(0.5, 0.5);
-
-	vec2 ps = SourceSize.zw;
-	vec2 OGL2Pos = pos * SourceSize.xy - coffset;
-	vec2 fp = fract(OGL2Pos);
-	
-	vec2 dx = vec2(ps.x,0.0);
-	vec2 dy = vec2(0.0, ps.y);
-   
-	// Reading the texels
-	vec2 x2 = 2.0*dx;
-	vec2 y2 = 2.0*dy;
-
-	vec2 offx = dx;
-	vec2 off2 = x2;
-	vec2 offy = dy;
-	float fpx = fp.x;
-	if(TATE > 0.5)
-	{
-		offx = dy;
-		off2 = y2;
-		offy = dx;
-		fpx = fp.y;
-	}
-	float  f = TATE < 0.5 ? fp.y : fp.x;
-	
-	vec2 pC4 = floor(OGL2Pos) * ps + 0.5*ps; 
-
-	if ((hsm_intres == 0.5 &&  TATE < 0.5 && prescalex.y < 1.5) || vgascan) pC4.y = floor(pC4.y * global.DerezedPassSize.y)*global.DerezedPassSize.w + 0.5*global.DerezedPassSize.w;
-	if ((hsm_intres == 0.5 && TATE > 0.5 && prescalex.x < 1.5) || (vgascan && TATE > 0.5)) pC4.x = floor(pC4.x * global.DerezedPassSize.x)*global.DerezedPassSize.z + 0.5*global.DerezedPassSize.z;
-
-	if (interb && no_scanlines < 0.025 && !hscan)  pC4.y = pos.y; else if (interb) pC4.y = pC4.y + smoothstep(0.40-0.5*no_scanlines, 0.60 + 0.5*no_scanlines, f)*mix(SourceSize.w, SourceSize.z, TATE);
-	if (hscan) pC4 = mix(vec2(pC4.x, pos.y), vec2(pos.x, pC4.y), TATE);
-
-	float zero = exp2(-h_sharp);
-	float sharp1 = s_sharp * zero;
-	
-	float idiv = clamp(mix(SourceSize.x, SourceSize.y, TATE) / 400.0, 1.0, 2.0);
-	float fdivider = max(min(mix(prescalex.x, prescalex.y,TATE), 2.0), idiv*float(interb));
-
-	float wl3 = (2.0 + fpx)/fdivider;
-	float wl2 = (1.0 + fpx)/fdivider;
-	float wl1 = (      fpx)/fdivider;
-	float wr1 = (1.0 - fpx)/fdivider;
-	float wr2 = (2.0 - fpx)/fdivider;
-	float wr3 = (3.0 - fpx)/fdivider;
-
-	wl3*=wl3; wl3 = exp2(-h_sharp*wl3);
-	wl2*=wl2; wl2 = exp2(-h_sharp*wl2);
-	wl1*=wl1; wl1 = exp2(-h_sharp*wl1);
-	wr1*=wr1; wr1 = exp2(-h_sharp*wr1);
-	wr2*=wr2; wr2 = exp2(-h_sharp*wr2);
-	wr3*=wr3; wr3 = exp2(-h_sharp*wr3);
-	
-	float fp1 = 1.-fpx;
-
-	float twl3 = max(wl3 - sharp1, 0.0);
-	float twl2 = max(wl2 - sharp1, mix(-0.12, 0.0, 1.0-fp1*fp1));
-	float twl1 = max(wl1 - sharp1, -0.12);
-	float twr1 = max(wr1 - sharp1, -0.12);
-	float twr2 = max(wr2 - sharp1, mix(-0.12, 0.0, 1.0-fpx*fpx));
-	float twr3 = max(wr3 - sharp1, 0.0);
-	
-	bool sharp = (sharp1 > 0.0);
-
-	vec3 c1, c2;
-	
-	if (smarte)
-	{
-		twl3 = 0.0; twr3 = 0.0;
-		c1 = COMPAT_TEXTURE(AvgLumPass, pC4       ).xyz;		
-		c2 = COMPAT_TEXTURE(AvgLumPass, pC4 + offy).xyz;
-		c1 = max(c1 - sth, 0.0);
-		c2 = max(c2 - sth, 0.0);
-	}
-
-	vec3 l3, l2, l1, r1, r2, r3, color1, color2, colmin, colmax;
-
-	l3 = COMPAT_TEXTURE(LinearizePass, pC4 -off2).rgb;
-	l2 = COMPAT_TEXTURE(LinearizePass, pC4 -offx).rgb;
-	l1 = COMPAT_TEXTURE(LinearizePass, pC4      ).rgb;
-	r1 = COMPAT_TEXTURE(LinearizePass, pC4 +offx).rgb;
-	r2 = COMPAT_TEXTURE(LinearizePass, pC4 +off2).rgb;
-	r3 = COMPAT_TEXTURE(LinearizePass, pC4 +offx+off2).rgb;
-
-	colmin = min(min(l1,r1), min(l2,r2));
-	colmax = max(max(l1,r1), max(l2,r2));
-	
-	if (smarte)
-	{	
-		float pc = min(smart_ei*c1.y, ei_limit);
-		float pl = min(smart_ei*max(c1.y,c1.x), ei_limit);
-		float pr = min(smart_ei*max(c1.y,c1.z), ei_limit);
-		twl1 = max(wl1-pc, 0.01*wl1); twr1 = max(wr1-pc, 0.01*wr1);
-		twl2 = max(wl2-pl, 0.01*wl2); twr2 = max(wr2-pr, 0.01*wr2);
-	}
-
-	color1 = (l3*twl3 + l2*twl2 + l1*twl1 + r1*twr1 + r2*twr2 + r3*twr3)/(twl3+twl2+twl1+twr1+twr2+twr3);
-
-	if (sharp) color1 = clamp(mix(clamp(color1, colmin, colmax), color1, ring), 0.0, 1.0);
-	float ts = 0.025;
-	vec3 luma = vec3(0.2126, 0.7152, 0.0722);
-	
-	float lm2 = max(max(l2.r,l2.g),l2.b);
-	float lm1 = max(max(l1.r,l1.g),l1.b);
-	float rm1 = max(max(r1.r,r1.g),r1.b);
-	float rm2 = max(max(r2.r,r2.g),r2.b);	
-
-	float swl2 = max(twl2, 0.0) * (dot(l2,luma) + ts);
-	float swl1 = max(twl1, 0.0) * (dot(l1,luma) + ts);
-	float swr1 = max(twr1, 0.0) * (dot(r1,luma) + ts);
-	float swr2 = max(twr2, 0.0) * (dot(r2,luma) + ts);
-	
-	float fscolor1 = (lm2*swl2 + lm1*swl1 + rm1*swr1 + rm2*swr2)/(swl2+swl1+swr1+swr2);
-	vec3 scolor1 = vec3(clamp(mix(max(max(color1.r,color1.g),color1.b), fscolor1, spike), 0.0, 1.0));
-
-	if(!interb) color1 = pow(color1, vec3(scangamma/gamma_in));
-	
-	vec3 scolor2;
-	
-	if (!interb && !hscan)
-{	
-	pC4+=offy;
-
-	if ((hsm_intres == 0.5 &&  TATE < 0.5 && prescalex.y < 1.5) || vgascan) pC4.y = floor((pos.y + 0.33*offy.y) * global.DerezedPassSize.y)*global.DerezedPassSize.w + 0.5*global.DerezedPassSize.w;
-	if ((hsm_intres == 0.5 && TATE > 0.5 && prescalex.x < 1.5) || (vgascan && TATE > 0.5)) pC4.x = floor((pos.x + 0.33*offy.x) * global.DerezedPassSize.x)*global.DerezedPassSize.z + 0.5*global.DerezedPassSize.z;
-
-	l3 = COMPAT_TEXTURE(LinearizePass, pC4 -off2).rgb;
-	l2 = COMPAT_TEXTURE(LinearizePass, pC4 -offx).rgb;
-	l1 = COMPAT_TEXTURE(LinearizePass, pC4      ).rgb;
-	r1 = COMPAT_TEXTURE(LinearizePass, pC4 +offx).rgb;
-	r2 = COMPAT_TEXTURE(LinearizePass, pC4 +off2).rgb;
-	r3 = COMPAT_TEXTURE(LinearizePass, pC4 +offx+off2).rgb;
-
-	colmin = min(min(l1,r1), min(l2,r2));
-	colmax = max(max(l1,r1), max(l2,r2));
-	
-	if (smarte)
-	{	
-		float pc = min(smart_ei*c2.y, ei_limit);
-		float pl = min(smart_ei*max(c2.y,c2.x), ei_limit);
-		float pr = min(smart_ei*max(c2.y,c2.z), ei_limit);
-		twl1 = max(wl1-pc, 0.01*wl1); twr1 = max(wr1-pc, 0.01*wr1);
-		twl2 = max(wl2-pl, 0.01*wl2); twr2 = max(wr2-pr, 0.01*wr2);
-	}
-	
-	color2 = (l3*twl3 + l2*twl2 + l1*twl1 + r1*twr1 + r2*twr2 + r3*twr3)/(twl3+twl2+twl1+twr1+twr2+twr3);
-
-	if (sharp) color2 = clamp(mix(clamp(color2, colmin, colmax), color2, ring), 0.0, 1.0);
-
-	lm2 = max(max(l2.r,l2.g),l2.b);
-	lm1 = max(max(l1.r,l1.g),l1.b);
-	rm1 = max(max(r1.r,r1.g),r1.b);
-	rm2 = max(max(r2.r,r2.g),r2.b);
-
-	swl2 = max(twl2, 0.0) * (dot(l2,luma) + ts);
-	swl1 = max(twl1, 0.0) * (dot(l1,luma) + ts);
-	swr1 = max(twr1, 0.0) * (dot(r1,luma) + ts);
-	swr2 = max(twr2, 0.0) * (dot(r2,luma) + ts);
-	
-	float fscolor2 = (lm2*swl2 + lm1*swl1 + rm1*swr1 + rm2*swr2)/(swl2+swl1+swr1+swr2);
-	scolor2 = vec3(clamp(mix(max(max(color2.r,color2.g),color2.b), fscolor2, spike), 0.0, 1.0));
-	
-	color2 = pow(color2, vec3(scangamma/gamma_in)); 
-	
-}
-
-	vec3 ctmp = color1; float w3 = 1.0; vec3 color = color1;
-	vec3 one = vec3(1.0);
-
-	if (hscan) { color2 = color1; scolor2 = scolor1; }
-
-if (!interb)
-{	
-	// calculating scanlines
-
-	float ssub = ssharp*max(abs(scolor1.x-scolor2.x), abs(dot(color1,luma)-dot(color2,luma)));
-
-	float shape1 = mix(scanline1, scanline2 + ssub * scolor1.x * 35.0, f);
-	float shape2 = mix(scanline1, scanline2 + ssub * scolor2.x * 35.0, 1.0-f);
-	
-	float wt1 = st(f);
-	float wt2 = st(1.0-f);
-
-	vec3 color00 = color1*wt1 + color2*wt2;
-	vec3 scolor0 = scolor1*wt1 + scolor2*wt2;
-	
-	ctmp = color00/(wt1+wt2);
-	vec3 sctmp = scolor0/(wt1+wt2);
-
-	vec3 w1, w2;
-	
-	vec3 cref1 = mix(sctmp, scolor1, beam_size); float creff1 = pow(max(max(cref1.r,cref1.g),cref1.b), scan_falloff);
-	vec3 cref2 = mix(sctmp, scolor2, beam_size); float creff2 = pow(max(max(cref2.r,cref2.g),cref2.b), scan_falloff);
-
-	if (tds > 0.5) { shape1 = mix(scanline2, shape1, creff1); shape2 = mix(scanline2, shape2, creff2); }
-
-	float f1 = f; 
-	float f2 = 1.0-f;
-	
-	float mc1 = max(max(color1.r,color1.g),color1.b) + eps;
-	float mc2 = max(max(color2.r,color2.g),color2.b) + eps;
-	
-	cref1 = color1 / mc1;
-	cref2 = color2 / mc2;
-
-	if (gsl <  0.5) { w1 = sw0(f1,creff1,shape1,cref1); w2 = sw0(f2,creff2,shape2,cref2);} else
-	if (gsl == 1.0) { w1 = sw1(f1,creff1,shape1,cref1); w2 = sw1(f2,creff2,shape2,cref2);} else
-	                { w1 = sw2(f1,creff1,shape1,cref1); w2 = sw2(f2,creff2,shape2,cref2);}
-
-	vec3 w3 = w1+w2;
-	float wf1 = max(max(w3.r,w3.g),w3.b);
-	if (wf1 > 1.0) {wf1 = 1.0/wf1; w1*=wf1, w2*=wf1;}
-	
-	if (abs(clips) > 0.005)
-	{
-		sy = mc1; one = (clips > 0.0) ? w1 : 1.0.xxx;
-		float sat = 1.0001-min(min(cref1.r,cref1.g),cref1.b);
-		color1 = mix(color1, plant(pow(color1, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-		sy = mc2; one = (clips > 0.0) ? w2 : 1.0.xxx;
-		sat =       1.0001-min(min(cref2.r,cref2.g),cref2.b);
-		color2 = mix(color2, plant(pow(color2, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-	}	
-	
-	color = (gc(color1)*w1 + gc(color2)*w2);
-
-	color = min(color, 1.0);
-}
-	
-	if (interb) 
-	{
-		color = gc(color1);
-	}
-
-	float colmx = max(max(ctmp.r,ctmp.g),ctmp.b);
-
-	if(!interb) color = pow( color, vec3(gamma_in/scangamma) );
-	
-	FragColor = vec4(color, colmx);
-
-	if (HSM_GetUseFakeScanlines())
-	{
-		vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 
-														1, 
-														TUBE_DIFFUSE_SCALE, 
-														TUBE_SCALE, 
-														TUBE_DIFFUSE_ASPECT, 
-														1);
-		FragColor = HSM_ApplyScanlineMask(FragColor, 
-											screen_scale_with_overscan, 
-											screen_coord_with_overscan, 
-											screen_curved_coord_with_overscan, 
-											tube_curved_coord, 
-											HSM_FAKE_SCANLINE_OPACITY);
-	}
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced.slang
deleted file mode 100644
index a4d86e9334..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-#include "hsm-crt-guest-advanced.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced_orig.slang
deleted file mode 100644
index 4de0a53d3d..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced_orig.slang
+++ /dev/null
@@ -1,569 +0,0 @@
-#version 450
-
-/*
-   CRT - Guest - Advanced
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	float TATE, IOS, OS, BLOOM, brightboost, brightboost1, gsl, scanline1, scanline2, beam_min, beam_max, beam_size,
-	h_sharp, s_sharp, csize, bsize1, warpX, warpY, glow, spike, ring, no_scanlines, tds, clips, ssharp, hiscan;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float bloom;
-	float halation;
-	float scans;
-	float gamma_c;
-	float smart_ei;
-	float ei_limit;
-	float sth;
-	float overscanX;
-	float overscanY;
-	float c_shape;
-	float intres;
-	float prescalex;
-	float scan_falloff;
-	float bloom_dist;
-	float scangamma;
-	float bmask1;
-	float hmask1;
-} global;
-
-
-#pragma parameter hiscan "          High Resolution Scanlines (prepend a scaler...)" 0.0 0.0 1.0 1.0
-#define hiscan        params.hiscan
-
-#pragma parameter bogus_brightness "[ BRIGHTNESS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter glow "          (Magic) Glow Strength" 0.08 -2.0 2.0 0.01
-#define glow         params.glow     // Glow Strength
-
-#pragma parameter bloom "          Bloom Strength" 0.0 -2.0 2.0 0.05
-#define bloom         global.bloom     // bloom effect
-
-#pragma parameter mask_bloom "          Mask Bloom" 0.0 -2.0 2.0 0.05
-#define mask_bloom         params.mask_bloom     // bloom effect
-
-#pragma parameter bloom_dist "          Bloom Distribution" 0.0 -2.0 3.0 0.05
-#define bloom_dist         global.bloom_dist     // bloom effect distribution
-
-#pragma parameter halation "          Halation Strength" 0.0 -2.0 2.0 0.025
-#define halation         global.halation     // halation effect
-
-#pragma parameter bmask1 "          Bloom Mask Strength" 0.0 -1.0 1.0 0.025
-#define bmask1         global.bmask1     // bloom/halation mask strength
-
-#pragma parameter hmask1 "          Halation Mask Strength" 0.5 -1.0 1.0 0.025
-#define hmask1         global.hmask1     // bloom/halation mask strength
-
-#pragma parameter gamma_c "          Gamma correct" 1.0 0.50 2.0 0.025
-#define gamma_c   global.gamma_c     // adjust brightness
-
-#pragma parameter brightboost "          Bright Boost Dark Pixels" 1.40 0.25 10.0 0.05
-#define brightboost  params.brightboost     // adjust brightness
-
-#pragma parameter brightboost1 "          Bright Boost Bright Pixels" 1.10 0.25 3.00 0.025
-#define brightboost1  params.brightboost1     // adjust brightness
-
-#pragma parameter clips "          Clip Saturated Color Beams" 0.0 -1.0 1.0 0.05
-#define clips  params.clips     // kinky effect
-
-#pragma parameter bogus_scanline "[ SCANLINE OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter gsl "          Scanline Type" 0.0 -1.0 2.0 1.0
-#define gsl          params.gsl      // Alternate scanlines
-
-#pragma parameter scanline1 "          Scanline Beam Shape Center" 6.0 -20.0 40.0 0.5
-#define scanline1    params.scanline1      // scanline param, vertical sharpness
-
-#pragma parameter scanline2 "          Scanline Beam Shape Edges" 8.0 0.0 70.0 1.0 
-#define scanline2    params.scanline2      // scanline param, vertical sharpness
-
-#pragma parameter beam_min "          Scanline Shape Dark Pixels" 1.30 0.25 10.0 0.05
-#define beam_min     params.beam_min     // dark area beam min - narrow
-
-#pragma parameter beam_max "          Scanline Shape Bright Pixels" 1.00 0.2 3.5 0.025
-#define beam_max     params.beam_max     // bright area beam max - wide
-
-#pragma parameter tds "          Thinner Dark Scanlines" 0.0 0. 1.0 1.0
-#define tds     params.tds     // thinner dark scanlines
-
-#pragma parameter beam_size "          Increased Bright Scanline Beam" 0.60 0.0 1.0 0.05
-#define beam_size    params.beam_size     // increased max. beam size
-
-#pragma parameter scans "          Scanline Saturation / Mask Falloff" 0.50 0.0 6.0 0.10
-#define scans        1.5*global.scans     // scanline saturation
-
-#pragma parameter scan_falloff "          Scanline Falloff" 1.0 0.10 2.0 0.025
-#define scan_falloff        global.scan_falloff     // scanline falloff
-
-#pragma parameter spike "          Scanline Spike Removal" 1.0 0.0 2.0 0.10
-#define spike params.spike
-
-#pragma parameter ssharp "          Smart Sharpen Scanlines" 0.0 0.0 0.30 0.01
-#define ssharp params.ssharp
-
-#pragma parameter scangamma "          Scanline Gamma" 2.40 0.5 5.0 0.05
-#define scangamma global.scangamma
-
-#pragma parameter no_scanlines "          No-scanline mode" 0.0 0.0 1.5 0.05
-#define no_scanlines params.no_scanlines
-
-#pragma parameter bogus_filtering "[ FILTERING OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter h_sharp "          Horizontal sharpness" 5.20 0.20 15.0 0.10
-#define h_sharp      params.h_sharp     // pixel sharpness
-
-#pragma parameter s_sharp "          Substractive sharpness (1.0 recommended)" 0.50 0.0 2.0 0.10
-#define s_sharp      params.s_sharp     // substractive sharpness
-
-#pragma parameter ring "          Substractive sharpness Ringing" 0.0 0.0 3.0 0.05
-#define ring      params.ring     // substractive sharpness ringing
-
-#pragma parameter smart_ei "          Smart Edges Effect Strength" 0.0 0.0 0.75 0.01
-#define smart_ei      global.smart_ei     // smart edge handling
-
-#pragma parameter ei_limit "          Smart Edges Effect Strength Limit" 0.25 0.0 0.75 0.01
-#define ei_limit      global.ei_limit     // smart edge handling
-
-#pragma parameter sth     "          Smart Edges Smoothing Threshold" 0.23 0.0 1.0 0.01
-#define sth        global.sth     // corner size
-
-#pragma parameter bogus_screen "[ SCREEN OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter intres "          Internal Resolution Y: 0.5...y-dowsample" 0.0 0.0 6.0 0.5 // Joint parameter with linearize pass, values must match
-
-#pragma parameter TATE "          TATE Mode" 0.0 0.0 1.0 1.0
-#define TATE         params.TATE     // Screen orientation
-
-#pragma parameter IOS "          Integer Scaling: Odd:Y, Even:'X'+Y" 0.0 0.0 4.0 1.0
-#define IOS          params.IOS     // Smart Integer Scaling
-
-#pragma parameter OS "          R. Bloom Overscan Mode" 1.0 0.0 2.0 1.0
-#define OS           params.OS     // Do overscan
-
-#pragma parameter BLOOM "          Raster bloom %" 0.0 0.0 20.0 1.0
-#define BLOOM        params.BLOOM     // Bloom overscan percentage
-
-#pragma parameter warpX "          CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-#define warpX        params.warpX     // Curvature X
-
-#pragma parameter warpY "          CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-#define warpY        params.warpY     // Curvature Y
-
-#pragma parameter c_shape "          Curvature Shape" 0.25 0.05 0.60 0.05
-#define c_shape        global.c_shape     // curvature shape
-
-#pragma parameter overscanX "          Overscan X original pixels" 0.0 -200.0 200.0 1.0
-#define overscanX        global.overscanX     // OverscanX pixels
-
-#pragma parameter overscanY "          Overscan Y original pixels" 0.0 -200.0 200.0 1.0
-#define overscanY        global.overscanY     // OverscanY pixels
-
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define TEX0 vTexCoord
-
-#define OutputSize global.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPass;
-layout(set = 0, binding = 4) uniform sampler2D PrePass;
-
-#define eps 1e-10 
-
-float st(float x)
-{
-	return exp2(-10.0*x*x);
-} 
-
-float st1(float x)
-{
-	return exp2(-8.0*x*x);
-}
-   
-vec3 sw0(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix(beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);
-	float ex = x*tmp;
-	ex = (gsl > -0.5) ? ex*ex : mix(ex*ex, ex*ex*ex, 0.4);
-	return exp2(-scanline*ex*sat);
-} 
-
-vec3 sw1(float x, float color, float scanline, vec3 c)
-{	
-	x = mix (x, beam_min*x, max(x-0.4*color,0.0));
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	float tmp = mix(1.2*beam_min, beam_max, color);
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}    
-
-vec3 sw2(float x, float color, float scanline, vec3 c)
-{
-	float tmp = mix((2.5-0.5*color)*beam_min, beam_max, color);
-	vec3 sat = mix(1.0.xxx + scans, 1.0.xxx, c);	
-	tmp = mix(beam_max, tmp, pow(x, color+0.3));
-	float ex = x*tmp;
-	return exp2(-scanline*ex*ex*sat);
-}   
-
- 
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx,dy);
-	return pos*0.5+0.5;
-} 
-
-
-vec3 gc(vec3 c)
-{
-	float mc = max(max(c.r,c.g),c.b);
-	float mg = pow(mc, 1.0/gamma_c);
-	return c * mg/(mc + eps);  
-}
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-
-void main()
-{
-	vec2 prescalex = vec2(vec2(textureSize(LinearizePass, 0))/global.OriginalSize.xy);
-	
-	vec4 SourceSize = global.OriginalSize * mix( vec4(prescalex.x, 1.0, 1.0/prescalex.x, 1.0), vec4(1.0, prescalex.y, 1.0, 1.0/prescalex.y), TATE);
-	
-	float lum = COMPAT_TEXTURE(AvgLumPass, vec2(0.5,0.5)).a;
-	
-	float gamma_in = 1.0/COMPAT_TEXTURE(LinearizePass, vec2(0.25,0.25)).a;
-	float intera = COMPAT_TEXTURE(LinearizePass, vec2(0.75,0.25)).a;
-	bool hscan = (hiscan > 0.5);
-	bool interb  = (((intera < 0.35) || (no_scanlines > 0.025)) && !hscan);
-	bool notate  = (TATE < 0.5);
-	bool vgascan = ((abs(intera-0.5) < 0.05) && (no_scanlines == 0.0));
-
-	float SourceY = mix(SourceSize.y, SourceSize.x, TATE);
-	
-	float sy = 1.0;
-	if (global.intres == 1.0) sy = SourceY/224.0;
-	if (global.intres > 0.25 && global.intres != 1.0) sy = global.intres;
-	
-	// VGA Scan Mode
-	if (vgascan) sy = 0.5; else if (abs(intera-0.75) < 0.05) sy = 1.0;
-	
-	if (notate) SourceSize*=vec4(1.0, 1.0/sy, 1.0, sy); else SourceSize*=vec4(1.0/sy, 1.0, sy, 1.0);
-	
-	// Calculating texel coordinates
-   
-	vec2 texcoord = TEX0.xy;
-	if (IOS > 0.0 && !interb){
-		vec2 ofactor = OutputSize.xy/global.OriginalSize.xy;
-		vec2 intfactor = (IOS < 2.5) ? floor(ofactor) : ceil(ofactor);
-		vec2 diff = ofactor/intfactor;
-		float scan = mix(diff.y, diff.x, TATE);
-		texcoord = Overscan(texcoord, scan, scan);
-		if (IOS == 1.0 || IOS == 3.0) texcoord = mix(vec2(TEX0.x, texcoord.y), vec2(texcoord.x, TEX0.y), TATE);
-	}
-   
-	float factor  = 1.00 + (1.0-0.5*OS)*BLOOM/100.0 - lum*BLOOM/100.0;
-	texcoord  = Overscan(texcoord, factor, factor);
-
-	texcoord = Overscan(texcoord, (global.OriginalSize.x - overscanX)/global.OriginalSize.x, (global.OriginalSize.y - overscanY)/global.OriginalSize.y);
-
-	vec2 pos  = Warp(texcoord);
-   
-	bool smarte  = (smart_ei > 0.01 && notate); // smart edge interpolation on / off
-
-	vec2 coffset = vec2(0.5, 0.5);
-	
-	vec2 ps = SourceSize.zw;
-	vec2 OGL2Pos = pos * SourceSize.xy - coffset;
-	vec2 fp = fract(OGL2Pos);
-	
-	vec2 dx = vec2(ps.x,0.0);
-	vec2 dy = vec2(0.0, ps.y);
-   
-	// Reading the texels
-	vec2 x2 = 2.0*dx;
-	vec2 y2 = 2.0*dy;
-
-	vec2 offx = dx;
-	vec2 off2 = x2;
-	vec2 offy = dy;
-	float fpx = fp.x;
-	if(!notate)
-	{
-		offx = dy;
-		off2 = y2;
-		offy = dx;
-		fpx = fp.y;
-	}
-	float  f = (notate) ? fp.y : fp.x;
-	
-	vec2 pC4 = floor(OGL2Pos) * ps + 0.5*ps; 
-	
-	if ((global.intres == 0.5 &&  notate && prescalex.y < 1.5) || vgascan) pC4.y = floor(pC4.y * global.OriginalSize.y)*global.OriginalSize.w + 0.5*global.OriginalSize.w;
-	if ((global.intres == 0.5 && !notate && prescalex.x < 1.5) || (vgascan && !notate)) pC4.x = floor(pC4.x * global.OriginalSize.x)*global.OriginalSize.z + 0.5*global.OriginalSize.z;
-	
-	if (interb && no_scanlines < 0.025 && !hscan)  pC4.y = pos.y; else if (interb) pC4.y = pC4.y + smoothstep(0.40-0.5*no_scanlines, 0.60 + 0.5*no_scanlines, f)*mix(SourceSize.w, SourceSize.z, TATE);
-	if (hscan) pC4 = mix(vec2(pC4.x, pos.y), vec2(pos.x, pC4.y), TATE);
-	
-	float zero = exp2(-h_sharp);
-	float sharp1 = s_sharp * zero;
-	
-	float idiv = clamp(mix(SourceSize.x, SourceSize.y, TATE) / 400.0, 1.0, 2.0);
-	float fdivider = max(min(mix(prescalex.x, prescalex.y,TATE), 2.0), idiv*float(interb));
-	
-	float wl3 = (2.0 + fpx)/fdivider;
-	float wl2 = (1.0 + fpx)/fdivider;
-	float wl1 = (      fpx)/fdivider;
-	float wr1 = (1.0 - fpx)/fdivider;
-	float wr2 = (2.0 - fpx)/fdivider;
-	float wr3 = (3.0 - fpx)/fdivider;
-
-	wl3*=wl3; wl3 = exp2(-h_sharp*wl3);
-	wl2*=wl2; wl2 = exp2(-h_sharp*wl2);
-	wl1*=wl1; wl1 = exp2(-h_sharp*wl1);
-	wr1*=wr1; wr1 = exp2(-h_sharp*wr1);
-	wr2*=wr2; wr2 = exp2(-h_sharp*wr2);
-	wr3*=wr3; wr3 = exp2(-h_sharp*wr3);
-	
-	float fp1 = 1.-fpx;
-
-	float twl3 = max(wl3 - sharp1, 0.0);
-	float twl2 = max(wl2 - sharp1, mix(-0.12, 0.0, 1.0-fp1*fp1));
-	float twl1 = max(wl1 - sharp1, -0.12);
-	float twr1 = max(wr1 - sharp1, -0.12);
-	float twr2 = max(wr2 - sharp1, mix(-0.12, 0.0, 1.0-fpx*fpx));
-	float twr3 = max(wr3 - sharp1, 0.0);
-	
-	bool sharp = (sharp1 > 0.0);
-
-	vec3 c1, c2;
-	
-	if (smarte)
-	{
-		twl3 = 0.0; twr3 = 0.0;
-		c1 = COMPAT_TEXTURE(AvgLumPass, pC4       ).xyz;		
-		c2 = COMPAT_TEXTURE(AvgLumPass, pC4 + offy).xyz;
-		c1 = max(c1 - sth, 0.0);
-		c2 = max(c2 - sth, 0.0);
-	}
-	
-	vec3 l3, l2, l1, r1, r2, r3, color1, color2, colmin, colmax;
-
-	l3 = COMPAT_TEXTURE(LinearizePass, pC4 -off2).rgb;
-	l2 = COMPAT_TEXTURE(LinearizePass, pC4 -offx).rgb;
-	l1 = COMPAT_TEXTURE(LinearizePass, pC4      ).rgb;
-	r1 = COMPAT_TEXTURE(LinearizePass, pC4 +offx).rgb;
-	r2 = COMPAT_TEXTURE(LinearizePass, pC4 +off2).rgb;
-	r3 = COMPAT_TEXTURE(LinearizePass, pC4 +offx+off2).rgb;
-
-	colmin = min(min(l1,r1), min(l2,r2));
-	colmax = max(max(l1,r1), max(l2,r2));
-	
-	if (smarte)
-	{	
-		float pc = min(smart_ei*c1.y, ei_limit);
-		float pl = min(smart_ei*max(c1.y,c1.x), ei_limit);
-		float pr = min(smart_ei*max(c1.y,c1.z), ei_limit);
-		twl1 = max(wl1-pc, 0.01*wl1); twr1 = max(wr1-pc, 0.01*wr1);
-		twl2 = max(wl2-pl, 0.01*wl2); twr2 = max(wr2-pr, 0.01*wr2);
-	}
-	
-	color1 = (l3*twl3 + l2*twl2 + l1*twl1 + r1*twr1 + r2*twr2 + r3*twr3)/(twl3+twl2+twl1+twr1+twr2+twr3);
-
-	if (sharp) color1 = clamp(mix(clamp(color1, colmin, colmax), color1, ring), 0.0, 1.0);
-	float ts = 0.025;
-	vec3 luma = vec3(0.2126, 0.7152, 0.0722);
-	
-	float lm2 = max(max(l2.r,l2.g),l2.b);
-	float lm1 = max(max(l1.r,l1.g),l1.b);
-	float rm1 = max(max(r1.r,r1.g),r1.b);
-	float rm2 = max(max(r2.r,r2.g),r2.b);	
-	
-	float swl2 = max(twl2, 0.0) * (dot(l2,luma) + ts);
-	float swl1 = max(twl1, 0.0) * (dot(l1,luma) + ts);
-	float swr1 = max(twr1, 0.0) * (dot(r1,luma) + ts);
-	float swr2 = max(twr2, 0.0) * (dot(r2,luma) + ts);
-	
-	float fscolor1 = (lm2*swl2 + lm1*swl1 + rm1*swr1 + rm2*swr2)/(swl2+swl1+swr1+swr2);
-	vec3 scolor1 = vec3(clamp(mix(max(max(color1.r,color1.g),color1.b), fscolor1, spike), 0.0, 1.0));
-
-	if(!interb) color1 = pow(color1, vec3(scangamma/gamma_in));
-	
-	vec3 scolor2;
-	
-	if (!interb && !hscan)
-{	
-	pC4+=offy;
-
-	if ((global.intres == 0.5 &&  notate && prescalex.y < 1.5) || vgascan) pC4.y = floor((pos.y + 0.33*offy.y) * global.OriginalSize.y)*global.OriginalSize.w + 0.5*global.OriginalSize.w;
-	if ((global.intres == 0.5 && !notate && prescalex.x < 1.5) || (vgascan && !notate)) pC4.x = floor((pos.x + 0.33*offy.x) * global.OriginalSize.x)*global.OriginalSize.z + 0.5*global.OriginalSize.z;
-	
-	l3 = COMPAT_TEXTURE(LinearizePass, pC4 -off2).rgb;
-	l2 = COMPAT_TEXTURE(LinearizePass, pC4 -offx).rgb;
-	l1 = COMPAT_TEXTURE(LinearizePass, pC4      ).rgb;
-	r1 = COMPAT_TEXTURE(LinearizePass, pC4 +offx).rgb;
-	r2 = COMPAT_TEXTURE(LinearizePass, pC4 +off2).rgb;
-	r3 = COMPAT_TEXTURE(LinearizePass, pC4 +offx+off2).rgb;
-
-	colmin = min(min(l1,r1), min(l2,r2));
-	colmax = max(max(l1,r1), max(l2,r2));
-	
-	if (smarte)
-	{	
-		float pc = min(smart_ei*c2.y, ei_limit);
-		float pl = min(smart_ei*max(c2.y,c2.x), ei_limit);
-		float pr = min(smart_ei*max(c2.y,c2.z), ei_limit);
-		twl1 = max(wl1-pc, 0.01*wl1); twr1 = max(wr1-pc, 0.01*wr1);
-		twl2 = max(wl2-pl, 0.01*wl2); twr2 = max(wr2-pr, 0.01*wr2);
-	}
-	
-	color2 = (l3*twl3 + l2*twl2 + l1*twl1 + r1*twr1 + r2*twr2 + r3*twr3)/(twl3+twl2+twl1+twr1+twr2+twr3);
-	
-	if (sharp) color2 = clamp(mix(clamp(color2, colmin, colmax), color2, ring), 0.0, 1.0);
-
-	lm2 = max(max(l2.r,l2.g),l2.b);
-	lm1 = max(max(l1.r,l1.g),l1.b);
-	rm1 = max(max(r1.r,r1.g),r1.b);
-	rm2 = max(max(r2.r,r2.g),r2.b);
-	
-	swl2 = max(twl2, 0.0) * (dot(l2,luma) + ts);
-	swl1 = max(twl1, 0.0) * (dot(l1,luma) + ts);
-	swr1 = max(twr1, 0.0) * (dot(r1,luma) + ts);
-	swr2 = max(twr2, 0.0) * (dot(r2,luma) + ts);
-	
-	float fscolor2 = (lm2*swl2 + lm1*swl1 + rm1*swr1 + rm2*swr2)/(swl2+swl1+swr1+swr2);
-	scolor2 = vec3(clamp(mix(max(max(color2.r,color2.g),color2.b), fscolor2, spike), 0.0, 1.0));
-	
-	color2 = pow(color2, vec3(scangamma/gamma_in)); 
-	
-}
-
-	vec3 ctmp = color1; float w3 = 1.0; vec3 color = color1;
-	vec3 one = vec3(1.0);
-
-	if (hscan) { color2 = color1; scolor2 = scolor1; }
-
-if (!interb)
-{	
-	// calculating scanlines
-
-	float ssub = ssharp*max(abs(scolor1.x-scolor2.x), abs(dot(color1,luma)-dot(color2,luma)));
-
-	float shape1 = mix(scanline1, scanline2 + ssub * scolor1.x * 35.0, f);
-	float shape2 = mix(scanline1, scanline2 + ssub * scolor2.x * 35.0, 1.0-f);
-	
-	float wt1 = st(f);
-	float wt2 = st(1.0-f);
-
-	vec3 color00 = color1*wt1 + color2*wt2;
-	vec3 scolor0 = scolor1*wt1 + scolor2*wt2;
-	
-	ctmp = color00/(wt1+wt2);
-	vec3 sctmp = scolor0/(wt1+wt2);
-	
-	vec3 w1, w2;
-	
-	vec3 cref1 = mix(sctmp, scolor1, beam_size); float creff1 = pow(max(max(cref1.r,cref1.g),cref1.b), scan_falloff);
-	vec3 cref2 = mix(sctmp, scolor2, beam_size); float creff2 = pow(max(max(cref2.r,cref2.g),cref2.b), scan_falloff);
-
-	if (tds > 0.5) { shape1 = mix(scanline2, shape1, creff1); shape2 = mix(scanline2, shape2, creff2); }
-
-	float f1 = f; 
-	float f2 = 1.0-f;
-
-	float mc1 = max(max(color1.r,color1.g),color1.b) + eps;
-	float mc2 = max(max(color2.r,color2.g),color2.b) + eps;
-	
-	cref1 = color1 / mc1;
-	cref2 = color2 / mc2;
-
-	if (gsl <  0.5) { w1 = sw0(f1,creff1,shape1,cref1); w2 = sw0(f2,creff2,shape2,cref2);} else
-	if (gsl == 1.0) { w1 = sw1(f1,creff1,shape1,cref1); w2 = sw1(f2,creff2,shape2,cref2);} else
-	                { w1 = sw2(f1,creff1,shape1,cref1); w2 = sw2(f2,creff2,shape2,cref2);}
-
-	vec3 w3 = w1+w2;
-	float wf1 = max(max(w3.r,w3.g),w3.b);
-	if (wf1 > 1.0) {wf1 = 1.0/wf1; w1*=wf1, w2*=wf1;}
-	
-	if (abs(clips) > 0.005)
-	{
-		sy = mc1; one = (clips > 0.0) ? w1 : 1.0.xxx;
-		float sat = 1.0001-min(min(cref1.r,cref1.g),cref1.b);
-		color1 = mix(color1, plant(pow(color1, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-		sy = mc2; one = (clips > 0.0) ? w2 : 1.0.xxx;
-		sat =       1.0001-min(min(cref2.r,cref2.g),cref2.b);
-		color2 = mix(color2, plant(pow(color2, 0.70.xxx-0.325*sat),sy), pow(sat,0.3333)*one*abs(clips));
-	}	
-	
-	color = (gc(color1)*w1 + gc(color2)*w2);
-	
-	color = min(color, 1.0);
-}
-	
-	if (interb) 
-	{
-		color = gc(color1);
-	}
-
-	float colmx = max(max(ctmp.r,ctmp.g),ctmp.b);
-
-	if(!interb) color = pow( color, vec3(gamma_in/scangamma) );
-	
-	FragColor = vec4(color, colmx);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen copy.inc b/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen copy.inc
deleted file mode 100644
index a14b48066b..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen copy.inc	
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-   Fast Sharpen Shader
-   
-   Copyright (C) 2005 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 DerezedPassSize;
-	float SHARPEN_ON;
-	float CSHARPEN, CCONTR, CDETAILS, DEBLUR;
-} params;
-
-#pragma parameter SHARPEN_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter SHARPEN_TITLE  	"[ FAST SHARPEN - GUEST.R ]:"         			0.00 0.0 2.00 0.05
-#pragma parameter SHARPEN_ON  		"          FSharpen - ON"       		1 0 1 1
-
-#pragma parameter CSHARPEN  		"          FSharpen - Sharpen strength"         0.00 0.0 5.00 0.10 
-#pragma parameter CCONTR    		"          FSharpen - Sharpen Contrast/Ringing" 0.05 0.0 0.25 0.01 
-#pragma parameter CDETAILS  		"          FSharpen - Details sharpened"        1.00 0.0 1.00 0.05 
-#pragma parameter DEBLUR    		"          FSharpen - Deblur Strength (For NTSC Only)"          1.00 1.0 7.00 0.25 
-
-#define SHARPEN_ON params.SHARPEN_ON
-#define CSHARPEN params.CSHARPEN
-#define CCONTR params.CCONTR
-#define CDETAILS params.CDETAILS
-#define DEBLUR params.DEBLUR
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#ifdef IS_NTSC_PRESET
-	layout(set = 0, binding = 3) uniform sampler2D PrePass0;
-#else
-	#define PrePass0 Source
-#endif
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-void main()
-{
-	if ( SHARPEN_ON < 0.5 )
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	vec2 g01 = vec2(-0.5*params.DerezedPassSize.z, 0.0);
-	vec2 g21 = vec2( 0.5*params.DerezedPassSize.z, 0.0); 
-
-	vec3 c01 = texture(Source, vTexCoord + g01).rgb;
-	vec3 c21 = texture(Source, vTexCoord + g21).rgb;
-	vec3 c11 = texture(Source, vTexCoord      ).rgb;
-	
-	vec3 b11 = 0.5*(c01+c21); 
-	
-	float contrast = max(max(c11.r,c11.g),c11.b);
-	contrast = mix(2.0*CCONTR, CCONTR, contrast);
-	
-	vec3 mn = min(min(c01,c21),c11); vec3 mn1 = min(mn,c11*(1.0-contrast));
-	vec3 mx = max(max(c01,c21),c11); vec3 mx1 = max(mx,c11*(1.0+contrast));
-	
-	vec3 dif = pow(mx1-mn1+0.0001, vec3(0.75,0.75,0.75));
-	vec3 sharpen = mix(vec3(CSHARPEN*CDETAILS), vec3(CSHARPEN), dif);
-	
-	vec3 res = clamp(mix(c11,b11,-sharpen), mn1,mx1);
-
-if (DEBLUR > 1.125) 
-{
-	c01 = texture(PrePass0, vTexCoord + 2.0*g01).rgb;
-	c21 = texture(PrePass0, vTexCoord + 2.0*g21).rgb;
-	c11 = texture(PrePass0, vTexCoord      ).rgb;
-
-	mn1 = sqrt(min(min(c01,c21), c11)*mn);
-	mx1 = sqrt(max(max(c01,c21), c11)*mx);
-
-	vec3 dif1 = max(res-mn1, 0.0) + 0.00001; dif1 = pow(dif1, DEBLUR.xxx);
-	vec3 dif2 = max(mx1-res, 0.0) + 0.00001; dif2 = pow(dif2, DEBLUR.xxx);
-	
-	vec3 ratio = dif1/(dif1+dif2);
-	sharpen  = min(mix(mn1, mx1, ratio), pow(res,mix(0.75.xxx,1.10.xxx, res)));
-	res = rgb2yiq(res);
-	res.x = dot(sharpen,vec3(0.2989, 0.5870, 0.1140));
-	res = max(yiq2rgb(res),0.0);
-}
-	
-	FragColor = vec4(res,1.0); 
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen-ntsc.slang b/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
deleted file mode 100644
index bd6ae42ba1..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen-ntsc.slang
+++ /dev/null
@@ -1,4 +0,0 @@
-#version 450
-
-#define IS_NTSC_PRESET
-#include "hsm-custom-fast-sharpen.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen.inc b/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen.inc
deleted file mode 100644
index a354d901bc..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen.inc
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-   Fast Sharpen Shader
-   
-   Copyright (C) 2005 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 DerezedPassSize;
-	float SHARPEN_ON;
-	float CSHARPEN, CCONTR, CDETAILS, DEBLUR;
-} params;
-
-#pragma parameter SHARPEN_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter SHARPEN_TITLE  	"[ FAST SHARPEN - GUEST.R ]:"         			0.00 0.0 2.00 0.05
-#pragma parameter SHARPEN_ON  		"          FSharpen - ON"       		1 0 1 1
-
-#pragma parameter CSHARPEN  		"          FSharpen - Sharpen strength"         0.00 0.0 5.00 0.10 
-#pragma parameter CCONTR    		"          FSharpen - Sharpen Contrast/Ringing" 0.05 0.0 0.25 0.01 
-#pragma parameter CDETAILS  		"          FSharpen - Details sharpened"        1.00 0.0 1.00 0.05 
-#pragma parameter DEBLUR    		"          FSharpen - Deblur Strength (For NTSC Only)"          1.00 1.0 7.00 0.25 
-
-#define SHARPEN_ON params.SHARPEN_ON
-#define CSHARPEN params.CSHARPEN
-#define CCONTR params.CCONTR
-#define CDETAILS params.CDETAILS
-#define DEBLUR params.DEBLUR
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#ifdef IS_NTSC_PRESET
-	layout(set = 0, binding = 3) uniform sampler2D PrePass0;
-#else
-	#define PrePass0 Source
-#endif
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-void main()
-{
-	if ( SHARPEN_ON < 0.5 )
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	vec2 g01 = vec2(-0.5*params.DerezedPassSize.z, 0.0);
-	vec2 g21 = vec2( 0.5*params.DerezedPassSize.z, 0.0); 
-
-	vec3 c01 = texture(Source, vTexCoord + g01).rgb;
-	vec3 c21 = texture(Source, vTexCoord + g21).rgb;
-	vec3 c11 = texture(Source, vTexCoord      ).rgb;
-	
-	vec3 b11 = 0.5*(c01+c21); 
-	
-	float contrast = max(max(c11.r,c11.g),c11.b);
-	contrast = mix(2.0*CCONTR, CCONTR, contrast);
-	
-	vec3 mn = min(min(c01,c21),c11); vec3 mn1 = min(mn,c11*(1.0-contrast));
-	vec3 mx = max(max(c01,c21),c11); vec3 mx1 = max(mx,c11*(1.0+contrast));
-	
-	vec3 dif = pow(mx1-mn1+0.0001, vec3(0.75,0.75,0.75));
-	vec3 sharpen = mix(vec3(CSHARPEN*CDETAILS), vec3(CSHARPEN), dif);
-	
-	vec3 res = clamp(mix(c11,b11,-sharpen), mn1,mx1);
-
-#ifdef IS_NTSC_PRESET
-if (DEBLUR > 1.125) 
-{
-	c01 = texture(PrePass0, vTexCoord + 2.0*g01).rgb;
-	c21 = texture(PrePass0, vTexCoord + 2.0*g21).rgb;
-	c11 = texture(PrePass0, vTexCoord      ).rgb;
-
-	mn1 = sqrt(min(min(c01,c21), c11)*mn);
-	mx1 = sqrt(max(max(c01,c21), c11)*mx);
-
-	vec3 dif1 = max(res-mn1, 0.0) + 0.00001; dif1 = pow(dif1, DEBLUR.xxx);
-	vec3 dif2 = max(mx1-res, 0.0) + 0.00001; dif2 = pow(dif2, DEBLUR.xxx);
-	
-	vec3 ratio = dif1/(dif1+dif2);
-	sharpen  = min(mix(mn1, mx1, ratio), pow(res,mix(0.75.xxx,1.10.xxx, res)));
-	res = rgb2yiq(res);
-	res.x = dot(sharpen,vec3(0.2989, 0.5870, 0.1140));
-	res = max(yiq2rgb(res),0.0);
-}
-#endif
-	
-	FragColor = vec4(res,1.0); 
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen.slang b/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen.slang
deleted file mode 100644
index 50eb1a5a82..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen.slang
+++ /dev/null
@@ -1,3 +0,0 @@
-#version 450
-
-#include "hsm-custom-fast-sharpen.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen_orig.slang
deleted file mode 100644
index 729dc19572..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-custom-fast-sharpen_orig.slang
+++ /dev/null
@@ -1,127 +0,0 @@
-#version 450
-
-/*
-   Fast Sharpen Shader (Custom)
-   
-   Copyright (C) 2005 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float CSHARPEN, CCONTR, CDETAILS, DEBLUR;
-} params;
-
-#pragma parameter CSHARPEN  "FSharpen - Sharpen strength"         0.00 0.0 5.00 0.10 
-#pragma parameter CCONTR    "FSharpen - Sharpen Contrast/Ringing" 0.05 0.0 0.25 0.01 
-#pragma parameter CDETAILS  "FSharpen - Details sharpened"        1.00 0.0 1.00 0.05 
-#pragma parameter DEBLUR    "FSharpen - Deblur Strength"          1.00 1.0 7.00 0.25 
-
-#define CSHARPEN params.CSHARPEN
-#define CCONTR params.CCONTR
-#define CDETAILS params.CDETAILS
-#define DEBLUR params.DEBLUR
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PrePass0;
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-void main()
-{
-	vec2 g01 = vec2(-0.5*params.OriginalSize.z, 0.0);
-	vec2 g21 = vec2( 0.5*params.OriginalSize.z, 0.0); 
-
-	vec3 c01 = texture(Source, vTexCoord + g01).rgb;
-	vec3 c21 = texture(Source, vTexCoord + g21).rgb;
-	vec3 c11 = texture(Source, vTexCoord      ).rgb;
-	
-	vec3 b11 = 0.5*(c01+c21); 
-	
-	float contrast = max(max(c11.r,c11.g),c11.b);
-	contrast = mix(2.0*CCONTR, CCONTR, contrast);
-	
-	vec3 mn = min(min(c01,c21),c11); vec3 mn1 = min(mn,c11*(1.0-contrast));
-	vec3 mx = max(max(c01,c21),c11); vec3 mx1 = max(mx,c11*(1.0+contrast));
-	
-	vec3 dif = pow(mx1-mn1+0.0001, vec3(0.75,0.75,0.75));
-	vec3 sharpen = mix(vec3(CSHARPEN*CDETAILS), vec3(CSHARPEN), dif);
-	
-	vec3 res = clamp(mix(c11,b11,-sharpen), mn1,mx1);
-
-if (DEBLUR > 1.125) 
-{
-	c01 = texture(PrePass0, vTexCoord + 2.0*g01).rgb;
-	c21 = texture(PrePass0, vTexCoord + 2.0*g21).rgb;
-	c11 = texture(PrePass0, vTexCoord      ).rgb;
-
-	mn1 = sqrt(min(min(c01,c21), c11)*mn);
-	mx1 = sqrt(max(max(c01,c21), c11)*mx);
-
-	vec3 dif1 = max(res-mn1, 0.0) + 0.00001; dif1 = pow(dif1, DEBLUR.xxx);
-	vec3 dif2 = max(mx1-res, 0.0) + 0.00001; dif2 = pow(dif2, DEBLUR.xxx);
-	
-	vec3 ratio = dif1/(dif1+dif2);
-	sharpen  = min(mix(mn1, mx1, ratio), pow(res,mix(0.75.xxx,1.10.xxx, res)));
-	res = rgb2yiq(res);
-	res.x = dot(sharpen,vec3(0.2989, 0.5870, 0.1140));
-	res = max(yiq2rgb(res),0.0);
-}
-	
-	FragColor = vec4(res,1.0); 
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-no-reflect.slang b/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-no-reflect.slang
deleted file mode 100644
index 769b90ffee..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-no-reflect.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-deconvergence.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-ntsc_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-ntsc_orig.slang
deleted file mode 100644
index 8ca9202403..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-ntsc_orig.slang
+++ /dev/null
@@ -1,828 +0,0 @@
-#version 450
-
-/*
-   CRT - Guest - Advanced
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	float IOS, OS, BLOOM, brightboost, brightboost1, csize, bsize1, warpX, warpY, glow, shadowMask, masksize,
-	slotmask, slotmask1, slotwidth, double_slot, mcut, maskDark, maskLight, maskstr, mshift, mask_layout, mask_bloom, hiscan;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float bloom;
-	float halation;
-	float slotms;
-	float mask_gamma;
-	float gamma_out;
-	float overscanX;
-	float overscanY;	
-	float intres;
-	float c_shape;
-	float barspeed;
-	float barintensity;   
-	float bardir;
-	float sborder;
-	float bloom_dist;
-	float deconr;
-	float decons;
-	float addnoised;
-	float noiseresd;
-	float noisetype;
-	float deconrr;
-	float deconrg;
-	float deconrb;
-	float deconrry;
-	float deconrgy;
-	float deconrby;	
-	float dctypex;
-	float dctypey;
-	float post_br;
-	float maskboost;
-	float smoothmask;
-	float gamma_c;
-	float m_glow;
-	float m_glow_low;
-	float m_glow_high;
-	float m_glow_dist;
-	float m_glow_mask;
-	float smask_mit;
-	float mask_zoom;
-	float no_scanlines;
-	float bmask;
-	float bmask1;
-	float hmask1;
-	float mzoom_sh;	
-} global;
-
-#pragma parameter hiscan "          High Resolution Scanlines (prepend a scaler...)" 0.0 0.0 1.0 1.0
-#define hiscan        params.hiscan
-
-#pragma parameter no_scanlines "          No-scanline mode" 0.0 0.0 1.5 0.05
-
-#pragma parameter bogus_brightness "[ BRIGHTNESS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter m_glow "          Ordinary Glow / Magic Glow" 0.0 0.0 1.0 1.0
-
-#pragma parameter m_glow_low "          Magic Glow Low Strength" 0.35 0.0 7.0 0.05 
-
-#pragma parameter m_glow_high "          Magic Glow High Strength" 5.0 0.0 7.0 0.10 
-
-#pragma parameter m_glow_dist "          Magic Glow Distribution" 1.0 0.20 4.0 0.05 
-
-#pragma parameter m_glow_mask "          Magic Glow Mask Strength" 1.0 0.0 2.0 0.025
-
-#pragma parameter glow "          (Magic) Glow Strength" 0.08 -2.0 2.0 0.01
-#define glow         params.glow     // Glow Strength
-
-#pragma parameter bloom "          Bloom Strength" 0.0 -2.0 2.0 0.05
-#define bloom         global.bloom     // bloom effect
-
-#pragma parameter mask_bloom "          Mask Bloom" 0.0 -2.0 2.0 0.05
-#define mask_bloom         params.mask_bloom     // bloom effect
-
-#pragma parameter bloom_dist "          Bloom Distribution" 0.0 -2.0 3.0 0.05
-#define bloom_dist         global.bloom_dist     // bloom effect distribution
-
-#pragma parameter halation "          Halation Strength" 0.0 -2.0 2.0 0.025
-#define halation         global.halation     // halation effect
-
-#pragma parameter bmask1 "          Bloom Mask Strength" 0.0 -1.0 1.0 0.025
-#define bmask1         global.bmask1     // bloom/halation mask strength
-
-#pragma parameter hmask1 "          Halation Mask Strength" 0.5 -1.0 1.0 0.025
-#define hmask1         global.hmask1     // bloom/halation mask strength
-
-#pragma parameter brightboost "          Bright Boost Dark Pixels" 1.40 0.25 10.0 0.05
-#define brightboost  params.brightboost     // adjust brightness
-
-#pragma parameter brightboost1 "          Bright Boost Bright Pixels" 1.10 0.25 3.00 0.025
-#define brightboost1  params.brightboost1     // adjust brightness
-
-#pragma parameter gamma_c "          Gamma correct" 1.0 0.50 2.0 0.025
-#define gamma_c   global.gamma_c     // adjust brightness
-
-#pragma parameter bogus_screen "[ SCREEN OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter IOS "          Integer Scaling: Odd:Y, Even:'X'+Y" 0.0 0.0 4.0 1.0
-#define IOS          params.IOS     // Smart Integer Scaling
-
-#pragma parameter OS "          R. Bloom Overscan Mode" 1.0 0.0 2.0 1.0
-#define OS           params.OS     // Do overscan
-
-#pragma parameter BLOOM "          Raster bloom %" 0.0 0.0 20.0 1.0
-#define BLOOM        params.BLOOM     // Bloom overscan percentage
-
-#pragma parameter csize "          Corner Size" 0.0 0.0 0.25 0.005
-#define csize        params.csize     // corner size
-
-#pragma parameter bsize1 "          Border Size" 0.01 0.0 3.0 0.01
-#define bsize1        params.bsize1     // border Size
-
-#pragma parameter sborder "          Border Intensity" 0.75 0.25 2.0 0.05
-#define sborder       global.sborder     // border intensity
-
-#pragma parameter barspeed "          Hum Bar Speed" 50.0 5.0 200.0 1.0
-
-#pragma parameter barintensity "          Hum Bar Intensity" 0.0 -1.0 1.0 0.01
-
-#pragma parameter bardir "          Hum Bar Direction" 0.0 0.0 1.0 1.0
-
-#pragma parameter warpX "          CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-#define warpX        params.warpX     // Curvature X
-
-#pragma parameter warpY "          CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-#define warpY        params.warpY     // Curvature Y
-
-#pragma parameter c_shape "          Curvature Shape" 0.25 0.05 0.60 0.05
-#define c_shape        global.c_shape     // curvature shape
-
-#pragma parameter overscanX "          Overscan X original pixels" 0.0 -200.0 200.0 1.0
-#define overscanX        global.overscanX     // OverscanX pixels
-
-#pragma parameter overscanY "          Overscan Y original pixels" 0.0 -200.0 200.0 1.0
-#define overscanY        global.overscanY     // OverscanY pixels
-
-#pragma parameter bogus_masks "[ CRT MASK OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter shadowMask "          CRT Mask: 0:CGWG, 1-4:Lottes, 5-13:'Trinitron'" 0.0 -1.0 13.0 1.0
-#define shadowMask   params.shadowMask     // Mask Style
-
-#pragma parameter maskstr "          Mask Strength (0, 5-12)" 0.3 -0.5 1.0 0.025
-#define maskstr         params.maskstr      // Mask Strength
-
-#pragma parameter mcut "          Mask 5-12 Low Strength" 1.10 0.0 2.0 0.05
-#define mcut         params.mcut      // Mask 5-12 dark color strength
-
-#pragma parameter maskboost "          CRT Mask Boost" 1.0 1.0 3.0 0.05
-#define maskboost     global.maskboost     // Mask Boost
-
-#pragma parameter masksize "          CRT Mask Size" 1.0 1.0 4.0 1.0
-#define masksize     params.masksize     // Mask Size
-
-#pragma parameter mask_zoom "          CRT Mask Zoom (+ mask width)" 0.0 -5.0 5.0 1.0
-#define mask_zoom     global.mask_zoom     // Mask Size
-
-#pragma parameter mzoom_sh "          CRT Mask Zoom Sharpen (needs Mask Zoom)" 0.0 0.0 1.0 0.05
-#define mzoom_sh     global.mzoom_sh  
-
-#pragma parameter mshift "          (Transform to) Shadow Mask" 0.0 0.0 1.0 0.5
-#define mshift     params.mshift     // do the "shadow mask"
-
-#pragma parameter mask_layout "          Mask Layout: RGB or BGR (check LCD panel) " 0.0 0.0 1.0 1.0
-#define mask_layout     params.mask_layout     // mask layout: RGB or BGR
-
-#pragma parameter maskDark "          Lottes maskDark" 0.5 0.0 2.0 0.05
-#define maskDark     params.maskDark     // Dark "Phosphor"
-
-#pragma parameter maskLight "          Lottes maskLight" 1.5 0.0 2.0 0.05
-#define maskLight    params.maskLight     // Light "Phosphor"
-
-#pragma parameter mask_gamma "          Mask gamma" 2.40 1.0 5.0 0.05
-#define mask_gamma   global.mask_gamma     // Mask application gamma
-
-#pragma parameter slotmask "          Slot Mask Strength Bright Pixels" 0.0 0.0 1.0 0.05
-#define slotmask     params.slotmask
-
-#pragma parameter slotmask1 "          Slot Mask Strength Dark Pixels" 0.0 0.0 1.0 0.05
-#define slotmask1     params.slotmask1
-
-#pragma parameter slotwidth "          Slot Mask Width (0:Auto)" 0.0 0.0 16.0 1.0
-#define slotwidth    params.slotwidth     // Slot Mask Width
-
-#pragma parameter double_slot "          Slot Mask Height: 2x1 or 4x1..." 2.0 1.0 4.0 1.0
-#define double_slot  params.double_slot     // Slot Mask Height
-
-#pragma parameter slotms "          Slot Mask Thickness" 1.0 1.0 4.0 1.0
-#define slotms  global.slotms     // Slot Mask Thickness
-
-#pragma parameter smoothmask "          Smooth Masks in bright scanlines" 0.0 0.0 1.0 1.0
-#define smoothmask  global.smoothmask
-
-#pragma parameter smask_mit "          Mitigate Slotmask Interaction" 0.0 0.0 1.0 0.05
-#define smask_mit  global.smask_mit
-
-#pragma parameter bmask "          Base (black) Mask strength" 0.0 0.0 0.25 0.01
-#define bmask  global.bmask
-
-#pragma parameter gamma_out "          Gamma out" 1.95 1.0 5.0 0.05
-#define gamma_out    global.gamma_out     // output gamma
-
-
-#pragma parameter bogus_deconvergence11 "[ HORIZONTAL/VERTICAL DECONVERGENCE ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter dctypex "          Deconvergence type X : 0.0 - static, other - dynamic" 0.0 0.0 0.75 0.05
-
-#pragma parameter dctypey "          Deconvergence type Y : 0.0 - static, other - dynamic" 0.0 0.0 0.75 0.05
-
-#pragma parameter deconrr "          Horizontal Deconvergence Red Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrg "          Horizontal Deconvergence Green Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrb "          Horizontal Deconvergence Blue Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrry "          Vertical Deconvergence Red Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrgy "          Vertical Deconvergence Green Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrby "          Vertical Deconvergence Blue Range" 0.0 -15.0 15.0 0.25
- 
-#pragma parameter decons "          Deconvergence Strength" 1.0 0.0 3.0 0.10
-
-#pragma parameter addnoised "          Add Noise" 0.0 -1.0 1.0 0.02
-
-#pragma parameter noiseresd "          Noise Resolution" 2.0 1.0 10.0 1.0
-
-#pragma parameter noisetype "          Noise Type: Colored, Luma" 0.0 0.0 1.0 1.0
-
-#pragma parameter post_br "          Post Brightness" 1.0 0.25 5.0 0.01
-
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define TEX0 vTexCoord
-
-#define OutputSize global.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPass;
-layout(set = 0, binding = 4) uniform sampler2D GlowPass;
-layout(set = 0, binding = 5) uniform sampler2D BloomPass;
-layout(set = 0, binding = 6) uniform sampler2D PrePass0;
-layout(set = 0, binding = 7) uniform sampler2D Source;
-
-#define eps 1e-10 
-
-// Shadow mask (1-4 from PD CRT Lottes shader).
-
-vec3 Mask(vec2 pos, float mx, float mb)
-{
-	vec3 mask = vec3(maskDark, maskDark, maskDark);
-	vec3 one = vec3(1.0);
-	
-	if (shadowMask == 0.0)
-	{
-		float mc = 1.0 - max(maskstr, 0.0);	
-		pos.x = fract(pos.x*0.5);
-		if (pos.x < 0.49) { mask.r = 1.0; mask.g = mc; mask.b = 1.0; }
-		else { mask.r = mc; mask.g = 1.0; mask.b = mc; }
-	}    
-   
-	// Very compressed TV style shadow mask.
-	else if (shadowMask == 1.0)
-	{
-		float line = maskLight;
-		float odd  = 0.0;
-
-		if (fract(pos.x/6.0) < 0.49)
-			odd = 1.0;
-		if (fract((pos.y + odd)/2.0) < 0.49)
-			line = maskDark;
-
-		pos.x = floor(mod(pos.x,3.0));
-    
-		if      (pos.x < 0.5) mask.r = maskLight;
-		else if (pos.x < 1.5) mask.g = maskLight;
-		else                  mask.b = maskLight;
-		
-		mask*=line;
-	} 
-
-	// Aperture-grille.
-	else if (shadowMask == 2.0)
-	{
-		pos.x = floor(mod(pos.x,3.0));
-
-		if      (pos.x < 0.5) mask.r = maskLight;
-		else if (pos.x < 1.5) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	} 
-
-	// Stretched VGA style shadow mask (same as prior shaders).
-	else if (shadowMask == 3.0)
-	{
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.3) mask.r = maskLight;
-		else if (pos.x < 0.6) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	}
-
-	// VGA style shadow mask.
-	else if (shadowMask == 4.0)
-	{
-		pos.xy = floor(pos.xy*vec2(1.0, 0.5));
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.3) mask.r = maskLight;
-		else if (pos.x < 0.6) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	}
-	
-	// Trinitron mask 5
-	else if (shadowMask == 5.0)
-	{
-		mask = vec3(0.0);		
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.49)
-		{	mask.r  = 1.0;
-			mask.b  = 1.0;
-		}
-		else     mask.g = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// Trinitron mask 6
-	else if (shadowMask == 6.0)
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,3.0));
-		if      (pos.x < 0.5) mask.r = 1.0;
-		else if (pos.x < 1.5) mask.g = 1.0;
-		else                    mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-	
-	// BW Trinitron mask 7
-	else if (shadowMask == 7.0)
-	{
-		mask = vec3(0.0);		
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.49)
-		{	mask  = 0.0.xxx;
-		}
-		else     mask = 1.0.xxx;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// BW Trinitron mask 8
-	else if (shadowMask == 8.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x/3.0);
-		if      (pos.x < 0.3) mask = 0.0.xxx;
-		else if (pos.x < 0.6) mask = 1.0.xxx;
-		else                  mask = 1.0.xxx;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// Magenta - Green - Black mask
-	else if (shadowMask == 9.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x/3.0);
-		if      (pos.x < 0.3) mask    = 0.0.xxx;
-		else if (pos.x < 0.6) mask.rb = 1.0.xx;
-		else                  mask.g  = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);	
-	}  
-	
-	// RGBX
-	else if (shadowMask == 10.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x * 0.25);
-		if      (pos.x < 0.2)  mask  = 0.0.xxx;
-		else if (pos.x < 0.4)  mask.r = 1.0;
-		else if (pos.x < 0.7)  mask.g = 1.0;	
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}  
-
-	// 4k mask
-	else if (shadowMask == 11.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x * 0.25);
-		if      (pos.x < 0.2)  mask.r  = 1.0;
-		else if (pos.x < 0.4)  mask.rg = 1.0.xx;
-		else if (pos.x < 0.7)  mask.gb = 1.0.xx;	
-		else                   mask.b  = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}     
-
-	// RRGGBBX mask
-	else if (shadowMask == 12.0)
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,7.0));
-		if      (pos.x < 0.5)  mask   = 0.0.xxx;
-		else if (pos.x < 2.5)  mask.r = 1.0;
-		else if (pos.x < 4.5)  mask.g = 1.0;	
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-
-	// 4k mask
-	else
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,6.0));
-		if      (pos.x < 0.5)  mask   = 0.0.xxx;
-		else if (pos.x < 1.5)  mask.r = 1.0;
-		else if (pos.x < 2.5)  mask.rg = 1.0.xx;
-		else if (pos.x < 3.5)  mask.rgb = 1.0.xxx;
-		else if (pos.x < 4.5)  mask.gb = 1.0.xx;		
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-	
-	if (mask_layout > 0.5) mask = mask.rbg;
-	float maskmin = min(min(mask.r,mask.g),mask.b);
-	return (mask - maskmin) * (1.0 + (maskboost-1.0)*mb) + maskmin;
-}
-
-
-float SlotMask(vec2 pos, float m, float swidth)
-{
-	if ((slotmask + slotmask1) == 0.0) return 1.0;
-	else
-	{
-	pos.y = floor(pos.y/slotms);
-	float mlen = swidth*2.0;
-	float px = floor(mod(pos.x, 0.99999*mlen));
-	float py = floor(fract(pos.y/(2.0*double_slot))*2.0*double_slot);
-	float slot_dark = mix(1.0-slotmask1, 1.0-slotmask, m);
-	float slot = 1.0;
-	if (py == 0.0 && px < swidth) slot = slot_dark; else
-	if (py == double_slot && px >= swidth) slot = slot_dark;		
-	
-	return slot;
-	}
-}
- 
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx,dy);
-	return pos*0.5+0.5;
-} 
-
-float humbar(float pos)
-{
-	if (global.barintensity == 0.0) return 1.0; else
-	{
-		pos = (global.barintensity >= 0.0) ? pos : (1.0-pos);
-		pos = fract(pos + mod(float(global.FrameCount),global.barspeed)/(global.barspeed-1.0));
-		pos = (global.barintensity <  0.0) ? pos : (1.0-pos);	
-		return (1.0-global.barintensity) + global.barintensity*pos;
-	}	
-}
-
-
-float corner(vec2 pos) {
-	vec2 b = vec2(bsize1, bsize1) *  vec2(1.0, OutputSize.x/OutputSize.y) * 0.05;
-	pos = clamp(pos, 0.0, 1.0);
-	pos = abs(2.0*(pos - 0.5));
-	float csize1 = mix(400.0, 7.0,  pow(4.0*csize, 0.10));
-	float crn = dot(pow(pos, csize1.xx), vec2(1.0, OutputSize.y/OutputSize.x));
-	crn = (csize == 0.0) ? max(pos.x, pos.y) : pow(crn, 1.0/csize1);
-	pos = max(pos, crn);
-	vec2 res = (bsize1 == 0.0) ? 1.0.xx : mix(0.0.xx, 1.0.xx, smoothstep(1.0.xx, 1.0.xx-b, sqrt(pos)));
-	res = pow(res, sborder.xx);	
-	return sqrt(res.x*res.y);
-}
-
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-vec3 declip(vec3 c, float b)
-{
-	float m = max(max(c.r,c.g),c.b);
-	if (m > b) c = c*b/m;
-	return c;
-}
-
-float igc(float mc)
-{
-	return pow(mc, gamma_c);
-}
-
-// noise function:
-// Dedicated to the public domain.
-// If you want a real license, you may consider this MIT/BSD/CC0/WTFPL-licensed (take your pick).
-// Adapted from ChuckNorris - shadertoy: https://www.shadertoy.com/view/XtK3Dz
-
-vec3 noise(vec3 v){
-    if (global.addnoised < 0.0) v.z = -global.addnoised; else v.z = mod(v.z,6001.0)/1753.0;
-	// ensure reasonable range
-    v = fract(v) + fract(v*1e4) + fract(v*1e-4);
-    // seed
-    v += vec3(0.12345, 0.6789, 0.314159);
-    // more iterations => more random
-    v = fract(v*dot(v, v)*123.456);
-    v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);	
-    return v;
-} 
-
-void fetch_pixel (inout vec3 c, inout vec3 b, inout vec3 g, vec2 coord, vec2 bcoord)
-{
-		float stepx = OutputSize.z;
-		float stepy = OutputSize.w;
-		
-		float ds = global.decons;
-				
-		vec2 dx = vec2(stepx, 0.0);
-		vec2 dy = vec2(0.0, stepy);		
-		
-		float posx = 2.0*coord.x - 1.0;
-		float posy = 2.0*coord.y - 1.0;
-		
-		if (global.dctypex > 0.025)
-		{
-			posx = sign(posx)*pow(abs(posx), 1.05-global.dctypex);
-			dx = posx * dx;
-		}
-
-		if (global.dctypey > 0.025)
-		{
-
-			posy = sign(posy)*pow(abs(posy), 1.05-global.dctypey);
-			dy = posy * dy;
-		}
-
-		vec2 rc = global.deconrr * dx + global.deconrry*dy;
-		vec2 gc = global.deconrg * dx + global.deconrgy*dy;
-		vec2 bc = global.deconrb * dx + global.deconrby*dy;		
-
-		float r1 = COMPAT_TEXTURE(Source, coord + rc).r;
-		float g1 = COMPAT_TEXTURE(Source, coord + gc).g;
-		float b1 = COMPAT_TEXTURE(Source, coord + bc).b;
-
-		vec3 d = vec3(r1, g1, b1);
-		c = clamp(mix(c, d, ds), 0.0, 1.0);
-		
-		r1 = COMPAT_TEXTURE(BloomPass, bcoord + rc).r;
-		g1 = COMPAT_TEXTURE(BloomPass, bcoord + gc).g;
-		b1 = COMPAT_TEXTURE(BloomPass, bcoord + bc).b;
-
-		d = vec3(r1, g1, b1);
-		b = g = mix(b, d, min(ds,1.0));
-		
-		r1 = COMPAT_TEXTURE(GlowPass, bcoord + rc).r;
-		g1 = COMPAT_TEXTURE(GlowPass, bcoord + gc).g;
-		b1 = COMPAT_TEXTURE(GlowPass, bcoord + bc).b;
-
-		d = vec3(r1, g1, b1);
-		g = mix(g, d, min(ds,1.0));
-}
-
-
-void main()
-{
-	vec4 SourceSize = global.OriginalSize;
-	
-	float lum = COMPAT_TEXTURE(AvgLumPass, vec2(0.5,0.5)).a;
-	
-	float gamma_in = 1.0/COMPAT_TEXTURE(LinearizePass, vec2(0.25,0.25)).a;
-	float intera = COMPAT_TEXTURE(LinearizePass, vec2(0.75,0.25)).a;
-	bool interb  = ((intera < 0.35 || global.no_scanlines > 0.025) && hiscan < 0.5);
-	
-	// Calculating texel coordinates
-   
-	vec2 texcoord = TEX0.xy;
-	if (IOS > 0.0 && !interb){
-		vec2 ofactor = OutputSize.xy/global.OriginalSize.xy;
-		vec2 intfactor = (IOS < 2.5) ? floor(ofactor) : ceil(ofactor);
-		vec2 diff = ofactor/intfactor;
-		float scan = diff.y;
-		texcoord = Overscan(texcoord, scan, scan);
-		if (IOS == 1.0 || IOS == 3.0) texcoord = vec2(TEX0.x, texcoord.y);
-	}
-   
-	float factor  = 1.00 + (1.0-0.5*OS)*BLOOM/100.0 - lum*BLOOM/100.0;
-	texcoord  = Overscan(texcoord, factor, factor);
-
-	texcoord = Overscan(texcoord, (global.OriginalSize.x - overscanX)/global.OriginalSize.x, (global.OriginalSize.y - overscanY)/global.OriginalSize.y);
-
-	vec2 pos1 = TEX0.xy;
-	vec2 pos  = Warp(texcoord);
-	vec2 pos0 = Warp(TEX0.xy);
-	
-	// color and bloom fetching
-	vec3 color = COMPAT_TEXTURE(Source,pos1).rgb;
-	vec3  Bloom = COMPAT_TEXTURE(BloomPass, pos).rgb;
-	vec3  Glow = COMPAT_TEXTURE(GlowPass, pos).rgb;
-
-if ((abs(global.deconrr) + abs(global.deconrry) + abs(global.deconrg) + abs(global.deconrgy) + abs(global.deconrb) + abs(global.deconrby)) > 0.2)
-	fetch_pixel(color, Bloom, Glow, pos1, pos); // deconvergence
-	
-	float cm = igc(max(max(color.r,color.g),color.b));
-	float mx1 = COMPAT_TEXTURE(Source, pos1     ).a;
-	float colmx = max(mx1, cm);
-	float w3 = min((cm + 0.0001) / (colmx + 0.0005), 1.0); if(interb) w3 = 1.0;
-	
-	vec2 dx = vec2(0.001, 0.0);
-	float mx0 = COMPAT_TEXTURE(Source, pos1 - dx).a;
-	float mx2 = COMPAT_TEXTURE(Source, pos1 + dx).a;
-	float mxg = max(max(mx0,mx1),max(mx2,cm));
-	float mx = pow(mxg, 1.40/gamma_in);
-
-	// mask boost tweak
-	
-	dx = vec2(global.OriginalSize.z, 0.0)*0.25;
-	mx0 = COMPAT_TEXTURE(Source, pos1 - dx).a;
-	mx2 = COMPAT_TEXTURE(Source, pos1 + dx).a;
-	float mb = (1.0 - min(abs(mx0-mx2)/(0.5+mx1), 1.0));
-	
-	vec3 one = vec3(1.0);
-	
-	// Apply Mask
-	
-	vec3 orig1 = color;
-	vec3 cmask = one;
-	vec3 cmask1 = one;
-	vec3 cmask2 = one;	
-
-	// mask widths and mask dark compensate (fractional part) values
-	float mwidths[14] = float[14] (2.0, 3.0, 3.0, 3.0, 6.0, 2.4, 3.5, 2.4, 3.25, 3.5, 4.5, 4.25, 7.5, 6.25); 
-	
-	float mwidth = mwidths[int(shadowMask)];
-	float mask_compensate = fract(mwidth);
-
-if (shadowMask > -0.5)
-{	
-	vec2 maskcoord = gl_FragCoord.xy * 1.00001;
-	vec2 scoord = maskcoord;
-	
-	mwidth = floor(mwidth) * masksize;
-	float swidth = mwidth;
-	bool zoomed = (abs(mask_zoom) > 0.75);
-	float mscale = 1.0;
-	vec2 maskcoord0 = maskcoord;
-	maskcoord.y = floor(maskcoord.y/masksize);
-	float mwidth1 = max(mwidth + mask_zoom, 2.0);
-
-if ( mshift > 0.25 )
-{	
-	float stagg_lvl = 1.0; if (fract(mshift) > 0.25) stagg_lvl = 2.0;
-	float next_line = float(floor(mod(maskcoord.y, 2.0*stagg_lvl)) < stagg_lvl);
-	maskcoord0.x = maskcoord0.x + next_line * 0.5 * mwidth1;
-}		
-	maskcoord = maskcoord0/masksize;
-
-if ( !zoomed )	
-	cmask*= Mask(floor(maskcoord), mx, mb);
-else{
-	mscale  = mwidth1/mwidth;
-	float mlerp = fract(maskcoord.x/mscale); if (mzoom_sh > 0.025) mlerp = (1.0 + mzoom_sh)*mlerp - 0.5*mzoom_sh;
-	float mcoord = floor(maskcoord.x/mscale); if (shadowMask == 12.0 && mask_zoom == -2.0) mcoord = ceil(maskcoord.x/mscale);
-	cmask*=max(mix(Mask(vec2(mcoord,maskcoord.y), mx, mb), Mask(vec2(mcoord + 1.0, maskcoord.y), mx, mb), mlerp), 0.0);
-}
-
-	if (slotwidth > 0.5) swidth = slotwidth; float smask = 1.0;
-
-	float sm_offset = 0.0; bool bsm_offset = (shadowMask == 0.0 || shadowMask == 2.0 || shadowMask == 5.0 || shadowMask == 6.0 || shadowMask == 8.0 || shadowMask == 11.0);
-	if( zoomed ) { if (mask_layout < 0.5 && bsm_offset) sm_offset = 1.0; else if (bsm_offset) sm_offset = -1.0; }
-	
-	swidth = round(swidth*mscale);
-	smask = SlotMask(scoord + vec2(sm_offset,0.0), mx, swidth);
-
-	smask = clamp(smask + mix(smask_mit, 0.0, min(w3, pow(w3*max(max(orig1.r,orig1.g),orig1.b), 0.33333))), 0.0, 1.0);
-	
-	cmask2 = cmask;
-	cmask*=smask;
-	cmask1 = cmask;
-
-	if (abs(mask_bloom) > 0.025)
-	{
-		float maxbl = max(max(max(Bloom.r,Bloom.g),Bloom.b), mxg);
-		maxbl = maxbl * max(mix(1.0, 2.0-colmx, bloom_dist), 0.0);
-		if (mask_bloom > 0.025) cmask = max(min(cmask + maxbl*mask_bloom, 1.0), cmask); else cmask = max(mix(cmask, cmask*(1.0-0.5*maxbl) + plant(pow(Bloom,0.35.xxx),maxbl), -mask_bloom),cmask);
-	}
-	
-	color = pow(color, vec3(mask_gamma/gamma_in));
-	color = color*cmask;
-	color = min(color,1.0);
-	color = pow(color, vec3(gamma_in/mask_gamma));
-
-	cmask  = min(cmask, 1.0);
-	cmask1 = min(cmask1, 1.0);
-}
-
-	float dark_compensate  = mix(max( clamp( mix (mcut, maskstr, mx),0.0, 1.0) - 1.0 + mask_compensate, 0.0) + 1.0, 1.0, mx); if(shadowMask < -0.5) dark_compensate = 1.0;
-	float bb = mix(brightboost, brightboost1, mx) * dark_compensate;
-	color*=bb;
-
-	vec3  Ref = COMPAT_TEXTURE(LinearizePass, pos).rgb;	
-	float maxb = COMPAT_TEXTURE(BloomPass, pos).a;
-	float vig  = COMPAT_TEXTURE(PrePass0, clamp(pos, 0.0+0.5*global.OriginalSize.zw, 1.0-0.5*global.OriginalSize.zw)).a;
-
-	vec3 Bloom1 = Bloom;
-	vec3 bcmask = mix(one, cmask, bmask1);
-	vec3 hcmask = mix(one, cmask, hmask1);
-
-	if (abs(bloom) > 0.025)
-	{
-		if (bloom < -0.01) Bloom1 = plant(Bloom, maxb);
-		Bloom1 = min(Bloom1*(orig1+color), max(0.5*(colmx + orig1 - color),0.001*Bloom1));
-		Bloom1 = 0.5*(Bloom1 + mix(Bloom1, mix(colmx*orig1, Bloom1, 0.5), 1.0-color));
-		Bloom1 = bcmask*Bloom1 * max(mix(1.0, 2.0-colmx, bloom_dist), 0.0);
-		color = pow(pow(color, vec3(mask_gamma/gamma_in)) + abs(bloom) * pow(Bloom1, vec3(mask_gamma/gamma_in)), vec3(gamma_in/mask_gamma));
-	}
-
-	if (!interb) color = declip(min(color,1.0), mix(1.0, w3, 0.6));
-
-	if (halation > 0.01) {
-		Bloom = mix(0.5*(Bloom + Bloom*Bloom), 0.75*Bloom*Bloom, colmx);	
-		color = color + 2.0*max((2.0*mix(maxb*maxb, maxb, colmx)-0.5*max(max(Ref.r,Ref.g),Ref.b)),0.25)*mix(1.0,w3,0.5*colmx)*hcmask*Bloom*halation; }
-	else
-	if (halation < -0.01) {
-		float mbl = max(max(Bloom.r,Bloom.g),Bloom.b);
-		Bloom = plant(Bloom + Ref + orig1 + Bloom*Bloom*Bloom, min(mbl*mbl,0.75));
-		color = color + 2.0*mix(1.0,w3,0.5*colmx)*hcmask*Bloom*(-halation); }
-		
-	
-	float w = 0.25 + 0.60*mix(w3, 1.0, sqrt(colmx));
-	if (smoothmask > 0.5) { color = min(color,1.0); color = max(min(color/w3, 1.0)*w3, min(orig1*bb,color*(1.0-w3))); }
-
-	if (global.m_glow < 0.5) Glow = mix(Glow, 0.25*color, colmx);
-	else
-	{ 
-		maxb = max(max(Glow.r,Glow.g),Glow.b);
-		vec3 orig2 = plant(orig1 + 0.001*Ref, 1.0);
-		Bloom = plant(Glow, 1.0);
-		Ref = abs(orig2-Bloom);
-		mx0 = max(max(orig2.g,orig2.g),orig2.b)-min(min(orig2.g,orig2.g),orig2.b);
-		mx2 = max(max(Bloom.g,Bloom.g),Bloom.b)-min(min(Bloom.g,Bloom.g),Bloom.b);		
-		Bloom = mix(maxb*min(Bloom,orig2), w*mix(mix(Glow, max(max(Ref.g,Ref.g),Ref.b)*Glow, max(mx,mx0)), mix(color, Glow, mx2), max(mx0,mx2)*Ref), min(sqrt((1.10-mx0)*(0.10+mx2)),1.0));
-		Glow = mix(global.m_glow_low*Glow, global.m_glow_high*Bloom, pow(colmx, global.m_glow_dist/gamma_in));
-	}
-	
-	if (global.m_glow < 0.5) {
-		if (glow >= 0.0) color = color + 0.5*Glow*glow; else color = color + abs(glow)*min(cmask2*cmask2,1.0)*Glow; }
-	else { cmask1 = clamp(mix(one, cmask1, global.m_glow_mask),0.0, 1.0); color = color + abs(glow)*cmask1*Glow; }
-
-	color = min(color, 1.0);
-	
-	color = pow(color, vec3(1.0/gamma_out));
-
-	float rc = 0.6*sqrt(max(max(color.r, color.g), color.b))+0.4;
-	
-	if (abs(global.addnoised) > 0.01) 
-	{
-		vec3 noise0 = noise(vec3(floor(OutputSize.xy * vTexCoord / global.noiseresd), float(global.FrameCount)));
-		if (global.noisetype < 0.5) color = mix(color, noise0, 0.25*abs(global.addnoised) * rc); 
-		else color = min(color * mix(1.0, 1.5*noise0.x, 0.5*abs(global.addnoised)), 1.0);
-	}
-
-	colmx = max(max(orig1.r,orig1.g),orig1.b);
-	color = color + bmask*mix(cmask2, 0.125*(1.0-colmx)*color, min(20.0*colmx, 1.0));
-	
-	FragColor = vec4(color*vig*humbar(mix(pos.y, pos.x, global.bardir))*global.post_br*corner(pos0), 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-potato.slang b/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-potato.slang
deleted file mode 100644
index b36040e536..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence-potato.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_POTATO_PRESET
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-deconvergence.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence.inc b/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence.inc
deleted file mode 100644
index b7a8790c3d..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence.inc
+++ /dev/null
@@ -1,935 +0,0 @@
-/*
-   CRT - Guest - Advanced
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-#pragma parameter hiscan "          High Resolution Scanlines (ScaleFx or XBR Only)" 0.0 0.0 1.0 1.0
-#define hiscan        global.hiscan
-
-#pragma parameter GDV_BRIGHTNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_brightness "[ BRIGHTNESS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter m_glow 		"          Ordinary Glow / Magic Glow -- m_glow" 0.0 0.0 1.0 1.0
-
-#pragma parameter m_glow_low 	"          Magic Glow Low Strength -- m_glow_low" 0.35 0.0 7.0 0.05 
-
-#pragma parameter m_glow_high 	"          Magic Glow High Strength -- m_glow_high" 5.0 0.0 7.0 0.10 
-
-#pragma parameter m_glow_dist 	"          Magic Glow Distribution -- m_glow_dist" 1.0 0.20 4.0 0.05 
-
-#pragma parameter m_glow_mask "          Magic Glow Mask Strength -- m_glow_mask" 1.0 0.0 2.0 0.025
-
-#pragma parameter glow 			"          (Magic) Glow Strength -- glow" 0.08 -2.0 2.0 0.01
-#define glow         global.glow     // Glow Strength
-
-#pragma parameter bloom 		"          Bloom Strength -- bloom" 0.0 -2.0 2.0 0.05
-#define bloom         global.bloom     // bloom effect
-
-#pragma parameter mask_bloom 	"          Mask Bloom -- mask_bloom" 0.0 -2.0 2.0 0.05
-#define mask_bloom         global.mask_bloom     // bloom effect
-
-#pragma parameter bloom_dist 	"          Bloom Distribution -- bloom_dist" 0.0 -2.0 3.0 0.05
-#define bloom_dist         global.bloom_dist     // bloom effect distribution
-
-#pragma parameter halation 		"          Halation Strength -- halation" 0.0 -2.0 2.0 0.025
-#define halation         global.halation     // halation effect
-
-#pragma parameter bmask1 "          Bloom Mask Strength -- bmask1" 0.0 -1.0 1.0 0.025
-#define bmask1         global.bmask1     // bloom/halation mask strength
-
-#pragma parameter hmask1 "          Halation Mask Strength -- hmask1" 0.5 -1.0 1.0 0.025
-#define hmask1         global.hmask1     // bloom/halation mask strength
-
-#pragma parameter brightboost 	"          Bright Boost Dark Pixels -- brightboost" 1.40 0.25 10.0 0.05
-#define brightboost  global.brightboost     // adjust brightness
-
-#pragma parameter brightboost1 	"          Bright Boost Bright Pixels -- brightboost1" 1.10 0.25 3.00 0.025
-#define brightboost1  global.brightboost1     // adjust brightness
-
-#pragma parameter gamma_c 		"          Gamma Correct -- gamma_c" 1.0 0.50 2.0 0.025
-#define gamma_c   global.gamma_c     // adjust brightness
-
-// #pragma parameter bogus_screen "[ SCREEN OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-// #pragma parameter TATE "          TATE Mode" 0.0 0.0 1.0 1.0
-// #define TATE         global.TATE     // Screen orientation
-
-// #pragma parameter TATE "          TATE Mode" 0.0 0.0 1.0 1.0
-// #define TATE         params.TATE     // Screen orientation
-
-// #pragma parameter IOS "          Integer Scaling: Odd:Y, Even:'X'+Y" 0.0 0.0 4.0 1.0
-// #define IOS          params.IOS     // Smart Integer Scaling
-
-// #pragma parameter csize "          Corner Size" 0.0 0.0 0.25 0.005
-// #define csize        params.csize     // corner size
-
-// #pragma parameter bsize1 "          Border Size" 0.01 0.0 3.0 0.01
-// #define bsize1        params.bsize1     // border Size
-
-// #pragma parameter sborder "          Border Intensity" 0.75 0.25 2.0 0.05
-// #define sborder       global.sborder     // border intensity
-
-#pragma parameter GDV_HUMBAR_LINE							" " 0 0 0.001 0.001
-#pragma parameter gdv_humbar_title "[ HUM BAR ]: " 0.0 0.0 0.1 0.1
-
-#pragma parameter barspeed "          Hum Bar Speed" 50.0 3.0 200.0 0.2
-
-#pragma parameter barintensity "          Hum Bar Intensity" 0.0 -1.0 1.0 0.01
-
-#pragma parameter bardir "          Hum Bar Direction - -1:AUTO | VERTICAL | HORIZ" -1.0 -1.0 1.0 1.0
-
-// #pragma parameter warpX "          CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-// #define warpX        global.warpX     // Curvature X
-
-// #pragma parameter warpY "          CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-// #define warpY        global.warpY     // Curvature Y
-
-// #pragma parameter c_shape "          Curvature Shape" 0.25 0.05 0.60 0.05
-// #define c_shape        global.c_shape     // curvature shape
-
-// #pragma parameter overscanX "          Overscan X original pixels" 0.0 -200.0 200.0 1.0
-// #define overscanX        global.overscanX     // OverscanX pixels
-
-// #pragma parameter overscanY "          Overscan Y original pixels" 0.0 -200.0 200.0 1.0
-// #define overscanY        global.overscanY     // OverscanY pixels
-
-#pragma parameter GDV_CRT_MASK_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_masks "[ CRT MASK OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter shadowMask "CRT Mask: -1:None|0:CGWG|1-4:Lottes|5-12:Trinitrn -- shadowMask" 0.0 -1.0 13.0 1.0
-#define shadowMask   global.shadowMask     // Mask Style
-
-#pragma parameter maskstr "          Mask Strength (0, 5-12) -- maskstr" 0.3 -0.5 1.0 0.025
-#define maskstr         global.maskstr      // CGWG Mask Strength
-
-#pragma parameter mcut "          Mask 5-12 Low Strength -- mcut" 1.10 0.0 2.0 0.05
-#define mcut         global.mcut      // Mask 5-9 cutoff
-
-#pragma parameter maskboost "          CRT Mask Boost" 1.0 1.0 3.0 0.05
-#define maskboost     global.maskboost     // Mask Boost
-
-#pragma parameter masksize "          Mask Size - 2K | 4k -- masksize" 1.0 1.0 4 1.0
-#define masksize     max(global.masksize, 1)     // Mask Size
-
-#pragma parameter mask_zoom "          CRT Mask Zoom (+ mask width)" 0.0 -5.0 5.0 1.0
-#define mask_zoom     global.mask_zoom     // Mask Size
-
-#pragma parameter mzoom_sh "          CRT Mask Zoom Sharpen (needs Mask Zoom)" 0.0 0.0 1.0 0.05
-#define mzoom_sh     global.mzoom_sh  
-
-#pragma parameter mshift "          (Transform to) Shadow Mask" 0.0 0.0 1.0 0.5
-#define mshift     global.mshift     // do the "shadow mask"
-
-#pragma parameter mask_layout "          Mask Layout: RGB or BGR (check LCD panel) " 0.0 0.0 1.0 1.0
-#define mask_layout     global.mask_layout     // mask layout: RGB or BGR
-
-#pragma parameter maskDark "          Mask 1-4 Lottes maskDark" 0.5 0.0 2.0 0.05
-#define maskDark     global.maskDark     // Dark "Phosphor"
-
-#pragma parameter maskLight "          Mask 1-4 Lottes maskLight" 1.5 0.0 2.0 0.05
-#define maskLight    global.maskLight     // Light "Phosphor"
-
-#pragma parameter mask_gamma "          Mask Gamma -- mask_gamma" 2.40 1.0 5.0 0.05
-#define mask_gamma   global.mask_gamma     // Mask application gamma
-
-#pragma parameter slotmask "          Slot Mask Strength Bright Pixels -- slotmask" 0.0 0.0 1.0 0.05
-#define slotmask     global.slotmask     // Slot Mask ON/OFF
-
-#pragma parameter slotmask1 "          Slot Mask Strength Dark Pixels -- slotmask1" 0.0 0.0 1.0 0.05
-#define slotmask1     global.slotmask1
-
-#pragma parameter slotwidth "          Slot Mask Width (0:Auto) -- slotwidth" 0.0 0.0 16.0 1.0
-#define slotwidth    global.slotwidth     // Slot Mask Width
-
-#pragma parameter double_slot "          Slot Mask Height: 2x1 or 4x1... -- double_slot" 2.0 1.0 4.0 1.0
-#define double_slot  global.double_slot     // Slot Mask Height
-
-#pragma parameter slotms "          Slot Mask Thickness - Auto | 2K | 4k -- slotms" 1.0 0.0 4.0 1.0
-#define slotms  global.slotms     // Slot Mask Thickness
-
-#pragma parameter smoothmask "          Smooth Masks in Bright Scanlines -- smoothmask" 0.0 0.0 1.0 1.0
-#define smoothmask  global.smoothmask
-
-#pragma parameter smask_mit "          Mitigate Slotmask Interaction -- smask_mit" 0.0 0.0 1.0 0.05
-#define smask_mit  global.smask_mit
-
-#pragma parameter bmask "          Base (black) Mask strength" 0.0 0.0 0.25 0.01
-#define bmask  global.bmask
-
-// #pragma parameter gamma_out "          Gamma out" 2.4 1.0 5.0 0.05
-// #define gamma_out    global.gamma_out     // output gamma
-
-#define gamma_out    HSM_GAMMA_OUT_CRT     // output gamma
-
-
-
-#pragma parameter GDV_DECONVERGENCE_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_deconvergence11 "[ HORIZONTAL/VERTICAL DECONVERGENCE ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter GDV_DECONVERGENCE_ON "          Use Deconvergence" 0 0 1 1
-#define GDV_DECONVERGENCE_ON global.GDV_DECONVERGENCE_ON
-
-#pragma parameter dctypex  "          Type X : 0.0 - static, other - dynamic -- dctypex" 0.0 0.0 0.75 0.05
-
-#pragma parameter dctypey  "          Type Y : 0.0 - static, other - dynamic -- dctypey" 0.0 0.0 0.75 0.05
-
-#pragma parameter deconrr  "          Horizontal Red Range -- deconrr" 1.0 -15.0 15.0 0.25
-
-#pragma parameter deconrg  "          Horizontal Green Range -- deconrg" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrb  "          Horizontal Blue Range -- deconrb" -1.0 -15.0 15.0 0.25
-
-#pragma parameter deconrry "          Vertical Red Range -- deconrry" 1.0 -15.0 15.0 0.25
-
-#pragma parameter deconrgy "          Vertical Green Range -- deconrgy" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrby "          Vertical Blue Range -- deconrby" -1.0 -15.0 15.0 0.25
-
-#pragma parameter decons   "          Strength -- decons" 1 0 3.0 0.10
-
-#pragma parameter dcscalemode   "       Scale Mode -- dcscalemode: SCREEN|OUTPUT|ABSOLUTE|MASK" 0 0 3 1
-
-
-#pragma parameter GDV_NOISE_LINE							" " 0 0 0.001 0.001
-#pragma parameter noise_title "[ NOISE ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter GDV_NOISE_ON 	"          Noise ON" 0 0 1 1
-
-#pragma parameter addnoised "          Add Noise" 0.2 -1.0 1.0 0.02
-
-#pragma parameter noiseresd "          Noise Size (AKA Resolution)" 2.0 1.0 10.0 1.0
-
-// HSM Added
-#pragma parameter noiseresd4kmult "          Noise Size Multiplier at 4K" 2 1 4 1
-
-#pragma parameter noisetype "          Noise Type: Colored, Luma" 0.0 0.0 1.0 1.0
-
-// #pragma parameter post_br "          Post Brightness" 1.0 0.25 5.0 0.01
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define TEX0 vTexCoord
-
-#define OutputSize global.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPass;
-layout(set = 0, binding = 4) uniform sampler2D GlowPass;
-layout(set = 0, binding = 5) uniform sampler2D BloomPass;
-
-/* HSM Removed - Only used for vignette
-layout(set = 0, binding = 6) uniform sampler2D PrePass;
-*/
-
-layout(set = 0, binding = 7) uniform sampler2D Source;
-
-// HSM Added
-layout(set = 0, binding = 8) uniform sampler2D InfoCachePass;
-
-#define eps 1e-10 
-
-// Shadow mask (1-4 from PD CRT Lottes shader).
-
-vec3 Mask(vec2 pos, float mx, float mb)
-{
-	vec3 mask = vec3(maskDark, maskDark, maskDark); 
-	vec3 one = vec3(1.0);
-
-	if (shadowMask == 0.0)
-	{
-		float mc = 1.0 - max(maskstr, 0.0);	
-		pos.x = fract(pos.x*0.5);
-		if (pos.x < 0.49) { mask.r = 1.0; mask.g = mc; mask.b = 1.0; }
-		else { mask.r = mc; mask.g = 1.0; mask.b = mc; }
-	}    
-   
-	// Very compressed TV style shadow mask.
-	else if (shadowMask == 1.0)
-	{
-		float line = maskLight;
-		float odd  = 0.0;
-
-		if (fract(pos.x/6.0) < 0.49)
-			odd = 1.0;
-		if (fract((pos.y + odd)/2.0) < 0.49)
-			line = maskDark;
-
-		pos.x = floor(mod(pos.x,3.0));
-    
-		if      (pos.x < 0.5) mask.r = maskLight;
-		else if (pos.x < 1.5) mask.g = maskLight;
-		else                  mask.b = maskLight;
-		
-		mask*=line;
-	} 
-
-	// Aperture-grille.
-	else if (shadowMask == 2.0)
-	{
-		pos.x = floor(mod(pos.x,3.0));
-
-		if      (pos.x < 0.5) mask.r = maskLight;
-		else if (pos.x < 1.5) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	} 
-
-	// Stretched VGA style shadow mask (same as prior shaders).
-	else if (shadowMask == 3.0)
-	{
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.3) mask.r = maskLight;
-		else if (pos.x < 0.6) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	}
-
-	// VGA style shadow mask.
-	else if (shadowMask == 4.0)
-	{
-		pos.xy = floor(pos.xy*vec2(1.0, 0.5));
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.3) mask.r = maskLight;
-		else if (pos.x < 0.6) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	}
-	
-	// Trinitron mask 5
-	else if (shadowMask == 5.0)
-	{
-		mask = vec3(0.0);		
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.49)
-		{	mask.r  = 1.0;
-			mask.b  = 1.0;
-		}
-		else     mask.g = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// Trinitron mask 6
-	else if (shadowMask == 6.0)
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,3.0));
-		if      (pos.x < 0.5) mask.r = 1.0;
-		else if (pos.x < 1.5) mask.g = 1.0;
-		else                    mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-	
-	// BW Trinitron mask 7
-	else if (shadowMask == 7.0)
-	{
-		mask = vec3(0.0);		
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.49)
-		{	mask  = 0.0.xxx;
-		}
-		else     mask = 1.0.xxx;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// BW Trinitron mask 8
-	else if (shadowMask == 8.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x/3.0);
-		if      (pos.x < 0.3) mask = 0.0.xxx;
-		else if (pos.x < 0.6) mask = 1.0.xxx;
-		else                  mask = 1.0.xxx;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// Magenta - Green - Black mask
-	else if (shadowMask == 9.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x/3.0);
-		if      (pos.x < 0.3) mask    = 0.0.xxx;
-		else if (pos.x < 0.6) mask.rb = 1.0.xx;
-		else                  mask.g  = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);	
-	}  
-	
-	// RGBX
-	else if (shadowMask == 10.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x * 0.25);
-		if      (pos.x < 0.2)  mask  = 0.0.xxx;
-		else if (pos.x < 0.4)  mask.r = 1.0;
-		else if (pos.x < 0.7)  mask.g = 1.0;	
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}  
-
-	// 4k mask
-	else if (shadowMask == 11.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x * 0.25);
-		if      (pos.x < 0.2)  mask.r  = 1.0;
-		else if (pos.x < 0.4)  mask.rg = 1.0.xx;
-		else if (pos.x < 0.7)  mask.gb = 1.0.xx;	
-		else                   mask.b  = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}     
-
-	// RRGGBBX mask
-	else if (shadowMask == 12.0)
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,7.0));
-		if      (pos.x < 0.5)  mask   = 0.0.xxx;
-		else if (pos.x < 2.5)  mask.r = 1.0;
-		else if (pos.x < 4.5)  mask.g = 1.0;	
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-
-	// 4k mask
-	else
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,6.0));
-		if      (pos.x < 0.5)  mask   = 0.0.xxx;
-		else if (pos.x < 1.5)  mask.r = 1.0;
-		else if (pos.x < 2.5)  mask.rg = 1.0.xx;
-		else if (pos.x < 3.5)  mask.rgb = 1.0.xxx;
-		else if (pos.x < 4.5)  mask.gb = 1.0.xx;		
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-	
-	if (mask_layout > 0.5) mask = mask.rbg;
-	float maskmin = min(min(mask.r,mask.g),mask.b);
-	return (mask - maskmin) * (1.0 + (maskboost-1.0)*mb) + maskmin;
-}
-
-
-float SlotMask(vec2 pos, float m, float swidth)
-{
-	if ((slotmask + slotmask1) == 0.0) return 1.0;
-	else
-	{
-	pos.y = floor(pos.y/slotms);
-	float mlen = swidth*2.0;
-	float px = floor(mod(pos.x, 0.99999*mlen));
-	float py = floor(fract(pos.y/(2.0*double_slot))*2.0*double_slot);
-	float slot_dark = mix(1.0-slotmask1, 1.0-slotmask, m);
-	float slot = 1.0;
-	if (py == 0.0 && px < swidth) slot = slot_dark; else
-	if (py == double_slot && px >= swidth) slot = slot_dark;		
-	
-	return slot;
-	}
-}
- 
-/* HSM Removed 
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx,dy);
-	return pos*0.5+0.5;
-} 
-*/
-
-float humbar(float pos)
-{
-	if (global.barintensity == 0.0) return 1.0; else
-	{
-		pos = (global.barintensity >= 0.0) ? pos : (1.0-pos);
-		pos = fract(pos + mod(float(global.FrameCount),global.barspeed)/(global.barspeed-1.0));
-		pos = (global.barintensity <  0.0) ? pos : (1.0-pos);	
-		return (1.0-global.barintensity) + global.barintensity*pos;
-	}	
-}
-
-/* HSM Removed
-float corner(vec2 pos) {
-	vec2 b = vec2(bsize1, bsize1) *  vec2(1.0, OutputSize.x/OutputSize.y) * 0.05;
-	pos = clamp(pos, 0.0, 1.0);
-	pos = abs(2.0*(pos - 0.5));
-	float csize1 = mix(400.0, 7.0,  pow(4.0*csize, 0.10));
-	float crn = dot(pow(pos, csize1.xx), vec2(1.0, OutputSize.y/OutputSize.x));
-	crn = (csize == 0.0) ? max(pos.x, pos.y) : pow(crn, 1.0/csize1);
-	pos = max(pos, crn);
-	vec2 res = (bsize1 == 0.0) ? 1.0.xx : mix(0.0.xx, 1.0.xx, smoothstep(1.0.xx, 1.0.xx-b, sqrt(pos)));
-	res = pow(res, sborder.xx);	
-	return sqrt(res.x*res.y);
-}
-*/
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-vec3 declip(vec3 c, float b)
-{
-	float m = max(max(c.r,c.g),c.b);
-	if (m > b) c = c*b/m;
-	return c;
-}
-
-float igc(float mc)
-{
-	return pow(mc, gamma_c);
-}
-
-// noise function:
-// Dedicated to the public domain.
-// If you want a real license, you may consider this MIT/BSD/CC0/WTFPL-licensed (take your pick).
-// Adapted from ChuckNorris - shadertoy: https://www.shadertoy.com/view/XtK3Dz
-
-vec3 noise(vec3 v){
-    if (global.addnoised < 0.0) v.z = -global.addnoised; else v.z = mod(v.z,6001.0)/1753.0;
-	// ensure reasonable range
-    v = fract(v) + fract(v*1e4) + fract(v*1e-4);
-    // seed
-    v += vec3(0.12345, 0.6789, 0.314159);
-    // more iterations => more random
-    v = fract(v*dot(v, v)*123.456);
-    v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);	
-    return v;
-} 
-
-void fetch_pixel (inout vec3 c, inout vec3 b, inout vec3 g, vec2 coord, vec2 bcoord)
-{
-	/* HSM REmoved
-		float stepx = OutputSize.z;
-		float stepy = OutputSize.w;
-	*/
-		float stepx = 0.5;
-		float stepy = 0.5;
-
-		// HSM Added
-		// Link Deconvergence as a ratio of the viewport height
-		if (global.dcscalemode < 1.5)
-		{
-			// Base deconvergence size based on 1080p
-			stepx = 1.0 / 1080.0 * OutputSize.y / OutputSize.x;
-			stepy = 1.0 / 1080.0;
-		}
-
-		// Link Deconvergence size to screen height
-		if (global.dcscalemode == 0)
-		{
-			stepx *= SCREEN_SCALE_WITH_ZOOM.y / DEFAULT_SCREEN_HEIGHT;
-			stepy *= SCREEN_SCALE_WITH_ZOOM.y / DEFAULT_SCREEN_HEIGHT;
-		}
-
-		// Link Deconvergence size is to final output pixel size
-		if (global.dcscalemode > 1.5)
-		{
-			// Compensate for a landscape viewport in 0-1 space
-			stepx = OutputSize.z;
-			stepy = OutputSize.w;
-
-			// Link the deconvergence to the mask size
-			if (global.dcscalemode == 3.0)
-			{
-				stepx *= masksize;
-				stepy *= masksize;
-			}
-		}
-
-		float ds = global.decons;
-				
-		vec2 dx = vec2(stepx, 0.0);
-		vec2 dy = vec2(0.0, stepy);		
-		
-		float posx = 2.0*coord.x - 1.0;
-		float posy = 2.0*coord.y - 1.0;
-		
-		if (global.dctypex > 0.025)
-		{
-			posx = sign(posx)*pow(abs(posx), 1.05-global.dctypex);
-			dx = posx * dx;
-		}
-
-		if (global.dctypey > 0.025)
-		{
-
-			posy = sign(posy)*pow(abs(posy), 1.05-global.dctypey);
-			dy = posy * dy;
-		}
-
-		vec2 rc = global.deconrr * dx + global.deconrry*dy;
-		vec2 gc = global.deconrg * dx + global.deconrgy*dy;
-		vec2 bc = global.deconrb * dx + global.deconrby*dy;		
-
-		float r1 = COMPAT_TEXTURE(Source, coord + rc).r;
-		float g1 = COMPAT_TEXTURE(Source, coord + gc).g;
-		float b1 = COMPAT_TEXTURE(Source, coord + bc).b;
-
-		vec3 d = vec3(r1, g1, b1);
-		c = clamp(mix(c, d, ds), 0.0, 1.0);
-		
-		// HSM Adjusted
-		r1 = HSM_GetCroppedTexSample(BloomPass, bcoord + rc).r;
-		g1 = HSM_GetCroppedTexSample(BloomPass, bcoord + gc).g;
-		b1 = HSM_GetCroppedTexSample(BloomPass, bcoord + bc).b;
-
-		d = vec3(r1, g1, b1);
-		b = g = mix(b, d, min(ds,1.0));
-		
-		// HSM Adjusted
-		r1 = HSM_GetCroppedTexSample(BloomPass, bcoord + rc).r;
-		g1 = HSM_GetCroppedTexSample(BloomPass, bcoord + gc).g;
-		b1 = HSM_GetCroppedTexSample(BloomPass, bcoord + bc).b;
-
-		d = vec3(r1, g1, b1);
-		g = mix(g, d, min(ds,1.0));
-}
-
-
-void main()
-{
-	/* HSM Removed
-	vec4 SourceSize = global.OriginalSize * vec4(prescalex, 1.0, 1.0/prescalex, 1.0);
-	*/
-
-	// HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-	vec2 SourceSize = CROPPED_ROTATED_SIZE_WITH_RES_MULT;
-	float TATE = USE_VERTICAL_SCANLINES;
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						SCREEN_ASPECT, 
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-	cache_bounds_coord = (BEZEL_OUTSIDE_COORD - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-		FragColor = vec4(0);
-		return;
-	}
-
-	/* HSM Removed
-	float lum = COMPAT_TEXTURE(AvgLumPass, vec2(0.5,0.5)).a;
-	*/
-	float no_scanlines = HSM_GetNoScanlineMode();
-	float gamma_in = 1.0/COMPAT_TEXTURE(LinearizePass, vec2(0.25,0.25)).a;
-	float intera = COMPAT_TEXTURE(LinearizePass, vec2(0.75,0.25)).a;
-	bool interb  = (intera < 0.35 || no_scanlines > 0.025) && hiscan < 0.5;
-	bool notate  = (TATE < 0.5);
-
-	/* HSM Removed
-	// Calculating texel coordinates
-   
-	vec2 texcoord = TEX0.xy;
-	if (IOS > 0.0 && !interb){
-		vec2 ofactor = OutputSize.xy/global.OriginalSize.xy;
-		vec2 intfactor = (IOS < 2.5) ? floor(ofactor) : ceil(ofactor);
-		vec2 diff = ofactor/intfactor;
-		float scan = mix(diff.y, diff.x, TATE);
-		texcoord = Overscan(texcoord, scan, scan);
-		if (IOS == 1.0 || IOS == 3.0) texcoord = mix(vec2(TEX0.x, texcoord.y), vec2(texcoord.x, TEX0.y), TATE);
-	}
-   
-	float factor  = 1.00 + (1.0-0.5*OS)*BLOOM/100.0 - lum*BLOOM/100.0;
-	texcoord  = Overscan(texcoord, factor, factor);
-
-	texcoord = Overscan(texcoord, (global.OriginalSize.x - overscanX)/global.OriginalSize.x, (global.OriginalSize.y - overscanY)/global.OriginalSize.y);
-	*/
-
-	vec2 pos1 = TEX0.xy;
-
-	/* HSM Removed
-	vec2 pos  = Warp(texcoord);
-	vec2 pos0 = Warp(TEX0.xy);
-	*/
-
-	// HSM Added
-	float raster_bloom_avg_lum = texture(AvgLumPass, vec2(0.5,0.5)).a;
-	vec2 screen_curved_coord = vec2(0.5);
-
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetCrtShaderFinalCoord(SCREEN_COORD,
-		SCREEN_SCALE,
-		raster_bloom_avg_lum,
-		screen_curved_coord);
-
-	vec2 pos = screen_curved_coord_with_overscan_and_mirror;
-	// End Addition
-
-	// color and bloom fetching
-	vec3 color = COMPAT_TEXTURE(Source,pos1).rgb;
-	vec3  Bloom = HSM_GetCroppedTexSample(BloomPass, pos).rgb;
-	vec3  Glow = HSM_GetCroppedTexSample(GlowPass, pos).rgb;
-
-	/* HSM Removed
-if ((abs(global.deconrr) + abs(global.deconrry) + abs(global.deconrg) + abs(global.deconrgy) + abs(global.deconrb) + abs(global.deconrby)) > 0.2)
-	fetch_pixel(color, Bloom, Glow, pos1, pos); // deconvergence
-	*/
-
-	// HSM Added
-	// TODO use Tube?
-	float screen_mask = HSM_GetCornerMask((screen_curved_coord - 0.5) * 0.999 + 0.5, SCREEN_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_SCREEN_CORNER_RADIUS_SCALE, 0.9);
-	bool is_inside_screen = screen_mask > 0.001;
-
-	if (is_inside_screen && GDV_DECONVERGENCE_ON > 0.5 && ((abs(global.deconrr) + abs(global.deconrry) + abs(global.deconrg) + abs(global.deconrgy) + abs(global.deconrb) + abs(global.deconrby)) > 0.2))
-		fetch_pixel(color, Bloom, Glow, pos1, pos); // deconvergence
-	
-	float cm = igc(max(max(color.r,color.g),color.b));
-	float mx1 = COMPAT_TEXTURE(Source, pos1     ).a;
-	float colmx = max(mx1, cm);
-	float w3 = min((cm + 0.0001) / (colmx + 0.0005), 1.0); if(interb) w3 = 1.0;
-	
-	vec2 dx = mix(vec2(0.001, 0.0), vec2(0.0, 0.001), TATE);
-	float mx0 = COMPAT_TEXTURE(Source, pos1 - dx).a;
-	float mx2 = COMPAT_TEXTURE(Source, pos1 + dx).a;
-	float mxg = max(max(mx0,mx1),max(mx2,cm));
-	float mx = pow(mxg, 1.40/gamma_in);
-
-	// mask boost tweak
-	
-	/* HSM Removed
-	dx = mix(vec2(global.OriginalSize.z, 0.0), vec2(0.0, global.OriginalSize.w), TATE) * 0.25;
-	*/
-
-	dx = mix(vec2(1 / CROPPED_ROTATED_SIZE_WITH_RES_MULT.x, 0.0), 
-			 vec2(0.0, 1 / CROPPED_ROTATED_SIZE_WITH_RES_MULT.y),
-			 TATE) * 0.25;
-	dx *=  SCREEN_SCALE.y / DEFAULT_SCREEN_HEIGHT;
-
-	mx0 = COMPAT_TEXTURE(Source, pos1 - dx).a;
-	mx2 = COMPAT_TEXTURE(Source, pos1 + dx).a;
-	float mb = (1.0 - min(abs(mx0-mx2)/(0.5+mx1), 1.0));
-	
-	vec3 one = vec3(1.0);
-	
-	// Apply Mask
-	
-	vec3 orig1 = color;
-	vec3 cmask = one;
-	vec3 cmask1 = one;
-	vec3 cmask2 = one;
-
-	// mask widths and mask dark compensate (fractional part) values
-	float mwidths[14] = float[14] (2.0, 3.0, 3.0, 3.0, 6.0, 2.4, 3.5, 2.4, 3.25, 3.5, 4.5, 4.25, 7.5, 6.25); 
-	
-	float mwidth = mwidths[int(shadowMask)];
-	float mask_compensate = fract(mwidth);
-
-// If the mask is ON
-if (shadowMask > -0.5)
-{	
-	vec2 maskcoord = gl_FragCoord.yx * 1.00001;
-	if (notate) maskcoord = maskcoord.yx;
-	vec2 scoord = maskcoord;
-	
-	mwidth = floor(mwidth) * masksize;
-	float swidth = mwidth;
-	bool zoomed = (abs(mask_zoom) > 0.75);
-	float mscale = 1.0;
-	vec2 maskcoord0 = maskcoord;
-	maskcoord.y = floor(maskcoord.y/masksize);
-	float mwidth1 = max(mwidth + mask_zoom, 2.0);
-
-if ( mshift > 0.25 )
-{	
-	float stagg_lvl = 1.0; if (fract(mshift) > 0.25) stagg_lvl = 2.0;
-	float next_line = float(floor(mod(maskcoord.y, 2.0*stagg_lvl)) < stagg_lvl);
-	maskcoord0.x = maskcoord0.x + next_line * 0.5 * mwidth1;
-}		
-	maskcoord = maskcoord0/masksize;
-
-if ( !zoomed )	
-	cmask*= Mask(floor(maskcoord), mx, mb);
-else{
-	mscale  = mwidth1/mwidth;
-	float mlerp = fract(maskcoord.x/mscale); if (mzoom_sh > 0.025) mlerp = (1.0 + mzoom_sh)*mlerp - 0.5*mzoom_sh;
-	float mcoord = floor(maskcoord.x/mscale); if (shadowMask == 12.0 && mask_zoom == -2.0) mcoord = ceil(maskcoord.x/mscale);
-	cmask*=max(mix(Mask(vec2(mcoord,maskcoord.y), mx, mb), Mask(vec2(mcoord + 1.0, maskcoord.y), mx, mb), mlerp), 0.0);
-}
-
-	if (slotwidth > 0.5) swidth = slotwidth; float smask = 1.0;
-
-	float sm_offset = 0.0; bool bsm_offset = (shadowMask == 0.0 || shadowMask == 2.0 || shadowMask == 5.0 || shadowMask == 6.0 || shadowMask == 8.0 || shadowMask == 11.0);
-	if( zoomed ) { if (mask_layout < 0.5 && bsm_offset) sm_offset = 1.0; else if (bsm_offset) sm_offset = -1.0; }
-	
-	swidth = round(swidth*mscale);
-	smask = SlotMask(scoord + vec2(sm_offset,0.0), mx, swidth);
-
-	smask = clamp(smask + mix(smask_mit, 0.0, min(w3, pow(w3*max(max(orig1.r,orig1.g),orig1.b), 0.33333))), 0.0, 1.0);
-	
-	cmask2 = cmask;
-	cmask*=smask;
-	cmask1 = cmask;
-
-	if (abs(mask_bloom) > 0.025)
-	{
-		float maxbl = max(max(max(Bloom.r,Bloom.g),Bloom.b), mxg);
-		maxbl = maxbl * max(mix(1.0, 2.0-colmx, bloom_dist), 0.0);
-		if (mask_bloom > 0.025) cmask = max(min(cmask + maxbl*mask_bloom, 1.0), cmask); else cmask = max(mix(cmask, cmask*(1.0-0.5*maxbl) + plant(pow(Bloom,0.35.xxx),maxbl), -mask_bloom),cmask);
-	}
-	
-	color = pow(color, vec3(mask_gamma/gamma_in));
-	color = color*cmask;
-	color = min(color,1.0);
-	color = pow(color, vec3(gamma_in/mask_gamma));
-
-	cmask  = min(cmask, 1.0);
-	cmask1 = min(cmask1, 1.0);
-}
-
-	float dark_compensate  = mix(max( clamp( mix (mcut, maskstr, mx),0.0, 1.0) - 1.0 + mask_compensate, 0.0) + 1.0, 1.0, mx); if(shadowMask < -0.5) dark_compensate = 1.0;
-	float bb = mix(brightboost, brightboost1, mx);
-	color*=bb;
-
-/* HSM Removed
-	vec3  Ref = COMPAT_TEXTURE(LinearizePass, pos).rgb;
-	float maxb = COMPAT_TEXTURE(BloomPass, pos).a;
-	float vig  = COMPAT_TEXTURE(PrePass, clamp(pos, 0.0+0.5*global.OriginalSize.zw, 1.0-0.5*global.OriginalSize.zw)).a;
-*/
-
-	vec3  Ref = HSM_GetCroppedTexSample(LinearizePass, pos).rgb;
-	float maxb = HSM_GetCroppedTexSample(BloomPass, pos).a;
-
-	vec3 Bloom1 = Bloom;
-	vec3 bcmask = mix(one, cmask, bmask1);
-	vec3 hcmask = mix(one, cmask, hmask1);
-
-	if (abs(bloom) > 0.025)
-	{
-		if (bloom < -0.01) Bloom1 = plant(Bloom, maxb);
-		Bloom1 = min(Bloom1*(orig1+color), max(0.5*(colmx + orig1 - color),0.001*Bloom1));
-		Bloom1 = 0.5*(Bloom1 + mix(Bloom1, mix(colmx*orig1, Bloom1, 0.5), 1.0-color));
-		Bloom1 = bcmask*Bloom1 * max(mix(1.0, 2.0-colmx, bloom_dist), 0.0);
-		color = pow(pow(color, vec3(mask_gamma/gamma_in)) + abs(bloom) * pow(Bloom1, vec3(mask_gamma/gamma_in)), vec3(gamma_in/mask_gamma));
-	}
-
-	if (!interb) color = declip(min(color,1.0), mix(1.0, w3, 0.6));
-
-	if (halation > 0.01) {
-		Bloom = mix(0.5*(Bloom + Bloom*Bloom), 0.75*Bloom*Bloom, colmx);	
-		color = color + 2.0*max((2.0*mix(maxb*maxb, maxb, colmx)-0.5*max(max(Ref.r,Ref.g),Ref.b)),0.25)*mix(1.0,w3,0.5*colmx)*hcmask*Bloom*halation; }
-	else
-	if (halation < -0.01) {
-		float mbl = max(max(Bloom.r,Bloom.g),Bloom.b);
-		Bloom = plant(Bloom + Ref + orig1 + Bloom*Bloom*Bloom, min(mbl*mbl,0.75));
-		color = color + 2.0*mix(1.0,w3,0.5*colmx)*hcmask*Bloom*(-halation); }
-
-
-	float w = 0.25 + 0.60*mix(w3, 1.0, sqrt(colmx));
-	if (smoothmask > 0.5) { color = min(color,1.0); color = max(min(color/w3, 1.0)*w3, min(orig1*bb,color*(1.0-w3))); }
-
-	if (global.m_glow < 0.5) Glow = mix(Glow, 0.25*color, colmx);
-	else
-	{ 
-		maxb = max(max(Glow.r,Glow.g),Glow.b);
-		vec3 orig2 = plant(orig1 + 0.001*Ref, 1.0);
-		Bloom = plant(Glow, 1.0);
-		Ref = abs(orig2-Bloom);
-		mx0 = max(max(orig2.g,orig2.g),orig2.b)-min(min(orig2.g,orig2.g),orig2.b);
-		mx2 = max(max(Bloom.g,Bloom.g),Bloom.b)-min(min(Bloom.g,Bloom.g),Bloom.b);		
-		Bloom = mix(maxb*min(Bloom,orig2), w*mix(mix(Glow, max(max(Ref.g,Ref.g),Ref.b)*Glow, max(mx,mx0)), mix(color, Glow, mx2), max(mx0,mx2)*Ref), min(sqrt((1.10-mx0)*(0.10+mx2)),1.0));
-		Glow = mix(global.m_glow_low*Glow, global.m_glow_high*Bloom, pow(colmx, global.m_glow_dist/gamma_in));
-	}
-
-	if (global.m_glow < 0.5) {
-		if (glow >= 0.0) color = color + 0.5*Glow*glow; else color = color + abs(glow)*min(cmask2*cmask2,1.0)*Glow; }
-	else { cmask1 = clamp(mix(one, cmask1, global.m_glow_mask),0.0, 1.0); color = color + abs(glow)*cmask1*Glow; }
-
-	/* HSM Removed
-	color = min(color, 1.0);
-	*/
-	
-	color = pow(color, vec3(1.0/gamma_out));
-
-	float rc = 0.6*sqrt(max(max(color.r, color.g), color.b))+0.4;
-	
-	if (global.GDV_NOISE_ON > 0.5)
-	{
-
-		/* HSM Removed
-		vec3 noise0 = noise(vec3(floor(OutputSize.xy * vTexCoord / global.noiseresd), float(global.FrameCount)));
-		if (global.noisetype < 0.5) color = mix(color, noise0, 0.25*abs(global.addnoised) * rc); 
-		else color = min(color * mix(1.0, 1.5*noise0.x, 0.5*abs(global.addnoised)), 1.0);
-		*/
-
-		// HSM Added
-		float noise_res = global.FinalViewportSize.y > 2000 ? global.noiseresd * global.noiseresd4kmult : global.noiseresd;
-
-		// If we are at 8k multiply this by 2
-		noise_res *= global.noiseresd4kmult > 1 && global.FinalViewportSize.y > 4200 ? 2 : 1;
-
-		vec3 noise0 = noise(vec3(floor(OutputSize.xy * vTexCoord / noise_res), float(global.FrameCount)));		
-		if (global.noisetype < 0.5) color = mix(color, noise0, 0.25*abs(global.addnoised) * rc);
-		else color = min(color * mix(1.0, 1.5*noise0.x, 0.5*abs(global.addnoised)), 1.0);
-	}
-	
-	colmx = max(max(orig1.r,orig1.g),orig1.b);
-	color = color + bmask*mix(cmask2, 0.125*(1.0-colmx)*color, min(20.0*colmx, 1.0));
-	
-	/* HSM Removed
-	FragColor = vec4(color*vig*humbar(mix(pos.y, pos.x, global.bardir))*global.post_br*corner(pos0), 1.0);
-	*/
-
-	// HSM Added
-	float adjusted_bardir = global.bardir < 0 ? TATE : global.bardir;
-	color.rgb *= humbar(mix(pos.y, pos.x, adjusted_bardir));
-
-	FragColor = HSM_Linearize(vec4(color, 1.0), DEFAULT_SRGB_GAMMA);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence.slang b/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence.slang
deleted file mode 100644
index 27e51fca5c..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-#include "hsm-deconvergence.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence_orig.slang
deleted file mode 100644
index 7574ef070f..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-deconvergence_orig.slang
+++ /dev/null
@@ -1,834 +0,0 @@
-#version 450
-
-/*
-   CRT - Guest - Advanced
-   
-   Copyright (C) 2018-2023 guest(r) - guest.r@gmail.com
-
-   Incorporates many good ideas and suggestions from Dr. Venom.
-   I would also like give thanks to many Libretro forums members for continuous feedback, suggestions and caring about the shader.
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-	float TATE, IOS, OS, BLOOM, brightboost, brightboost1, csize, bsize1, warpX, warpY, glow, shadowMask, masksize,
-	slotmask, slotmask1, slotwidth, double_slot, mcut, maskDark, maskLight, maskstr, mshift, mask_layout, mask_bloom, hiscan;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float bloom;
-	float halation;
-	float slotms;
-	float mask_gamma;
-	float gamma_out;
-	float overscanX;
-	float overscanY;	
-	float intres;
-	float c_shape;
-	float barspeed;
-	float barintensity;   
-	float bardir;
-	float sborder;
-	float bloom_dist;
-	float deconr;
-	float decons;
-	float addnoised;
-	float noisetype;
-	float noiseresd;
-	float deconrr;
-	float deconrg;
-	float deconrb;
-	float deconrry;
-	float deconrgy;
-	float deconrby;	
-	float dctypex;
-	float dctypey;
-	float post_br;
-	float maskboost;
-	float smoothmask;
-	float gamma_c;
-	float m_glow;
-	float m_glow_low;
-	float m_glow_high;
-	float m_glow_dist;
-	float m_glow_mask;
-	float smask_mit;
-	float mask_zoom;
-	float no_scanlines;
-	float bmask;
-	float bmask1;
-	float hmask1;
-	float mzoom_sh;	
-} global;
-
-#pragma parameter hiscan "          High Resolution Scanlines (prepend a scaler...)" 0.0 0.0 1.0 1.0
-#define hiscan        params.hiscan
-
-#pragma parameter no_scanlines "          No-scanline mode" 0.0 0.0 1.5 0.05
-
-#pragma parameter bogus_brightness "[ BRIGHTNESS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter m_glow "          Ordinary Glow / Magic Glow" 0.0 0.0 1.0 1.0
-
-#pragma parameter m_glow_low "          Magic Glow Low Strength" 0.35 0.0 7.0 0.05 
-
-#pragma parameter m_glow_high "          Magic Glow High Strength" 5.0 0.0 7.0 0.10 
-
-#pragma parameter m_glow_dist "          Magic Glow Distribution" 1.0 0.20 4.0 0.05 
-
-#pragma parameter m_glow_mask "          Magic Glow Mask Strength" 1.0 0.0 2.0 0.025
-
-#pragma parameter glow "          (Magic) Glow Strength" 0.08 -2.0 2.0 0.01
-#define glow         params.glow     // Glow Strength
-
-#pragma parameter bloom "          Bloom Strength" 0.0 -2.0 2.0 0.05
-#define bloom         global.bloom     // bloom effect
-
-#pragma parameter mask_bloom "          Mask Bloom" 0.0 -2.0 2.0 0.05
-#define mask_bloom         params.mask_bloom     // bloom effect
-
-#pragma parameter bloom_dist "          Bloom Distribution" 0.0 -2.0 3.0 0.05
-#define bloom_dist         global.bloom_dist     // bloom effect distribution
-
-#pragma parameter halation "          Halation Strength" 0.0 -2.0 2.0 0.025
-#define halation         global.halation     // halation effect
-
-#pragma parameter bmask1 "          Bloom Mask Strength" 0.0 -1.0 1.0 0.025
-#define bmask1         global.bmask1     // bloom/halation mask strength
-
-#pragma parameter hmask1 "          Halation Mask Strength" 0.5 -1.0 1.0 0.025
-#define hmask1         global.hmask1     // bloom/halation mask strength
-
-#pragma parameter brightboost "          Bright Boost Dark Pixels" 1.40 0.25 10.0 0.05
-#define brightboost  params.brightboost     // adjust brightness
-
-#pragma parameter brightboost1 "          Bright Boost Bright Pixels" 1.10 0.25 3.00 0.025
-#define brightboost1  params.brightboost1     // adjust brightness
-
-#pragma parameter gamma_c "          Gamma correct" 1.0 0.50 2.0 0.025
-#define gamma_c   global.gamma_c     // adjust brightness
-
-#pragma parameter bogus_screen "[ SCREEN OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter TATE "          TATE Mode" 0.0 0.0 1.0 1.0
-#define TATE         params.TATE     // Screen orientation
-
-#pragma parameter IOS "          Integer Scaling: Odd:Y, Even:'X'+Y" 0.0 0.0 4.0 1.0
-#define IOS          params.IOS     // Smart Integer Scaling
-
-#pragma parameter OS "          R. Bloom Overscan Mode" 1.0 0.0 2.0 1.0
-#define OS           params.OS     // Do overscan
-
-#pragma parameter BLOOM "          Raster bloom %" 0.0 0.0 20.0 1.0
-#define BLOOM        params.BLOOM     // Bloom overscan percentage
-
-#pragma parameter csize "          Corner Size" 0.0 0.0 0.25 0.005
-#define csize        params.csize     // corner size
-
-#pragma parameter bsize1 "          Border Size" 0.01 0.0 3.0 0.01
-#define bsize1        params.bsize1     // border Size
-
-#pragma parameter sborder "          Border Intensity" 0.75 0.25 2.0 0.05
-#define sborder       global.sborder     // border intensity
-
-#pragma parameter barspeed "          Hum Bar Speed" 50.0 5.0 200.0 1.0
-
-#pragma parameter barintensity "          Hum Bar Intensity" 0.0 -1.0 1.0 0.01
-
-#pragma parameter bardir "          Hum Bar Direction" 0.0 0.0 1.0 1.0
-
-#pragma parameter warpX "          CurvatureX (default 0.03)" 0.0 0.0 0.25 0.01
-#define warpX        params.warpX     // Curvature X
-
-#pragma parameter warpY "          CurvatureY (default 0.04)" 0.0 0.0 0.25 0.01
-#define warpY        params.warpY     // Curvature Y
-
-#pragma parameter c_shape "          Curvature Shape" 0.25 0.05 0.60 0.05
-#define c_shape        global.c_shape     // curvature shape
-
-#pragma parameter overscanX "          Overscan X original pixels" 0.0 -200.0 200.0 1.0
-#define overscanX        global.overscanX     // OverscanX pixels
-
-#pragma parameter overscanY "          Overscan Y original pixels" 0.0 -200.0 200.0 1.0
-#define overscanY        global.overscanY     // OverscanY pixels
-
-#pragma parameter bogus_masks "[ CRT MASK OPTIONS ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter shadowMask "          CRT Mask: 0:CGWG, 1-4:Lottes, 5-13:'Trinitron'" 0.0 -1.0 13.0 1.0
-#define shadowMask   params.shadowMask     // Mask Style
-
-#pragma parameter maskstr "          Mask Strength (0, 5-12)" 0.3 -0.5 1.0 0.025
-#define maskstr         params.maskstr      // Mask Strength
-
-#pragma parameter mcut "          Mask 5-12 Low Strength" 1.10 0.0 2.0 0.05
-#define mcut         params.mcut      // Mask 5-12 dark color strength
-
-#pragma parameter maskboost "          CRT Mask Boost" 1.0 1.0 3.0 0.05
-#define maskboost     global.maskboost     // Mask Boost
-
-#pragma parameter masksize "          CRT Mask Size" 1.0 1.0 4.0 1.0
-#define masksize     params.masksize     // Mask Size
-
-#pragma parameter mask_zoom "          CRT Mask Zoom (+ mask width)" 0.0 -5.0 5.0 1.0
-#define mask_zoom     global.mask_zoom     // Mask Size
-
-#pragma parameter mzoom_sh "          CRT Mask Zoom Sharpen (needs Mask Zoom)" 0.0 0.0 1.0 0.05
-#define mzoom_sh     global.mzoom_sh  
-
-#pragma parameter mshift "          (Transform to) Shadow Mask" 0.0 0.0 1.0 0.5
-#define mshift     params.mshift     // do the "shadow mask"
-
-#pragma parameter mask_layout "          Mask Layout: RGB or BGR (check LCD panel) " 0.0 0.0 1.0 1.0
-#define mask_layout     params.mask_layout     // mask layout: RGB or BGR
-
-#pragma parameter maskDark "          Lottes maskDark" 0.5 0.0 2.0 0.05
-#define maskDark     params.maskDark     // Dark "Phosphor"
-
-#pragma parameter maskLight "          Lottes maskLight" 1.5 0.0 2.0 0.05
-#define maskLight    params.maskLight     // Light "Phosphor"
-
-#pragma parameter mask_gamma "          Mask gamma" 2.40 1.0 5.0 0.05
-#define mask_gamma   global.mask_gamma     // Mask application gamma
-
-#pragma parameter slotmask "          Slot Mask Strength Bright Pixels" 0.0 0.0 1.0 0.05
-#define slotmask     params.slotmask
-
-#pragma parameter slotmask1 "          Slot Mask Strength Dark Pixels" 0.0 0.0 1.0 0.05
-#define slotmask1     params.slotmask1
-
-#pragma parameter slotwidth "          Slot Mask Width (0:Auto)" 0.0 0.0 16.0 1.0
-#define slotwidth    params.slotwidth     // Slot Mask Width
-
-#pragma parameter double_slot "          Slot Mask Height: 2x1 or 4x1..." 2.0 1.0 4.0 1.0
-#define double_slot  params.double_slot     // Slot Mask Height
-
-#pragma parameter slotms "          Slot Mask Thickness" 1.0 1.0 4.0 1.0
-#define slotms  global.slotms     // Slot Mask Thickness
-
-#pragma parameter smoothmask "          Smooth Masks in bright scanlines" 0.0 0.0 1.0 1.0
-#define smoothmask  global.smoothmask
-
-#pragma parameter smask_mit "          Mitigate Slotmask Interaction" 0.0 0.0 1.0 0.05
-#define smask_mit  global.smask_mit
-
-#pragma parameter bmask "          Base (black) Mask strength" 0.0 0.0 0.25 0.01
-#define bmask  global.bmask
-
-#pragma parameter gamma_out "          Gamma out" 2.4 1.0 5.0 0.05
-#define gamma_out    global.gamma_out     // output gamma
-
-
-#pragma parameter bogus_deconvergence11 "[ HORIZONTAL/VERTICAL DECONVERGENCE ]: " 0.0 0.0 1.0 1.0
-
-#pragma parameter dctypex "          Deconvergence type X : 0.0 - static, other - dynamic" 0.0 0.0 0.75 0.05
-
-#pragma parameter dctypey "          Deconvergence type Y : 0.0 - static, other - dynamic" 0.0 0.0 0.75 0.05
-
-#pragma parameter deconrr "          Horizontal Deconvergence Red Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrg "          Horizontal Deconvergence Green Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrb "          Horizontal Deconvergence Blue Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrry "          Vertical Deconvergence Red Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrgy "          Vertical Deconvergence Green Range" 0.0 -15.0 15.0 0.25
-
-#pragma parameter deconrby "          Vertical Deconvergence Blue Range" 0.0 -15.0 15.0 0.25
- 
-#pragma parameter decons "          Deconvergence Strength" 1.0 0.0 3.0 0.10
-
-#pragma parameter addnoised "          Add Noise" 0.0 -1.0 1.0 0.02
-
-#pragma parameter noiseresd "          Noise Resolution" 2.0 1.0 10.0 1.0
-
-#pragma parameter noisetype "          Noise Type: Colored, Luma" 0.0 0.0 1.0 1.0
-
-#pragma parameter post_br "          Post Brightness" 1.0 0.25 5.0 0.01
-
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-#define TEX0 vTexCoord
-
-#define OutputSize global.OutputSize
-#define gl_FragCoord (vTexCoord * OutputSize.xy)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-layout(set = 0, binding = 3) uniform sampler2D AvgLumPass;
-layout(set = 0, binding = 4) uniform sampler2D GlowPass;
-layout(set = 0, binding = 5) uniform sampler2D BloomPass;
-layout(set = 0, binding = 6) uniform sampler2D PrePass;
-layout(set = 0, binding = 7) uniform sampler2D Source;
-
-#define eps 1e-10 
-
-// Shadow mask (1-4 from PD CRT Lottes shader).
-
-vec3 Mask(vec2 pos, float mx, float mb)
-{
-	vec3 mask = vec3(maskDark, maskDark, maskDark);
-	vec3 one = vec3(1.0);
-	
-	if (shadowMask == 0.0)
-	{
-		float mc = 1.0 - max(maskstr, 0.0);	
-		pos.x = fract(pos.x*0.5);
-		if (pos.x < 0.49) { mask.r = 1.0; mask.g = mc; mask.b = 1.0; }
-		else { mask.r = mc; mask.g = 1.0; mask.b = mc; }
-	}    
-   
-	// Very compressed TV style shadow mask.
-	else if (shadowMask == 1.0)
-	{
-		float line = maskLight;
-		float odd  = 0.0;
-
-		if (fract(pos.x/6.0) < 0.49)
-			odd = 1.0;
-		if (fract((pos.y + odd)/2.0) < 0.49)
-			line = maskDark;
-
-		pos.x = floor(mod(pos.x,3.0));
-    
-		if      (pos.x < 0.5) mask.r = maskLight;
-		else if (pos.x < 1.5) mask.g = maskLight;
-		else                  mask.b = maskLight;
-		
-		mask*=line;
-	} 
-
-	// Aperture-grille.
-	else if (shadowMask == 2.0)
-	{
-		pos.x = floor(mod(pos.x,3.0));
-
-		if      (pos.x < 0.5) mask.r = maskLight;
-		else if (pos.x < 1.5) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	} 
-
-	// Stretched VGA style shadow mask (same as prior shaders).
-	else if (shadowMask == 3.0)
-	{
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.3) mask.r = maskLight;
-		else if (pos.x < 0.6) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	}
-
-	// VGA style shadow mask.
-	else if (shadowMask == 4.0)
-	{
-		pos.xy = floor(pos.xy*vec2(1.0, 0.5));
-		pos.x += pos.y*3.0;
-		pos.x  = fract(pos.x/6.0);
-
-		if      (pos.x < 0.3) mask.r = maskLight;
-		else if (pos.x < 0.6) mask.g = maskLight;
-		else                  mask.b = maskLight;
-	}
-	
-	// Trinitron mask 5
-	else if (shadowMask == 5.0)
-	{
-		mask = vec3(0.0);		
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.49)
-		{	mask.r  = 1.0;
-			mask.b  = 1.0;
-		}
-		else     mask.g = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// Trinitron mask 6
-	else if (shadowMask == 6.0)
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,3.0));
-		if      (pos.x < 0.5) mask.r = 1.0;
-		else if (pos.x < 1.5) mask.g = 1.0;
-		else                    mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-	
-	// BW Trinitron mask 7
-	else if (shadowMask == 7.0)
-	{
-		mask = vec3(0.0);		
-		pos.x = fract(pos.x/2.0);
-		if  (pos.x < 0.49)
-		{	mask  = 0.0.xxx;
-		}
-		else     mask = 1.0.xxx;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// BW Trinitron mask 8
-	else if (shadowMask == 8.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x/3.0);
-		if      (pos.x < 0.3) mask = 0.0.xxx;
-		else if (pos.x < 0.6) mask = 1.0.xxx;
-		else                  mask = 1.0.xxx;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}    
-
-	// Magenta - Green - Black mask
-	else if (shadowMask == 9.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x/3.0);
-		if      (pos.x < 0.3) mask    = 0.0.xxx;
-		else if (pos.x < 0.6) mask.rb = 1.0.xx;
-		else                  mask.g  = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);	
-	}  
-	
-	// RGBX
-	else if (shadowMask == 10.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x * 0.25);
-		if      (pos.x < 0.2)  mask  = 0.0.xxx;
-		else if (pos.x < 0.4)  mask.r = 1.0;
-		else if (pos.x < 0.7)  mask.g = 1.0;	
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}  
-
-	// 4k mask
-	else if (shadowMask == 11.0)
-	{
-		mask = vec3(0.0);
-		pos.x = fract(pos.x * 0.25);
-		if      (pos.x < 0.2)  mask.r  = 1.0;
-		else if (pos.x < 0.4)  mask.rg = 1.0.xx;
-		else if (pos.x < 0.7)  mask.gb = 1.0.xx;	
-		else                   mask.b  = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}     
-
-	// RRGGBBX mask
-	else if (shadowMask == 12.0)
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,7.0));
-		if      (pos.x < 0.5)  mask   = 0.0.xxx;
-		else if (pos.x < 2.5)  mask.r = 1.0;
-		else if (pos.x < 4.5)  mask.g = 1.0;	
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-
-	// 4k mask
-	else
-	{
-		mask = vec3(0.0);
-		pos.x = floor(mod(pos.x,6.0));
-		if      (pos.x < 0.5)  mask   = 0.0.xxx;
-		else if (pos.x < 1.5)  mask.r = 1.0;
-		else if (pos.x < 2.5)  mask.rg = 1.0.xx;
-		else if (pos.x < 3.5)  mask.rgb = 1.0.xxx;
-		else if (pos.x < 4.5)  mask.gb = 1.0.xx;		
-		else                   mask.b = 1.0;
-		mask = clamp(mix( mix(one, mask, mcut), mix(one, mask, maskstr), mx), 0.0, 1.0);
-	}
-	
-	if (mask_layout > 0.5) mask = mask.rbg;
-	float maskmin = min(min(mask.r,mask.g),mask.b);
-	return (mask - maskmin) * (1.0 + (maskboost-1.0)*mb) + maskmin;
-}
-
-
-float SlotMask(vec2 pos, float m, float swidth)
-{
-	if ((slotmask + slotmask1) == 0.0) return 1.0;
-	else
-	{
-	pos.y = floor(pos.y/slotms);
-	float mlen = swidth*2.0;
-	float px = floor(mod(pos.x, 0.99999*mlen));
-	float py = floor(fract(pos.y/(2.0*double_slot))*2.0*double_slot);
-	float slot_dark = mix(1.0-slotmask1, 1.0-slotmask, m);
-	float slot = 1.0;
-	if (py == 0.0 && px < swidth) slot = slot_dark; else
-	if (py == double_slot && px >= swidth) slot = slot_dark;		
-	
-	return slot;
-	}
-}
- 
-vec2 Warp(vec2 pos)
-{
-	pos  = pos*2.0-1.0;    
-	pos  = mix(pos, vec2(pos.x*inversesqrt(1.0-c_shape*pos.y*pos.y), pos.y*inversesqrt(1.0-c_shape*pos.x*pos.x)), vec2(warpX, warpY)/c_shape);
-	return pos*0.5 + 0.5;
-}
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx,dy);
-	return pos*0.5+0.5;
-} 
-
-float humbar(float pos)
-{
-	if (global.barintensity == 0.0) return 1.0; else
-	{
-		pos = (global.barintensity >= 0.0) ? pos : (1.0-pos);
-		pos = fract(pos + mod(float(global.FrameCount),global.barspeed)/(global.barspeed-1.0));
-		pos = (global.barintensity <  0.0) ? pos : (1.0-pos);	
-		return (1.0-global.barintensity) + global.barintensity*pos;
-	}	
-}
-
-
-float corner(vec2 pos) {
-	vec2 b = vec2(bsize1, bsize1) *  vec2(1.0, OutputSize.x/OutputSize.y) * 0.05;
-	pos = clamp(pos, 0.0, 1.0);
-	pos = abs(2.0*(pos - 0.5));
-	float csize1 = mix(400.0, 7.0,  pow(4.0*csize, 0.10));
-	float crn = dot(pow(pos, csize1.xx), vec2(1.0, OutputSize.y/OutputSize.x));
-	crn = (csize == 0.0) ? max(pos.x, pos.y) : pow(crn, 1.0/csize1);
-	pos = max(pos, crn);
-	vec2 res = (bsize1 == 0.0) ? 1.0.xx : mix(0.0.xx, 1.0.xx, smoothstep(1.0.xx, 1.0.xx-b, sqrt(pos)));
-	res = pow(res, sborder.xx);	
-	return sqrt(res.x*res.y);
-}
-
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-vec3 declip(vec3 c, float b)
-{
-	float m = max(max(c.r,c.g),c.b);
-	if (m > b) c = c*b/m;
-	return c;
-}
-
-float igc(float mc)
-{
-	return pow(mc, gamma_c);
-}
-
-// noise function:
-// Dedicated to the public domain.
-// If you want a real license, you may consider this MIT/BSD/CC0/WTFPL-licensed (take your pick).
-// Adapted from ChuckNorris - shadertoy: https://www.shadertoy.com/view/XtK3Dz
-
-vec3 noise(vec3 v){
-    if (global.addnoised < 0.0) v.z = -global.addnoised; else v.z = mod(v.z,6001.0)/1753.0;
-	// ensure reasonable range
-    v = fract(v) + fract(v*1e4) + fract(v*1e-4);
-    // seed
-    v += vec3(0.12345, 0.6789, 0.314159);
-    // more iterations => more random
-    v = fract(v*dot(v, v)*123.456);
-    v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);	
-    return v;
-} 
-
-void fetch_pixel (inout vec3 c, inout vec3 b, inout vec3 g, vec2 coord, vec2 bcoord)
-{
-		float stepx = OutputSize.z;
-		float stepy = OutputSize.w;
-		
-		float ds = global.decons;
-				
-		vec2 dx = vec2(stepx, 0.0);
-		vec2 dy = vec2(0.0, stepy);		
-		
-		float posx = 2.0*coord.x - 1.0;
-		float posy = 2.0*coord.y - 1.0;
-		
-		if (global.dctypex > 0.025)
-		{
-			posx = sign(posx)*pow(abs(posx), 1.05-global.dctypex);
-			dx = posx * dx;
-		}
-
-		if (global.dctypey > 0.025)
-		{
-
-			posy = sign(posy)*pow(abs(posy), 1.05-global.dctypey);
-			dy = posy * dy;
-		}
-
-		vec2 rc = global.deconrr * dx + global.deconrry*dy;
-		vec2 gc = global.deconrg * dx + global.deconrgy*dy;
-		vec2 bc = global.deconrb * dx + global.deconrby*dy;		
-
-		float r1 = COMPAT_TEXTURE(Source, coord + rc).r;
-		float g1 = COMPAT_TEXTURE(Source, coord + gc).g;
-		float b1 = COMPAT_TEXTURE(Source, coord + bc).b;
-
-		vec3 d = vec3(r1, g1, b1);
-		c = clamp(mix(c, d, ds), 0.0, 1.0);
-		
-		r1 = COMPAT_TEXTURE(BloomPass, bcoord + rc).r;
-		g1 = COMPAT_TEXTURE(BloomPass, bcoord + gc).g;
-		b1 = COMPAT_TEXTURE(BloomPass, bcoord + bc).b;
-
-		d = vec3(r1, g1, b1);
-		b = g = mix(b, d, min(ds,1.0));
-		
-		r1 = COMPAT_TEXTURE(GlowPass, bcoord + rc).r;
-		g1 = COMPAT_TEXTURE(GlowPass, bcoord + gc).g;
-		b1 = COMPAT_TEXTURE(GlowPass, bcoord + bc).b;
-
-		d = vec3(r1, g1, b1);
-		g = mix(g, d, min(ds,1.0));
-}
-
-
-void main()
-{
-	vec4 SourceSize = global.OriginalSize;
-	
-	float lum = COMPAT_TEXTURE(AvgLumPass, vec2(0.5,0.5)).a;
-	
-	float gamma_in = 1.0/COMPAT_TEXTURE(LinearizePass, vec2(0.25,0.25)).a;
-	float intera = COMPAT_TEXTURE(LinearizePass, vec2(0.75,0.25)).a;
-	bool interb  = ((intera < 0.35 || global.no_scanlines > 0.025) && hiscan < 0.5);
-	bool notate  = (TATE < 0.5);
-	
-	// Calculating texel coordinates
-   
-	vec2 texcoord = TEX0.xy;
-	if (IOS > 0.0 && !interb){
-		vec2 ofactor = OutputSize.xy/global.OriginalSize.xy;
-		vec2 intfactor = (IOS < 2.5) ? floor(ofactor) : ceil(ofactor);
-		vec2 diff = ofactor/intfactor;
-		float scan = mix(diff.y, diff.x, TATE);
-		texcoord = Overscan(texcoord, scan, scan);
-		if (IOS == 1.0 || IOS == 3.0) texcoord = mix(vec2(TEX0.x, texcoord.y), vec2(texcoord.x, TEX0.y), TATE);
-	}
-   
-	float factor  = 1.00 + (1.0-0.5*OS)*BLOOM/100.0 - lum*BLOOM/100.0;
-	texcoord  = Overscan(texcoord, factor, factor);
-
-	texcoord = Overscan(texcoord, (global.OriginalSize.x - overscanX)/global.OriginalSize.x, (global.OriginalSize.y - overscanY)/global.OriginalSize.y);
-
-	vec2 pos1 = TEX0.xy;
-	vec2 pos  = Warp(texcoord);
-	vec2 pos0 = Warp(TEX0.xy);
-	
-	// color and bloom fetching
-	vec3 color = COMPAT_TEXTURE(Source,pos1).rgb;
-	vec3  Bloom = COMPAT_TEXTURE(BloomPass, pos).rgb;
-	vec3  Glow = COMPAT_TEXTURE(GlowPass, pos).rgb;
-
-if ((abs(global.deconrr) + abs(global.deconrry) + abs(global.deconrg) + abs(global.deconrgy) + abs(global.deconrb) + abs(global.deconrby)) > 0.2)
-	fetch_pixel(color, Bloom, Glow, pos1, pos); // deconvergence
-	
-	float cm = igc(max(max(color.r,color.g),color.b));
-	float mx1 = COMPAT_TEXTURE(Source, pos1     ).a;
-	float colmx = max(mx1, cm);
-	float w3 = min((cm + 0.0001) / (colmx + 0.0005), 1.0); if(interb) w3 = 1.0;
-	
-	vec2 dx = mix(vec2(0.001, 0.0), vec2(0.0, 0.001), TATE);
-	float mx0 = COMPAT_TEXTURE(Source, pos1 - dx).a;
-	float mx2 = COMPAT_TEXTURE(Source, pos1 + dx).a;
-	float mxg = max(max(mx0,mx1),max(mx2,cm));
-	float mx = pow(mxg, 1.40/gamma_in);
-
-	// mask boost tweak
-	
-	dx = mix(vec2(global.OriginalSize.z, 0.0), vec2(0.0, global.OriginalSize.w), TATE) * 0.25;
-	mx0 = COMPAT_TEXTURE(Source, pos1 - dx).a;
-	mx2 = COMPAT_TEXTURE(Source, pos1 + dx).a;
-	float mb = (1.0 - min(abs(mx0-mx2)/(0.5+mx1), 1.0));
-	
-	vec3 one = vec3(1.0);
-	
-	// Apply Mask
-	
-	vec3 orig1 = color;
-	vec3 cmask = one;
-	vec3 cmask1 = one;
-	vec3 cmask2 = one;
-
-	// mask widths and mask dark compensate (fractional part) values
-	float mwidths[14] = float[14] (2.0, 3.0, 3.0, 3.0, 6.0, 2.4, 3.5, 2.4, 3.25, 3.5, 4.5, 4.25, 7.5, 6.25); 
-	
-	float mwidth = mwidths[int(shadowMask)];
-	float mask_compensate = fract(mwidth);
-
-if (shadowMask > -0.5)
-{	
-	vec2 maskcoord = gl_FragCoord.yx * 1.00001;
-	if (notate) maskcoord = maskcoord.yx;
-	vec2 scoord = maskcoord;
-	
-	mwidth = floor(mwidth) * masksize;
-	float swidth = mwidth;
-	bool zoomed = (abs(mask_zoom) > 0.75);
-	float mscale = 1.0;
-	vec2 maskcoord0 = maskcoord;
-	maskcoord.y = floor(maskcoord.y/masksize);
-	float mwidth1 = max(mwidth + mask_zoom, 2.0);
-
-if ( mshift > 0.25 )
-{	
-	float stagg_lvl = 1.0; if (fract(mshift) > 0.25) stagg_lvl = 2.0;
-	float next_line = float(floor(mod(maskcoord.y, 2.0*stagg_lvl)) < stagg_lvl);
-	maskcoord0.x = maskcoord0.x + next_line * 0.5 * mwidth1;
-}		
-	maskcoord = maskcoord0/masksize;
-
-if ( !zoomed )	
-	cmask*= Mask(floor(maskcoord), mx, mb);
-else{
-	mscale  = mwidth1/mwidth;
-	float mlerp = fract(maskcoord.x/mscale); if (mzoom_sh > 0.025) mlerp = (1.0 + mzoom_sh)*mlerp - 0.5*mzoom_sh;
-	float mcoord = floor(maskcoord.x/mscale); if (shadowMask == 12.0 && mask_zoom == -2.0) mcoord = ceil(maskcoord.x/mscale);
-	cmask*=max(mix(Mask(vec2(mcoord,maskcoord.y), mx, mb), Mask(vec2(mcoord + 1.0, maskcoord.y), mx, mb), mlerp), 0.0);
-}
-
-	if (slotwidth > 0.5) swidth = slotwidth; float smask = 1.0;
-
-	float sm_offset = 0.0; bool bsm_offset = (shadowMask == 0.0 || shadowMask == 2.0 || shadowMask == 5.0 || shadowMask == 6.0 || shadowMask == 8.0 || shadowMask == 11.0);
-	if( zoomed ) { if (mask_layout < 0.5 && bsm_offset) sm_offset = 1.0; else if (bsm_offset) sm_offset = -1.0; }
-	
-	swidth = round(swidth*mscale);
-	smask = SlotMask(scoord + vec2(sm_offset,0.0), mx, swidth);
-
-	smask = clamp(smask + mix(smask_mit, 0.0, min(w3, pow(w3*max(max(orig1.r,orig1.g),orig1.b), 0.33333))), 0.0, 1.0);
-	
-	cmask2 = cmask;
-	cmask*=smask;
-	cmask1 = cmask;
-
-	if (abs(mask_bloom) > 0.025)
-	{
-		float maxbl = max(max(max(Bloom.r,Bloom.g),Bloom.b), mxg);
-		maxbl = maxbl * max(mix(1.0, 2.0-colmx, bloom_dist), 0.0);
-		if (mask_bloom > 0.025) cmask = max(min(cmask + maxbl*mask_bloom, 1.0), cmask); else cmask = max(mix(cmask, cmask*(1.0-0.5*maxbl) + plant(pow(Bloom,0.35.xxx),maxbl), -mask_bloom),cmask);
-	}
-	
-	color = pow(color, vec3(mask_gamma/gamma_in));
-	color = color*cmask;
-	color = min(color,1.0);
-	color = pow(color, vec3(gamma_in/mask_gamma));
-
-	cmask  = min(cmask, 1.0);
-	cmask1 = min(cmask1, 1.0);
-}
-
-	float dark_compensate  = mix(max( clamp( mix (mcut, maskstr, mx),0.0, 1.0) - 1.0 + mask_compensate, 0.0) + 1.0, 1.0, mx); if(shadowMask < -0.5) dark_compensate = 1.0;
-	float bb = mix(brightboost, brightboost1, mx) * dark_compensate;
-	color*=bb;
-
-	vec3  Ref = COMPAT_TEXTURE(LinearizePass, pos).rgb;
-	float maxb = COMPAT_TEXTURE(BloomPass, pos).a;
-	float vig  = COMPAT_TEXTURE(PrePass, clamp(pos, 0.0+0.5*global.OriginalSize.zw, 1.0-0.5*global.OriginalSize.zw)).a;
-
-	vec3 Bloom1 = Bloom;
-	vec3 bcmask = mix(one, cmask, bmask1);
-	vec3 hcmask = mix(one, cmask, hmask1);
-
-	if (abs(bloom) > 0.025)
-	{
-		if (bloom < -0.01) Bloom1 = plant(Bloom, maxb);
-		Bloom1 = min(Bloom1*(orig1+color), max(0.5*(colmx + orig1 - color),0.001*Bloom1));
-		Bloom1 = 0.5*(Bloom1 + mix(Bloom1, mix(colmx*orig1, Bloom1, 0.5), 1.0-color));
-		Bloom1 = bcmask*Bloom1 * max(mix(1.0, 2.0-colmx, bloom_dist), 0.0);
-		color = pow(pow(color, vec3(mask_gamma/gamma_in)) + abs(bloom) * pow(Bloom1, vec3(mask_gamma/gamma_in)), vec3(gamma_in/mask_gamma));
-	}
-
-	if (!interb) color = declip(min(color,1.0), mix(1.0, w3, 0.6));
-
-	if (halation > 0.01) {
-		Bloom = mix(0.5*(Bloom + Bloom*Bloom), 0.75*Bloom*Bloom, colmx);	
-		color = color + 2.0*max((2.0*mix(maxb*maxb, maxb, colmx)-0.5*max(max(Ref.r,Ref.g),Ref.b)),0.25)*mix(1.0,w3,0.5*colmx)*hcmask*Bloom*halation; }
-	else
-	if (halation < -0.01) {
-		float mbl = max(max(Bloom.r,Bloom.g),Bloom.b);
-		Bloom = plant(Bloom + Ref + orig1 + Bloom*Bloom*Bloom, min(mbl*mbl,0.75));
-		color = color + 2.0*mix(1.0,w3,0.5*colmx)*hcmask*Bloom*(-halation); }
-
-
-	float w = 0.25 + 0.60*mix(w3, 1.0, sqrt(colmx));
-	if (smoothmask > 0.5) { color = min(color,1.0); color = max(min(color/w3, 1.0)*w3, min(orig1*bb,color*(1.0-w3))); }
-	
-
-	if (global.m_glow < 0.5) Glow = mix(Glow, 0.25*color, colmx);
-	else
-	{ 
-		maxb = max(max(Glow.r,Glow.g),Glow.b);
-		vec3 orig2 = plant(orig1 + 0.001*Ref, 1.0);
-		Bloom = plant(Glow, 1.0);
-		Ref = abs(orig2-Bloom);
-		mx0 = max(max(orig2.g,orig2.g),orig2.b)-min(min(orig2.g,orig2.g),orig2.b);
-		mx2 = max(max(Bloom.g,Bloom.g),Bloom.b)-min(min(Bloom.g,Bloom.g),Bloom.b);		
-		Bloom = mix(maxb*min(Bloom,orig2), w*mix(mix(Glow, max(max(Ref.g,Ref.g),Ref.b)*Glow, max(mx,mx0)), mix(color, Glow, mx2), max(mx0,mx2)*Ref), min(sqrt((1.10-mx0)*(0.10+mx2)),1.0));
-		Glow = mix(global.m_glow_low*Glow, global.m_glow_high*Bloom, pow(colmx, global.m_glow_dist/gamma_in));
-	}
-
-	if (global.m_glow < 0.5) {
-		if (glow >= 0.0) color = color + 0.5*Glow*glow; else color = color + abs(glow)*min(cmask2*cmask2,1.0)*Glow; }
-	else { cmask1 = clamp(mix(one, cmask1, global.m_glow_mask),0.0, 1.0); color = color + abs(glow)*cmask1*Glow; }
-
-	color = min(color, 1.0);
-	
-	color = pow(color, vec3(1.0/gamma_out));
-
-	float rc = 0.6*sqrt(max(max(color.r, color.g), color.b))+0.4;
-	
-	if (abs(global.addnoised) > 0.01) 
-	{
-		vec3 noise0 = noise(vec3(floor(OutputSize.xy * vTexCoord / global.noiseresd), float(global.FrameCount)));
-		if (global.noisetype < 0.5) color = mix(color, noise0, 0.25*abs(global.addnoised) * rc); 
-		else color = min(color * mix(1.0, 1.5*noise0.x, 0.5*abs(global.addnoised)), 1.0);
-	}
-	
-	colmx = max(max(orig1.r,orig1.g),orig1.b);
-	color = color + bmask*mix(cmask2, 0.125*(1.0-colmx)*color, min(20.0*colmx, 1.0));
-	
-	FragColor = vec4(color*vig*humbar(mix(pos.y, pos.x, global.bardir))*global.post_br*corner(pos0), 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_horizontal.slang b/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_horizontal.slang
deleted file mode 100644
index 339ac9bc9e..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_horizontal.slang
+++ /dev/null
@@ -1,137 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - horizontal pass, dynamic range, resizable
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 DerezedPassSize;
-	float SIZEH;
-	float SIGMA_H;
-	float FINE_GLOW;	
-	float m_glow;
-	float m_glow_cutoff;
-	float m_glow_low;
-	float m_glow_high;
-	float m_glow_dist;
-	float m_glow_mask;
-} params;
-
-#pragma parameter GDV_GDV_ADV_LINE							" " 0 0 0.001 0.001
-#pragma parameter GDV_GDV_ADV_TITLE_2 		"[ --- GUEST-DrVenom Advanced --- ]:" 0 0 0.001 0.001
-
-#pragma parameter bogus_mglow "[ MAGIC GLOW SETTINGS ]:" 0 0 0.001 0.001
-
-#pragma parameter FINE_GLOW "          Fine Glow/M.Glow Sampling" 1.0 1.0 5.0 1.0 
-#define FINE_GLOW params.FINE_GLOW
-
-#pragma parameter m_glow 		"          Ordinary Glow / Magic Glow -- m_glow" 0.0 0.0 1.0 1.0
-#define m_glow params.m_glow
-
-#pragma parameter m_glow_cutoff "          Magic Glow Cutoff -- m_glow_cutoff" 0.12 0.0 0.4 0.01 
-#define m_glow_cutoff params.m_glow_cutoff
-
-#pragma parameter m_glow_low 	"          Magic Glow Low Strength -- m_glow_low" 0.35 0.0 7.0 0.05 
-
-#pragma parameter m_glow_high 	"          Magic Glow High Strength -- m_glow_high" 5.0 0.0 7.0 0.10 
-
-#pragma parameter m_glow_dist 	"          Magic Glow Distribution -- m_glow_dist" 1.0 0.20 4.0 0.05 
-
-#pragma parameter m_glow_mask 	"          Magic Glow Mask Strength -- m_glow_mask" 1.0 0.0 2.0 0.025 
-
-#pragma parameter bogus_glow "[ GLOW PASS SETTINGS ]:" 0 0 0.001 0.001
-
-#pragma parameter SIZEH 		"          Horizontal Glow Radius (Num Samples) -- SIZEH" 6.0 1.0 50.0 1.0 
-#define SIZEH params.SIZEH
-
-#pragma parameter SIGMA_H 		"          Horizontal Glow Sigma ( Spread ) -- SIGMA_H" 1.20 0.20 15.0 0.05
-#define SIGMA_H params.SIGMA_H
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_H*SIGMA_H);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-void main()
-{
-	vec4 SourceSize1 = params.DerezedPassSize*mix(1.0.xxxx, vec4(FINE_GLOW, FINE_GLOW, 1.0/FINE_GLOW, 1.0/FINE_GLOW), min(FINE_GLOW-1.0,1.0));
-	float f = fract(SourceSize1.x * vTexCoord.x);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec3 color = vec3(0.0);
-	vec2 dx  = vec2(SourceSize1.z, 0.0);
-
-	float w;
-	float wsum = 0.0;
-	vec3 pixel;
-	float n = -SIZEH;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(LinearizePass, tex + n*dx).rgb;
-		if (m_glow > 0.5)
-		{
-			pixel = max(pixel-m_glow_cutoff, 0.0);
-			pixel = plant(pixel, max(max(max(pixel.r,pixel.g),pixel.b)-m_glow_cutoff,0.0));
-		}
-		w      = gaussian(n+f);
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEH);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_horizontal_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_horizontal_orig.slang
deleted file mode 100644
index db95be7309..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_horizontal_orig.slang
+++ /dev/null
@@ -1,137 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - horizontal pass, dynamic range, resizable
-   
-   Copyright (C) 2020-2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 LinearizePassSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SIZEH;
-	float SIGMA_H;
-	float FINE_GLOW;	
-	float m_glow;
-	float m_glow_cutoff;
-	float m_glow_low;
-	float m_glow_high;
-	float m_glow_dist;
-	float m_glow_mask;
-} params;
-
-#pragma parameter bogus_mglow "[ MAGIC GLOW SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter m_glow "          Ordinary Glow / Magic Glow" 0.0 0.0 1.0 1.0 
-#define m_glow params.m_glow
-
-#pragma parameter m_glow_cutoff "          Magic Glow Cutoff" 0.12 0.0 0.4 0.01 
-#define m_glow_cutoff params.m_glow_cutoff
-
-#pragma parameter m_glow_low "          Magic Glow Low Strength" 0.35 0.0 7.0 0.05 
-
-#pragma parameter m_glow_high "          Magic Glow High Strength" 5.0 0.0 7.0 0.10 
-
-#pragma parameter m_glow_dist "          Magic Glow Distribution" 1.0 0.20 4.0 0.05 
-
-#pragma parameter m_glow_mask "          Magic Glow Mask Strength" 1.0 0.0 2.0 0.025 
-
-#pragma parameter bogus_glow "[ GLOW PASS SETTINGS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter FINE_GLOW "          Fine Glow/M.Glow Sampling" 1.0 1.0 5.0 1.0 
-#define FINE_GLOW params.FINE_GLOW
-
-#pragma parameter SIZEH "          Horizontal Glow Radius" 6.0 1.0 50.0 1.0 
-#define SIZEH params.SIZEH
-
-#pragma parameter SIGMA_H "          Horizontal Glow Sigma" 1.20 0.20 15.0 0.05
-#define SIGMA_H params.SIGMA_H
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D LinearizePass;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_H*SIGMA_H);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-void main()
-{
-	vec4 SourceSize1 = params.OriginalSize*mix(1.0.xxxx, vec4(FINE_GLOW, FINE_GLOW, 1.0/FINE_GLOW, 1.0/FINE_GLOW), min(FINE_GLOW-1.0,1.0));
-	float f = fract(SourceSize1.x * vTexCoord.x);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec3 color = vec3(0.0);
-	vec2 dx  = vec2(SourceSize1.z, 0.0);
-
-	float w;
-	float wsum = 0.0;
-	vec3 pixel;
-	float n = -SIZEH;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(LinearizePass, tex + n*dx).rgb;
-		if (m_glow > 0.5)
-		{
-			pixel = max(pixel-m_glow_cutoff, 0.0);
-			pixel = plant(pixel, max(max(max(pixel.r,pixel.g),pixel.b)-m_glow_cutoff,0.0));
-		}
-		w      = gaussian(n+f);
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEH);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_vertical.slang b/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_vertical.slang
deleted file mode 100644
index 1774924e22..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_vertical.slang
+++ /dev/null
@@ -1,101 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - vertical pass, dynamic range, resizable
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 DerezedPassSize;
-	float SIZEV;
-	float SIGMA_V;
-	float FINE_GLOW;
-} params;
-
-
-#pragma parameter SIZEV "          Vertical Glow Radius (Num Samples) -- SIZEV" 6.0 1.0 50.0 1.0 
-#define SIZEV params.SIZEV
-
-#pragma parameter SIGMA_V "          Vertical Glow Sigma ( Spread ) -- SIGMA_V" 1.20 0.20 15.0 0.05
-#define SIGMA_V params.SIGMA_V
-
-#pragma parameter FINE_GLOW "          Fine Glow/M.Glow Sampling" 1.0 1.0 5.0 1.0 
-#define FINE_GLOW params.FINE_GLOW
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_V*SIGMA_V);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{
-	vec4 SourceSize1 = vec4(params.SourceSize.x, params.DerezedPassSize.y, params.SourceSize.z, params.DerezedPassSize.w)*mix(1.0.xxxx, vec4(FINE_GLOW, FINE_GLOW, 1.0/FINE_GLOW, 1.0/FINE_GLOW), min(FINE_GLOW-1.0,1.0));
-	float f = fract(SourceSize1.y * vTexCoord.y);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec3 color = vec3(0.0);
-	vec2 dy  = vec2(0.0, SourceSize1.w);
-
-	float w;
-	float wsum = 0.0;
-	vec3 pixel;
-	float n = -SIZEV;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(Source, tex + n*dy).rgb;
-		w      = gaussian(n+f);
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEV);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_vertical_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_vertical_orig.slang
deleted file mode 100644
index e5e0a80f0b..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-gaussian_vertical_orig.slang
+++ /dev/null
@@ -1,103 +0,0 @@
-#version 450
-
-/*
-   Gaussian blur - vertical pass, dynamic range, resizable
-   
-   Copyright (C) 2020 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SIZEV;
-	float SIGMA_V;
-	float FINE_GLOW;
-} params;
-
-
-#pragma parameter SIZEV "          Vertical Glow Radius" 6.0 1.0 50.0 1.0 
-#define SIZEV params.SIZEV
-
-#pragma parameter SIGMA_V "          Vertical Glow Sigma" 1.20 0.20 15.0 0.05
-#define SIGMA_V params.SIGMA_V
-
-#pragma parameter FINE_GLOW "          Fine Glow/M.Glow Sampling" 1.0 1.0 5.0 1.0 
-#define FINE_GLOW params.FINE_GLOW
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-float invsqrsigma = 1.0/(2.0*SIGMA_V*SIGMA_V);
-
-float gaussian(float x)
-{
-	return exp(-x*x*invsqrsigma);
-}
-
-void main()
-{
-	vec4 SourceSize1 = vec4(params.SourceSize.x, params.OriginalSize.y, params.SourceSize.z, params.OriginalSize.w)*mix(1.0.xxxx, vec4(FINE_GLOW, FINE_GLOW, 1.0/FINE_GLOW, 1.0/FINE_GLOW), min(FINE_GLOW-1.0,1.0));
-	float f = fract(SourceSize1.y * vTexCoord.y);
-	f = 0.5 - f;
-	vec2 tex = floor(SourceSize1.xy * vTexCoord)*SourceSize1.zw + 0.5*SourceSize1.zw;
-	vec3 color = vec3(0.0);
-	vec2 dy  = vec2(0.0, SourceSize1.w);
-
-	float w;
-	float wsum = 0.0;
-	vec3 pixel;
-	float n = -SIZEV;
-
-	do
-	{
-		pixel  = COMPAT_TEXTURE(Source, tex + n*dy).rgb;
-		w      = gaussian(n+f);
-		color  = color + w * pixel;
-		wsum   = wsum + w;
-		n = n + 1.0;
-		
-	} while (n <= SIZEV);
-
-	color = color / wsum;
-	
-	FragColor = vec4(color, 1.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-interlace-and-linearize.inc b/bezel/Mega_Bezel/shaders/guest/hsm-interlace-and-linearize.inc
deleted file mode 100644
index 4f83488c3f..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-interlace-and-linearize.inc
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-   Interlacing
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/  
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	// float GAMMA_INPUT;
-	// float inter;
-	// float interm;
-	// float iscan;
-	// float intres;
-	// float iscans;
-	// float downsample_levelx;
-	// float downsample_levely;
-	// float gamma_out;
-	// float vga_mode;
-	// float hiscan;
-} params;
-
-
-/*
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	vec4 SourceSize;
-	mat4 MVP;
-} global;
-*/
-
-// #pragma parameter bogus_gamma "[ GAMMA OPTIONS ]: " 0.0 0.0 0.0 1.0
-
-// #pragma parameter GAMMA_INPUT "          Gamma Input" 2.4 1.0 5.0 0.05
-// #define GAMMA_INPUT params.GAMMA_INPUT
-
-// #pragma parameter gamma_out "          Gamma out" 2.4 1.0 5.0 0.05
-// #define gamma_out    params.gamma_out     // output gamma
-
-// #pragma parameter bogus_interlacing "[ INTERLACING OPTIONS ]: " 0.0 0.0 0.0 1.0
-
-// #pragma parameter inter "          Interlace Trigger Resolution :" 375.0 0.0 800.0 25.0
-// #define inter         params.inter     // interlace resolution
-
-// #pragma parameter interm "          Interlace Mode: OFF, Normal 1-3, Interpolation 4-5" 1.0 0.0 5.0 1.0
-
-#define interm      HSM_INTERLACE_MODE     // interlace mode 
-
-
-// #pragma parameter inters "          Interlacing Effect Smoothness" 0.0 0.0 0.5 0.05 // Joint parameter with main pass, values must match
-
-#define inters  	HSM_INTERLACE_EFFECT_SMOOTHNESS_INTERS     // interlacing effect smoothing
-
-
-// #pragma parameter iscan "          Interlacing Scanline Effect" 0.20 0.0 1.0 0.05
-
-#define iscan  		HSM_INTERLACE_SCANLINE_EFFECT     // interlacing effect scanlining
-
-
-// #pragma parameter intres "          Internal Resolution Y: 224p/240p, 1.5...y-dowsample" 0.0 0.0 6.0 0.5 // Joint parameter with main pass, values must match
-
-// #define intres         params.intres     // interlace resolution
-
-// #pragma parameter downsample_levelx "          Downsampling-X (High-res content, pre-scalers)" 0.0 0.0 2.0 0.25
-
-#define downsample_level         HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR     // downsample level
-
-// #pragma parameter downsample_levely "          Downsampling-Y (High-res content, pre-scalers)" 0.0 0.0 2.0 0.25
-
-// #pragma parameter iscans 	"          Interlacing (Scanline) Saturation" 0.25 0 1 0.05
-// #define iscans global.iscans
-
-// #pragma parameter vga_mode "          VGA Single/Double Scan mode" 0.0 0.0 1.0 1.0
-// #define vga_mode        global.vga_mode     // interlace saturation
-
-#pragma parameter hiscan "          High Resolution Scanlines (ScaleFx or XBR Only)" 0.0 0.0 1.0 1.0
-#define hiscan        global.hiscan
-
-
-bool use_vert_scanlines_bool = false;
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D PrePass;
-layout(set = 0, binding = 3) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 4) uniform sampler2D DerezedPass;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-
-vec3 fetch_pixel(vec2 coord)
-{
-	float downsample_levelx = use_vert_scanlines_bool ? HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR : HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR;
-	float downsample_levely = use_vert_scanlines_bool ? HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR : HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR;
-	vec2 dx = vec2(global.DerezedPassSize.z, 0.0) * downsample_levelx;
-	vec2 dy = vec2(0.0, global.DerezedPassSize.w) * downsample_levely;
-	vec2 d1 = dx + dy;
-	vec2 d2 = dx - dy;
-	
-	float sum = 15.0;
-	vec3 result = 3.0*COMPAT_TEXTURE(PrePass, coord     ).rgb + 
-	              2.0*COMPAT_TEXTURE(PrePass, coord + dx).rgb +
-	              2.0*COMPAT_TEXTURE(PrePass, coord - dx).rgb +
-	              2.0*COMPAT_TEXTURE(PrePass, coord + dy).rgb +
-	              2.0*COMPAT_TEXTURE(PrePass, coord - dy).rgb +
-	              COMPAT_TEXTURE(PrePass, coord + d1).rgb +
-	              COMPAT_TEXTURE(PrePass, coord - d1).rgb +
-	              COMPAT_TEXTURE(PrePass, coord + d2).rgb +
-	              COMPAT_TEXTURE(PrePass, coord - d2).rgb;  
-				  
-	return result/sum;
-}
-
-// noise function:
-// Dedicated to the public domain.
-// If you want a real license, you may consider this MIT/BSD/CC0/WTFPL-licensed (take your pick).
-// Adapted from ChuckNorris - shadertoy: https://www.shadertoy.com/view/XtK3Dz
-
-vec3 noise(vec3 v, float noise_amount){
-    if (noise_amount < 0.0) v.z = -noise_amount; else v.z = mod(v.z,6001.0)/1753.0;
-	// ensure reasonable range
-    v = fract(v) + fract(v*1e4) + fract(v*1e-4);
-    // seed
-    v += vec3(0.12345, 0.6789, 0.314159);
-    // more iterations => more random
-    v = fract(v*dot(v, v)*123.456);
-    v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);
-	v = fract(v*dot(v, v)*123.456);	
-    return v;
-}
-
-void main()
-{
-	/* HSM Removed
-	vec3 c1 = COMPAT_TEXTURE(PrePass, vTexCoord).rgb;
-	vec3 c2 = COMPAT_TEXTURE(PrePass, vTexCoord + vec2(0.0, params.OriginalSize.w)).rgb;
-	*/
-
-	vec3  c1 = vec3(0);
-	vec3  c2 = vec3(0);
-	
-	// HSM Added
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	use_vert_scanlines_bool = (USE_VERTICAL_SCANLINES > 0.5);
-
-	// HSM Added
-	if (abs(HSM_ROTATE_CORE_IMAGE) > 0.5)
-	{
-		use_vert_scanlines_bool = !use_vert_scanlines_bool;
-	}
-
-	vec2 rotated_derezed_size = HSM_GetRotatedDerezedSize();
-
-	float derezed_opposite_dir_res = use_vert_scanlines_bool ? rotated_derezed_size.x : rotated_derezed_size.y;
-	float derezed_scaled_opposite_dir_res = derezed_opposite_dir_res * HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR;
-
-	float orig_opposite_dir_res = use_vert_scanlines_bool ? ROTATED_CORE_PREPPED_SIZE.x : ROTATED_CORE_PREPPED_SIZE.y;
-
-	float tex_coord_scan_dir = use_vert_scanlines_bool ? vTexCoord.x : vTexCoord.y;
-
-	vec2 downsample_offset = vec2(0, 1 / orig_opposite_dir_res / NEGATIVE_CROP_EXPAND_MULTIPLIER );
-
-	if (use_vert_scanlines_bool)
-		downsample_offset = vec2(1 / orig_opposite_dir_res / NEGATIVE_CROP_EXPAND_MULTIPLIER, 0 );
-
-	if ((HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR + HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR) > 0.0)
-	{
-		c1 = fetch_pixel(vTexCoord);
-		c2 = fetch_pixel(vTexCoord + downsample_offset);	
-	}
-	else
-	{
-		c1 = COMPAT_TEXTURE(PrePass, vTexCoord).rgb;
-		c2 = COMPAT_TEXTURE(PrePass, vTexCoord + downsample_offset).rgb;
-	}
-	vec3  c  = c1;
-
-	float intera = 1.0;
-	float gamma_in = clamp(GAMMA_INPUT, 1.0, 5.0);
-
-	float m1 = max(max(c1.r,c1.g),c1.b);
-	float m2 = max(max(c2.r,c2.g),c2.b);
-	vec3 df = abs(c1-c2);
-		
-	float d = max(max(df.r,df.g),df.b);
-	if (interm == 2.0) d = mix(0.1*d,10.0*d, step(m1/(m2+0.0001),m2/(m1+0.0001)));
-
-	float r = m1;
-
-	/* HSM Removed
-	 float yres_div = 1.0; if (intres > 1.25) yres_div = intres;
-
-	if (inter <= params.OriginalSize.y/yres_div && interm > 0.5 && intres != 1.0  && intres != 0.5 && vga_mode < 0.5)
-	*/
-
-	bool hscan = (hiscan > 0.5);
-		
-	// HSM Added
-	if (HSM_INTERLACE_TRIGGER_RES <= derezed_scaled_opposite_dir_res && interm > 0.5 && HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR != 1.0 && vga_mode < 0.5 || hscan) 
-	{
-		intera = 0.25;
-
-		/* HSM Removed
-		float line_no  = clamp(floor(mod(params.OriginalSize.y*vTexCoord.y, 2.0)), 0.0, 1.0);
-		*/
-
-		// HSM Added
-		float line_no  = clamp( floor( mod( orig_opposite_dir_res * tex_coord_scan_dir, 2.0 ) ), 0.0, 1.0 );
-		float frame_no = clamp(floor(mod(float(params.FrameCount),2.0)), 0.0, 1.0);
-		float ii = abs(line_no-frame_no);
-		
-		if (interm < 3.5)
-		{
-			c2 = plant(mix(c2, c2*c2, iscans), max(max(c2.r,c2.g),c2.b));
-			r = clamp(max(m1*ii, (1.0-iscan)*min(m1,m2)), 0.0, 1.0);
-			c = plant( mix(mix(c1,c2, min(mix(m1, 1.0-m2, min(m1,1.0-m1))/(d+0.00001),1.0)), c1, ii), r);
-			if (interm == 3.0) c = (1.0-0.5*iscan)*mix(c2, c1, ii);
-			intera = 0.0;
-		}
-		if (interm == 4.0) { c = plant(mix(c, c*c, 0.5*iscans), max(max(c.r,c.g),c.b)) * (1.0-0.5*iscan); }
-		if (interm == 5.0) { c = mix(c2, c1, 0.5); c = plant(mix(c, c*c, 0.5*iscans), max(max(c.r,c.g),c.b)) * (1.0-0.5*iscan); }
-	
-		if (hscan) c = c1;	
-	}
-
-	#ifndef DO_NOT_LINEARIZE
-	// Linearize Color
-	c = pow(c, vec3(gamma_in));
-	#endif
-
-	// HSM Added Noise based on Guest.r's noise from deconvergence pass
-	if (HSM_SIGNAL_NOISE_ON > 0.5)
-	{
-		float rc = 0.6*sqrt(max(max(c.r, c.g), c.b))+0.4;
-
-		vec2 upscale_mult = global.SourceSize.xy / global.DerezedPassSize.xy;
-		
-		float noise_size = 1;
-
-		// Scanline sized noise
-		if (HSM_SIGNAL_NOISE_SIZE_MODE == 0)
-			noise_size = upscale_mult.x * HSM_SIGNAL_NOISE_SIZE_MULT / SAMPLING_OPPOSITE_DIR_MULT;
-		// Core resolution sized noise
-		if (HSM_SIGNAL_NOISE_SIZE_MODE == 1)
-			noise_size = upscale_mult.x * HSM_SIGNAL_NOISE_SIZE_MULT;
-		// Uprezed sized noise
-		if (HSM_SIGNAL_NOISE_SIZE_MODE == 2)
-			noise_size = HSM_SIGNAL_NOISE_SIZE_MULT;
-
-		vec3 noise0 = noise(vec3(floor(global.SourceSize.xy * vTexCoord / noise_size), float(global.FrameCount)), HSM_SIGNAL_NOISE_AMOUNT);		
-		noise0 = clamp(HSM_SIGNAL_NOISE_BLACK_LEVEL * (noise0 - 0.5) + 0.5, 0, 1);
-		if (HSM_SIGNAL_NOISE_TYPE < 0.5)
-			c = mix(c, 				
-					noise0,
-					0.25 * abs(HSM_SIGNAL_NOISE_AMOUNT) * rc);
-		else 
-			c = min(c * mix(1.0,
-							1.5 * noise0.x, 0.5 * abs(HSM_SIGNAL_NOISE_AMOUNT)),
-							1.0);
-	}
-
-	if (vTexCoord.x > 0.5) gamma_in = intera; else gamma_in = 1.0/gamma_in;
-	
-	FragColor = vec4(c, gamma_in);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-interlace-and-linearize.slang b/bezel/Mega_Bezel/shaders/guest/hsm-interlace-and-linearize.slang
deleted file mode 100644
index 71d84e30e8..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-interlace-and-linearize.slang
+++ /dev/null
@@ -1,3 +0,0 @@
-#version 450
-
-#include "hsm-interlace-and-linearize.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-interlace.slang b/bezel/Mega_Bezel/shaders/guest/hsm-interlace.slang
deleted file mode 100644
index 4325c03d88..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-interlace.slang
+++ /dev/null
@@ -1,4 +0,0 @@
-#version 450
-
-#define DO_NOT_LINEARIZE
-#include "hsm-interlace-and-linearize.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-linearize-ntsc_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-linearize-ntsc_orig.slang
deleted file mode 100644
index 7474cf7641..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-linearize-ntsc_orig.slang
+++ /dev/null
@@ -1,185 +0,0 @@
-#version 450
-
-/*
-   Interlacing
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/  
-
-layout(push_constant) uniform Push
-{
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float GAMMA_INPUT;
-	float inter;
-	float interm;
-	float iscan;
-	float intres;
-	float iscans;
-	float downsample_levelx;
-	float downsample_levely;
-	float gamma_out;
-	float hiscan;
-} params;
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	vec4 SourceSize;
-	mat4 MVP;
-} global;
-
-#pragma parameter bogus_gamma "[ GAMMA OPTIONS ]: " 0.0 0.0 0.0 1.0
-
-#pragma parameter GAMMA_INPUT "          Gamma Input" 2.0 1.0 5.0 0.05
-#define GAMMA_INPUT params.GAMMA_INPUT
-
-#pragma parameter gamma_out "          Gamma out" 1.95 1.0 5.0 0.05
-#define gamma_out    params.gamma_out     // output gamma
-
-#pragma parameter bogus_interlacing "[ INTERLACING OPTIONS ]: " 0.0 0.0 0.0 1.0
-
-#pragma parameter inter "          Interlace Trigger Resolution :" 400.0 0.0 800.0 25.0
-#define inter         params.inter     // interlace resolution
-
-#pragma parameter interm "          Interlace Mode: OFF, Normal 1-3, Interpolation 4-5" 1.0 0.0 5.0 1.0
-#define interm         params.interm     // interlace mode 
-
-#pragma parameter iscan "          Interlacing Scanline Effect ('Laced brightness)" 0.20 0.0 1.0 0.05
-#define iscan  params.iscan     // interlacing effect scanlining
-
-#pragma parameter intres "          Internal Resolution Y: 0.5...y-dowsample" 0.0 0.0 6.0 0.5 // Joint parameter with main pass, values must match
-
-#define intres         params.intres     // interlace resolution
-
-#pragma parameter downsample_levelx "          Downsampling-X (High-res content, pre-scalers)" 0.0 0.0 2.0 0.05
-#define downsample_levelx         params.downsample_levelx     // downsample level
-
-#pragma parameter downsample_levely "          Downsampling-Y (High-res content, pre-scalers)" 0.0 0.0 2.0 0.05
-#define downsample_levely         params.downsample_levely     // downsample level
-
-#pragma parameter iscans "          Interlacing (Scanline) Saturation" 0.25 0.0 1.0 0.05
-#define iscans        params.iscans     // interlace saturation
-
-#pragma parameter hiscan "          High Resolution Scanlines (prepend a scaler...)" 0.0 0.0 1.0 1.0
-#define hiscan        params.hiscan
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D NtscPass;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-
-vec3 fetch_pixel(vec2 coord)
-{
-	vec2 dx = vec2(global.SourceSize.z, 0.0) * downsample_levelx;
-	vec2 dy = vec2(0.0, global.SourceSize.w) * downsample_levely;	
-	vec2 d1 = dx + dy;
-	vec2 d2 = dx - dy;
-	
-	float sum = 15.0;
-	vec3 result = 3.0*COMPAT_TEXTURE(NtscPass, coord     ).rgb + 
-	              2.0*COMPAT_TEXTURE(NtscPass, coord + dx).rgb +
-	              2.0*COMPAT_TEXTURE(NtscPass, coord - dx).rgb +
-	              2.0*COMPAT_TEXTURE(NtscPass, coord + dy).rgb +
-	              2.0*COMPAT_TEXTURE(NtscPass, coord - dy).rgb +
-	              COMPAT_TEXTURE(NtscPass, coord + d1).rgb +
-	              COMPAT_TEXTURE(NtscPass, coord - d1).rgb +
-	              COMPAT_TEXTURE(NtscPass, coord + d2).rgb +
-	              COMPAT_TEXTURE(NtscPass, coord - d2).rgb;  
-				  
-	return result/sum;
-}
-
-
-void main()
-{
-	vec3 c1 = COMPAT_TEXTURE(NtscPass, vTexCoord).rgb;
-	vec3 c2 = COMPAT_TEXTURE(NtscPass, vTexCoord + vec2(0.0, params.OriginalSize.w)).rgb;
-	
-	if ((downsample_levelx + downsample_levely) > 0.025)
-	{
-		c1 = fetch_pixel(vTexCoord);
-		c2 = fetch_pixel(vTexCoord + vec2(0.0, params.OriginalSize.w));	
-	}
-	
-	vec3  c  = c1;
-
-	float intera = 1.0;
-	float gamma_in = clamp(GAMMA_INPUT, 1.0, 5.0);
-
-	float m1 = max(max(c1.r,c1.g),c1.b);
-	float m2 = max(max(c2.r,c2.g),c2.b);
-	vec3 df = abs(c1-c2);
-		
-	float d = max(max(df.r,df.g),df.b);
-	if (interm == 2.0) d = mix(0.1*d,10.0*d, step(m1/(m2+0.0001),m2/(m1+0.0001)));
-
-	float r = m1;
-
-	float yres_div = 1.0; if (intres > 1.25) yres_div = intres;
-
-	bool hscan = (hiscan > 0.5);
-		
-	if (inter <= params.OriginalSize.y/yres_div && interm > 0.5 && intres != 1.0 && intres != 0.5 || hscan) 
-	{
-		intera = 0.25;
-		float line_no  = clamp(floor(mod(params.OriginalSize.y*vTexCoord.y, 2.0)), 0.0, 1.0);
-		float frame_no = clamp(floor(mod(float(params.FrameCount),2.0)), 0.0, 1.0);
-		float ii = abs(line_no-frame_no);
-		
-		if (interm < 3.5)
-		{
-			c2 = plant(mix(c2, c2*c2, iscans), max(max(c2.r,c2.g),c2.b));
-			r = clamp(max(m1*ii, (1.0-iscan)*min(m1,m2)), 0.0, 1.0);
-			c = plant( mix(mix(c1,c2, min(mix(m1, 1.0-m2, min(m1,1.0-m1))/(d+0.00001),1.0)), c1, ii), r);
-			if (interm == 3.0) c = (1.0-0.5*iscan)*mix(c2, c1, ii);
-		}
-		if (interm == 4.0) { c = plant(mix(c, c*c, 0.5*iscans), max(max(c.r,c.g),c.b)) * (1.0-0.5*iscan); }
-		if (interm == 5.0) { c = mix(c2, c1, 0.5); c = plant(mix(c, c*c, 0.5*iscans), max(max(c.r,c.g),c.b)) * (1.0-0.5*iscan); }
-		
-		if (hscan) c = c1;		
-	}
-	c = pow(c, vec3(gamma_in));
-	
-	if (vTexCoord.x > 0.5) gamma_in = intera; else gamma_in = 1.0/gamma_in;
-	
-	FragColor = vec4(c, gamma_in);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-linearize_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-linearize_orig.slang
deleted file mode 100644
index 1d4b846e39..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-linearize_orig.slang
+++ /dev/null
@@ -1,197 +0,0 @@
-#version 450
-
-/*
-   Interlacing
-   
-   Copyright (C) 2020 - 2023 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/  
-
-layout(push_constant) uniform Push
-{
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float GAMMA_INPUT;
-	float inter;
-	float interm;
-	float iscan;
-	float intres;
-	float iscans;
-	float downsample_levelx;
-	float downsample_levely;
-	float gamma_out;
-	float vga_mode;
-	float hiscan;
-} params;
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	vec4 SourceSize;
-	mat4 MVP;
-} global;
-
-
-#pragma parameter bogus_gamma "[ GAMMA OPTIONS ]: " 0.0 0.0 0.0 1.0
-
-#pragma parameter GAMMA_INPUT "          Gamma Input" 2.4 1.0 5.0 0.05
-#define GAMMA_INPUT params.GAMMA_INPUT
-
-#pragma parameter gamma_out "          Gamma out" 2.4 1.0 5.0 0.05
-#define gamma_out    params.gamma_out     // output gamma
-
-#pragma parameter bogus_interlacing "[ INTERLACING OPTIONS ]: " 0.0 0.0 0.0 1.0
-
-#pragma parameter inter "          Interlace Trigger Resolution/VGA Trigger:" 375.0 0.0 800.0 25.0
-#define inter         params.inter     // interlace resolution
-
-#pragma parameter interm "          Interlace Mode: OFF, Normal 1-3, Interpolation 4-5" 1.0 0.0 5.0 1.0
-#define interm         params.interm     // interlace mode 
-
-#pragma parameter iscan "          Interlacing Scanline Effect ('Laced brightness)" 0.20 0.0 1.0 0.05
-#define iscan  params.iscan     // interlacing effect scanlining
-
-#pragma parameter intres "          Internal Resolution Y: 0.5...y-dowsample" 0.0 0.0 6.0 0.5 // Joint parameter with main pass, values must match
-
-#define intres         params.intres     // interlace resolution
-
-#pragma parameter downsample_levelx "          Downsampling-X (High-res content, pre-scalers)" 0.0 0.0 3.0 0.05
-#define downsample_levelx         params.downsample_levelx     // downsample level
-
-#pragma parameter downsample_levely "          Downsampling-Y (High-res content, pre-scalers)" 0.0 0.0 3.0 0.05
-#define downsample_levely         params.downsample_levely     // downsample level
-
-#pragma parameter iscans "          Interlacing (Scanline) Saturation" 0.25 0.0 1.0 0.05
-#define iscans        params.iscans     // interlace saturation
-
-#pragma parameter vga_mode "          VGA Single/Double Scan mode" 0.0 0.0 1.0 1.0
-#define vga_mode        params.vga_mode     // interlace saturation
-
-#pragma parameter hiscan "          High Resolution Scanlines (prepend a scaler...)" 0.0 0.0 1.0 1.0
-#define hiscan        params.hiscan
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D PrePass;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-
-vec3 fetch_pixel(vec2 coord)
-{
-	vec2 dx = vec2(global.SourceSize.z, 0.0) * downsample_levelx;
-	vec2 dy = vec2(0.0, global.SourceSize.w) * downsample_levely;	
-	vec2 d1 = dx + dy;
-	vec2 d2 = dx - dy;
-	
-	float sum = 15.0;
-	vec3 result = 3.0*COMPAT_TEXTURE(PrePass, coord     ).rgb + 
-	              2.0*COMPAT_TEXTURE(PrePass, coord + dx).rgb +
-	              2.0*COMPAT_TEXTURE(PrePass, coord - dx).rgb +
-	              2.0*COMPAT_TEXTURE(PrePass, coord + dy).rgb +
-	              2.0*COMPAT_TEXTURE(PrePass, coord - dy).rgb +
-	              COMPAT_TEXTURE(PrePass, coord + d1).rgb +
-	              COMPAT_TEXTURE(PrePass, coord - d1).rgb +
-	              COMPAT_TEXTURE(PrePass, coord + d2).rgb +
-	              COMPAT_TEXTURE(PrePass, coord - d2).rgb;  
-				  
-	return result/sum;
-}
-
-
-void main()
-{
-	vec3 c1 = COMPAT_TEXTURE(PrePass, vTexCoord).rgb;
-	vec3 c2 = COMPAT_TEXTURE(PrePass, vTexCoord + vec2(0.0, params.OriginalSize.w)).rgb;
-	
-	if ((downsample_levelx + downsample_levely) > 0.025)
-	{
-		c1 = fetch_pixel(vTexCoord);
-		c2 = fetch_pixel(vTexCoord + vec2(0.0, params.OriginalSize.w));	
-	}
-	
-	vec3  c  = c1;
-
-	float intera = 1.0;
-	float gamma_in = clamp(GAMMA_INPUT, 1.0, 5.0);
-
-	float m1 = max(max(c1.r,c1.g),c1.b);
-	float m2 = max(max(c2.r,c2.g),c2.b);
-	vec3 df = abs(c1-c2);
-		
-	float d = max(max(df.r,df.g),df.b);
-	if (interm == 2.0) d = mix(0.1*d,10.0*d, step(m1/(m2+0.0001),m2/(m1+0.0001)));
-
-	float r = m1;
-
-	float yres_div = 1.0; if (intres > 1.25) yres_div = intres;
-
-	bool hscan = (hiscan > 0.5);
-		
-	if (inter <= params.OriginalSize.y/yres_div && interm > 0.5 && intres != 1.0  && intres != 0.5 && vga_mode < 0.5 || hscan)
-	{
-		intera = 0.25;
-		float line_no  = clamp(floor(mod(params.OriginalSize.y*vTexCoord.y, 2.0)), 0.0, 1.0);
-		float frame_no = clamp(floor(mod(float(params.FrameCount),2.0)), 0.0, 1.0);
-		float ii = abs(line_no-frame_no);
-		
-		if (interm < 3.5)
-		{
-			c2 = plant(mix(c2, c2*c2, iscans), max(max(c2.r,c2.g),c2.b));
-			r = clamp(max(m1*ii, (1.0-iscan)*min(m1,m2)), 0.0, 1.0);
-			c = plant( mix(mix(c1,c2, min(mix(m1, 1.0-m2, min(m1,1.0-m1))/(d+0.00001),1.0)), c1, ii), r);
-			if (interm == 3.0) c = (1.0-0.5*iscan)*mix(c2, c1, ii);
-		}
-		if (interm == 4.0) { c = plant(mix(c, c*c, 0.5*iscans), max(max(c.r,c.g),c.b)) * (1.0-0.5*iscan); }
-		if (interm == 5.0) { c = mix(c2, c1, 0.5); c = plant(mix(c, c*c, 0.5*iscans), max(max(c.r,c.g),c.b)) * (1.0-0.5*iscan); }
-	
-		if (hscan) c = c1;	
-	}
-	
-	if (vga_mode > 0.5)
-	{
-		c = c1;
-		if (inter <= params.OriginalSize.y) intera = 0.75; else intera = 0.5;
-	}	
-	
-	c = pow(c, vec3(gamma_in));
-	
-	if (vTexCoord.x > 0.5) gamma_in = intera; else gamma_in = 1.0/gamma_in;
-	
-	FragColor = vec4(c, gamma_in);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-pre-shaders-afterglow.slang b/bezel/Mega_Bezel/shaders/guest/hsm-pre-shaders-afterglow.slang
deleted file mode 100644
index 822283f21b..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-pre-shaders-afterglow.slang
+++ /dev/null
@@ -1,384 +0,0 @@
-#version 450
-
-/*
-   CRT Advanced Afterglow, color altering
-   
-   Copyright (C) 2019-2021 guest(r) and Dr. Venom
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/  
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 OriginalSize;
-   vec4 OutputSize;
-   uint FrameCount;
-   float TNTC;
-   float LS;
-   float LUTLOW, LUTBR;   
-   float CP, CS;
-   float WP;
-   float wp_saturation;
-   float AS, sat;
-   float BP;
-   // float vigstr;
-   // float vigdef;
-   float sega_fix;
-   float pre_bb;
-   float contr;
-} params;
-
-#pragma parameter AS             "          Afterglow Strength -- AS" 0.20 0.0 0.60 0.01
-#define AS params.AS
-
-#pragma parameter sat            "          Afterglow Saturation  -- sat" 0.50 0.0 1.0 0.01
-#define sat params.sat
-
-#pragma parameter GDV_COLOR_LINE							" " 0 0 0.001 0.001
-#pragma parameter bogus_color    "[ GUEST COLOR TWEAKS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter CS             "       Display Gamut: sRGB, Modern, DCI, Adobe, Rec.2020 -- CS" 0.0 0.0 4.0 1.0 
-#pragma parameter CP             "       CRT Profile: EBU | P22 | SMPTE-C | Philips | Trin. -- CP" 0.0 -1.0 5.0 1.0 
-
-#define CP params.CP
-#define CS params.CS
-
-#pragma parameter TNTC           "       LUT Colors: Trin. | InvTrin. | NEC Mult. | NTSC -- TNTC" 0.0 0.0 4.0 1.0
-#define TNTC params.TNTC
-
-#pragma parameter LS             "          LUT Size -- LS" 32.0 16.0 64.0 16.0
-#define LS params.LS
-
-#define LUTLOW 5.0  // "Fix LUT Dark - Range" from 0.0 to 50.0 - RGB singletons
-
-#define LUTBR 1.0   // "Fix LUT Brightness" from 0.0 to 1.0
- 
-#pragma parameter WP             "          Color Temperature % -- wp" 0.0 -100.0 100.0 5.0 
-
-#pragma parameter wp_saturation  "          Saturation Adjustment -- wp_saturation" 1.0 0.0 2.0 0.05 
-
-#pragma parameter pre_bb         "          Brightness Adjustment" 1.0 0.0 2.0 0.01
-
-#pragma parameter contr          "          Contrast Adjustment" 0.0 -2.0 2.0 0.05
-
-// #pragma parameter sega_fix       "          Sega Brightness Fix" 0.0 0.0 1.0 1.0
-// #define SEGA_FIX params.sega_fix
-#define SEGA_FIX 0
-
-#pragma parameter BP             "          Raise Black Level" 0.0 -100.0 25.0 1.0
-
-// #pragma parameter vigstr "          Vignette Strength" 0.0 0.0 2.0 0.025
-
-// #pragma parameter vigdef "          Vignette Definition" 7.0 0.4 15.0 0.2
-
-#define WP params.WP
-#define wp_saturation params.wp_saturation
-#define BP params.BP
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D PreCRTPass;
-layout(set = 0, binding = 3) uniform sampler2D AfterglowPass;
-layout(set = 0, binding = 4) uniform sampler2D SamplerLUT1;
-layout(set = 0, binding = 5) uniform sampler2D SamplerLUT2;
-layout(set = 0, binding = 6) uniform sampler2D SamplerLUT3;
-layout(set = 0, binding = 7) uniform sampler2D SamplerLUT4;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-
-// Color profile matrices
-
-const mat3 Profile0 = 
-mat3(
- 0.412391,  0.212639,  0.019331,
- 0.357584,  0.715169,  0.119195,
- 0.180481,  0.072192,  0.950532
-);
-
-const mat3 Profile1 = 
-mat3(
- 0.430554,  0.222004,  0.020182,
- 0.341550,  0.706655,  0.129553,
- 0.178352,  0.071341,  0.939322
-);
-
-const mat3 Profile2 = 
-mat3(
- 0.396686,  0.210299,  0.006131,
- 0.372504,  0.713766,  0.115356,
- 0.181266,  0.075936,  0.967571
-);
-
-const mat3 Profile3 = 
-mat3(
- 0.393521,  0.212376,  0.018739,
- 0.365258,  0.701060,  0.111934,
- 0.191677,  0.086564,  0.958385
-);
-
-const mat3 Profile4 = 
-mat3(
- 0.392258,  0.209410,  0.016061,
- 0.351135,  0.725680,  0.093636,
- 0.166603,  0.064910,  0.850324
-);
-
-const mat3 Profile5 = 
-mat3(
- 0.377923,  0.195679,  0.010514,
- 0.317366,  0.722319,  0.097826,
- 0.207738,  0.082002,  1.076960
-);
-
-const mat3 ToSRGB = 
-mat3(
- 3.240970, -0.969244,  0.055630,
--1.537383,  1.875968, -0.203977,
--0.498611,  0.041555,  1.056972
-);
-
-const mat3 ToModern = 
-mat3(
- 2.791723,	-0.894766,	0.041678,
--1.173165,	 1.815586, -0.130886,
--0.440973,	 0.032000,	1.002034
-);
-
-const mat3 ToDCI = 
-mat3(
- 2.725394,  -0.795168,   0.041242,
--1.018003,   1.689732,  -0.087639,
--0.440163,   0.022647,   1.100929
-);
-
-const mat3 ToAdobe = 
-mat3(
- 2.041588, -0.969244,  0.013444,
--0.565007,  1.875968, -0.11836,
--0.344731,  0.041555,  1.015175
-);
-
-const mat3 ToREC = 
-mat3(
- 1.716651, -0.666684,  0.017640,
--0.355671,  1.616481, -0.042771,
--0.253366,  0.015769,  0.942103
-); 
-
-// Color temperature matrices
-
-const mat3 D65_to_D55 = mat3 (
-           0.4850339153,  0.2500956126,  0.0227359648,
-           0.3488957224,  0.6977914447,  0.1162985741,
-           0.1302823568,  0.0521129427,  0.6861537456);
-
-
-const mat3 D65_to_D93 = mat3 (
-           0.3412754080,  0.1759701322,  0.0159972847,
-           0.3646170520,  0.7292341040,  0.1215390173,
-           0.2369894093,  0.0947957637,  1.2481442225);
-
-
-vec3 fix_lut(vec3 lutcolor, vec3 ref)
-{
-	float r = length(ref);
-	float l = length(lutcolor);
-	float m = max(max(ref.r,ref.g),ref.b);
-	ref = normalize(lutcolor + 0.0000001) * mix(r, l, pow(m,1.25));
-	return mix(lutcolor, ref, LUTBR);
-}
-
-vec2 ctransform (vec2 inputc)
-{
-	return vec2( inputc.x * sqrt(1.0 - 0.5*inputc.y*inputc.y), inputc.y * sqrt(1.0 - 0.5*inputc.x*inputc.x));
-}
-
-/* HSM Removed
-float vignette (vec2 coords)
-{
-	vec2 ccoords = ctransform(2.0*(coords-0.5));
-	ccoords = ccoords * ccoords;
-	float vstr = sqrt(ccoords.x+ccoords.y);
-	vstr = pow(vstr, params.vigdef);
-	return max(mix(1.0, 1.0-vstr, params.vigstr), 0.0);
-}
-*/
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-float contrast(float x)
-{
-	return max(mix(x, smoothstep(0.0, 1.0, x), params.contr),0.0);
-}
-
-
-void main()
-{
-   vec4 imgColor = COMPAT_TEXTURE(PreCRTPass, vTexCoord.xy);
-   vec4 aftglow = COMPAT_TEXTURE(AfterglowPass, vTexCoord.xy);
-   
-   float w = 1.0-aftglow.w;
-
-   float l = length(aftglow.rgb);
-   aftglow.rgb = AS*w*normalize(pow(aftglow.rgb + 0.01, vec3(sat)))*l;
-   float bp = w * BP/255.0;
-   
-   // Retro Sega Systems: Genesis, 32x, CD and Saturn 2D had color palettes designed in TV levels to save on transformations.
-   if (SEGA_FIX > 0.5) imgColor.rgb = imgColor.rgb * (255.0 / 239.0);
-   
-   imgColor.rgb = min(imgColor.rgb, 1.0);
-   
-   vec3 color = imgColor.rgb;
-   
-   if (int(TNTC) == 0)
-   {
-      color.rgb = imgColor.rgb;
-   }
-   else
-   {
-	  float lutlow = LUTLOW/255.0; float invLS = 1.0/LS;
-	  vec3 lut_ref = imgColor.rgb + lutlow*(1.0 - pow(imgColor.rgb, 0.333.xxx));
-	  float lutb = lut_ref.b * (1.0-0.5*invLS);	  
-	  lut_ref.rg    = lut_ref.rg * (1.0-invLS) + 0.5*invLS; 
-	  float tile1 = ceil (lutb * (LS-1.0));
-	  float tile0 = max(tile1 - 1.0, 0.0);
-	  float f = fract(lutb * (LS-1.0)); if (f == 0.0) f = 1.0;
-	  vec2 coord0 = vec2(tile0 + lut_ref.r, lut_ref.g)*vec2(invLS, 1.0);
-	  vec2 coord1 = vec2(tile1 + lut_ref.r, lut_ref.g)*vec2(invLS, 1.0);
-	  vec4 color1, color2, res;
-	  
-      if (int(TNTC) == 1)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT1, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT1, coord1);
-         res = mix(color1, color2, f);
-      }
-      else if (int(TNTC) == 2)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT2, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT2, coord1);
-         res = mix(color1, color2, f);
-      }	
-      else if (int(TNTC) == 3)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT3, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT3, coord1);
-         res = mix(color1, color2, f);
-      }	
-      else if (int(TNTC) == 4)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT4, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT4, coord1);
-         res = mix(color1, color2, f);
-      }	
-
-      res.rgb = fix_lut (res.rgb, imgColor.rgb);
-	  
-      color = mix(imgColor.rgb, res.rgb, min(TNTC,1.0));
-   }
-
-	vec3 c = clamp(color, 0.0, 1.0);
-	
-	float p;
-	mat3 m_out;
-	
-	if (CS == 0.0) { p = 2.2; m_out =  ToSRGB;   } else
-	if (CS == 1.0) { p = 2.2; m_out =  ToModern; } else	
-	if (CS == 2.0) { p = 2.6; m_out =  ToDCI;    } else
-	if (CS == 3.0) { p = 2.2; m_out =  ToAdobe;  } else
-	if (CS == 4.0) { p = 2.4; m_out =  ToREC;    }
-	
-	color = pow(c, vec3(p));
-	
-	mat3 m_in = Profile0;
-
-	if (CP == 0.0) { m_in = Profile0; } else	
-	if (CP == 1.0) { m_in = Profile1; } else
-	if (CP == 2.0) { m_in = Profile2; } else
-	if (CP == 3.0) { m_in = Profile3; } else
-	if (CP == 4.0) { m_in = Profile4; } else
-	if (CP == 5.0) { m_in = Profile5; }
-	
-	color = m_in*color;
-	color = m_out*color;
-
-	color = clamp(color, 0.0, 1.0);
-
-	color = pow(color, vec3(1.0/p));	
-	
-	if (CP == -1.0) color = c;
-	
-	vec3 scolor1 = plant(pow(color, vec3(wp_saturation)), max(max(color.r,color.g),color.b));
-	float luma = dot(color, vec3(0.299, 0.587, 0.114));
-	vec3 scolor2 = mix(vec3(luma), color, wp_saturation);
-	color = (wp_saturation > 1.0) ? scolor1 : scolor2;
-   
-	color = plant(color, contrast(max(max(color.r,color.g),color.b)));
-
-	p = 2.2;
-	color = clamp(color, 0.0, 1.0);	
-	color = pow(color, vec3(p)); 
-	
-	vec3 warmer = D65_to_D55*color;
-	warmer = ToSRGB*warmer;
-	
-	vec3 cooler = D65_to_D93*color;
-	cooler = ToSRGB*cooler;
-	
-	float m = abs(WP)/100.0;
-	
-	vec3 comp = (WP < 0.0) ? cooler : warmer;
-	
-	color = mix(color, comp, m);
-	color = pow(max(color, 0.0), vec3(1.0/p));
-	
-	if (BP > -0.5) color = color + aftglow.rgb + bp; else
-	{ 
-		color = max(color + BP/255.0, 0.0) / (1.0 + BP/255.0*step(- BP/255.0, max(max(color.r,color.g),color.b))) + aftglow.rgb;
-	}
-	
-	color = min(color * params.pre_bb, 1.0);
-
-   /* HSM Removed
-	FragColor = vec4(color, vignette(vTexCoord.xy)); 
-   */
-
-   // HSM Added (Vignette added in post crt processing)
-	FragColor = vec4(color, 0); 
-} 
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-pre-shaders-afterglow_orig.slang b/bezel/Mega_Bezel/shaders/guest/hsm-pre-shaders-afterglow_orig.slang
deleted file mode 100644
index a2a140a4e2..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm-pre-shaders-afterglow_orig.slang
+++ /dev/null
@@ -1,371 +0,0 @@
-#version 450
-
-/*
-   CRT Advanced Afterglow, color altering
-   
-   Copyright (C) 2019-2022 guest(r) and Dr. Venom
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/  
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 OriginalSize;
-   vec4 OutputSize;
-   uint FrameCount;
-   float TNTC;
-   float LS;
-   float LUTLOW, LUTBR;   
-   float CP, CS;
-   float WP;
-   float wp_saturation;
-   float AS, sat;
-   float BP;
-   float vigstr;
-   float vigdef;
-   float sega_fix;
-   float pre_bb;
-   float contr;
-} params;
-
-#pragma parameter AS "          Afterglow Strength" 0.20 0.0 0.60 0.01
-#define AS params.AS
-
-#pragma parameter sat "          Afterglow saturation" 0.50 0.0 1.0 0.01
-#define sat params.sat
-
-#pragma parameter bogus_color "[ COLOR TWEAKS ]:" 0.0 0.0 1.0 1.0
-
-#pragma parameter CS "          Display Gamut: sRGB, Modern, DCI, Adobe, Rec.2020" 0.0 0.0 4.0 1.0 
-
-#pragma parameter CP "          CRT Profile: EBU | P22 | SMPTE-C | Philips | Trin." 0.0 -1.0 5.0 1.0 
-
-#define CP params.CP
-#define CS params.CS
-
-#pragma parameter TNTC "          LUT Colors: Trin.1 | Trin.2 | Nec Mult. | NTSC" 0.0 0.0 4.0 1.0
-#define TNTC params.TNTC
-
-#pragma parameter LS "          LUT Size" 32.0 16.0 64.0 16.0
-#define LS params.LS
-
-#define LUTLOW 5.0  // "Fix LUT Dark - Range" from 0.0 to 50.0 - RGB singletons
-
-#define LUTBR 1.0   // "Fix LUT Brightness" from 0.0 to 1.0
-
-#pragma parameter WP "          Color Temperature %" 0.0 -100.0 100.0 5.0 
-
-#pragma parameter wp_saturation "          Saturation Adjustment" 1.0 0.0 2.0 0.05
-
-#pragma parameter pre_bb "          Brightness Adjustment" 1.0 0.0 2.0 0.01
-
-#pragma parameter contr "          Contrast Adjustment" 0.0 -2.0 2.0 0.05
-
-#pragma parameter sega_fix "          Sega Brightness Fix" 0.0 0.0 1.0 1.0
-
-#pragma parameter BP "          Raise Black Level" 0.0 -100.0 25.0 1.0
-
-#pragma parameter vigstr "          Vignette Strength" 0.0 0.0 2.0 0.05
-
-#pragma parameter vigdef "          Vignette Size" 1.0 0.5 3.0 0.10
-
-#define WP params.WP
-#define wp_saturation params.wp_saturation
-#define BP params.BP
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D StockPass;
-layout(set = 0, binding = 3) uniform sampler2D AfterglowPass;
-layout(set = 0, binding = 4) uniform sampler2D SamplerLUT1;
-layout(set = 0, binding = 5) uniform sampler2D SamplerLUT2;
-layout(set = 0, binding = 6) uniform sampler2D SamplerLUT3;
-layout(set = 0, binding = 7) uniform sampler2D SamplerLUT4;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-
-// Color profile matrices
-
-const mat3 Profile0 = 
-mat3(
- 0.412391,  0.212639,  0.019331,
- 0.357584,  0.715169,  0.119195,
- 0.180481,  0.072192,  0.950532
-);
-
-const mat3 Profile1 = 
-mat3(
- 0.430554,  0.222004,  0.020182,
- 0.341550,  0.706655,  0.129553,
- 0.178352,  0.071341,  0.939322
-);
-
-const mat3 Profile2 = 
-mat3(
- 0.396686,  0.210299,  0.006131,
- 0.372504,  0.713766,  0.115356,
- 0.181266,  0.075936,  0.967571
-);
-
-const mat3 Profile3 = 
-mat3(
- 0.393521,  0.212376,  0.018739,
- 0.365258,  0.701060,  0.111934,
- 0.191677,  0.086564,  0.958385
-);
-
-const mat3 Profile4 = 
-mat3(
- 0.392258,  0.209410,  0.016061,
- 0.351135,  0.725680,  0.093636,
- 0.166603,  0.064910,  0.850324
-);
-
-const mat3 Profile5 = 
-mat3(
- 0.377923,  0.195679,  0.010514,
- 0.317366,  0.722319,  0.097826,
- 0.207738,  0.082002,  1.076960
-);
-
-const mat3 ToSRGB = 
-mat3(
- 3.240970, -0.969244,  0.055630,
--1.537383,  1.875968, -0.203977,
--0.498611,  0.041555,  1.056972
-);
-
-const mat3 ToModern = 
-mat3(
- 2.791723,	-0.894766,	0.041678,
--1.173165,	 1.815586, -0.130886,
--0.440973,	 0.032000,	1.002034
-);
-
-const mat3 ToDCI = 
-mat3(
- 2.493497,	-0.829489,	0.035846,
--0.931384,	 1.762664, -0.076172,
--0.402711,	 0.023625,	0.956885
-);
-
-const mat3 ToAdobe = 
-mat3(
- 2.041588, -0.969244,  0.013444,
--0.565007,  1.875968, -0.11836,
--0.344731,  0.041555,  1.015175
-);
-
-const mat3 ToREC = 
-mat3(
- 1.716651, -0.666684,  0.017640,
--0.355671,  1.616481, -0.042771,
--0.253366,  0.015769,  0.942103
-); 
-
-// Color temperature matrices
-
-const mat3 D65_to_D55 = mat3 (
-           0.4850339153,  0.2500956126,  0.0227359648,
-           0.3488957224,  0.6977914447,  0.1162985741,
-           0.1302823568,  0.0521129427,  0.6861537456);
-
-
-const mat3 D65_to_D93 = mat3 (
-           0.3412754080,  0.1759701322,  0.0159972847,
-           0.3646170520,  0.7292341040,  0.1215390173,
-           0.2369894093,  0.0947957637,  1.2481442225);
-
-
-vec3 fix_lut(vec3 lutcolor, vec3 ref)
-{
-	float r = length(ref);
-	float l = length(lutcolor);
-	float m = max(max(ref.r,ref.g),ref.b);
-	ref = normalize(lutcolor + 0.0000001) * mix(r, l, pow(m,1.25));
-	return mix(lutcolor, ref, LUTBR);
-}
-
-
-float vignette(vec2 pos) {
-	vec2 b = vec2(params.vigdef, params.vigdef) *  vec2(1.0, params.OriginalSize.x/params.OriginalSize.y) * 0.125;
-	pos = clamp(pos, 0.0, 1.0);
-	pos = abs(2.0*(pos - 0.5));
-	vec2 res = mix(0.0.xx, 1.0.xx, smoothstep(1.0.xx, 1.0.xx-b, sqrt(pos)));
-	res = pow(res, 0.70.xx);	
-	return max(mix(1.0, sqrt(res.x*res.y), params.vigstr), 0.0);
-}
-
-
-vec3 plant (vec3 tar, float r)
-{
-	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-	return tar * r / t;
-}
-
-float contrast(float x)
-{
-	return max(mix(x, smoothstep(0.0, 1.0, x), params.contr),0.0);
-}
-
-
-void main()
-{
-   vec4 imgColor = COMPAT_TEXTURE(StockPass, vTexCoord.xy);
-   vec4 aftglow = COMPAT_TEXTURE(AfterglowPass, vTexCoord.xy);
-   
-   float w = 1.0-aftglow.w;
-
-   float l = length(aftglow.rgb);
-   aftglow.rgb = AS*w*normalize(pow(aftglow.rgb + 0.01, vec3(sat)))*l;
-   float bp = w * BP/255.0;
-   
-   if (params.sega_fix > 0.5) imgColor.rgb = imgColor.rgb * (255.0 / 239.0);
-   
-   imgColor.rgb = min(imgColor.rgb, 1.0);
-   
-   vec3 color = imgColor.rgb;
- 
-   if (int(TNTC) == 0)
-   {
-      color.rgb = imgColor.rgb;
-   }
-   else
-   {
-	  float lutlow = LUTLOW/255.0; float invLS = 1.0/LS;
-	  vec3 lut_ref = imgColor.rgb + lutlow*(1.0 - pow(imgColor.rgb, 0.333.xxx));
-	  float lutb = lut_ref.b * (1.0-0.5*invLS);	  
-	  lut_ref.rg    = lut_ref.rg * (1.0-invLS) + 0.5*invLS; 
-	  float tile1 = ceil (lutb * (LS-1.0));
-	  float tile0 = max(tile1 - 1.0, 0.0);
-	  float f = fract(lutb * (LS-1.0)); if (f == 0.0) f = 1.0;
-	  vec2 coord0 = vec2(tile0 + lut_ref.r, lut_ref.g)*vec2(invLS, 1.0);
-	  vec2 coord1 = vec2(tile1 + lut_ref.r, lut_ref.g)*vec2(invLS, 1.0);
-	  vec4 color1, color2, res;
-	  
-      if (int(TNTC) == 1)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT1, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT1, coord1);
-         res = mix(color1, color2, f);
-      }
-      else if (int(TNTC) == 2)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT2, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT2, coord1);
-         res = mix(color1, color2, f);
-      }	
-      else if (int(TNTC) == 3)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT3, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT3, coord1);
-         res = mix(color1, color2, f);
-      }	
-      else if (int(TNTC) == 4)
-      {
-         color1 = COMPAT_TEXTURE(SamplerLUT4, coord0);
-         color2 = COMPAT_TEXTURE(SamplerLUT4, coord1);
-         res = mix(color1, color2, f);
-      }	
-
-      res.rgb = fix_lut (res.rgb, imgColor.rgb);
-	  
-      color = mix(imgColor.rgb, res.rgb, min(TNTC,1.0));
-   }
-
-	vec3 c = clamp(color, 0.0, 1.0);
-	
-	float p;
-	mat3 m_out;
-	
-	if (CS == 0.0) { p = 2.2; m_out =  ToSRGB;   } else
-	if (CS == 1.0) { p = 2.2; m_out =  ToModern; } else	
-	if (CS == 2.0) { p = 2.6; m_out =  ToDCI;    } else
-	if (CS == 3.0) { p = 2.2; m_out =  ToAdobe;  } else
-	if (CS == 4.0) { p = 2.4; m_out =  ToREC;    }
-	
-	color = pow(c, vec3(p));
-	
-	mat3 m_in = Profile0;
-
-	if (CP == 0.0) { m_in = Profile0; } else	
-	if (CP == 1.0) { m_in = Profile1; } else
-	if (CP == 2.0) { m_in = Profile2; } else
-	if (CP == 3.0) { m_in = Profile3; } else
-	if (CP == 4.0) { m_in = Profile4; } else
-	if (CP == 5.0) { m_in = Profile5; }
-	
-	color = m_in*color;
-	color = m_out*color;
-
-	color = clamp(color, 0.0, 1.0);
-
-	color = pow(color, vec3(1.0/p));	
-	
-	if (CP == -1.0) color = c;
-	
-	vec3 scolor1 = plant(pow(color, vec3(wp_saturation)), max(max(color.r,color.g),color.b));
-	float luma = dot(color, vec3(0.299, 0.587, 0.114));
-	vec3 scolor2 = mix(vec3(luma), color, wp_saturation);
-	color = (wp_saturation > 1.0) ? scolor1 : scolor2;
-
-	color = plant(color, contrast(max(max(color.r,color.g),color.b)));
-
-	p = 2.2;
-	color = clamp(color, 0.0, 1.0);	
-	color = pow(color, vec3(p)); 
-	
-	vec3 warmer = D65_to_D55*color;
-	warmer = ToSRGB*warmer;
-	
-	vec3 cooler = D65_to_D93*color;
-	cooler = ToSRGB*cooler;
-	
-	float m = abs(WP)/100.0;
-	
-	vec3 comp = (WP < 0.0) ? cooler : warmer;
-	
-	color = mix(color, comp, m);
-	color = pow(max(color, 0.0), vec3(1.0/p));
-
-	if (BP > -0.5) color = color + aftglow.rgb + bp; else
-	{ 
-		color = max(color + BP/255.0, 0.0) / (1.0 + BP/255.0*step(- BP/255.0, max(max(color.r,color.g),color.b))) + aftglow.rgb;
-	}
-	
-	color = min(color * params.pre_bb, 1.0);
-	
-	FragColor = vec4(color, vignette(vTexCoord.xy)); 
-} 
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/hsm_crt-guest-advanced-release-version.txt b/bezel/Mega_Bezel/shaders/guest/hsm_crt-guest-advanced-release-version.txt
deleted file mode 100644
index 6971d862f7..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/hsm_crt-guest-advanced-release-version.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-crt-guest-advanced-2023-12-02-release1
-
-Grade is not included in this version of Guest. 
-This is because we want to use guest color correction as well as grade  
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/hsm-inv-trinitron-lut_orig.png b/bezel/Mega_Bezel/shaders/guest/lut/hsm-inv-trinitron-lut_orig.png
deleted file mode 100644
index c9033bc581..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/hsm-inv-trinitron-lut_orig.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/hsm-nec-lut_orig.png b/bezel/Mega_Bezel/shaders/guest/lut/hsm-nec-lut_orig.png
deleted file mode 100644
index 604dc19887..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/hsm-nec-lut_orig.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/hsm-ntsc-lut_orig.png b/bezel/Mega_Bezel/shaders/guest/lut/hsm-ntsc-lut_orig.png
deleted file mode 100644
index 323ec71c97..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/hsm-ntsc-lut_orig.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/hsm-trinitron-lut_orig.png b/bezel/Mega_Bezel/shaders/guest/lut/hsm-trinitron-lut_orig.png
deleted file mode 100644
index b5f1e5af17..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/hsm-trinitron-lut_orig.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/inv-trinitron-lut.png b/bezel/Mega_Bezel/shaders/guest/lut/inv-trinitron-lut.png
deleted file mode 100644
index ea93bda8aa..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/inv-trinitron-lut.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/nec-lut.png b/bezel/Mega_Bezel/shaders/guest/lut/nec-lut.png
deleted file mode 100644
index d18e00d6ea..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/nec-lut.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/ntsc-lut.png b/bezel/Mega_Bezel/shaders/guest/lut/ntsc-lut.png
deleted file mode 100644
index ef7e883fd0..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/ntsc-lut.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/lut/trinitron-lut.png b/bezel/Mega_Bezel/shaders/guest/lut/trinitron-lut.png
deleted file mode 100644
index d38bdd7c10..0000000000
Binary files a/bezel/Mega_Bezel/shaders/guest/lut/trinitron-lut.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass1.slang b/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass1.slang
deleted file mode 100644
index b914bb8d44..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass1.slang
+++ /dev/null
@@ -1,187 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(push_constant) uniform Push
-{
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-   float quality, ntsc_sat, cust_fringing, cust_artifacting, ntsc_bright, ntsc_scale, ntsc_fields, ntsc_phase, ntsc_gamma;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter NTSC_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter ntsc_quality_title   "[ NTSC QUALITY ]:" 0 0 0.01 0.01
-
-#pragma parameter quality              "INFO:  Fringe & Artifact Values: Svideo 0 | Composite 1 | RF 2" 0.0 0.0 0.0 1.0
-#pragma parameter cust_artifacting     "          Artifacting Value" 1.0 0.0 5.0 0.1
-#pragma parameter cust_fringing        "          Fringing Value" 1.0 0.0 5.0 0.1
-
-#pragma parameter ntsc_phase_title    "[ NTSC FIELDS & PHASE ]:" 0 0 0.01 0.01
-#pragma parameter ntsc_fields          "          Merge Fields: Auto | NO | YES" -1.0 -1.0 1.0 1.0
-#pragma parameter ntsc_phase           "          Phase: Auto | 2 phase | 3 phase | Mixed" 1.0 1.0 4.0 1.0
-#pragma parameter ntsc_scale           "          Resolution Scaling" 1.0 0.20 2.5 0.025
-
-#pragma parameter ntsc_color_title     "[ NTSC COLOR & BRIGHTNESS]:" 0 0 0.01 0.01
-#pragma parameter ntsc_cscale          "          Chroma Scaling / Bleeding" 1.0 0.20 4.0 0.05
-#pragma parameter ntsc_sat             "          Color Saturation" 1.0 0.0 2.0 0.01
-#pragma parameter ntsc_bright          "          Brightness" 1.0 0.0 1.5 0.01
-#pragma parameter ntsc_gamma           "          NTSC Filtering Gamma Correction" 1.0 0.25 2.0 0.025
-
-
-
-#define PI 3.14159265
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 pix_no;
-layout(location = 2) out float phase;
-layout(location = 3) out float BRIGHTNESS;
-layout(location = 4) out float SATURATION;
-layout(location = 5) out float FRINGING;
-layout(location = 6) out float ARTIFACTING;
-layout(location = 7) out float CHROMA_MOD_FREQ;
-layout(location = 8) out float MERGE;
-
-void main()
-{
-	float res = min(params.ntsc_scale, 1.0);
-	float OriginalSize = params.OriginalSize.x;
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-	pix_no = TexCoord * params.OriginalSize.xy * res * vec2(4.0,1.0);
-	phase = (params.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((params.ntsc_phase > 2.5) ? 3.0 : 2.0);
-	if (params.ntsc_phase == 4.0) phase = 3.0;
-	
-	CHROMA_MOD_FREQ = (phase < 2.5) ? (4.0 * PI / 15.0) : (PI / 3.0);
-	ARTIFACTING = params.cust_artifacting;
-	FRINGING = params.cust_fringing;
-	SATURATION = params.ntsc_sat;
-	BRIGHTNESS = params.ntsc_bright;
-	MERGE = 0.0;
-	if (params.ntsc_fields == -1.0 && phase == 3.0) MERGE = 1.0;
-	else if (params.ntsc_fields ==  0.0) MERGE = 0.0;
-	else if (params.ntsc_fields ==  1.0) MERGE = 1.0;	
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 2) in float phase;
-layout(location = 3) in float BRIGHTNESS;
-layout(location = 4) in float SATURATION;
-layout(location = 5) in float FRINGING;
-layout(location = 6) in float ARTIFACTING;
-layout(location = 7) in float CHROMA_MOD_FREQ;
-layout(location = 8) in float MERGE;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define mix_mat  mat3(BRIGHTNESS, FRINGING, FRINGING, ARTIFACTING, 2.0 * SATURATION, 0.0, ARTIFACTING, 0.0, 2.0 * SATURATION)
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-void main()
-{
-   float res = params.ntsc_scale;
-   vec3 col = texture(Source, vTexCoord).rgb;
- 
-   vec3 yiq = rgb2yiq(col);
-
-   yiq.x = pow(yiq.x, params.ntsc_gamma);
-
-   float lum = yiq.x;
-
-if (params.ntsc_phase == 4.0) 
-{
-   vec2 dx = vec2(params.OriginalSize.z, 0.0);
-   vec3 c1 = texture(Source, vTexCoord - dx).rgb;
-   vec3 c2 = texture(Source, vTexCoord + dx).rgb;
-   c1 = rgb2yiq(c1); c1.x = pow(c1.x, params.ntsc_gamma);
-   c2 = rgb2yiq(c2); c2.x = pow(c2.x, params.ntsc_gamma);
-   yiq.x = mix(min(0.5*(yiq.x + max(c1.x,c2.x)), max(yiq.x , min(c1.x,c2.x))), yiq.x, 5.0*min(abs(c1.x-c2.x),1.0));
-}   
-   vec3 yiq2 = yiq;	
-   vec3 yiqs = yiq;
-   vec3 yiqz = yiq;
-   
-   float mod1 = 2.0;
-   float mod2 = 3.0; 
-
-if (MERGE > 0.5)
-{
-   float chroma_phase2 = (phase < 2.5) ? PI * (mod(pix_no.y, mod1) + mod(params.FrameCount+1, 2.)) : 0.6667 * PI * (mod(pix_no.y, mod2) + mod(params.FrameCount+1, 2.));
-   float mod_phase2 = chroma_phase2 + pix_no.x * CHROMA_MOD_FREQ;
-   float i_mod2 = cos(mod_phase2);
-   float q_mod2 = sin(mod_phase2);
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Modulate.
-   yiq2 *= mix_mat; // Cross-talk.
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Demodulate.   
-
-   if (res > 1.025)
-   {
-      mod_phase2 = chroma_phase2 + pix_no.x * CHROMA_MOD_FREQ * res;
-      i_mod2 = cos(mod_phase2);
-      q_mod2 = sin(mod_phase2);
-      yiqs.yz *= vec2(i_mod2, q_mod2); // Modulate.
-      yiq2.x = dot(yiqs, mix_mat[0]);  // Cross-talk.
-   }
-}
-   
-   float chroma_phase = (phase < 2.5) ? PI * (mod(pix_no.y, mod1) + mod(params.FrameCount, 2.)) : 0.6667 * PI * (mod(pix_no.y, mod2) + mod(params.FrameCount, 2.));
-   float mod_phase = chroma_phase + pix_no.x * CHROMA_MOD_FREQ;
-
-   float i_mod = cos(mod_phase);
-   float q_mod = sin(mod_phase);
-
-   yiq.yz *= vec2(i_mod, q_mod); // Modulate.
-   yiq *= mix_mat; // Cross-talk.
-   yiq.yz *= vec2(i_mod, q_mod); // Demodulate.
-   
-    if (res > 1.025)
-   {
-      mod_phase = chroma_phase + pix_no.x * CHROMA_MOD_FREQ * res;
-      i_mod = cos(mod_phase); 
-      q_mod = sin(mod_phase);
-      yiqz.yz *= vec2(i_mod, q_mod); // Modulate.
-      yiq.x = dot(yiqz, mix_mat[0]); // Cross-talk.
-   }
-      
-if (params.ntsc_phase == 4.0)
-{
-	yiq.x = lum; yiq2.x = lum;
-}
-
-   yiq = (MERGE < 0.5) ? yiq : 0.5*(yiq+yiq2);
-   
-   FragColor = vec4(yiq, lum);
-} 
diff --git a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass1_orig.slang b/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass1_orig.slang
deleted file mode 100644
index 891209af60..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass1_orig.slang
+++ /dev/null
@@ -1,181 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(push_constant) uniform Push
-{
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-   float quality, ntsc_sat, cust_fringing, cust_artifacting, ntsc_bright, ntsc_scale, ntsc_fields, ntsc_phase, ntsc_gamma;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter ntsc-row1 "------------------------------------------------" 0.0 0.0 1.0 1.0
-#pragma parameter quality "Values (Info Only): Svideo = 0.0 | Composite = 1.0 | RF = 2.0" 0.0 0.0 0.0 1.0
-#pragma parameter cust_artifacting "NTSC Artifacting Value" 1.0 0.0 5.0 0.1
-#pragma parameter cust_fringing "NTSC Fringing Value" 1.0 0.0 5.0 0.1
-#pragma parameter ntsc-row2 "------------------------------------------------" 0.0 0.0 1.0 1.0
-#pragma parameter ntsc_fields "NTSC Merge Fields: Auto | NO | YES" -1.0 -1.0 1.0 1.0
-#pragma parameter ntsc_phase "NTSC Phase: Auto | 2 phase | 3 phase | Mixed" 1.0 1.0 4.0 1.0
-#pragma parameter ntsc_scale "NTSC Resolution Scaling" 1.0 0.20 2.5 0.025
-#pragma parameter ntsc_cscale "NTSC Chroma Scaling / Bleeding" 1.0 0.20 4.0 0.05
-#pragma parameter ntsc_sat "NTSC Color Saturation" 1.0 0.0 2.0 0.01
-#pragma parameter ntsc_bright "NTSC Brightness" 1.0 0.0 1.5 0.01
-#pragma parameter ntsc_gamma "NTSC Filtering Gamma Correction" 1.0 0.25 2.0 0.025
-
-
-#define PI 3.14159265
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 pix_no;
-layout(location = 2) out float phase;
-layout(location = 3) out float BRIGHTNESS;
-layout(location = 4) out float SATURATION;
-layout(location = 5) out float FRINGING;
-layout(location = 6) out float ARTIFACTING;
-layout(location = 7) out float CHROMA_MOD_FREQ;
-layout(location = 8) out float MERGE;
-
-void main()
-{
-	float res = min(params.ntsc_scale, 1.0);
-	float OriginalSize = params.OriginalSize.x;
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-	pix_no = TexCoord * params.OriginalSize.xy * res * vec2(4.0,1.0);
-	phase = (params.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((params.ntsc_phase > 2.5) ? 3.0 : 2.0);
-	if (params.ntsc_phase == 4.0) phase = 3.0;
-	
-	CHROMA_MOD_FREQ = (phase < 2.5) ? (4.0 * PI / 15.0) : (PI / 3.0);
-	ARTIFACTING = params.cust_artifacting;
-	FRINGING = params.cust_fringing;
-	SATURATION = params.ntsc_sat;
-	BRIGHTNESS = params.ntsc_bright;
-	MERGE = 0.0;
-	if (params.ntsc_fields == -1.0 && phase == 3.0) MERGE = 1.0;
-	else if (params.ntsc_fields ==  0.0) MERGE = 0.0;
-	else if (params.ntsc_fields ==  1.0) MERGE = 1.0;	
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 2) in float phase;
-layout(location = 3) in float BRIGHTNESS;
-layout(location = 4) in float SATURATION;
-layout(location = 5) in float FRINGING;
-layout(location = 6) in float ARTIFACTING;
-layout(location = 7) in float CHROMA_MOD_FREQ;
-layout(location = 8) in float MERGE;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define mix_mat  mat3(BRIGHTNESS, FRINGING, FRINGING, ARTIFACTING, 2.0 * SATURATION, 0.0, ARTIFACTING, 0.0, 2.0 * SATURATION)
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-void main()
-{
-   float res = params.ntsc_scale;
-   vec3 col = texture(Source, vTexCoord).rgb;
- 
-   vec3 yiq = rgb2yiq(col);
-
-   yiq.x = pow(yiq.x, params.ntsc_gamma);
-
-   float lum = yiq.x;
-
-if (params.ntsc_phase == 4.0) 
-{
-   vec2 dx = vec2(params.OriginalSize.z, 0.0);
-   vec3 c1 = texture(Source, vTexCoord - dx).rgb;
-   vec3 c2 = texture(Source, vTexCoord + dx).rgb;
-   c1 = rgb2yiq(c1); c1.x = pow(c1.x, params.ntsc_gamma);
-   c2 = rgb2yiq(c2); c2.x = pow(c2.x, params.ntsc_gamma);
-   yiq.x = mix(min(0.5*(yiq.x + max(c1.x,c2.x)), max(yiq.x , min(c1.x,c2.x))), yiq.x, 5.0*min(abs(c1.x-c2.x),1.0));
-}   
-   vec3 yiq2 = yiq;	
-   vec3 yiqs = yiq;
-   vec3 yiqz = yiq;
-   
-   float mod1 = 2.0;
-   float mod2 = 3.0; 
-
-if (MERGE > 0.5)
-{
-   float chroma_phase2 = (phase < 2.5) ? PI * (mod(pix_no.y, mod1) + mod(params.FrameCount+1, 2.)) : 0.6667 * PI * (mod(pix_no.y, mod2) + mod(params.FrameCount+1, 2.));
-   float mod_phase2 = chroma_phase2 + pix_no.x * CHROMA_MOD_FREQ;
-   float i_mod2 = cos(mod_phase2);
-   float q_mod2 = sin(mod_phase2);
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Modulate.
-   yiq2 *= mix_mat; // Cross-talk.
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Demodulate.   
-
-   if (res > 1.025)
-   {
-      mod_phase2 = chroma_phase2 + pix_no.x * CHROMA_MOD_FREQ * res;
-      i_mod2 = cos(mod_phase2);
-      q_mod2 = sin(mod_phase2);
-      yiqs.yz *= vec2(i_mod2, q_mod2); // Modulate.
-      yiq2.x = dot(yiqs, mix_mat[0]);  // Cross-talk.
-   }
-}
-   
-   float chroma_phase = (phase < 2.5) ? PI * (mod(pix_no.y, mod1) + mod(params.FrameCount, 2.)) : 0.6667 * PI * (mod(pix_no.y, mod2) + mod(params.FrameCount, 2.));
-   float mod_phase = chroma_phase + pix_no.x * CHROMA_MOD_FREQ;
-
-   float i_mod = cos(mod_phase);
-   float q_mod = sin(mod_phase);
-
-   yiq.yz *= vec2(i_mod, q_mod); // Modulate.
-   yiq *= mix_mat; // Cross-talk.
-   yiq.yz *= vec2(i_mod, q_mod); // Demodulate.
-   
-    if (res > 1.025)
-   {
-      mod_phase = chroma_phase + pix_no.x * CHROMA_MOD_FREQ * res;
-      i_mod = cos(mod_phase); 
-      q_mod = sin(mod_phase);
-      yiqz.yz *= vec2(i_mod, q_mod); // Modulate.
-      yiq.x = dot(yiqz, mix_mat[0]); // Cross-talk.
-   }
-      
-if (params.ntsc_phase == 4.0)
-{
-	yiq.x = lum; yiq2.x = lum;
-}
-
-   yiq = (MERGE < 0.5) ? yiq : 0.5*(yiq+yiq2);
-   
-   FragColor = vec4(yiq, lum);
-} 
diff --git a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass2.slang b/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass2.slang
deleted file mode 100644
index 5a5e1d0efc..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass2.slang
+++ /dev/null
@@ -1,352 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(push_constant) uniform Push
-{
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float ntsc_scale;
-   float ntsc_phase;
-   float auto_res;
-   float ntsc_ring;
-   float ntsc_cscale;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter ntsc_cscale          "          Chroma Scaling / Bleeding" 1.0 0.20 4.0 0.05
-#pragma parameter ntsc_scale           "          Resolution Scaling" 1.0 0.20 2.5 0.025
-#pragma parameter ntsc_phase           "          Phase: Auto | 2 phase | 3 phase | Mixed" 1.0 1.0 4.0 1.0
-#pragma parameter ntsc_ring            "          Anti-Ringing" 0.5 0.0 1.0 0.10
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord - vec2(0.25 * params.OriginalSize.z/4.0, 0.0); // Compensate for decimate-by-2.
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PrePass0;
-
-
-vec3 fetch_offset(float offset, vec2 one_x)
-{
-   return vec3(texture(Source, vTexCoord + vec2((offset) * (one_x.x), 0.0)).x, texture(Source, vTexCoord + vec2((offset) * one_x.y, 0.0)).yz);
-}
-
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-
-const int TAPS_2_phase = 32;
-const float luma_filter_2_phase[33] = float[33](
-   -0.000174844,
-   -0.000205844,
-   -0.000149453,
-   -0.000051693,
-   0.000000000,
-   -0.000066171,
-   -0.000245058,
-   -0.000432928,
-   -0.000472644,
-   -0.000252236,
-   0.000198929,
-   0.000687058,
-   0.000944112,
-   0.000803467,
-   0.000363199,
-   0.000013422,
-   0.000253402,
-   0.001339461,
-   0.002932972,
-   0.003983485,
-   0.003026683,
-   -0.001102056,
-   -0.008373026,
-   -0.016897700,
-   -0.022914480,
-   -0.021642347,
-   -0.028863273,
-   0.027271957,
-   0.054921920,
-   0.098342579,
-   0.139044281,
-   0.168055832,
-   0.178571429);
-
-
-
-const int TAPS_3_phase = 24;
-const float luma_filter_3_phase[25] = float[25](
-   -0.000012020,
-   -0.000022146,
-   -0.000013155,
-   -0.000012020,
-   -0.000049979,
-   -0.000113940,
-   -0.000122150,
-   -0.000005612,
-   0.000170516,
-   0.000237199,
-   0.000169640,
-   0.000285688,
-   0.000984574,
-   0.002018683,
-   0.002002275,
-   -0.005909882,
-   -0.012049081,
-   -0.018222860,
-   -0.022606931,
-   0.002460860,
-   0.035868225,
-   0.084016453,
-   0.135563500,
-   0.175261268,
-   0.220176552);
-
-const float chroma_filter_3_phase[25] = float[25](
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
-
-
-const float chroma_filter_4_phase[33] = float[33](
-    0.0,
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0,
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
-
-void main()
-{
-
-float chroma_filter_2_phase[33] = float[33](
-   0.001384762,
-   0.001678312,
-   0.002021715,
-   0.002420562,
-   0.002880460,
-   0.003406879,
-   0.004004985,
-   0.004679445,
-   0.005434218,
-   0.006272332,
-   0.007195654,
-   0.008204665,
-   0.009298238,
-   0.010473450,
-   0.011725413,
-   0.013047155,
-   0.014429548,
-   0.015861306,
-   0.017329037,
-   0.018817382,
-   0.020309220,
-   0.021785952,
-   0.023227857,
-   0.024614500,
-   0.025925203,
-   0.027139546,
-   0.028237893,
-   0.029201910,
-   0.030015081,
-   0.030663170,
-   0.031134640,
-   0.031420995,
-   0.031517031);
-
-   float res = params.ntsc_scale;
-   float OriginalSize = params.OriginalSize.x; 
-   vec2 one_x = 0.25*params.OriginalSize.zz / res;
-   vec3 signal = vec3(0.0);
-   float phase = (params.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((params.ntsc_phase > 2.5) ? 3.0 : 2.0);
-   if (params.ntsc_phase == 4.0) { phase = 2.0; chroma_filter_2_phase = chroma_filter_4_phase; }
-   
-   float cres = params.ntsc_cscale; if (phase == 3.0 || params.ntsc_phase == 4.0) cres = min(cres, 2.25); one_x.y = one_x.y/cres;
-
-   if(phase < 2.5)
-   {
-      vec3 sums = fetch_offset(0.0 - 32.0, one_x) + fetch_offset(32.0 - 0.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[0], chroma_filter_2_phase[0], chroma_filter_2_phase[0]);
-      sums = fetch_offset(1.0 - 32.0, one_x) + fetch_offset(32.0 - 1.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[1], chroma_filter_2_phase[1], chroma_filter_2_phase[1]);
-      sums = fetch_offset(2.0 - 32.0, one_x) + fetch_offset(32.0 - 2.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[2], chroma_filter_2_phase[2], chroma_filter_2_phase[2]);
-      sums = fetch_offset(3.0 - 32.0, one_x) + fetch_offset(32.0 - 3.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[3], chroma_filter_2_phase[3], chroma_filter_2_phase[3]);
-      sums = fetch_offset(4.0 - 32.0, one_x) + fetch_offset(32.0 - 4.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[4], chroma_filter_2_phase[4], chroma_filter_2_phase[4]);
-      sums = fetch_offset(5.0 - 32.0, one_x) + fetch_offset(32.0 - 5.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[5], chroma_filter_2_phase[5], chroma_filter_2_phase[5]);
-      sums = fetch_offset(6.0 - 32.0, one_x) + fetch_offset(32.0 - 6.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[6], chroma_filter_2_phase[6], chroma_filter_2_phase[6]);
-      sums = fetch_offset(7.0 - 32.0, one_x) + fetch_offset(32.0 - 7.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[7], chroma_filter_2_phase[7], chroma_filter_2_phase[7]);
-      sums = fetch_offset(8.0 - 32.0, one_x) + fetch_offset(32.0 - 8.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[8], chroma_filter_2_phase[8], chroma_filter_2_phase[8]);
-      sums = fetch_offset(9.0 - 32.0, one_x) + fetch_offset(32.0 - 9.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[9], chroma_filter_2_phase[9], chroma_filter_2_phase[9]);
-      sums = fetch_offset(10.0 - 32.0, one_x) + fetch_offset(32.0 - 10.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[10], chroma_filter_2_phase[10], chroma_filter_2_phase[10]);
-      sums = fetch_offset(11.0 - 32.0, one_x) + fetch_offset(32.0 - 11.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[11], chroma_filter_2_phase[11], chroma_filter_2_phase[11]);
-      sums = fetch_offset(12.0 - 32.0, one_x) + fetch_offset(32.0 - 12.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[12], chroma_filter_2_phase[12], chroma_filter_2_phase[12]);
-      sums = fetch_offset(13.0 - 32.0, one_x) + fetch_offset(32.0 - 13.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[13], chroma_filter_2_phase[13], chroma_filter_2_phase[13]);
-      sums = fetch_offset(14.0 - 32.0, one_x) + fetch_offset(32.0 - 14.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[14], chroma_filter_2_phase[14], chroma_filter_2_phase[14]);
-      sums = fetch_offset(15.0 - 32.0, one_x) + fetch_offset(32.0 - 15.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[15], chroma_filter_2_phase[15], chroma_filter_2_phase[15]);
-      sums = fetch_offset(16.0 - 32.0, one_x) + fetch_offset(32.0 - 16.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[16], chroma_filter_2_phase[16], chroma_filter_2_phase[16]);
-      sums = fetch_offset(17.0 - 32.0, one_x) + fetch_offset(32.0 - 17.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[17], chroma_filter_2_phase[17], chroma_filter_2_phase[17]);
-      sums = fetch_offset(18.0 - 32.0, one_x) + fetch_offset(32.0 - 18.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[18], chroma_filter_2_phase[18], chroma_filter_2_phase[18]);
-      sums = fetch_offset(19.0 - 32.0, one_x) + fetch_offset(32.0 - 19.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[19], chroma_filter_2_phase[19], chroma_filter_2_phase[19]);
-      sums = fetch_offset(20.0 - 32.0, one_x) + fetch_offset(32.0 - 20.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[20], chroma_filter_2_phase[20], chroma_filter_2_phase[20]);
-      sums = fetch_offset(21.0 - 32.0, one_x) + fetch_offset(32.0 - 21.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[21], chroma_filter_2_phase[21], chroma_filter_2_phase[21]);
-      sums = fetch_offset(22.0 - 32.0, one_x) + fetch_offset(32.0 - 22.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[22], chroma_filter_2_phase[22], chroma_filter_2_phase[22]);
-      sums = fetch_offset(23.0 - 32.0, one_x) + fetch_offset(32.0 - 23.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[23], chroma_filter_2_phase[23], chroma_filter_2_phase[23]);
-      sums = fetch_offset(24.0 - 32.0, one_x) + fetch_offset(32.0 - 24.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[24], chroma_filter_2_phase[24], chroma_filter_2_phase[24]);
-      sums = fetch_offset(25.0 - 32.0, one_x) + fetch_offset(32.0 - 25.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[25], chroma_filter_2_phase[25], chroma_filter_2_phase[25]);
-      sums = fetch_offset(26.0 - 32.0, one_x) + fetch_offset(32.0 - 26.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[26], chroma_filter_2_phase[26], chroma_filter_2_phase[26]);
-      sums = fetch_offset(27.0 - 32.0, one_x) + fetch_offset(32.0 - 27.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[27], chroma_filter_2_phase[27], chroma_filter_2_phase[27]);
-      sums = fetch_offset(28.0 - 32.0, one_x) + fetch_offset(32.0 - 28.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[28], chroma_filter_2_phase[28], chroma_filter_2_phase[28]);
-      sums = fetch_offset(29.0 - 32.0, one_x) + fetch_offset(32.0 - 29.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[29], chroma_filter_2_phase[29], chroma_filter_2_phase[29]);
-      sums = fetch_offset(30.0 - 32.0, one_x) + fetch_offset(32.0 - 30.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[30], chroma_filter_2_phase[30], chroma_filter_2_phase[30]);
-      sums = fetch_offset(31.0 - 32.0, one_x) + fetch_offset(32.0 - 31.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[31], chroma_filter_2_phase[31], chroma_filter_2_phase[31]);
-      
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase]);
-   }
-   else if(phase > 2.5)
-   {
-      for (int i = 0; i < TAPS_3_phase; i++)
-      {
-         float offset = float(i);
-
-         vec3 sums = fetch_offset(offset - float(TAPS_3_phase), one_x) +
-            fetch_offset(float(TAPS_3_phase) - offset, one_x);
-         signal += sums * vec3(luma_filter_3_phase[i], chroma_filter_3_phase[i], chroma_filter_3_phase[i]);
-      }
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase]);
-   }
-
-   if (params.ntsc_ring > 0.05)
-   {
-      vec2 dx = vec2(params.OriginalSize.z / min(res, 1.0), 0.0);
-	  float a = texture(Source, vTexCoord - 1.5*dx).a;
-	  float b = texture(Source, vTexCoord - 0.5*dx).a;
-	  float c = texture(Source, vTexCoord + 1.5*dx).a;
-	  float d = texture(Source, vTexCoord + 0.5*dx).a;
-      float e = texture(Source, vTexCoord         ).a;	  
-      signal.x = mix(signal.x, clamp(signal.x, min(min(min(a,b),min(c,d)),e), max(max(max(a,b),max(c,d)),e)), params.ntsc_ring);
-   }
-   
-   vec3 orig = rgb2yiq(texture(PrePass0, vTexCoord).rgb);
-   
-   signal.x = clamp(signal.x, -1.0, 1.0);
-   vec3 rgb = signal;
-   
-   FragColor = vec4(rgb, orig.x);
-}  
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass2_orig.slang b/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass2_orig.slang
deleted file mode 100644
index e282e6d532..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass2_orig.slang
+++ /dev/null
@@ -1,352 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(push_constant) uniform Push
-{
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float ntsc_scale;
-   float ntsc_phase;
-   float auto_res;
-   float ntsc_ring;
-   float ntsc_cscale;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter ntsc_cscale "NTSC Chroma Scaling / Bleeding" 1.0 0.20 4.0 0.05
-#pragma parameter ntsc_scale  "NTSC Resolution Scaling" 1.0 0.20 2.5 0.025
-#pragma parameter ntsc_phase  "NTSC Phase: Auto | 2 phase | 3 phase | Mixed" 1.0 1.0 4.0 1.0
-#pragma parameter ntsc_ring   "NTSC Anti-Ringing" 0.5 0.0 1.0 0.10
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord - vec2(0.25 * params.OriginalSize.z/4.0, 0.0); // Compensate for decimate-by-2.
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PrePass0;
-
-
-vec3 fetch_offset(float offset, vec2 one_x)
-{
-   return vec3(texture(Source, vTexCoord + vec2((offset) * (one_x.x), 0.0)).x, texture(Source, vTexCoord + vec2((offset) * one_x.y, 0.0)).yz);
-}
-
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-
-const int TAPS_2_phase = 32;
-const float luma_filter_2_phase[33] = float[33](
-   -0.000174844,
-   -0.000205844,
-   -0.000149453,
-   -0.000051693,
-   0.000000000,
-   -0.000066171,
-   -0.000245058,
-   -0.000432928,
-   -0.000472644,
-   -0.000252236,
-   0.000198929,
-   0.000687058,
-   0.000944112,
-   0.000803467,
-   0.000363199,
-   0.000013422,
-   0.000253402,
-   0.001339461,
-   0.002932972,
-   0.003983485,
-   0.003026683,
-   -0.001102056,
-   -0.008373026,
-   -0.016897700,
-   -0.022914480,
-   -0.021642347,
-   -0.028863273,
-   0.027271957,
-   0.054921920,
-   0.098342579,
-   0.139044281,
-   0.168055832,
-   0.178571429);
-
-
-
-const int TAPS_3_phase = 24;
-const float luma_filter_3_phase[25] = float[25](
-   -0.000012020,
-   -0.000022146,
-   -0.000013155,
-   -0.000012020,
-   -0.000049979,
-   -0.000113940,
-   -0.000122150,
-   -0.000005612,
-   0.000170516,
-   0.000237199,
-   0.000169640,
-   0.000285688,
-   0.000984574,
-   0.002018683,
-   0.002002275,
-   -0.005909882,
-   -0.012049081,
-   -0.018222860,
-   -0.022606931,
-   0.002460860,
-   0.035868225,
-   0.084016453,
-   0.135563500,
-   0.175261268,
-   0.220176552);
-
-const float chroma_filter_3_phase[25] = float[25](
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
-
-
-const float chroma_filter_4_phase[33] = float[33](
-    0.0,
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0, 
-	0.0,
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
-
-void main()
-{
-
-float chroma_filter_2_phase[33] = float[33](
-   0.001384762,
-   0.001678312,
-   0.002021715,
-   0.002420562,
-   0.002880460,
-   0.003406879,
-   0.004004985,
-   0.004679445,
-   0.005434218,
-   0.006272332,
-   0.007195654,
-   0.008204665,
-   0.009298238,
-   0.010473450,
-   0.011725413,
-   0.013047155,
-   0.014429548,
-   0.015861306,
-   0.017329037,
-   0.018817382,
-   0.020309220,
-   0.021785952,
-   0.023227857,
-   0.024614500,
-   0.025925203,
-   0.027139546,
-   0.028237893,
-   0.029201910,
-   0.030015081,
-   0.030663170,
-   0.031134640,
-   0.031420995,
-   0.031517031);
-
-   float res = params.ntsc_scale;
-   float OriginalSize = params.OriginalSize.x; 
-   vec2 one_x = 0.25*params.OriginalSize.zz / res;
-   vec3 signal = vec3(0.0);
-   float phase = (params.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((params.ntsc_phase > 2.5) ? 3.0 : 2.0);
-   if (params.ntsc_phase == 4.0) { phase = 2.0; chroma_filter_2_phase = chroma_filter_4_phase; }
-   
-   float cres = params.ntsc_cscale; if (phase == 3.0 || params.ntsc_phase == 4.0) cres = min(cres, 2.25); one_x.y = one_x.y/cres;
-
-   if(phase < 2.5)
-   {
-      vec3 sums = fetch_offset(0.0 - 32.0, one_x) + fetch_offset(32.0 - 0.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[0], chroma_filter_2_phase[0], chroma_filter_2_phase[0]);
-      sums = fetch_offset(1.0 - 32.0, one_x) + fetch_offset(32.0 - 1.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[1], chroma_filter_2_phase[1], chroma_filter_2_phase[1]);
-      sums = fetch_offset(2.0 - 32.0, one_x) + fetch_offset(32.0 - 2.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[2], chroma_filter_2_phase[2], chroma_filter_2_phase[2]);
-      sums = fetch_offset(3.0 - 32.0, one_x) + fetch_offset(32.0 - 3.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[3], chroma_filter_2_phase[3], chroma_filter_2_phase[3]);
-      sums = fetch_offset(4.0 - 32.0, one_x) + fetch_offset(32.0 - 4.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[4], chroma_filter_2_phase[4], chroma_filter_2_phase[4]);
-      sums = fetch_offset(5.0 - 32.0, one_x) + fetch_offset(32.0 - 5.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[5], chroma_filter_2_phase[5], chroma_filter_2_phase[5]);
-      sums = fetch_offset(6.0 - 32.0, one_x) + fetch_offset(32.0 - 6.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[6], chroma_filter_2_phase[6], chroma_filter_2_phase[6]);
-      sums = fetch_offset(7.0 - 32.0, one_x) + fetch_offset(32.0 - 7.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[7], chroma_filter_2_phase[7], chroma_filter_2_phase[7]);
-      sums = fetch_offset(8.0 - 32.0, one_x) + fetch_offset(32.0 - 8.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[8], chroma_filter_2_phase[8], chroma_filter_2_phase[8]);
-      sums = fetch_offset(9.0 - 32.0, one_x) + fetch_offset(32.0 - 9.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[9], chroma_filter_2_phase[9], chroma_filter_2_phase[9]);
-      sums = fetch_offset(10.0 - 32.0, one_x) + fetch_offset(32.0 - 10.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[10], chroma_filter_2_phase[10], chroma_filter_2_phase[10]);
-      sums = fetch_offset(11.0 - 32.0, one_x) + fetch_offset(32.0 - 11.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[11], chroma_filter_2_phase[11], chroma_filter_2_phase[11]);
-      sums = fetch_offset(12.0 - 32.0, one_x) + fetch_offset(32.0 - 12.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[12], chroma_filter_2_phase[12], chroma_filter_2_phase[12]);
-      sums = fetch_offset(13.0 - 32.0, one_x) + fetch_offset(32.0 - 13.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[13], chroma_filter_2_phase[13], chroma_filter_2_phase[13]);
-      sums = fetch_offset(14.0 - 32.0, one_x) + fetch_offset(32.0 - 14.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[14], chroma_filter_2_phase[14], chroma_filter_2_phase[14]);
-      sums = fetch_offset(15.0 - 32.0, one_x) + fetch_offset(32.0 - 15.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[15], chroma_filter_2_phase[15], chroma_filter_2_phase[15]);
-      sums = fetch_offset(16.0 - 32.0, one_x) + fetch_offset(32.0 - 16.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[16], chroma_filter_2_phase[16], chroma_filter_2_phase[16]);
-      sums = fetch_offset(17.0 - 32.0, one_x) + fetch_offset(32.0 - 17.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[17], chroma_filter_2_phase[17], chroma_filter_2_phase[17]);
-      sums = fetch_offset(18.0 - 32.0, one_x) + fetch_offset(32.0 - 18.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[18], chroma_filter_2_phase[18], chroma_filter_2_phase[18]);
-      sums = fetch_offset(19.0 - 32.0, one_x) + fetch_offset(32.0 - 19.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[19], chroma_filter_2_phase[19], chroma_filter_2_phase[19]);
-      sums = fetch_offset(20.0 - 32.0, one_x) + fetch_offset(32.0 - 20.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[20], chroma_filter_2_phase[20], chroma_filter_2_phase[20]);
-      sums = fetch_offset(21.0 - 32.0, one_x) + fetch_offset(32.0 - 21.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[21], chroma_filter_2_phase[21], chroma_filter_2_phase[21]);
-      sums = fetch_offset(22.0 - 32.0, one_x) + fetch_offset(32.0 - 22.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[22], chroma_filter_2_phase[22], chroma_filter_2_phase[22]);
-      sums = fetch_offset(23.0 - 32.0, one_x) + fetch_offset(32.0 - 23.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[23], chroma_filter_2_phase[23], chroma_filter_2_phase[23]);
-      sums = fetch_offset(24.0 - 32.0, one_x) + fetch_offset(32.0 - 24.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[24], chroma_filter_2_phase[24], chroma_filter_2_phase[24]);
-      sums = fetch_offset(25.0 - 32.0, one_x) + fetch_offset(32.0 - 25.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[25], chroma_filter_2_phase[25], chroma_filter_2_phase[25]);
-      sums = fetch_offset(26.0 - 32.0, one_x) + fetch_offset(32.0 - 26.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[26], chroma_filter_2_phase[26], chroma_filter_2_phase[26]);
-      sums = fetch_offset(27.0 - 32.0, one_x) + fetch_offset(32.0 - 27.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[27], chroma_filter_2_phase[27], chroma_filter_2_phase[27]);
-      sums = fetch_offset(28.0 - 32.0, one_x) + fetch_offset(32.0 - 28.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[28], chroma_filter_2_phase[28], chroma_filter_2_phase[28]);
-      sums = fetch_offset(29.0 - 32.0, one_x) + fetch_offset(32.0 - 29.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[29], chroma_filter_2_phase[29], chroma_filter_2_phase[29]);
-      sums = fetch_offset(30.0 - 32.0, one_x) + fetch_offset(32.0 - 30.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[30], chroma_filter_2_phase[30], chroma_filter_2_phase[30]);
-      sums = fetch_offset(31.0 - 32.0, one_x) + fetch_offset(32.0 - 31.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[31], chroma_filter_2_phase[31], chroma_filter_2_phase[31]);
-      
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase]);
-   }
-   else if(phase > 2.5)
-   {
-      for (int i = 0; i < TAPS_3_phase; i++)
-      {
-         float offset = float(i);
-
-         vec3 sums = fetch_offset(offset - float(TAPS_3_phase), one_x) +
-            fetch_offset(float(TAPS_3_phase) - offset, one_x);
-         signal += sums * vec3(luma_filter_3_phase[i], chroma_filter_3_phase[i], chroma_filter_3_phase[i]);
-      }
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase]);
-   }
-
-   if (params.ntsc_ring > 0.05)
-   {
-      vec2 dx = vec2(params.OriginalSize.z / min(res, 1.0), 0.0);
-	  float a = texture(Source, vTexCoord - 1.5*dx).a;
-	  float b = texture(Source, vTexCoord - 0.5*dx).a;
-	  float c = texture(Source, vTexCoord + 1.5*dx).a;
-	  float d = texture(Source, vTexCoord + 0.5*dx).a;
-      float e = texture(Source, vTexCoord         ).a;	  
-      signal.x = mix(signal.x, clamp(signal.x, min(min(min(a,b),min(c,d)),e), max(max(max(a,b),max(c,d)),e)), params.ntsc_ring);
-   }
-   
-   vec3 orig = rgb2yiq(texture(PrePass0, vTexCoord).rgb);
-   
-   signal.x = clamp(signal.x, -1.0, 1.0);
-   vec3 rgb = signal;
-   
-   FragColor = vec4(rgb, orig.x);
-}  
diff --git a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass3.slang b/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass3.slang
deleted file mode 100644
index 210f21a678..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass3.slang
+++ /dev/null
@@ -1,119 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(push_constant) uniform Push
-{
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float auto_res;
-   float ntsc_sharp;
-   float ntsc_shape;
-   float ntsc_gamma;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter NTSC_SHARPNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter ntsc_sharpness_title "   [ NTSC SHARPNESS ]:" 0 0 0.01 0.01
-#pragma parameter ntsc_sharp           "          Sharpness (Negative: Adaptive)" 0.0 -10.0 10.0 0.50
-#pragma parameter ntsc_shape           "          Sharpness Shape" 0.75 0.5 1.0 0.05
-#pragma parameter ntsc_gamma           "          NTSC Filtering Gamma Correction" 1.0 0.25 2.0 0.025
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord - vec2(0.25 * params.OriginalSize.z/4.0, 0.0); // Compensate for decimate-by-2.
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D NPass1;
-
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-   
-
-void main()
-{
-   vec2 offsetx = vec2(0.5 * params.OriginalSize.z, 0.0);
-   vec2 dx = vec2(0.25 * params.OriginalSize.z, 0.0)/4.0;
-   vec2 texcoord = vTexCoord + dx;
-   
-   vec3 l1  = texture(Source, texcoord +      offsetx).xyz;
-   vec3 l2  = texture(Source, texcoord -      offsetx).xyz;
-   vec3 l3  = texture(Source, texcoord + 0.50*offsetx).xyz;
-   vec3 l4  = texture(Source, texcoord - 0.50*offsetx).xyz;
-   vec3 ref = texture(Source, texcoord).xyz;
-   
-   float lum1 = min(texture(Source, vTexCoord - dx).a, texture(Source, vTexCoord + dx).a);
-   float lum2 = max(ref.x, 0.0);
-
-   float dif = max(max(abs(l1.x-l2.x), abs(l1.y-l2.y)), max(abs(l1.z-l2.z), abs(l1.x*l1.x-l2.x*l2.x)));
-   float dff = max(max(abs(l3.x-l4.x), abs(l3.y-l4.y)), max(abs(l3.z-l4.z), abs(l3.x*l3.x-l4.x*l4.x)));   
-   
-   float lc = (1.0-smoothstep(0.10, 0.20, abs(lum2-lum1)))*pow(dff, 0.125);
-
-   float sweight = smoothstep(0.05-0.03*lc, 0.45 - 0.40*lc, dif);
-   
-   vec3 signal = ref;
-
-   if (abs(params.ntsc_sharp) > -0.1)
-   {
-	  float lummix = mix(lum2, lum1, 0.1*abs(params.ntsc_sharp));
-      float lm1 =  mix(lum2*lum2, lum1*lum1, 0.1*abs(params.ntsc_sharp)); lm1 = sqrt(lm1);
-      float lm2 =  mix(sqrt(lum2), sqrt(lum1), 0.1*abs(params.ntsc_sharp)); lm2 = lm2*lm2;
-	  
-	  float k1 = abs(lummix - lm1) + 0.00001;
-	  float k2 = abs(lummix - lm2) + 0.00001;
-	  
-	  lummix = min((k2*lm1 + k1*lm2)/(k1+k2), 1.0);
-	  
-	  signal.x = mix(lum2, lummix, smoothstep(0.25, 0.4, pow(dff, 0.125)));
-	  signal.x = min(signal.x, max(params.ntsc_shape*signal.x, lum2)); 	  
-   }   
-   else    signal.x = clamp(signal.x, 0.0, 1.0);
-
-   vec3 rgb = signal;	
-   if (params.ntsc_sharp < -0.1)
-   {
-      rgb.x = mix(ref.x, rgb.x, sweight);
-   }
-  
-   rgb.x = pow(rgb.x, 1.0/params.ntsc_gamma);
-   rgb = clamp(yiq2rgb(rgb), 0.0, 1.0);
-   
-   FragColor = vec4(rgb, 1.0);
-}  
diff --git a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass3_orig.slang b/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass3_orig.slang
deleted file mode 100644
index c485bf332e..0000000000
--- a/bezel/Mega_Bezel/shaders/guest/ntsc/hsm-ntsc-pass3_orig.slang
+++ /dev/null
@@ -1,117 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(push_constant) uniform Push
-{
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float auto_res;
-   float ntsc_sharp;
-   float ntsc_shape;
-   float ntsc_gamma;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter ntsc_sharp "NTSC Sharpness (negative: Adaptive)" 0.0 -10.0 10.0 0.50
-#pragma parameter ntsc_shape "NTSC Sharpness Shape" 0.75 0.5 1.0 0.05
-#pragma parameter ntsc_gamma "NTSC Filtering Gamma Correction" 1.0 0.25 2.0 0.025
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord - vec2(0.25 * params.OriginalSize.z/4.0, 0.0); // Compensate for decimate-by-2.
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D NPass1;
-
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-   
-
-void main()
-{
-   vec2 offsetx = vec2(0.5 * params.OriginalSize.z, 0.0);
-   vec2 dx = vec2(0.25 * params.OriginalSize.z, 0.0)/4.0;
-   vec2 texcoord = vTexCoord + dx;
-   
-   vec3 l1  = texture(Source, texcoord +      offsetx).xyz;
-   vec3 l2  = texture(Source, texcoord -      offsetx).xyz;
-   vec3 l3  = texture(Source, texcoord + 0.50*offsetx).xyz;
-   vec3 l4  = texture(Source, texcoord - 0.50*offsetx).xyz;
-   vec3 ref = texture(Source, texcoord).xyz;
-   
-   float lum1 = min(texture(Source, vTexCoord - dx).a, texture(Source, vTexCoord + dx).a);
-   float lum2 = max(ref.x, 0.0);
-
-   float dif = max(max(abs(l1.x-l2.x), abs(l1.y-l2.y)), max(abs(l1.z-l2.z), abs(l1.x*l1.x-l2.x*l2.x)));
-   float dff = max(max(abs(l3.x-l4.x), abs(l3.y-l4.y)), max(abs(l3.z-l4.z), abs(l3.x*l3.x-l4.x*l4.x)));   
-   
-   float lc = (1.0-smoothstep(0.10, 0.20, abs(lum2-lum1)))*pow(dff, 0.125);
-
-   float sweight = smoothstep(0.05-0.03*lc, 0.45 - 0.40*lc, dif);
-   
-   vec3 signal = ref;
-
-   if (abs(params.ntsc_sharp) > -0.1)
-   {
-	  float lummix = mix(lum2, lum1, 0.1*abs(params.ntsc_sharp));
-      float lm1 =  mix(lum2*lum2, lum1*lum1, 0.1*abs(params.ntsc_sharp)); lm1 = sqrt(lm1);
-      float lm2 =  mix(sqrt(lum2), sqrt(lum1), 0.1*abs(params.ntsc_sharp)); lm2 = lm2*lm2;
-	  
-	  float k1 = abs(lummix - lm1) + 0.00001;
-	  float k2 = abs(lummix - lm2) + 0.00001;
-	  
-	  lummix = min((k2*lm1 + k1*lm2)/(k1+k2), 1.0);
-	  
-	  signal.x = mix(lum2, lummix, smoothstep(0.25, 0.4, pow(dff, 0.125)));
-	  signal.x = min(signal.x, max(params.ntsc_shape*signal.x, lum2)); 	  
-   }   
-   else    signal.x = clamp(signal.x, 0.0, 1.0);
-
-   vec3 rgb = signal;	
-   if (params.ntsc_sharp < -0.1)
-   {
-      rgb.x = mix(ref.x, rgb.x, sweight);
-   }
-  
-   rgb.x = pow(rgb.x, 1.0/params.ntsc_gamma);
-   rgb = clamp(yiq2rgb(rgb), 0.0, 1.0);
-   
-   FragColor = vec4(rgb, 1.0);
-}  
diff --git a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang b/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang
deleted file mode 100644
index c4ffa8da4b..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang
+++ /dev/null
@@ -1,121 +0,0 @@
-#version 450
-
-/*
-   Checkerboard Dedither - pass1
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float CB_DEDITHER_ON;
-	// float CD_BLEND_OPTION;
-	float CD_BLEND_LEVEL;
-	float HSM_DEDITHER_MODE;
-} params;
-
-#pragma parameter HSM_DEDITHERING_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DEDITHERING_TITLE "[ --- MDAPT & HYLLIAN DE-DITHERING --- ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-// #pragma parameter CD_BLEND_OPTION             "          Blend Option:   OFF | ON"               0.0  0.0 1.0  1.0
-#pragma parameter CD_BLEND_LEVEL              "          Dedither Blend Amount"                1.0  0.0 1.0  0.02
-
-#define CD_BLEND_OPTION             1
-#define CD_BLEND_LEVEL              params.CD_BLEND_LEVEL
-
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));}
-vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	if (HSM_DEDITHER_MODE < 2.5 || HSM_DEDITHER_MODE > 4.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec3 C  = texture(Source, vTexCoord    ).xyz;
-    vec3 L  = texture(Source, vTexCoord -dx).xyz;
-    vec3 R  = texture(Source, vTexCoord +dx).xyz;
-    vec3 U  = texture(Source, vTexCoord -dy).xyz;
-    vec3 D  = texture(Source, vTexCoord +dy).xyz;
-    vec3 UL = texture(Source, vTexCoord -dx -dy).xyz;
-    vec3 UR = texture(Source, vTexCoord +dx -dy).xyz;
-    vec3 DL = texture(Source, vTexCoord -dx +dy).xyz;
-    vec3 DR = texture(Source, vTexCoord +dx +dy).xyz;
-
-    vec3 color = C;
-
-    if (CD_BLEND_OPTION == 1)
-    {
-        float diff = dot(max(C, max(L, R)) - min(C, min(L, R)), Y);
-
-        diff *= (1.0 - CD_BLEND_LEVEL);
-
-        vec3 min_sample = max(min_s(C, L, R), min_s(C, U, D));
-        vec3 max_sample = min(max_s(C, L, R), max_s(C, U, D));
-
-        color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D);
-
-        color = clamp(color, min_sample, max_sample);
-    }
-
-    float luma_diff = abs(dot(C, Y)-dot(color, Y));
-
-    FragColor = vec4(color, luma_diff);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang b/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang
deleted file mode 100644
index ceeb1b2b15..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang
+++ /dev/null
@@ -1,151 +0,0 @@
-#version 450
-
-/*
-   Checkerboard Dedither - pass2
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float CD_BLEND_LEVEL;
-	float HSM_DEDITHER_MODE;
-} params;
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-#pragma parameter CD_BLEND_LEVEL              "          Dedither Blend Amount"                1.0  0.0 1.0  0.02
-#define CD_BLEND_LEVEL             params.CD_BLEND_LEVEL
-
-#define PATTERN(A)                 step(Delta,A)
-
-const float Delta = 0.000000001;
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D LinearGamma;
-
-void main()
-{
-	if (HSM_DEDITHER_MODE < 2.5 || HSM_DEDITHER_MODE > 4.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec4 C =  texture(Source, vTexCoord        );
-    vec4 L =  texture(Source, vTexCoord -dx    );
-    vec4 R =  texture(Source, vTexCoord +dx    );
-    vec4 U =  texture(Source, vTexCoord     -dy);
-    vec4 D =  texture(Source, vTexCoord     +dy);
-    vec4 UL = texture(Source, vTexCoord -dx -dy);
-    vec4 UR = texture(Source, vTexCoord +dx -dy);
-    vec4 DL = texture(Source, vTexCoord -dx +dy);
-    vec4 DR = texture(Source, vTexCoord +dx +dy);
-
-    vec4 L2 =  texture(Source, vTexCoord -2.0*dx    );
-    vec4 R2 =  texture(Source, vTexCoord +2.0*dx    );
-    vec4 U2 =  texture(Source, vTexCoord     -2.0*dy);
-    vec4 D2 =  texture(Source, vTexCoord     +2.0*dy);
-
-    vec4 UL2 =  texture(Source, vTexCoord -2.0*dx -dy);
-    vec4 UR2 =  texture(Source, vTexCoord +2.0*dx -dy);
-    vec4 DL2 =  texture(Source, vTexCoord -2.0*dx +dy);
-    vec4 DR2 =  texture(Source, vTexCoord +2.0*dx +dy);
-
-    vec4 LU2 =  texture(Source, vTexCoord -dx -2.0*dy);
-    vec4 RU2 =  texture(Source, vTexCoord +dx -2.0*dy);
-    vec4 LD2 =  texture(Source, vTexCoord -dx +2.0*dy);
-    vec4 RD2 =  texture(Source, vTexCoord +dx -2.0*dy);
-
-    vec3 color =  C.rgb;
-
-    vec3 oriC = texture(LinearGamma, vTexCoord        ).rgb;
-    vec3 oriL = texture(LinearGamma, vTexCoord -dx    ).rgb;
-    vec3 oriR = texture(LinearGamma, vTexCoord +dx    ).rgb;
-    vec3 oriU = texture(LinearGamma, vTexCoord     -dy).rgb;
-    vec3 oriD = texture(LinearGamma, vTexCoord     +dy).rgb;
-
-    float count1 = 0.0;
-    float count2 = 0.0;
-
-    float diff  = (1.0 - CD_BLEND_LEVEL);
-
-//      LU2  U2  RU2
-//  UL2  UL   U  UR  UR2
-//   L2   L   C   R   R2
-//  DL2  DL   D  DR  DR2
-//      LD2  D2  RD2
-
-    count1 += PATTERN(L.a*D.a*R.a);
-    count1 += PATTERN(L.a*U.a*R.a);
-    count1 += PATTERN(L.a*UL.a*R.a*UR.a + L.a*DL.a*R.a*DR.a);
-
-    count1 += PATTERN(U.a*D2.a*(UL.a*LD2.a + UR.a*RD2.a) + U2.a*D.a*(LU2.a*DL.a + RU2.a*DR.a));
-
-    count2 += PATTERN(U.a*L.a*D.a);
-    count2 += PATTERN(U.a*R.a*D.a);
-    count2 += PATTERN(U.a*UR.a*D.a*DR.a + D.a*DL.a*U.a*UL.a);
-
-    count2 += PATTERN(L.a*R2.a*(DL.a*DR2.a + UL.a*UR2.a) + L2.a*R.a*(DL2.a*DR.a + UL2.a*UR.a));
-
-    if ((count1 * count2) > 0.0 && count1 == count2)
-        color = 0.5*(1.0+diff)*oriC + 0.125*(1.0-diff)*(oriL + oriR + oriU + oriD);
-    else if (count1 > 0.0 && count1 > count2)
-        color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriL + oriR);
-    else if (count2 > 0.0 && count2 > count1)
-        color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriU + oriD);
-
-    float luma_diff = abs(dot(oriC, Y)-dot(color, Y));
-
-    FragColor = vec4(color, luma_diff);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang b/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang
deleted file mode 100644
index 4635c2f781..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang
+++ /dev/null
@@ -1,164 +0,0 @@
-#version 450
-
-/*
-   Checkerboard Dedither - pass3
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-    float CD_MITIG_NEIGHBRS;
-    float CD_MITIG_LINES;
-    float CD_ADJUST_VIEW;
-	float HSM_DEDITHER_MODE;
-} params;
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-#pragma parameter CD_MITIG_NEIGHBRS            "          Hyllian CB - Reduce Neighbor Errors" 4.0  0.0 4.0  1.0
-// CD_MITIG_NEIGHBRS default 1, changed to 4
-#pragma parameter CD_MITIG_LINES               "          Hyllian CB - Reduce Region Errors"   1.0  0.0 1.0  1.0
-// CD_MITIG_LINES default 0, changed to 1
-#pragma parameter CD_ADJUST_VIEW               "          Hyllian CB - Debug View"                0.0  0.0 1.0  1.0
-// #pragma parameter UseGamma                  "          Gamma Slider"                1.0  0.0 1.0  0.1
-
-#define CD_MITIG_NEIGHBRS   params.CD_MITIG_NEIGHBRS
-#define CD_MITIG_LINES      params.CD_MITIG_LINES
-#define CD_ADJUST_VIEW      params.CD_ADJUST_VIEW
-// #define UseGamma            params.UseGamma
-// #define OuputGamma          (UseGamma+1.0)
-
-// #define GAMMA_OUT(color)    pow(color, vec3(1.0 / OuputGamma, 1.0 / OuputGamma, 1.0 / OuputGamma))
-
-#define PATTERN(A)          step(Delta,A)
-
-const float Delta = 0.000000001;
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D LinearGamma;
-
-void main()
-{
-	if (HSM_DEDITHER_MODE < 2.5 || HSM_DEDITHER_MODE > 4.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec4 C =  texture(Source, vTexCoord        );
-    vec4 L =  texture(Source, vTexCoord -dx    );
-    vec4 R =  texture(Source, vTexCoord +dx    );
-    vec4 U =  texture(Source, vTexCoord     -dy);
-    vec4 D =  texture(Source, vTexCoord     +dy);
-    vec4 UL = texture(Source, vTexCoord -dx -dy);
-    vec4 UR = texture(Source, vTexCoord +dx -dy);
-    vec4 DL = texture(Source, vTexCoord -dx +dy);
-    vec4 DR = texture(Source, vTexCoord +dx +dy);
-
-    vec4 L2 =  texture(Source, vTexCoord -2.0*dx    );
-    vec4 R2 =  texture(Source, vTexCoord +2.0*dx    );
-    vec4 U2 =  texture(Source, vTexCoord     -2.0*dy);
-    vec4 D2 =  texture(Source, vTexCoord     +2.0*dy);
-
-    vec4 L3 =  texture(Source, vTexCoord -3.0*dx    );
-    vec4 R3 =  texture(Source, vTexCoord +3.0*dx    );
-    vec4 U3 =  texture(Source, vTexCoord     -3.0*dy);
-    vec4 D3 =  texture(Source, vTexCoord     +3.0*dy);
-
-    vec3 color =  C.rgb;
-
-    vec3 oriC = texture(LinearGamma, vTexCoord        ).rgb;
-
-    float count   = 0.0;
-    float count2  = 0.0;
-    float count3  = 0.0;
-
-//              U3
-//              U2     
-//          UL   U  UR     
-//  L3  L2   L   C   R   R2  R3
-//          DL   D  DR     
-//              D2     
-//              D3
-
-    count += PATTERN(L.a);
-    count += PATTERN(R.a);
-    count += PATTERN(U.a);
-    count += PATTERN(D.a);
-    count += PATTERN(UL.a*UR.a*DL.a*DR.a);
-
-    count2 += PATTERN(L.a*UL.a*U.a + U.a*UR.a*R.a + R.a*DR.a*D.a + D.a*DL.a*L.a);
-
-    count3 += PATTERN(L3.a*L2.a*L.a);
-    count3 += PATTERN(L2.a*L.a*R.a);
-    count3 += PATTERN(L.a*R.a*R2.a);
-    count3 += PATTERN(R.a*R2.a*R3.a);
-
-    count3 += PATTERN(U3.a*U2.a*U.a);
-    count3 += PATTERN(U2.a*U.a*D.a);
-    count3 += PATTERN(U.a*D.a*D2.a);
-    count3 += PATTERN(D.a*D2.a*D3.a);
-
-    if ((count < CD_MITIG_NEIGHBRS)  && (count2 < 1.0))
-        color = oriC;
-    else if ((CD_MITIG_LINES == 1.0) && (count3 < 1.0))
-        color = oriC;
-
-    float luma_diff = abs(dot(oriC, Y)-dot(color, Y));
-
-    color = mix(color, vec3(luma_diff), CD_ADJUST_VIEW);
-
-	// FragColor = vec4(GAMMA_OUT(color), 1.0);
-	FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither_version.txt b/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither_version.txt
deleted file mode 100644
index b3c90bec10..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/checkerboard-dedither_version.txt
+++ /dev/null
@@ -1 +0,0 @@
-Checkerboard-Dedither 2022-09-15
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/linearize.slang b/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/linearize.slang
deleted file mode 100644
index 0c88b23a66..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/checkerboard-dedither/linearize.slang
+++ /dev/null
@@ -1,54 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float InputGamma;
-	float CD_BLEND_OPTION;
-	float HSM_DEDITHER_MODE;
-} params;
-
-#pragma parameter HSM_DEDITHERING_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DEDITHERING_TITLE "[ --- MDAPT & HYLLIAN DE-DITHERING --- ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-#define InputGamma 2.0
-
-#define GAMMA_IN(color)     pow(color, vec3(InputGamma, InputGamma, InputGamma))
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	if (HSM_DEDITHER_MODE < 2.5 || HSM_DEDITHER_MODE > 4.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-   FragColor = vec4(GAMMA_IN(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/blur_horiz.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/blur_horiz.slang
deleted file mode 100644
index 086f5cb1cf..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/blur_horiz.slang
+++ /dev/null
@@ -1,47 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define GLOW_FALLOFF 0.35
-#define TAPS 4
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-void main()
-{
-    vec3 col = vec3(0.0);
-    float dx = 4.0 * global.SourceSize.z; // Mipmapped
-
-    float k_total = 0.0;
-    for (int i = -TAPS; i <= TAPS; i++)
-    {
-        float k  = kernel(i);
-        k_total += k;
-        col     += k * texture(Source, vTexCoord + vec2(float(i) * dx, 0.0)).rgb;
-    }
-
-    FragColor = vec4(col / k_total, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/blur_vert.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/blur_vert.slang
deleted file mode 100644
index 99d3e9a966..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/blur_vert.slang
+++ /dev/null
@@ -1,46 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define GLOW_FALLOFF 0.35
-#define TAPS 4
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-void main()
-{
-    vec3 col = vec3(0.0);
-    float dy = global.SourceSize.w;
-
-    float k_total = 0.0;
-    for (int i = -TAPS; i <= TAPS; i++)
-    {
-        float k = kernel(i);
-        k_total += k;
-        col += k * texture(Source, vTexCoord + vec2(0.0, float(i) * dy)).rgb;
-    }
-
-    FragColor = vec4(col / k_total, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-hyllian-sinc-curvature.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-hyllian-sinc-curvature.slang
deleted file mode 100644
index 24ae6112a3..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-hyllian-sinc-curvature.slang
+++ /dev/null
@@ -1,298 +0,0 @@
-#version 450
-
-#include "../../base/common/globals-and-screen-scale-params.inc"
-#include "../../base/common/params-2-bezel.inc"
-#include "../../base/common/common-functions-bezel.inc"
-
-layout(push_constant) uniform Push
-{
-    float BEAM_MIN_WIDTH;
-    float BEAM_MAX_WIDTH;
-    float SCANLINES_STRENGTH;
-    float COLOR_BOOST;
-    float SHARPNESS_HACK;
-    float PHOSPHOR_LAYOUT;
-    float MASK_INTENSITY;
-    float InputGamma;
-    float OutputGamma;
-    float VSCANLINES;
-    float CRT_ANTI_RINGING;
-   float CRT_CURVATURE;
-   float CRT_warpX;
-   float CRT_warpY;
-   float CRT_cornersize;
-   float CRT_cornersmooth;
-} param;
-
-#pragma parameter CRT_HYLLIAN_SINC      "[ CRT-HYLLIAN-SINC PARAMS ]:" 0.0 0.0 0.0 0.0
-#pragma parameter BEAM_MIN_WIDTH        "          MIN BEAM WIDTH" 1.0 0.0 1.0 0.01
-#pragma parameter BEAM_MAX_WIDTH        "          MAX BEAM WIDTH" 1.0 0.0 1.0 0.01
-#pragma parameter SCANLINES_STRENGTH    "          SCANLINES STRENGTH" 0.67 0.0 1.0 0.01
-#pragma parameter COLOR_BOOST           "          COLOR BOOST" 1.20 1.0 2.0 0.05
-#pragma parameter SHARPNESS_HACK        "          SHARPNESS_HACK" 1.0 1.0 4.0 1.0
-#pragma parameter PHOSPHOR_LAYOUT       "          PHOSPHOR LAYOUT" 12.0 0.0 24.0 1.0
-#pragma parameter MASK_INTENSITY        "          MASK INTENSITY" 0.7 0.0 1.0 0.1
-#pragma parameter VSCANLINES            "          SCANLINES DIRECTION" 0.0 0.0 1.0 1.0
-#pragma parameter CRT_CURVATURE         "          CRT-Curvature" 1.0 0.0 1.0 1.0
-#pragma parameter CRT_warpX             "          CRT-Curvature X-Axis" 0.010 0.0 0.125 0.01
-#pragma parameter CRT_warpY             "          CRT-Curvature Y-Axis" 0.020 0.0 0.125 0.01
-vec2 CRT_Distortion = vec2(param.CRT_warpX, param.CRT_warpY) * 15.;
-#pragma parameter CRT_cornersize        "          CRT-Corner Size" 0.01 0.001 1.0 0.005
-#define cornersize param.CRT_cornersize
-#pragma parameter CRT_cornersmooth      "          CRT-Corner Smoothness" 280.0 80.0 2080.0 100.0
-#define cornersmooth param.CRT_cornersmooth
-
-#pragma parameter CRT_ANTI_RINGING      "          CRT Anti-Ringing [ OFF | ON ]" 1.0 0.0 1.0 1.0
-#define CRT_ANTI_RINGING param.CRT_ANTI_RINGING
-
-// layout(std140, set = 0, binding = 0) uniform UBO
-// {
-//    mat4 MVP;
-//    vec4 OutputSize;
-//    vec4 OriginalSize;
-//    vec4 SourceSize;
-// } global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 FragCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D InfoCachePass;
-
-/*
-    Hyllian's CRT Shader - Sinc/Spline16 version
-
-    Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-*/
-
-#include "../../../../../include/subpixel_masks.h"
-
-
-#define scanlines_strength (2.0*param.SCANLINES_STRENGTH)
-#define beam_min_width     param.BEAM_MIN_WIDTH
-#define beam_max_width     param.BEAM_MAX_WIDTH
-#define color_boost        param.COLOR_BOOST
-
-#define pi    3.1415926535897932384626433832795
-#define wa    (0.5*pi)
-#define wb    (pi)
-
-const vec2 corner_aspect   = vec2(1.0,  0.75);
-
-float corner(vec2 coord)
-{
-    coord = (coord - vec2(0.5)) + vec2(0.5, 0.5);
-    coord = min(coord, vec2(1.0) - coord) * corner_aspect;
-    vec2 cdist = vec2(cornersize);
-    coord = (cdist - min(coord, cdist));
-    float dist = sqrt(dot(coord, coord));
-    
-    return clamp((cdist.x - dist)*cornersmooth, 0.0, 1.0);
-}
-
-
-vec2 Warp(vec2 texCoord){
-
-  vec2 curvedCoords = texCoord * 2.0 - 1.0;
-  float curvedCoordsDistance = sqrt(curvedCoords.x*curvedCoords.x+curvedCoords.y*curvedCoords.y);
-
-  curvedCoords = curvedCoords / curvedCoordsDistance;
-
-  curvedCoords = curvedCoords * (1.0-pow(vec2(1.0-(curvedCoordsDistance/1.4142135623730950488016887242097)),(1.0/(1.0+CRT_Distortion*0.2))));
-
-  curvedCoords = curvedCoords / (1.0-pow(vec2(0.29289321881345247559915563789515),(1.0/(vec2(1.0)+CRT_Distortion*0.2))));
-
-  curvedCoords = curvedCoords * 0.5 + 0.5;
-  return curvedCoords;
-}
-
-float weight(float x)
-{
-	x = abs(x);
-
-	if (x < 1.0)
-	{
-		return
-			(
-			 ((x - 9.0 / 5.0) * x - 1.0 / 5.0 ) * x + 1.0
-			);
-	}
-	else if ((x >= 1.0) && (x < 2.0))
-	{
-		return
-			(
-			 (( -1.0 / 3.0 * (x - 1) + 4.0 / 5.0 ) * (x - 1) - 7.0 / 15.0 ) * (x - 1)
-			);
-	}
-	else
-	{
-		return 0.0;
-	}
-}
-
-vec4 weight4(float x)
-{
-	return vec4(
-			weight(x - 2.0),
-			weight(x - 1.0),
-			weight(x),
-			weight(x + 1.0)
-		   );
-}
-
-
-vec3 resampler3(vec3 x)
-{
-	vec3 res;
-	res.x = (x.x<=0.001) ?  wa*wb  :  sin(x.x*wa)*sin(x.x*wb)/(x.x*x.x);
-	res.y = (x.y<=0.001) ?  wa*wb  :  sin(x.y*wa)*sin(x.y*wb)/(x.y*x.y);
-	res.z = (x.z<=0.001) ?  wa*wb  :  sin(x.z*wa)*sin(x.z*wb)/(x.z*x.z);
-	return res;
-}
-
-void main()
-{
-	// HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						SCREEN_ASPECT, 
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-	cache_bounds_coord = (BEZEL_OUTSIDE_COORD - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-        FragColor = vec4(0);
-        return;
-	}
-
-	// HSM Added
-	vec4 SourceSize = vec4(CROPPED_ROTATED_SIZE_WITH_RES_MULT, 1/CROPPED_ROTATED_SIZE_WITH_RES_MULT);
-
-	// float TATE = USE_VERTICAL_SCANLINES;
-    
-    // HSM Removed
-    // vec2 TextureSize = mix(vec2(global.SourceSize.x * param.SHARPNESS_HACK, global.SourceSize.y), vec2(global.SourceSize.x, global.SourceSize.y * param.SHARPNESS_HACK), USE_VERTICAL_SCANLINES);
-
-    vec2 TextureSize = mix(vec2(SourceSize.x * param.SHARPNESS_HACK, SourceSize.y), vec2(SourceSize.x, SourceSize.y * param.SHARPNESS_HACK), USE_VERTICAL_SCANLINES);
-
-    vec2 dx = mix(vec2(1.0/TextureSize.x, 0.0), vec2(0.0, 1.0/TextureSize.y), USE_VERTICAL_SCANLINES);
-    vec2 dy = mix(vec2(0.0, 1.0/TextureSize.y), vec2(1.0/TextureSize.x, 0.0), USE_VERTICAL_SCANLINES);
-
-    // HSM Removed
-    // vec2 pp = vTexCoord.xy;
-    // pp = (param.CRT_CURVATURE > 0.5) ? Warp(pp) : pp;
-
-    vec2 screen_curved_coord = HSM_GetCRTShaderCurvedCoord(SCREEN_COORD);
-	vec2 pp = HSM_GetMirrorWrappedCoord(screen_curved_coord);
- 
-    vec2 pix_coord = pp.xy*TextureSize + vec2(-0.5, 0.5);
-
-    vec2 tc = mix((floor(pix_coord) + vec2(0.5, 0.5))/TextureSize, (floor(pix_coord) + vec2(1.5, -0.5))/TextureSize, USE_VERTICAL_SCANLINES);
-
-    vec2 fp = mix(fract(pix_coord), fract(pix_coord.yx), USE_VERTICAL_SCANLINES);
-
-    vec3 c00 = HSM_GetCroppedTexSample(Source, tc     - dx - dy).xyz;
-    vec3 c01 = HSM_GetCroppedTexSample(Source, tc          - dy).xyz;
-    vec3 c02 = HSM_GetCroppedTexSample(Source, tc     + dx - dy).xyz;
-    vec3 c03 = HSM_GetCroppedTexSample(Source, tc + 2.0*dx - dy).xyz;
-    vec3 c10 = HSM_GetCroppedTexSample(Source, tc     - dx     ).xyz;
-    vec3 c11 = HSM_GetCroppedTexSample(Source, tc              ).xyz;
-    vec3 c12 = HSM_GetCroppedTexSample(Source, tc     + dx     ).xyz;
-    vec3 c13 = HSM_GetCroppedTexSample(Source, tc + 2.0*dx     ).xyz;
-
-    mat4x3 color_matrix0 = mat4x3(c00, c01, c02, c03);
-    mat4x3 color_matrix1 = mat4x3(c10, c11, c12, c13);
-
-    // Get weights for spline16 horizontal filter
-    vec4 weights = weight4(1.0 - fp.x);
-    
-    // Spline16 horizontal filter
-    vec3 color0   = (color_matrix0 * weights)/dot(weights, vec4(1.0));
-    vec3 color1   = (color_matrix1 * weights)/dot(weights, vec4(1.0));
-
-    // Get min/max samples
-    vec3 min_sample0 = min(c01,c02);
-    vec3 max_sample0 = max(c01,c02);
-    vec3 min_sample1 = min(c11,c12);
-    vec3 max_sample1 = max(c11,c12);
-    
-    // Anti-ringing
-    vec3 aux = color0;
-    color0 = clamp(color0, min_sample0, max_sample0);
-    color0 = mix(aux, color0, CRT_ANTI_RINGING * step(0.0, (c00-c01)*(c02-c03)));
-    aux = color1;
-    color1 = clamp(color1, min_sample1, max_sample1);
-    color1 = mix(aux, color1, CRT_ANTI_RINGING * step(0.0, (c10-c11)*(c12-c13)));
-
-    // Apply scanlines. Sinc filter vertically.
-    float pos0 = fp.y;
-    float pos1 = 1 - fp.y;
-
-    vec3 lum0 = mix(vec3(beam_min_width), vec3(beam_max_width), color0);
-    vec3 lum1 = mix(vec3(beam_min_width), vec3(beam_max_width), color1);
-
-    vec3 d0 = clamp(scanlines_strength*pos0/(lum0*lum0+0.0000001), 0.0, 1.0);
-    vec3 d1 = clamp(scanlines_strength*pos1/(lum1*lum1+0.0000001), 0.0, 1.0);
-
-    d0 = resampler3(d0);
-    d1 = resampler3(d1);
-
-    // Apply color enhancement, scanlines orientation, mask and gamma.
-    vec3 color = color_boost*(color0*d0+color1*d1)/(wa*wb);
-
-    vec2 mask_coords = vTexCoord.xy * global.OutputSize.xy;
-
-    mask_coords = mix(mask_coords.xy, mask_coords.yx, USE_VERTICAL_SCANLINES);
-
-    color.rgb*=mask_weights(mask_coords,  param.MASK_INTENSITY, int(param.PHOSPHOR_LAYOUT));
-
-    FragColor = vec4(color, 1.0);
-
-    FragColor *= (param.CRT_CURVATURE > 0.5) ? corner(pp) : 1.0;
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp
deleted file mode 100644
index f51b1dd01f..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp
+++ /dev/null
@@ -1,126 +0,0 @@
-shaders = "11"
-
-
-shader0 = "linearize.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "XbrSource"
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "super-xbr-pass0.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "super-xbr-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "2.000000"
-scale_type_y2 = "source"
-scale_y2 = "2.000000"
-
-shader3 = "super-xbr-pass2.slang"
-filter_linear3 = "false"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "custom-bicubic-x.slang"
-filter_linear4 = "false"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "true"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-
-shader5 = "custom-bicubic-y.slang"
-filter_linear5 = "false"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "0.500000"
-
-shader6 = "crt-hyllian-sinc-curvature.slang"
-filter_linear6 = "true"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = "CRT_PASS"
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "viewport"
-scale_x6 = "1.000000"
-scale_type_y6 = "viewport"
-scale_y6 = "1.000000"
-
-shader7 = "threshold.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "blur_horiz.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_border"
-mipmap_input8 = "true"
-alias8 = ""
-float_framebuffer8 = "false"
-srgb_framebuffer8 = "true"
-scale_type_x8 = "source"
-scale_x8 = "0.200000"
-scale_type_y8 = "source"
-scale_y8 = "0.200000"
-
-shader9 = "blur_vert.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "false"
-srgb_framebuffer9 = "true"
-
-shader10 = "custom-resolve.slang"
-filter_linear10 = "true"
-wrap_mode10 = "clamp_to_border"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "false"
-srgb_framebuffer10 = "true"
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr_version.txt b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr_version.txt
deleted file mode 100644
index eb3e0e941c..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr_version.txt
+++ /dev/null
@@ -1 +0,0 @@
-crt-super-xbr_2022-09-09
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
deleted file mode 100644
index 47d49d9b71..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang
+++ /dev/null
@@ -1,132 +0,0 @@
-#version 450
-
-/*
-   b-spline-x Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SUPERXBR_ON;
-} params;
-
-#pragma parameter SUPERXBR_ON 		"          Super-XBR ON" 1 0 1 1
-#define SUPERXBR_ON params.SUPERXBR_ON
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// B-Spline bicubic parameters
-const float  B =  0.0; 
-const float  C =  1.0;
-
-const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                        (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                       -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                   (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0001 - vec2(0.5, 0.0)*ps;
-//        vTexCoord = TexCoord * 1.0001 - vec2(1.0, 0.0)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( -dx, 0.0,    0.0, 0.0); 
-	t2 = vTexCoord.xyxy + vec4(  dx, 0.0, 2.0*dx, 0.0);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-// 	// HSM Added
-// 	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-// 	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-// 	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// // If it's the potato preset render the whole frame
-// #ifndef IS_POTATO_PRESET
-// #ifndef IS_NO_REFLECT_PRESET
-// 	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-// 	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-// 						TUBE_DIFFUSE_SCALE, 
-// 						TUBE_SCALE, 
-// 						SCREEN_ASPECT, 
-// 						false,
-// 						BEZEL_OUTSIDE_SCALE,
-// 						BEZEL_OUTSIDE_COORD, 
-// 						BEZEL_OUTSIDE_CURVED_COORD, 
-// 						FRAME_OUTSIDE_CURVED_COORD);
-// 	cache_bounds_coord = (FRAME_OUTSIDE_CURVED_COORD - 0.5) * 0.9 + 0.5;
-// #endif
-// #endif
-
-// 	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-// 	{
-//         FragColor = vec4(0);
-//         return;
-// 	}
-
-   if (SUPERXBR_ON < 0.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Px    = vec4(fp.x*fp.x*fp.x, fp.x*fp.x, fp.x, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Px;
-
-   FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
deleted file mode 100644
index 7e32762cbd..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang
+++ /dev/null
@@ -1,132 +0,0 @@
-#version 450
-
-/*
-   b-spline-y Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SUPERXBR_ON;
-} params;
-
-#pragma parameter SUPERXBR_ON 		"          Super-XBR ON" 1 0 1 1
-#define SUPERXBR_ON params.SUPERXBR_ON
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// B-Spline bicubic parameters
-const float  B =  0.0; 
-const float  C =  1.0;
-
-const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                        (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                       -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                   (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0001 - vec2(0.0, 0.5)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( 0.0, -dy, 0.0,    0.0); 
-	t2 = vTexCoord.xyxy + vec4( 0.0,  dy, 0.0, 2.0*dy);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D XbrSource;
-
-void main()
-{
-// 	// HSM Added
-// 	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-// 	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-// 	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// // If it's the potato preset render the whole frame
-// #ifndef IS_POTATO_PRESET
-// #ifndef IS_NO_REFLECT_PRESET
-// 	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-// 	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-// 						TUBE_DIFFUSE_SCALE, 
-// 						TUBE_SCALE, 
-// 						SCREEN_ASPECT, 
-// 						false,
-// 						BEZEL_OUTSIDE_SCALE,
-// 						BEZEL_OUTSIDE_COORD, 
-// 						BEZEL_OUTSIDE_CURVED_COORD, 
-// 						FRAME_OUTSIDE_CURVED_COORD);
-// 	cache_bounds_coord = (FRAME_OUTSIDE_CURVED_COORD - 0.5) * 0.9 + 0.5;
-// #endif
-// #endif
-
-// 	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-// 	{
-//         FragColor = vec4(0);
-//         return;
-// 	}
-
-   if (SUPERXBR_ON < 0.5)
-	{
-		FragColor = texture(XbrSource, vTexCoord);
-		return;
-	}
-
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Py    = vec4(fp.y*fp.y*fp.y, fp.y*fp.y, fp.y, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Py;
-
-  FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-resolve.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-resolve.slang
deleted file mode 100644
index 96c612bb57..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/custom-resolve.slang
+++ /dev/null
@@ -1,92 +0,0 @@
-#version 450
-
-#include "../../base/common/globals-and-screen-scale-params.inc"
-#include "../../base/common/params-2-bezel.inc"
-#include "../../base/common/common-functions-bezel.inc"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float BLOOM_STRENGTH;
-	float SOURCE_BOOST;
-	float OUTPUT_GAMMA;
-} params;
-
-#pragma parameter BLOOM_STRENGTH 	"          Bloom Strength"  0.10 0.0 1.0 0.01
-#pragma parameter SOURCE_BOOST 		"          Bloom Color Boost" 1.15 1.0 2.0 0.05
-#pragma parameter OUTPUT_GAMMA 	"OUTPUT GAMMA"       2.2 1.0 3.0  0.1
-
-#define BLOOM_STRENGTH params.BLOOM_STRENGTH
-#define SOURCE_BOOST params.SOURCE_BOOST
-#define OUTPUT_GAMMA params.OUTPUT_GAMMA
-
-#define INV_OUTPUT_GAMMA (1.0 / OUTPUT_GAMMA)
-#define saturate(c) clamp(c, 0.0, 1.0)
-
-// layout(std140, set = 0, binding = 0) uniform UBO
-// {
-// 	mat4 MVP;
-// } global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D CRT_PASS;
-
-void main()
-{
-// 	// HSM Added
-// 	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-// 	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-// 	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// // If it's the potato preset render the whole frame
-// #ifndef IS_POTATO_PRESET
-// #ifndef IS_NO_REFLECT_PRESET
-// 	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-// 	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-// 						TUBE_DIFFUSE_SCALE, 
-// 						TUBE_SCALE, 
-// 						SCREEN_ASPECT, 
-// 						false,
-// 						BEZEL_OUTSIDE_SCALE,
-// 						BEZEL_OUTSIDE_COORD, 
-// 						BEZEL_OUTSIDE_CURVED_COORD, 
-// 						FRAME_OUTSIDE_CURVED_COORD);
-// 	cache_bounds_coord = (FRAME_OUTSIDE_CURVED_COORD - 0.5) * 0.9 + 0.5;
-// #endif
-// #endif
-
-// 	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-// 	{
-//         FragColor = vec4(0);
-//         return;
-// 	}
-
-	vec3 source = SOURCE_BOOST * texture(CRT_PASS, vTexCoord).rgb;
-	vec3 bloom = texture(Source, vTexCoord).rgb;
-	source += BLOOM_STRENGTH * bloom;
-
-	// HSM Removed
-	FragColor = vec4(pow(saturate(source), vec3(INV_OUTPUT_GAMMA,INV_OUTPUT_GAMMA,INV_OUTPUT_GAMMA)), 1.0);
-
-	// HSM add output gamma
-	// FragColor = HSM_Delinearize(vec4(saturate(source), 1), HSM_GAMMA_OUT_CRT);
-	// End Addition
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/linearize.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/linearize.slang
deleted file mode 100644
index e66f7f7311..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/linearize.slang
+++ /dev/null
@@ -1,40 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float INPUT_GAMMA;
-} params;
-
-#pragma parameter INPUT_GAMMA "Input Gamma" 2.4 2.0 2.6 0.02
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 color = texture(Source, vTexCoord).rgb;
-
-    FragColor  = vec4(pow(color, vec3(params.INPUT_GAMMA)), 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
deleted file mode 100644
index c5b2d89dc1..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang
+++ /dev/null
@@ -1,250 +0,0 @@
-#version 450
-
-/*
-   
-  *******  Super XBR Shader - pass0  *******
-   
-  Copyright (c) 2015 Hyllian - sergiogdb@gmail.com
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float XBR_EDGE_STR_P0;
-	float XBR_WEIGHT;
-	float XBR_ANTI_RINGING;
-	float MODE;
-	float XBR_EDGE_SHP;
-	float XBR_TEXTURE_SHP;
-	float SUPERXBR_ON;
-} params;
-
-#pragma parameter HSM_SUPER_XBR_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter SUPERXBR_TITLE "[ --- SUPER-XBR by HYLLIAN --- ]:" 0 0 0.01 0.01
-#pragma parameter SUPERXBR_ON 		"          Super-XBR ON" 1 0 1 1
-#define SUPERXBR_ON params.SUPERXBR_ON
-
-#pragma parameter MODE 				"          Mode - Normal, Details, Adaptive" 1.0 0.0 2.0 1.0
-#pragma parameter XBR_EDGE_STR_P0 	"          Xbr - Edge Strength p0" 1.0 0.0 5.0 0.5
-#pragma parameter XBR_WEIGHT 		"          Xbr - Filter Weight" 0.0 0.0 1.0 0.1
-#pragma parameter XBR_EDGE_SHP 		"          Adaptive Dynamic Edge Sharp" 0.4 0.0 3.0 0.1
-#pragma parameter XBR_TEXTURE_SHP 	"          Adaptive Static Edge Sharp" 1.0 0.0 2.0 0.1
-
-#define XBR_EDGE_STR_P0 params.XBR_EDGE_STR_P0
-#define XBR_WEIGHT params.XBR_WEIGHT
-#define MODE params.MODE
-#define XBR_EDGE_SHP params.XBR_EDGE_SHP
-#define XBR_TEXTURE_SHP params.XBR_TEXTURE_SHP
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define mul(a,b) (b*a)
-
-const vec3 Y = vec3(.2126, .7152, .0722);
-
-float RGBtoYUV(vec3 color)
-{
-  return dot(color, Y);
-}
-
-float df(float A, float B)
-{
-  return abs(A-B);
-}
-
-/*
-                              P1
-     |P0|B |C |P1|         C     F4          |a0|b1|c2|d3|
-     |D |E |F |F4|      B     F     I4       |b0|c1|d2|e3|   |e1|i1|i2|e2|
-     |G |H |I |I4|   P0    E  A  I     P3    |c0|d1|e2|f3|   |e3|i3|i4|e4|
-     |P2|H5|I5|P3|      D     H     I5       |d0|e1|f2|g3|
-                           G     H5
-                              P2
-*/
-
-
-float d_wd(float wp1, float wp2, float wp3, float wp4, float wp5, float wp6, float b0, float b1, float c0, float c1, float c2, float d0, float d1, float d2, float d3, float e1, float e2, float e3, float f2, float f3)
-{
-	return (wp1*(df(c1,c2) + df(c1,c0) + df(e2,e1) + df(e2,e3)) + wp2*(df(d2,d3) + df(d0,d1)) + wp3*(df(d1,d3) + df(d0,d2)) + wp4*df(d1,d2) + wp5*(df(c0,c2) + df(e1,e3)) + wp6*(df(b0,b1) + df(f2,f3)));
-}
-
-float hv_wd(float wp1, float wp2, float wp3, float wp4, float wp5, float wp6, float i1, float i2, float i3, float i4, float e1, float e2, float e3, float e4)
-{
-	return ( wp4*(df(i1,i2)+df(i3,i4)) + wp1*(df(i1,e1)+df(i2,e2)+df(i3,e3)+df(i4,e4)) + wp3*(df(i1,e2)+df(i3,e4)+df(e1,i2)+df(e3,i4)));
-}
-
-vec3 min4(vec3 a, vec3 b, vec3 c, vec3 d)
-{
-    return min(a, min(b, min(c, d)));
-}
-
-vec3 max4(vec3 a, vec3 b, vec3 c, vec3 d)
-{
-    return max(a, max(b, max(c, d)));
-}
-
-float max4float(float a, float b, float c, float d)
-{
-    return max(a, max(b, max(c, d)));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-   
-   float dx = params.SourceSize.z;
-   float dy = params.SourceSize.w;
-   t1 = vTexCoord.xyxy + vec4(-dx, -dy, 2.0*dx, 2.0*dy);
-   t2 = vTexCoord.xyxy + vec4(  0, -dy,     dx, 2.0*dy);
-   t3 = vTexCoord.xyxy + vec4(-dx,   0, 2.0*dx,     dy);
-   t4 = vTexCoord.xyxy + vec4(  0,   0,     dx,     dy);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	if (SUPERXBR_ON < 0.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-// settings //
-	float wp1, wp2, wp3, wp4, wp5, wp6, weight1, weight2;
-
-		wp1	=	2.0;
-		wp2	=	1.0;
-		wp3	=	-1.0;
-		wp4	=	4.0;
-		wp5	=	-1.0;
-		wp6	=	1.0;
-
-		weight1	=	(XBR_WEIGHT*1.29633/10.0);
-		weight2	=	(XBR_WEIGHT*1.75068/10.0/2.0);
-
-// end settings //
-
-	vec3 P0 = texture(Source, t1.xy).xyz;
-	vec3 P1 = texture(Source, t1.zy).xyz;
-	vec3 P2 = texture(Source, t1.xw).xyz;
-	vec3 P3 = texture(Source, t1.zw).xyz;
-
-	vec3  B = texture(Source, t2.xy).xyz;
-	vec3  C = texture(Source, t2.zy).xyz;
-	vec3 H5 = texture(Source, t2.xw).xyz;
-	vec3 I5 = texture(Source, t2.zw).xyz;
-
-	vec3  D = texture(Source, t3.xy).xyz;
-	vec3 F4 = texture(Source, t3.zy).xyz;
-	vec3  G = texture(Source, t3.xw).xyz;
-	vec3 I4 = texture(Source, t3.zw).xyz;
-
-	vec3  E = texture(Source, t4.xy).xyz;
-	vec3  F = texture(Source, t4.zy).xyz;
-	vec3  H = texture(Source, t4.xw).xyz;
-	vec3  I = texture(Source, t4.zw).xyz;
-
-	float b = RGBtoYUV( B );
-	float c = RGBtoYUV( C );
-	float d = RGBtoYUV( D );
-	float e = RGBtoYUV( E );
-	float f = RGBtoYUV( F );
-	float g = RGBtoYUV( G );
-	float h = RGBtoYUV( H );
-	float i = RGBtoYUV( I );
-
-	float i4 = RGBtoYUV( I4 ); float p0 = RGBtoYUV( P0 );
-	float i5 = RGBtoYUV( I5 ); float p1 = RGBtoYUV( P1 );
-	float h5 = RGBtoYUV( H5 ); float p2 = RGBtoYUV( P2 );
-	float f4 = RGBtoYUV( F4 ); float p3 = RGBtoYUV( P3 );
-
-	/* Calc edgeness in diagonal directions. */
-	float d_edge  = (d_wd( wp1, wp2, wp3, wp4, wp5, wp6, d, b, g, e, c, p2, h, f, p1, h5, i, f4, i5, i4 ) - d_wd( wp1, wp2, wp3, wp4, wp5, wp6, c, f4, b, f, i4, p0, e, i, p3, d, h, i5, g, h5 ));
-
-	/* Calc edgeness in horizontal/vertical directions. */
-	float hv_edge = (hv_wd(wp1, wp2, wp3, wp4, wp5, wp6, f, i, e, h, c, i5, b, h5) - hv_wd(wp1, wp2, wp3, wp4, wp5, wp6, e, f, h, i, d, f4, g, i4));
-
-	float limits = XBR_EDGE_STR_P0 + 0.000001;
-	float edge_strength = smoothstep(0.0, limits, abs(d_edge));
-	
-	vec4 w1, w2;
-	vec3 c3, c4;
-	if (MODE == 2.0)
-	{
-		float contrast = max(max4float(df(e,f),df(e,i),df(e,h),df(f,h)),max(df(f,i),df(h,i)))/(e+0.001);
-
-		float wgt1 = weight1*(smoothstep(0.0, 0.6, contrast)*XBR_EDGE_SHP + XBR_TEXTURE_SHP);
-		float wgt2 = weight2*(smoothstep(0.0, 0.6, contrast)*XBR_EDGE_SHP + XBR_TEXTURE_SHP);
-	
-		/* Filter weights. Two taps only. */
-		w1 = vec4(-wgt1, wgt1+ 0.5, wgt1+ 0.5, -wgt1);
-		w2 = vec4(-wgt2, wgt2+0.25, wgt2+0.25, -wgt2);
-		c3 = mul(w2, mat4x3(P0+2.0*(D+G)+P2, B+2.0*(E+H)+H5, C+2.0*(F+I)+I5, P1+2.0*(F4+I4)+P3))/3.0;
-      c4 = mul(w2, mat4x3(P0+2.0*(C+B)+P1, D+2.0*(F+E)+F4, G+2.0*(I+H)+I4, P2+2.0*(I5+H5)+P3))/3.0;
-	}
-	else
-	{
-		/* Filter weights. Two taps only. */
-		w1 = vec4(-weight1, weight1+0.5, weight1+0.5, -weight1);
-		w2 = vec4(-weight2, weight2+0.25, weight2+0.25, -weight2);
-		c3 = mul(w2, mat4x3(D+G, E+H, F+I, F4+I4));
-		c4 = mul(w2, mat4x3(C+B, F+E, I+H, I5+H5));
-	}
-
-	/* Filtering and normalization in four direction generating four colors. */
-    vec3 c1 = mul(w1, mat4x3( P2,   H,   F,   P1 ));
-    vec3 c2 = mul(w1, mat4x3( P0,   E,   I,   P3 ));
-
-	/* Smoothly blends the two strongest directions (one in diagonal and the other in vert/horiz direction). */
-	vec3 color =  mix(mix(c1, c2, step(0.0, d_edge)), mix(c3, c4, step(0.0, hv_edge)), 1. - edge_strength);
-
-	/* Anti-ringing code. */
-	vec3 min_sample = min4( E, F, H, I );
-	vec3 max_sample = max4( E, F, H, I );
-	color = clamp(color, min_sample, max_sample);
-
-	FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
deleted file mode 100644
index 72ebe00de6..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang
+++ /dev/null
@@ -1,268 +0,0 @@
-#version 450
-
-/*
-   
-  *******  Super XBR Shader - pass1  *******
-   
-  Copyright (c) 2015 Hyllian - sergiogdb@gmail.com
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-*/
-
-#define XBR_WEIGHT 1.0
-#define XBR_ANTI_RINGING 1.0
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float MODE;
-	float XBR_EDGE_SHP;
-	float XBR_TEXTURE_SHP;
-    float XBR_EDGE_STR_P1;
-	float SUPERXBR_ON;
-} params;
-
-#pragma parameter SUPERXBR_ON 		"          Super-XBR ON" 1 0 1 1
-#define SUPERXBR_ON params.SUPERXBR_ON
-
-#pragma parameter XBR_EDGE_STR_P1 	"          Xbr - Edge Strength p1" 1.0 0.0 5.0 0.5
-#pragma parameter MODE 				"          Mode - Normal, Details, Adaptive" 1.0 0.0 2.0 1.0
-#pragma parameter XBR_EDGE_SHP 		"          Adaptive Dynamic Edge Sharp" 0.4 0.0 3.0 0.1
-#pragma parameter XBR_TEXTURE_SHP 	"          Adaptive Static Edge Sharp" 1.0 0.0 2.0 0.1
-
-#define MODE params.MODE
-#define XBR_EDGE_SHP params.XBR_EDGE_SHP
-#define XBR_TEXTURE_SHP params.XBR_TEXTURE_SHP
-#define XBR_EDGE_STR_P1 params.XBR_EDGE_STR_P1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define mul(a,b) (b*a)
-
-const vec3 Y = vec3(.2126, .7152, .0722);
-
-float RGBtoYUV(vec3 color)
-{
-  return dot(color, Y);
-}
-
-float df(float A, float B)
-{
-  return abs(A-B);
-}
-
-/*
-                              P1
-     |P0|B |C |P1|         C     F4          |a0|b1|c2|d3|
-     |D |E |F |F4|      B     F     I4       |b0|c1|d2|e3|   |e1|i1|i2|e2|
-     |G |H |I |I4|   P0    E  A  I     P3    |c0|d1|e2|f3|   |e3|i3|i4|e4|
-     |P2|H5|I5|P3|      D     H     I5       |d0|e1|f2|g3|
-                           G     H5
-                              P2
-*/
-
-float d_wd(float wp1, float wp2, float wp3, float wp4, float wp5, float wp6, float b0, float b1, float c0, float c1, float c2, float d0, float d1, float d2, float d3, float e1, float e2, float e3, float f2, float f3)
-{
-	return (wp1*(df(c1,c2) + df(c1,c0) + df(e2,e1) + df(e2,e3)) + wp2*(df(d2,d3) + df(d0,d1)) + wp3*(df(d1,d3) + df(d0,d2)) + wp4*df(d1,d2) + wp5*(df(c0,c2) + df(e1,e3)) + wp6*(df(b0,b1) + df(f2,f3)));
-}
-
-float hv_wd(float wp1, float wp2, float wp3, float wp4, float wp5, float wp6, float i1, float i2, float i3, float i4, float e1, float e2, float e3, float e4)
-{
-	return ( wp4*(df(i1,i2)+df(i3,i4)) + wp1*(df(i1,e1)+df(i2,e2)+df(i3,e3)+df(i4,e4)) + wp3*(df(i1,e2)+df(i3,e4)+df(e1,i2)+df(e3,i4)));
-}
-
-vec3 min4(vec3 a, vec3 b, vec3 c, vec3 d)
-{
-    return min(a, min(b, min(c, d)));
-}
-vec3 max4(vec3 a, vec3 b, vec3 c, vec3 d)
-{
-    return max(a, max(b, max(c, d)));
-}
-
-float max4float(float a, float b, float c, float d)
-{
-    return max(a, max(b, max(c, d)));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D XbrSource;
-
-void main()
-{
-   if (SUPERXBR_ON < 0.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-// settings //
-	float wp1, wp2, wp3, wp4, wp5, wp6, weight1, weight2;
-	if (MODE == 1.0)
-	{
-		wp1	=	1.0;
-		wp2	=	0.0;
-		wp3	=	0.0;
-		wp4	=	0.0;
-		wp5	=	0.0;
-		wp6	=	0.0;
-
-		weight1	=	(XBR_WEIGHT*1.29633/10.0);
-		weight2	=	(XBR_WEIGHT*1.75068/10.0/2.0);
-	}
-	else if (MODE == 2.0)
-	{
-		wp1	=	8.0;
-		wp2	=	0.0;
-		wp3	=	0.0;
-		wp4	=	0.0;
-		wp5	=	0.0;
-		wp6	=	0.0;
-
-		weight1	=	(1.29633/10.0);
-		weight2	=	(1.75068/10.0/2.0);
-	}
-	else
-	{
-		wp1	=	8.0;
-		wp2	=	0.0;
-		wp3	=	0.0;
-		wp4	=	0.0;
-		wp5	=	0.0;
-		wp6	=	0.0;
-
-		weight1	=	(XBR_WEIGHT*1.29633/10.0);
-		weight2	=	(XBR_WEIGHT*1.75068/10.0/2.0);
-	}
-// end settings //
-
-	//Skip pixels on wrong grid
-	vec2 fp = fract(vTexCoord.xy * params.SourceSize.xy);
-	vec2 dir = fp - vec2(0.5,0.5);
- 	if ((dir.x*dir.y)>0.0)
-	{
-		FragColor = mix( texture(XbrSource, vTexCoord), texture(Source, vTexCoord), step(0.0, dir.x));
-	}
-	else
-	{
-	vec2 g1 = (fp.x>0.5) ? vec2(0.5/params.SourceSize.x, 0.0) : vec2(0.0, 0.5/params.SourceSize.y);
-	vec2 g2 = (fp.x>0.5) ? vec2(0.0, 0.5/params.SourceSize.y) : vec2(0.5/params.SourceSize.x, 0.0);
-
-	vec3 P0 = texture(XbrSource,	vTexCoord -3.0*g1        ).xyz;
-	vec3 P1 = texture(Source,	vTexCoord         -3.0*g2).xyz;
-	vec3 P2 = texture(Source,	vTexCoord         +3.0*g2).xyz;
-	vec3 P3 = texture(XbrSource,	vTexCoord +3.0*g1        ).xyz;
-
-	vec3  B = texture(Source,	vTexCoord -2.0*g1     -g2).xyz;
-	vec3  C = texture(XbrSource,	vTexCoord     -g1 -2.0*g2).xyz;
-	vec3  D = texture(Source,	vTexCoord -2.0*g1     +g2).xyz;
-	vec3  E = texture(XbrSource,	vTexCoord     -g1        ).xyz;
-	vec3  F = texture(Source,	vTexCoord             -g2).xyz;
-	vec3  G = texture(XbrSource,	vTexCoord     -g1 +2.0*g2).xyz;
-	vec3  H = texture(Source,	vTexCoord             +g2).xyz;
-	vec3  I = texture(XbrSource,	vTexCoord     +g1        ).xyz;
-
-	vec3 F4 = texture(XbrSource,	vTexCoord     +g1 -2.0*g2).xyz;
-	vec3 I4 = texture(Source,	vTexCoord +2.0*g1     -g2).xyz;
-	vec3 H5 = texture(XbrSource,	vTexCoord     +g1 +2.0*g2).xyz;
-	vec3 I5 = texture(Source,	vTexCoord +2.0*g1     +g2).xyz;
-
-	float b = RGBtoYUV( B );
-	float c = RGBtoYUV( C );
-	float d = RGBtoYUV( D );
-	float e = RGBtoYUV( E );
-	float f = RGBtoYUV( F );
-	float g = RGBtoYUV( G );
-	float h = RGBtoYUV( H );
-	float i = RGBtoYUV( I );
-
-	float i4 = RGBtoYUV( I4 ); float p0 = RGBtoYUV( P0 );
-	float i5 = RGBtoYUV( I5 ); float p1 = RGBtoYUV( P1 );
-	float h5 = RGBtoYUV( H5 ); float p2 = RGBtoYUV( P2 );
-	float f4 = RGBtoYUV( F4 ); float p3 = RGBtoYUV( P3 );
-
-	/* Calc edgeness in diagonal directions. */
-	float d_edge  = (d_wd( wp1, wp2, wp3, wp4, wp5, wp6, d, b, g, e, c, p2, h, f, p1, h5, i, f4, i5, i4 ) - d_wd( wp1, wp2, wp3, wp4, wp5, wp6, c, f4, b, f, i4, p0, e, i, p3, d, h, i5, g, h5 ));
-
-	/* Calc edgeness in horizontal/vertical directions. */
-	float hv_edge = (hv_wd(wp1, wp2, wp3, wp4, wp5, wp6, f, i, e, h, c, i5, b, h5) - hv_wd(wp1, wp2, wp3, wp4, wp5, wp6, e, f, h, i, d, f4, g, i4));
-
-	float limits = XBR_EDGE_STR_P1 + 0.000001;
-	float edge_strength = smoothstep(0.0, limits, abs(d_edge));
-	
-	vec4 w1, w2;
-	vec3 c3, c4;
-	if (MODE == 2.0)
-	{
-		float contrast = max(max4float(df(e,f),df(e,i),df(e,h),df(f,h)),max(df(f,i),df(h,i)))/(e+0.001);
-
-		float wgt1 = weight1*(smoothstep(0.0, 0.6, contrast)*XBR_EDGE_SHP + XBR_TEXTURE_SHP);
-		float wgt2 = weight2*(smoothstep(0.0, 0.6, contrast)*XBR_EDGE_SHP + XBR_TEXTURE_SHP);
-	
-		/* Filter weights. Two taps only. */
-		w1 = vec4(-wgt1, wgt1+ 0.5, wgt1+ 0.5, -wgt1);
-		w2 = vec4(-wgt2, wgt2+0.25, wgt2+0.25, -wgt2);
-		c3 = mul(w2, mat4x3(P0+2.0*(D+G)+P2, B+2.0*(E+H)+H5, C+2.0*(F+I)+I5, P1+2.0*(F4+I4)+P3))/3.0;
-        c4 = mul(w2, mat4x3(P0+2.0*(C+B)+P1, D+2.0*(F+E)+F4, G+2.0*(I+H)+I4, P2+2.0*(I5+H5)+P3))/3.0;
-	}
-	else
-	{
-		/* Filter weights. Two taps only. */
-		w1 = vec4(-weight1, weight1+0.5, weight1+0.5, -weight1);
-		w2 = vec4(-weight2, weight2+0.25, weight2+0.25, -weight2);
-		c3 = mul(w2, mat4x3(D+G, E+H, F+I, F4+I4));
-		c4 = mul(w2, mat4x3(C+B, F+E, I+H, I5+H5));
-	}
-
-	/* Filtering and normalization in four direction generating four colors. */
-    vec3 c1 = mul(w1, mat4x3( P2,   H,   F,   P1 ));
-    vec3 c2 = mul(w1, mat4x3( P0,   E,   I,   P3 ));
-
-	/* Smoothly blends the two strongest directions (one in diagonal and the other in vert/horiz direction). */
-	vec3 color =  mix(mix(c1, c2, step(0.0, d_edge)), mix(c3, c4, step(0.0, hv_edge)), 1. - edge_strength);
-
-	/* Anti-ringing code. */
-	vec3 min_sample = min4( E, F, H, I );
-	vec3 max_sample = max4( E, F, H, I );
-	color = clamp(color, min_sample, max_sample);
-	
-	FragColor = vec4(color, 1.0);
-	}
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
deleted file mode 100644
index 63ca123c1d..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang
+++ /dev/null
@@ -1,280 +0,0 @@
-#version 450
-
-/*
-   
-  *******  Super XBR Shader - pass2  *******  This pass is optional.
-   
-  Copyright (c) 2015 Hyllian - sergiogdb@gmail.com
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-*/
-
-const float XBR_WEIGHT = 1.0;
-const float XBR_ANTI_RINGING = 1.0;
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float MODE;
-	float XBR_EDGE_SHP;
-	float XBR_TEXTURE_SHP;
-   float XBR_EDGE_STR_P2;
-	float SUPERXBR_ON;
-} params;
-
-#pragma parameter SUPERXBR_ON 		"          Super-XBR ON" 1 0 1 1
-#define SUPERXBR_ON params.SUPERXBR_ON
-
-#pragma parameter MODE 				"          Mode - Normal, Details, Adaptive" 1.0 0.0 2.0 1.0
-#pragma parameter XBR_EDGE_STR_P2 	"          Xbr - Edge Strength p2" 1.0 0.0 5.0 0.5
-#pragma parameter XBR_EDGE_SHP 		"          Adaptive Dynamic Edge Sharp" 0.4 0.0 3.0 0.1
-#pragma parameter XBR_TEXTURE_SHP 	"          Adaptive Static Edge Sharp" 1.0 0.0 2.0 0.1
-
-#define MODE params.MODE
-#define XBR_EDGE_SHP params.XBR_EDGE_SHP
-#define XBR_TEXTURE_SHP params.XBR_TEXTURE_SHP
-#define XBR_EDGE_STR_P2 params.XBR_EDGE_STR_P2
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define mul(a,b) (b*a)
-
-const vec3 Y = vec3(.2126, .7152, .0722);
-
-float RGBtoYUV(vec3 color)
-{
-  return dot(color, Y);
-}
-
-float df(float A, float B)
-{
-  return abs(A-B);
-}
-
-/*
-                              P1
-     |P0|B |C |P1|         C     F4          |a0|b1|c2|d3|
-     |D |E |F |F4|      B     F     I4       |b0|c1|d2|e3|   |e1|i1|i2|e2|
-     |G |H |I |I4|   P0    E  A  I     P3    |c0|d1|e2|f3|   |e3|i3|i4|e4|
-     |P2|H5|I5|P3|      D     H     I5       |d0|e1|f2|g3|
-                           G     H5
-                              P2
-*/
-
-float d_wd(float wp1, float wp2, float wp3, float wp4, float wp5, float wp6, float b0, float b1, float c0, float c1, float c2, float d0, float d1, float d2, float d3, float e1, float e2, float e3, float f2, float f3)
-{
-	return (wp1*(df(c1,c2) + df(c1,c0) + df(e2,e1) + df(e2,e3)) + wp2*(df(d2,d3) + df(d0,d1)) + wp3*(df(d1,d3) + df(d0,d2)) + wp4*df(d1,d2) + wp5*(df(c0,c2) + df(e1,e3)) + wp6*(df(b0,b1) + df(f2,f3)));
-}
-
-float hv_wd(float wp1, float wp2, float wp3, float wp4, float wp5, float wp6, float i1, float i2, float i3, float i4, float e1, float e2, float e3, float e4)
-{
-	return ( wp4*(df(i1,i2)+df(i3,i4)) + wp1*(df(i1,e1)+df(i2,e2)+df(i3,e3)+df(i4,e4)) + wp3*(df(i1,e2)+df(i3,e4)+df(e1,i2)+df(e3,i4)));
-}
-
-vec3 min4(vec3 a, vec3 b, vec3 c, vec3 d)
-{
-    return min(a, min(b, min(c, d)));
-}
-vec3 max4(vec3 a, vec3 b, vec3 c, vec3 d)
-{
-    return max(a, max(b, max(c, d)));
-}
-
-float max4float(float a, float b, float c, float d)
-{
-    return max(a, max(b, max(c, d)));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-   
-   float dx = params.SourceSize.z;
-   float dy = params.SourceSize.w;
-   t1 = vTexCoord.xyxy + vec4(-2.0*dx, -2.0*dy, dx, dy);
-   t2 = vTexCoord.xyxy + vec4(    -dx, -2.0*dy,  0, dy);
-   t3 = vTexCoord.xyxy + vec4(-2.0*dx,     -dy, dx,  0);
-   t4 = vTexCoord.xyxy + vec4(    -dx,     -dy,  0,  0);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   if (SUPERXBR_ON < 0.5)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-// settings //
-	float wp1, wp2, wp3, wp4, wp5, wp6, weight1, weight2;
-	if (MODE == 1.0)
-	{
-		wp1	=	0.0;
-		wp2	=	0.0;
-		wp3	=	0.0;
-		wp4	=	1.0;
-		wp5	=	0.0;
-		wp6	=	0.0;
-
-		weight1	=	(XBR_WEIGHT*1.29633/10.0);
-		weight2	=	(XBR_WEIGHT*1.75068/10.0/2.0);
-	}
-	else if (MODE == 2.0)
-	{
-		wp1	=	1.0;
-		wp2	=	0.0;
-		wp3	=	1.0;
-		wp4	=	3.0;
-		wp5	=	-2.0;
-		wp6	=	0.0;
-
-		weight1	=	(1.29633/10.0);
-		weight2	=	(1.75068/10.0/2.0);
-	}
-	else
-	{
-		wp1	=	1.0;
-		wp2	=	0.0;
-		wp3	=	2.0;
-		wp4	=	3.0;
-		wp5	=	-2.0;
-		wp6	=	1.0;
-
-		weight1	=	(XBR_WEIGHT*1.29633/10.0);
-		weight2	=	(XBR_WEIGHT*1.75068/10.0/2.0);
-	}
-// end settings //
-
-	vec3 P0 = texture(Source, t1.xy).xyz;
-	vec3 P1 = texture(Source, t1.zy).xyz;
-	vec3 P2 = texture(Source, t1.xw).xyz;
-	vec3 P3 = texture(Source, t1.zw).xyz;
-
-	vec3  B = texture(Source, t2.xy).xyz;
-	vec3  C = texture(Source, t2.zy).xyz;
-	vec3 H5 = texture(Source, t2.xw).xyz;
-	vec3 I5 = texture(Source, t2.zw).xyz;
-
-	vec3  D = texture(Source, t3.xy).xyz;
-	vec3 F4 = texture(Source, t3.zy).xyz;
-	vec3  G = texture(Source, t3.xw).xyz;
-	vec3 I4 = texture(Source, t3.zw).xyz;
-
-	vec3  E = texture(Source, t4.xy).xyz;
-	vec3  F = texture(Source, t4.zy).xyz;
-	vec3  H = texture(Source, t4.xw).xyz;
-	vec3  I = texture(Source, t4.zw).xyz;
-
-	float b = RGBtoYUV( B );
-	float c = RGBtoYUV( C );
-	float d = RGBtoYUV( D );
-	float e = RGBtoYUV( E );
-	float f = RGBtoYUV( F );
-	float g = RGBtoYUV( G );
-	float h = RGBtoYUV( H );
-	float i = RGBtoYUV( I );
-
-	float i4 = RGBtoYUV( I4 ); float p0 = RGBtoYUV( P0 );
-	float i5 = RGBtoYUV( I5 ); float p1 = RGBtoYUV( P1 );
-	float h5 = RGBtoYUV( H5 ); float p2 = RGBtoYUV( P2 );
-	float f4 = RGBtoYUV( F4 ); float p3 = RGBtoYUV( P3 );
-
-/*
-                              P1
-     |P0|B |C |P1|         C     F4          |a0|b1|c2|d3|
-     |D |E |F |F4|      B     F     I4       |b0|c1|d2|e3|   |e1|i1|i2|e2|
-     |G |H |I |I4|   P0    E  A  I     P3    |c0|d1|e2|f3|   |e3|i3|i4|e4|
-     |P2|H5|I5|P3|      D     H     I5       |d0|e1|f2|g3|
-                           G     H5
-                              P2
-*/
-
-	/* Calc edgeness in diagonal directions. */
-	float d_edge  = (d_wd( wp1, wp2, wp3, wp4, wp5, wp6, d, b, g, e, c, p2, h, f, p1, h5, i, f4, i5, i4 ) - d_wd( wp1, wp2, wp3, wp4, wp5, wp6, c, f4, b, f, i4, p0, e, i, p3, d, h, i5, g, h5 ));
-
-	/* Calc edgeness in horizontal/vertical directions. */
-	float hv_edge = (hv_wd(wp1, wp2, wp3, wp4, wp5, wp6, f, i, e, h, c, i5, b, h5) - hv_wd(wp1, wp2, wp3, wp4, wp5, wp6, e, f, h, i, d, f4, g, i4));
-
-	float limits = XBR_EDGE_STR_P2 + 0.000001;
-	float edge_strength = smoothstep(0.0, limits, abs(d_edge));
-	
-	vec4 w1, w2;
-	vec3 c3, c4;
-	if (MODE == 2.0)
-	{
-		float contrast = max(max4float(df(e,f),df(e,i),df(e,h),df(f,h)),max(df(f,i),df(h,i)))/(e+0.001);
-
-		float wgt1 = weight1*(smoothstep(0.0, 0.6, contrast)*XBR_EDGE_SHP + XBR_TEXTURE_SHP);
-		float wgt2 = weight2*(smoothstep(0.0, 0.6, contrast)*XBR_EDGE_SHP + XBR_TEXTURE_SHP);
-		
-		/* Filter weights. Two taps only. */
-		w1 = vec4(-wgt1, wgt1+ 0.5, wgt1+ 0.5, -wgt1);
-		w2 = vec4(-wgt2, wgt2+0.25, wgt2+0.25, -wgt2);
-		c3 = mul(w2, mat4x3(P0+2.0*(D+G)+P2, B+2.0*(E+H)+H5, C+2.0*(F+I)+I5, P1+2.0*(F4+I4)+P3))/3.0;
-		c4 = mul(w2, mat4x3(P0+2.0*(C+B)+P1, D+2.0*(F+E)+F4, G+2.0*(I+H)+I4, P2+2.0*(I5+H5)+P3))/3.0;
-	}
-	else
-	{
-		/* Filter weights. Two taps only. */
-		w1 = vec4(-weight1, weight1+0.5, weight1+0.5, -weight1);
-		w2 = vec4(-weight2, weight2+0.25, weight2+0.25, -weight2);
-		c3 = mul(w2, mat4x3(D+G, E+H, F+I, F4+I4));
-		c4 = mul(w2, mat4x3(C+B, F+E, I+H, I5+H5));
-	}
-
-	/* Filtering and normalization in four direction generating four colors. */
-	vec3 c1 = mul(w1, mat4x3( P2,   H,   F,   P1 ));
-	vec3 c2 = mul(w1, mat4x3( P0,   E,   I,   P3 ));
-
-	/* Smoothly blends the two strongest directions (one in diagonal and the other in vert/horiz direction). */
-	vec3 color =  mix(mix(c1, c2, step(0.0, d_edge)), mix(c3, c4, step(0.0, hv_edge)), 1. - edge_strength);
-
-	/* Anti-ringing code. */
-	vec3 min_sample = min4( E, F, H, I );
-	vec3 max_sample = max4( E, F, H, I );
-	color = clamp(color, min_sample, max_sample);
-	
-   FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/threshold.slang b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/threshold.slang
deleted file mode 100644
index 274ca2998c..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/threshold.slang
+++ /dev/null
@@ -1,43 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float GLOW_WHITEPOINT;
-    float GLOW_ROLLOFF;
-} params;
-
-#pragma parameter GLOW_WHITEPOINT   "          Glow Whitepoint" 1.0 0.5 1.1 0.02
-#pragma parameter GLOW_ROLLOFF      "          Glow Rolloff" 3.0 1.2 6.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 color  = 1.15 * texture(Source, vTexCoord).rgb;
-    vec3 factor = clamp(color / params.GLOW_WHITEPOINT, 0.0, 1.0);
-
-    FragColor = vec4(pow(factor, vec3(params.GLOW_ROLLOFF)), 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/cubic/hsm-drez-b-spline-x.slang b/bezel/Mega_Bezel/shaders/hyllian/cubic/hsm-drez-b-spline-x.slang
deleted file mode 100644
index adb423f6db..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/cubic/hsm-drez-b-spline-x.slang
+++ /dev/null
@@ -1,132 +0,0 @@
-#version 450
-
-/*
-   b-spline-x Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float C_ANTI_RINGING;
-   float C_FILTER_MODE;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_DREZ_TITLE "[ DREZ DOWNSAMPLE FILTER - HYLLIAN - DREZ PRESETS ONLY ]:" 0 0 0.001 0.001
-
-#pragma parameter C_FILTER_MODE "     DREZ Filter: B-SPLINE | BICUBIC | CATMULL-ROM | BICUBIC H" 0.0 0.0 3.0 1.0
-#define C_FILTER_MODE params.C_FILTER_MODE
-
-// #pragma parameter C_ANTI_RINGING "          Catmull-Rom Anti-Ringing [ OFF | ON ]" 1.0 0.0 1.0 1.0
-// #define C_ANTI_RINGING params.C_ANTI_RINGING
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0001 - vec2(0.5, 0.0)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( -dx, 0.0,    0.0, 0.0); 
-	t2 = vTexCoord.xyxy + vec4(  dx, 0.0, 2.0*dx, 0.0);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   // B-Spline
-   float  B =  1.0;
-   float  C =  0.0;
-
-   if (C_FILTER_MODE == 1)
-   {
-      // Bicubic
-      B =  1.0/3.0; 
-      C =  1.0/3.0;
-   }
-   if (C_FILTER_MODE == 2)
-   {
-      // Catmull-Rom
-      B =  0.0;
-      C =  0.5;
-   }
-   if (C_FILTER_MODE == 3)
-   {
-      // Bicubic Hyllian
-      B =  0.0;
-      C =  1.0;
-   }
-
-
-   const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                          (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                          -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                      (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Px    = vec4(fp.x*fp.x*fp.x, fp.x*fp.x, fp.x, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Px;
-
-   // // Anti-ringing
-   // if (C_ANTI_RINGING == 1)
-   // {
-   //    vec3 aux = color;
-   //    vec3 min_sample = min(min(C0, C1), min(C2, C3));
-   //    vec3 max_sample = max(max(C0, C1), max(C2, C3));
-   //    color = clamp(color, min_sample, max_sample);
-   //    color = mix(aux, color, step(0.0, (C0-C1)*(C2-C3)));
-   // }
-
-   FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/cubic/hsm-drez-b-spline-y.slang b/bezel/Mega_Bezel/shaders/hyllian/cubic/hsm-drez-b-spline-y.slang
deleted file mode 100644
index b13ce58a00..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/cubic/hsm-drez-b-spline-y.slang
+++ /dev/null
@@ -1,129 +0,0 @@
-#version 450
-
-/*
-   b-spline-y Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float C_FILTER_MODE;
-   float C_ANTI_RINGING;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter C_FILTER_MODE "     DREZ Filter: B-SPLINE | BICUBIC | CATMULL-ROM | BICUBIC H" 0.0 0.0 3.0 1.0
-#define C_FILTER_MODE params.C_FILTER_MODE
-
-// #pragma parameter C_ANTI_RINGING "          Catmull-Rom Anti-Ringing [ OFF | ON ]" 1.0 0.0 1.0 1.0
-// #define C_ANTI_RINGING params.C_ANTI_RINGING
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0001 - vec2(0.0, 0.5)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( 0.0, -dy, 0.0,    0.0); 
-	t2 = vTexCoord.xyxy + vec4( 0.0,  dy, 0.0, 2.0*dy);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   // B-Spline
-   float  B =  1.0;
-   float  C =  0.0;
-
-   if (C_FILTER_MODE == 1)
-   {
-      // Bicubic
-      B =  1.0/3.0; 
-      C =  1.0/3.0;
-   }
-   if (C_FILTER_MODE == 2)
-   {
-      // Catmull-Rom
-      B =  0.0;
-      C =  0.5;
-   }
-   if (C_FILTER_MODE == 3)
-   {
-      // Bicubic Hyllian
-      B =  0.0;
-      C =  1.0;
-   }
-
-   const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                          (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                          -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                      (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Py    = vec4(fp.y*fp.y*fp.y, fp.y*fp.y, fp.y, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Py;
-
-   // // Anti-ringing
-   // if (C_ANTI_RINGING == 1.0)
-   // {
-   //    vec3 aux = color;
-   //    vec3 min_sample = min(min(C0, C1), min(C2, C3));
-   //    vec3 max_sample = max(max(C0, C1), max(C2, C3));
-   //    color = clamp(color, min_sample, max_sample);
-   //    color = mix(aux, color, step(0.0, (C0-C1)*(C2-C3)));
-   // }
-
-  FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix-pass2.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix-pass2.slang
deleted file mode 100644
index 751a27c92b..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix-pass2.slang
+++ /dev/null
@@ -1,154 +0,0 @@
-#version 450
-
-/*
-   SGENPT-MIX - Sega Genesis Pseudo Transparency Mixer Shader - v8 - Pass2
-   
-   2011-2020 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SGPT_BLEND_OPTION_P2;
-	float SGPT_BLEND_LEVEL_P2;
-	float SGPT_ADJUST_VIEW_P2;
-	float SGPT_ON;
-} params;
-
-#pragma parameter SGPT_ON 				"    SGENPT-MIX ON" 0 0 1 1
-#pragma parameter SGPT_BLEND_OPTION_P2 	"    Pass 2 Blend - OFF | VL | CB | CB-S | Both | Both2 | Both-S" 2.0 0.0 6.0 1.0
-#pragma parameter SGPT_BLEND_LEVEL_P2 	"    Pass 2 - Both Blend Level " 1.0 0.0 1.0 0.1
-// #pragma parameter SGPT_ADJUST_VIEW_P2 	"    Pass 2 - Adjust View" 0.0 0.0 1.0 1.0
-#define SGPT_BLEND_OPTION_P2 (params.SGPT_BLEND_OPTION_P2 * params.SGPT_ON)
-#define SGPT_BLEND_LEVEL_P2 params.SGPT_BLEND_LEVEL_P2
-#define SGPT_ADJUST_VIEW_P2 0
-
-#define GAMMA_IN(color)     color*color
-#define GAMMA_OUT(color)    sqrt(color)
-
-const vec3 Y = vec3(.2126, .7152, .0722);
-
-vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));}
-vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-void main()
-{
-	vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-	vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-	// Reading the texels.
-	vec3 C = GAMMA_IN(texture(Source, vTexCoord    ).xyz);
-	vec3 L = GAMMA_IN(texture(Source, vTexCoord -dx).xyz);
-	vec3 R = GAMMA_IN(texture(Source, vTexCoord +dx).xyz);
-	vec3 U = GAMMA_IN(texture(Source, vTexCoord -dy).xyz);
-	vec3 D = GAMMA_IN(texture(Source, vTexCoord +dy).xyz);
-	vec3 UL = GAMMA_IN(texture(Source, vTexCoord -dx -dy).xyz);
-	vec3 UR = GAMMA_IN(texture(Source, vTexCoord +dx -dy).xyz);
-	vec3 DL = GAMMA_IN(texture(Source, vTexCoord -dx +dy).xyz);
-	vec3 DR = GAMMA_IN(texture(Source, vTexCoord +dx +dy).xyz);
-
-	vec3 color = C;
-
-	//  Get min/max samples
-	vec3 min_sample = min_s(C, L, R);
-	vec3 max_sample = max_s(C, L, R);
-
-	float diff = dot(max(max(C, L), max(C, R)) - min(min(C, L), min(C, R)), Y);
-
-	if (SGPT_BLEND_OPTION_P2 == 1)
-	{
-		min_sample = max_s(min_sample, min_s(C, DL, DR), min_s(C, UL, UR));
-		max_sample = min_s(max_sample, max_s(C, DL, DR), max_s(C, UL, UR));
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL_P2);
-
-		color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-	}
-	else if (SGPT_BLEND_OPTION_P2 == 2)
-	{
-		min_sample = max(min_sample, min_s(C, U, D));
-		max_sample = min(max_sample, max_s(C, U, D));
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL_P2);
-
-		color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D);
-	}
-	else if (SGPT_BLEND_OPTION_P2 == 3)
-	{
-		min_sample = min_s(min_sample, U, D);
-		max_sample = max_s(max_sample, U, D);
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL_P2);
-
-		color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D);
-	}
-	else if (SGPT_BLEND_OPTION_P2 == 4)
-	{
-		min_sample = min_s(min_sample, U, D);
-		max_sample = max_s(max_sample, U, D);
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL_P2);
-
-		color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-	}
-	else if (SGPT_BLEND_OPTION_P2 == 5)
-	{
-		min_sample = min(min_sample, min(min_s(D, DL, DR), min_s(U, UL, UR)));
-		max_sample = max(max_sample, max(max_s(D, DL, DR), max_s(U, UL, UR)));
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL_P2);
-
-		color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-	}
-
-	color = clamp(color, min_sample, max_sample);
-
-	color = mix(color, vec3(dot(abs(C-color), vec3(1.0, 1.0, 1.0))), SGPT_ADJUST_VIEW_P2);
-
-	FragColor = vec4(GAMMA_OUT(color), 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix.slang
deleted file mode 100644
index 5b797d8086..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix.slang
+++ /dev/null
@@ -1,166 +0,0 @@
-#version 450
-
-/*
-   SGENPT-MIX - Sega Genesis Pseudo Transparency Mixer Shader - v8b
-   
-   2011-2020 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SGPT_BLEND_OPTION;
-	float SGPT_BLEND_LEVEL;
-	float SGPT_ADJUST_VIEW;
-	float SGPT_LINEAR_GAMMA;
-	float SGPT_ON;
-} params;
-
-#pragma parameter SGPT_TITLE			"[ --- SGENPT-MIX DE-DITHERING V8b --- ]:" 0 0 0.01 0.01
-
-#pragma parameter SGPT_ON 				"    SGENPT-MIX ON" 0 0 1 1
-#pragma parameter SGPT_BLEND_OPTION 	"    Pass 1 Blend - OFF | VL | CB | CB-S | Both | Both2 | Both-S" 4.0 0.0 6.0 1.0
-#pragma parameter SGPT_BLEND_LEVEL 		"    Pass 1 Both Blend Level" 1.0 0.0 1.0 0.1
-// #pragma parameter SGPT_ADJUST_VIEW 	"          Adjust View (Debug)" 0.0 0.0 1.0 1.0
-#pragma parameter SGPT_LINEAR_GAMMA 	"    Pass 1 Use Linear Gamma" 0.0 0.0 1.0 1.0
-#define SGPT_BLEND_OPTION (params.SGPT_BLEND_OPTION * params.SGPT_ON)
-#define SGPT_BLEND_LEVEL params.SGPT_BLEND_LEVEL
-#define SGPT_ADJUST_VIEW 0
-#define SGPT_LINEAR_GAMMA params.SGPT_LINEAR_GAMMA
-
-#define GAMMA_EXP		(SGPT_LINEAR_GAMMA+1.0)
-#define GAMMA_IN(color)		pow(color, vec3(GAMMA_EXP, GAMMA_EXP, GAMMA_EXP))
-#define GAMMA_OUT(color)	pow(color, vec3(1.0 / GAMMA_EXP, 1.0 / GAMMA_EXP, 1.0 / GAMMA_EXP))
-
-const vec3 Y = vec3(.2126, .7152, .0722);
-
-vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));}
-vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-	vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-	// Reading the texels.
-	vec3 C = GAMMA_IN(texture(Source, vTexCoord    ).xyz);
-	vec3 L = GAMMA_IN(texture(Source, vTexCoord -dx).xyz);
-	vec3 R = GAMMA_IN(texture(Source, vTexCoord +dx).xyz);
-	vec3 U = GAMMA_IN(texture(Source, vTexCoord -dy).xyz);
-	vec3 D = GAMMA_IN(texture(Source, vTexCoord +dy).xyz);
-	vec3 UL = GAMMA_IN(texture(Source, vTexCoord -dx -dy).xyz);
-	vec3 UR = GAMMA_IN(texture(Source, vTexCoord +dx -dy).xyz);
-	vec3 DL = GAMMA_IN(texture(Source, vTexCoord -dx +dy).xyz);
-	vec3 DR = GAMMA_IN(texture(Source, vTexCoord +dx +dy).xyz);
-
-	vec3 color = C;
-
-	//  Get min/max samples
-	vec3 min_sample = min_s(C, L, R);
-	vec3 max_sample = max_s(C, L, R);
-
-	float diff = dot(max(max(C, L), max(C, R)) - min(min(C, L), min(C, R)), Y);
-
-	if (SGPT_BLEND_OPTION == 1) // Only Vertical Lines
-	{
-		min_sample = max_s(min_sample, min_s(C, DL, DR), min_s(C, UL, UR));
-		max_sample = min_s(max_sample, max_s(C, DL, DR), max_s(C, UL, UR));
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL);
-
-		color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-	}
-	else if (SGPT_BLEND_OPTION == 2) // Only Checkerboard
-	{
-		min_sample = max(min_sample, min_s(C, U, D));
-		max_sample = min(max_sample, max_s(C, U, D));
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL);
-
-		color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D);
-	}
-	else if (SGPT_BLEND_OPTION == 3) // Only Checkerboard - Soft
-	{
-		min_sample = min_s(min_sample, U, D);
-		max_sample = max_s(max_sample, U, D);
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL);
-
-		color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D);
-	}
-	else if (SGPT_BLEND_OPTION == 4) // VL-CB
-	{
-		diff *= (1.0 - SGPT_BLEND_LEVEL);
-
-		color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-	}
-	else if (SGPT_BLEND_OPTION == 5) // VL-CB-2
-	{
-		min_sample = min_s(min_sample, U, D);
-		max_sample = max_s(max_sample, U, D);
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL);
-
-		color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-	}
-	else if (SGPT_BLEND_OPTION == 6) // VL-CB-Soft
-	{
-		min_sample = min(min_sample, min(min_s(D, DL, DR), min_s(U, UL, UR)));
-		max_sample = max(max_sample, max(max_s(D, DL, DR), max_s(U, UL, UR)));
-
-		diff *= (1.0 - SGPT_BLEND_LEVEL);
-
-		color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-	}
-
-	color = clamp(color, min_sample, max_sample);
-
-	color = mix(color, vec3(dot(abs(C-color), vec3(1.0, 1.0, 1.0))), SGPT_ADJUST_VIEW);
-
-	FragColor = vec4(GAMMA_OUT(color), 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
deleted file mode 100644
index 25874f9d18..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang
+++ /dev/null
@@ -1,111 +0,0 @@
-#version 450
-
-/*
-   Sgenpt-Mix - pass1
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float SGPT_BLEND_OPTION;
-    float CB_BLEND_LEVEL;
-} params;
-
-#pragma parameter HSM_SGENPT_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter HSM_SGENPT_TITLE          "[ --- HYLLIAN SGENPT-MIX DE-DITHERING --- ]:" 0 0 0.01 0.01
-
-#pragma parameter SGPT_BLEND_OPTION         "          Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0  0.0 3.0  1.0
-#define SGPT_BLEND_OPTION                   params.SGPT_BLEND_OPTION
-
-#pragma parameter CB_BLEND_LEVEL            "          Checkerboard Blend Level"                     1.0  0.0 1.0  0.1
-#define CB_BLEND_LEVEL                      params.CB_BLEND_LEVEL
-
-
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));}
-vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec3 C  = texture(Source, vTexCoord    ).xyz;
-    vec3 L  = texture(Source, vTexCoord -dx).xyz;
-    vec3 R  = texture(Source, vTexCoord +dx).xyz;
-    vec3 U  = texture(Source, vTexCoord -dy).xyz;
-    vec3 D  = texture(Source, vTexCoord +dy).xyz;
-    vec3 UL = texture(Source, vTexCoord -dx -dy).xyz;
-    vec3 UR = texture(Source, vTexCoord +dx -dy).xyz;
-    vec3 DL = texture(Source, vTexCoord -dx +dy).xyz;
-    vec3 DR = texture(Source, vTexCoord +dx +dy).xyz;
-
-    vec3 color = C;
-
-    if (SGPT_BLEND_OPTION == 1 || SGPT_BLEND_OPTION == 3)
-    {
-        float diff = dot(max(C, max(L, R)) - min(C, min(L, R)), Y);
-
-        diff *= (1.0 - CB_BLEND_LEVEL);
-
-        vec3 min_sample = max(min_s(C, L, R), min_s(C, U, D));
-        vec3 max_sample = min(max_s(C, L, R), max_s(C, U, D));
-
-        color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D);
-
-        color = clamp(color, min_sample, max_sample);
-    }
-
-    float luma_diff = abs(dot(C, Y)-dot(color, Y));
-
-    FragColor = vec4(color, luma_diff);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
deleted file mode 100644
index 9a50ddde2c..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang
+++ /dev/null
@@ -1,141 +0,0 @@
-#version 450
-
-/*
-   Sgenpt-Mix - pass2
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float CB_BLEND_LEVEL;
-} params;
-
-#pragma parameter CB_BLEND_LEVEL            "          Checkerboard Blend Level"                     1.0  0.0 1.0  0.1
-#define CB_BLEND_LEVEL              params.CB_BLEND_LEVEL
-
-#define PATTERN(A)                 step(Delta,A)
-
-const float Delta = 0.000000001;
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D LinearGamma;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec4 C =  texture(Source, vTexCoord        );
-    vec4 L =  texture(Source, vTexCoord -dx    );
-    vec4 R =  texture(Source, vTexCoord +dx    );
-    vec4 U =  texture(Source, vTexCoord     -dy);
-    vec4 D =  texture(Source, vTexCoord     +dy);
-    vec4 UL = texture(Source, vTexCoord -dx -dy);
-    vec4 UR = texture(Source, vTexCoord +dx -dy);
-    vec4 DL = texture(Source, vTexCoord -dx +dy);
-    vec4 DR = texture(Source, vTexCoord +dx +dy);
-
-    vec4 L2 =  texture(Source, vTexCoord -2.0*dx    );
-    vec4 R2 =  texture(Source, vTexCoord +2.0*dx    );
-    vec4 U2 =  texture(Source, vTexCoord     -2.0*dy);
-    vec4 D2 =  texture(Source, vTexCoord     +2.0*dy);
-
-    vec4 UL2 =  texture(Source, vTexCoord -2.0*dx -dy);
-    vec4 UR2 =  texture(Source, vTexCoord +2.0*dx -dy);
-    vec4 DL2 =  texture(Source, vTexCoord -2.0*dx +dy);
-    vec4 DR2 =  texture(Source, vTexCoord +2.0*dx +dy);
-
-    vec4 LU2 =  texture(Source, vTexCoord -dx -2.0*dy);
-    vec4 RU2 =  texture(Source, vTexCoord +dx -2.0*dy);
-    vec4 LD2 =  texture(Source, vTexCoord -dx +2.0*dy);
-    vec4 RD2 =  texture(Source, vTexCoord +dx -2.0*dy);
-
-    vec3 color =  C.rgb;
-
-    vec3 oriC = texture(LinearGamma, vTexCoord        ).rgb;
-    vec3 oriL = texture(LinearGamma, vTexCoord -dx    ).rgb;
-    vec3 oriR = texture(LinearGamma, vTexCoord +dx    ).rgb;
-    vec3 oriU = texture(LinearGamma, vTexCoord     -dy).rgb;
-    vec3 oriD = texture(LinearGamma, vTexCoord     +dy).rgb;
-
-    float count1 = 0.0;
-    float count2 = 0.0;
-
-    float diff  = (1.0 - CB_BLEND_LEVEL);
-
-//      LU2  U2  RU2
-//  UL2  UL   U  UR  UR2
-//   L2   L   C   R   R2
-//  DL2  DL   D  DR  DR2
-//      LD2  D2  RD2
-
-    count1 += PATTERN(L.a*D.a*R.a);
-    count1 += PATTERN(L.a*U.a*R.a);
-    count1 += PATTERN(L.a*UL.a*R.a*UR.a + L.a*DL.a*R.a*DR.a);
-
-    count1 += PATTERN(U.a*D2.a*(UL.a*LD2.a + UR.a*RD2.a) + U2.a*D.a*(LU2.a*DL.a + RU2.a*DR.a));
-
-    count2 += PATTERN(U.a*L.a*D.a);
-    count2 += PATTERN(U.a*R.a*D.a);
-    count2 += PATTERN(U.a*UR.a*D.a*DR.a + D.a*DL.a*U.a*UL.a);
-
-    count2 += PATTERN(L.a*R2.a*(DL.a*DR2.a + UL.a*UR2.a) + L2.a*R.a*(DL2.a*DR.a + UL2.a*UR.a));
-
-    if ((count1 * count2) > 0.0 && count1 == count2)
-        color = 0.5*(1.0+diff)*oriC + 0.125*(1.0-diff)*(oriL + oriR + oriU + oriD);
-    else if (count1 > 0.0 && count1 > count2)
-        color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriL + oriR);
-    else if (count2 > 0.0 && count2 > count1)
-        color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriU + oriD);
-
-    float luma_diff = abs(dot(oriC, Y)-dot(color, Y));
-
-    FragColor = vec4(color, luma_diff);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
deleted file mode 100644
index f79c52375d..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang
+++ /dev/null
@@ -1,156 +0,0 @@
-#version 450
-
-/*
-   Sgenpt-Mix - pass3
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float CB_MITIG_NEIGHBRS;
-    float CB_MITIG_LINES;
-    float CB_ADJUST_VIEW;
-    // float UseGamma;
-} params;
-
-#pragma parameter CB_MITIG_NEIGHBRS            "          Checkerboard - Mitigate Errors in Neighbors" 1.0  0.0 4.0  1.0
-#define CB_MITIG_NEIGHBRS   params.CB_MITIG_NEIGHBRS
-
-#pragma parameter CB_MITIG_LINES               "          Checkerboard - Mitigate Errors in Regions"   1.0  0.0 1.0  1.0
-#define CB_MITIG_LINES      params.CB_MITIG_LINES
-
-#pragma parameter CB_ADJUST_VIEW               "          Checkerboard - Show Debug View"              0.0  0.0 1.0  1.0
-#define CB_ADJUST_VIEW      params.CB_ADJUST_VIEW
-
-// #pragma parameter UseGamma                     "    Gamma Slider"                1.0  0.0 1.0  0.1
-
-
-// #define UseGamma            params.UseGamma
-// #define CBDOuputGamma          (UseGamma+1.0)
-
-// #define GAMMA_OUT(color)    pow(color, vec3(1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma))
-
-#define PATTERN(A)          step(Delta,A)
-
-const float Delta = 0.000000001;
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D LinearGamma;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec4 C =  texture(Source, vTexCoord        );
-    vec4 L =  texture(Source, vTexCoord -dx    );
-    vec4 R =  texture(Source, vTexCoord +dx    );
-    vec4 U =  texture(Source, vTexCoord     -dy);
-    vec4 D =  texture(Source, vTexCoord     +dy);
-    vec4 UL = texture(Source, vTexCoord -dx -dy);
-    vec4 UR = texture(Source, vTexCoord +dx -dy);
-    vec4 DL = texture(Source, vTexCoord -dx +dy);
-    vec4 DR = texture(Source, vTexCoord +dx +dy);
-
-    vec4 L2 =  texture(Source, vTexCoord -2.0*dx    );
-    vec4 R2 =  texture(Source, vTexCoord +2.0*dx    );
-    vec4 U2 =  texture(Source, vTexCoord     -2.0*dy);
-    vec4 D2 =  texture(Source, vTexCoord     +2.0*dy);
-
-    vec4 L3 =  texture(Source, vTexCoord -3.0*dx    );
-    vec4 R3 =  texture(Source, vTexCoord +3.0*dx    );
-    vec4 U3 =  texture(Source, vTexCoord     -3.0*dy);
-    vec4 D3 =  texture(Source, vTexCoord     +3.0*dy);
-
-    vec3 color =  C.rgb;
-
-    vec3 oriC = texture(LinearGamma, vTexCoord        ).rgb;
-
-    float count   = 0.0;
-    float count2  = 0.0;
-    float count3  = 0.0;
-
-//              U3
-//              U2     
-//          UL   U  UR     
-//  L3  L2   L   C   R   R2  R3
-//          DL   D  DR     
-//              D2     
-//              D3
-
-    count += PATTERN(L.a);
-    count += PATTERN(R.a);
-    count += PATTERN(U.a);
-    count += PATTERN(D.a);
-    count += PATTERN(UL.a*UR.a*DL.a*DR.a);
-
-    count2 += PATTERN(L.a*UL.a*U.a + U.a*UR.a*R.a + R.a*DR.a*D.a + D.a*DL.a*L.a);
-
-    count3 += PATTERN(L3.a*L2.a*L.a);
-    count3 += PATTERN(L2.a*L.a*R.a);
-    count3 += PATTERN(L.a*R.a*R2.a);
-    count3 += PATTERN(R.a*R2.a*R3.a);
-
-    count3 += PATTERN(U3.a*U2.a*U.a);
-    count3 += PATTERN(U2.a*U.a*D.a);
-    count3 += PATTERN(U.a*D.a*D2.a);
-    count3 += PATTERN(D.a*D2.a*D3.a);
-
-    if ((count < CB_MITIG_NEIGHBRS)  && (count2 < 1.0))
-        color = oriC;
-    else if ((CB_MITIG_LINES == 1.0) && (count3 < 1.0))
-        color = oriC;
-
-    float luma_diff = abs(dot(oriC, Y)-dot(color, Y));
-
-    color = mix(color, vec3(luma_diff), CB_ADJUST_VIEW);
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
deleted file mode 100644
index 2c50afd185..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang
+++ /dev/null
@@ -1,108 +0,0 @@
-#version 450
-
-/*
-   Sgenpt-Mix - pass4
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float SGPT_BLEND_OPTION;
-    float VL_BLEND_LEVEL;
-} params;
-
-#pragma parameter SGPT_BLEND_OPTION    "          Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0  0.0 3.0  1.0
-#define SGPT_BLEND_OPTION             params.SGPT_BLEND_OPTION
-
-#pragma parameter VL_BLEND_LEVEL       "          Vertical Lines Blend Level"                     0.8  0.0 1.0  0.1
-#define VL_BLEND_LEVEL                params.VL_BLEND_LEVEL
-
-
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));}
-vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec3 C  = texture(Source, vTexCoord    ).xyz;
-    vec3 L  = texture(Source, vTexCoord -dx).xyz;
-    vec3 R  = texture(Source, vTexCoord +dx).xyz;
-    vec3 U  = texture(Source, vTexCoord -dy).xyz;
-    vec3 D  = texture(Source, vTexCoord +dy).xyz;
-    vec3 UL = texture(Source, vTexCoord -dx -dy).xyz;
-    vec3 UR = texture(Source, vTexCoord +dx -dy).xyz;
-    vec3 DL = texture(Source, vTexCoord -dx +dy).xyz;
-    vec3 DR = texture(Source, vTexCoord +dx +dy).xyz;
-
-    vec3 color = C;
-
-    if (SGPT_BLEND_OPTION == 2 || SGPT_BLEND_OPTION == 3)
-    {
-        float diff = dot(max(C, max(L, R)) - min(C, min(L, R)), Y);
-
-        diff *= (1.0 - VL_BLEND_LEVEL);
-
-        vec3 min_sample = max_s(min_s(C, L, R), min_s(C, DL, DR), min_s(C, UL, UR));
-        vec3 max_sample = min_s(max_s(C, L, R), max_s(C, DL, DR), max_s(C, UL, UR));
-
-        color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R);
-
-        color = clamp(color, min_sample, max_sample);
-    }
-
-    float luma_diff = abs(dot(C, Y)-dot(color, Y));
-
-    FragColor = vec4(color, luma_diff);
-}
diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
deleted file mode 100644
index 89823fea03..0000000000
--- a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang
+++ /dev/null
@@ -1,160 +0,0 @@
-#version 450
-
-/*
-   Sgenpt-Mix - pass5
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float VL_MITIG_NEIGHBRS;
-    float VL_MITIG_LINES;
-    float VL_ADJUST_VIEW;
-    float UseGamma;
-} params;
-
-#pragma parameter VL_MITIG_NEIGHBRS            "          Vertical Lines - Mitigate Errors in Neighbors" 1.0  0.0 4.0  1.0
-#define VL_MITIG_NEIGHBRS   params.VL_MITIG_NEIGHBRS
-
-#pragma parameter VL_MITIG_LINES               "          Vertical Lines - Mitigate Errors in Regions"   1.0  0.0 1.0  1.0
-#define VL_MITIG_LINES      params.VL_MITIG_LINES
-
-#pragma parameter VL_ADJUST_VIEW               "          Vertical Lines - Debug View"                 0.0  0.0 1.0  1.0
-#define VL_ADJUST_VIEW      params.VL_ADJUST_VIEW
-
-// HSM removed
-
-// #pragma parameter UseGamma                     "    Gamma Slider"                     1.0  0.0 1.0  0.1
-// #define UseGamma            params.UseGamma
-
-// #define CBDOuputGamma          (UseGamma+1.0)
-
-// #define GAMMA_OUT(color)    pow(color, vec3(1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma))
-
-#define PATTERN(A)          step(Delta,A)
-
-const float Delta = 0.000000001;
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D CB_Output;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec4 C =  texture(Source, vTexCoord        );
-    vec4 L =  texture(Source, vTexCoord -dx    );
-    vec4 R =  texture(Source, vTexCoord +dx    );
-    vec4 U =  texture(Source, vTexCoord     -dy);
-    vec4 D =  texture(Source, vTexCoord     +dy);
-    vec4 UL = texture(Source, vTexCoord -dx -dy);
-    vec4 UR = texture(Source, vTexCoord +dx -dy);
-    vec4 DL = texture(Source, vTexCoord -dx +dy);
-    vec4 DR = texture(Source, vTexCoord +dx +dy);
-
-    vec4 L2 =  texture(Source, vTexCoord -2.0*dx    );
-    vec4 R2 =  texture(Source, vTexCoord +2.0*dx    );
-    vec4 U2 =  texture(Source, vTexCoord     -2.0*dy);
-    vec4 D2 =  texture(Source, vTexCoord     +2.0*dy);
-
-    vec4 L3 =  texture(Source, vTexCoord -3.0*dx    );
-    vec4 R3 =  texture(Source, vTexCoord +3.0*dx    );
-    vec4 U3 =  texture(Source, vTexCoord     -3.0*dy);
-    vec4 D3 =  texture(Source, vTexCoord     +3.0*dy);
-
-    vec3 color =  C.rgb;
-
-    vec3 oriC = texture(CB_Output, vTexCoord        ).rgb;
-
-    float count   = 0.0;
-    float count2  = 0.0;
-    float count3  = 0.0;
-    float count4  = 0.0;
-
-//              U3
-//              U2     
-//          UL   U  UR     
-//  L3  L2   L   C   R   R2  R3
-//          DL   D  DR     
-//              D2     
-//              D3
-
-    count += PATTERN(L.a);
-    count += PATTERN(R.a);
-    count += PATTERN(U.a);
-    count += PATTERN(D.a);
-
-    count += PATTERN(UL.a*UR.a*DL.a*DR.a);
-
-    count2 += PATTERN(L.a*UL.a*U.a + U.a*UR.a*R.a + R.a*DR.a*D.a + D.a*DL.a*L.a);
-
-    count3 += PATTERN(L3.a*L2.a*L.a);
-    count3 += PATTERN(L2.a*L.a*R.a);
-    count3 += PATTERN(L.a*R.a*R2.a);
-    count3 += PATTERN(R.a*R2.a*R3.a);
-
-    count4 += PATTERN(U.a);
-    count4 += PATTERN(D.a);
-
-    if ((count < VL_MITIG_NEIGHBRS)  && (count2 < 1.0))
-        color = oriC;
-    else if ((VL_MITIG_LINES == 1.0) && ((count3*count4) < 1.0))
-        color = oriC;
-
-    float luma_diff = abs(dot(oriC, Y)-dot(color, Y));
-
-    color = mix(color, vec3(luma_diff), VL_ADJUST_VIEW);
-
-    // HSM removed
-    // FragColor = vec4(GAMMA_OUT(color), 1.0);
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-gba-color.slang b/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-gba-color.slang
deleted file mode 100644
index 91cdb53abe..0000000000
--- a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-gba-color.slang
+++ /dev/null
@@ -1,83 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-   float darken_screen;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-/*
-   Shader Modified: Pokefan531
-   Color Mangler
-   Author: hunterk
-   License: Public domain
-*/
-// Shader that replicates the LCD dynamics from a GameBoy Advance
-
-// #pragma parameter darken_screen "Darken Screen" 0.5 -0.25 1.5 0.05
-
-#define darken_screen 0
-#define target_gamma 2.2
-#define display_gamma 2.2
-#define sat 1.0
-#define lum 1.0
-#define contrast 1.0
-#define blr 0.0
-#define blg 0.0
-#define blb 0.0
-#define r 0.86
-#define g 0.66
-#define b 0.81
-#define rg 0.11
-#define rb 0.1325
-#define gr 0.19
-#define gb 0.0575
-#define br -0.05
-#define bg 0.23
-#define overscan_percent_x 0.0
-#define overscan_percent_y 0.0
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 screen = pow(texture(Source, vTexCoord), vec4(target_gamma + darken_screen)).rgba;
-   vec4 avglum = vec4(0.5);
-   screen = mix(screen, avglum, (1.0 - contrast));
-   
- //				r   g    b   black
-mat4 color = mat4(r,  rg,  rb, 0.0,  //red channel
-			   gr,  g,   gb, 0.0,  //green channel
-			   br,  bg,  b,  0.0,  //blue channel
-			  blr, blg, blb,    0.0); //alpha channel; these numbers do nothing for our purposes.
-			  
-mat4 adjust = mat4((1.0 - sat) * 0.3086 + sat, (1.0 - sat) * 0.3086, (1.0 - sat) * 0.3086, 1.0,
-(1.0 - sat) * 0.6094, (1.0 - sat) * 0.6094 + sat, (1.0 - sat) * 0.6094, 1.0,
-(1.0 - sat) * 0.0820, (1.0 - sat) * 0.0820, (1.0 - sat) * 0.0820 + sat, 1.0,
-0.0, 0.0, 0.0, 1.0);
-	color *= adjust;
-	screen = clamp(screen * lum, 0.0, 1.0);
-	screen = color * screen;
-	FragColor = pow(screen, vec4(1.0 / (display_gamma)));
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-no-reflect.slang b/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-no-reflect.slang
deleted file mode 100644
index de014efa41..0000000000
--- a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-no-reflect.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-lcd-grid-v2.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang b/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang
deleted file mode 100644
index ce01c6b083..0000000000
--- a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-potato-params.inc"
-#include "../base/common/common-functions.inc"
-#include "hsm-lcd-grid-v2.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2.inc b/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2.inc
deleted file mode 100644
index 51aa999ada..0000000000
--- a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2.inc
+++ /dev/null
@@ -1,191 +0,0 @@
-
-layout(push_constant) uniform Push
-{
-    float LCD_RSUBPIX_R;
-    float LCD_RSUBPIX_G;
-    float LCD_RSUBPIX_B;
-    float LCD_GSUBPIX_R;
-    float LCD_GSUBPIX_G;
-    float LCD_GSUBPIX_B;
-    float LCD_BSUBPIX_R;
-    float LCD_BSUBPIX_G;
-    float LCD_BSUBPIX_B;
-    float LCD_GAIN;
-    float LCD_GAMMA;
-    float LCD_BLACK_LEVEL;
-    float LCD_AMBIENT;
-    float LCD_BGR;
-} param;
-
-#pragma parameter LCDGRID_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter LCD_TITLE	        "[ --- LCD GRID V2 --- ]:" 0 0 0.01 0.01
-#pragma parameter LCD_SUBPIX_TITLE	"[ SUBPIXEL COLORS ]:" 0 0 0.01 0.01
-#pragma parameter LCD_RSUBPIX_R     "          Colour of R subpixel: R" 0.75 0.0 1.0 0.01
-#pragma parameter LCD_RSUBPIX_G     "          Colour of R subpixel: G" 0.0 0.0 1.0 0.01
-#pragma parameter LCD_RSUBPIX_B     "          Colour of R subpixel: B" 0.0 0.0 1.0 0.01
-#pragma parameter LCD_GSUBPIX_R     "          Colour of G subpixel: R" 0.0 0.0 1.0 0.01
-#pragma parameter LCD_GSUBPIX_G     "          Colour of G subpixel: G" 0.75 0.0 1.0 0.01
-#pragma parameter LCD_GSUBPIX_B     "          Colour of G subpixel: B" 0.0 0.0 1.0 0.01
-#pragma parameter LCD_BSUBPIX_R     "          Colour of B subpixel: R" 0.0 0.0 1.0 0.01
-#pragma parameter LCD_BSUBPIX_G     "          Colour of B subpixel: G" 0.0 0.0 1.0 0.01
-#pragma parameter LCD_BSUBPIX_B     "          Colour of B subpixel: B" 0.75 0.0 1.0 0.01
-#pragma parameter LCDGRID_BRIGHTNESS_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter LCD_BRIGHT_TITLE	"[ BRIGHTNESS & GAMMA ]:" 0 0 0.01 0.01
-#pragma parameter LCD_GAIN          "          Gain"                    1.30 0.5 2.0 0.05 // This was 1.75 before for an unknown reason
-#pragma parameter LCD_GAMMA         "          LCD Gamma"               2.5 0.5 5.0 0.1
-#pragma parameter LCD_AMBIENT       "          Ambient"                 0.0 0.0 25 0.1
-#pragma parameter LCD_BGR           "          BGR LCD Sub Pixel Order" 0 0 1 1
-
-#define outgamma 2.2
-
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-layout(set = 0, binding = 3) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 4) uniform sampler2D AvgLumPass;
-
-layout(location = 0) out vec4 FragColor;
-
-vec3 fetch_offset(sampler2D in_sampler, vec2 coord, vec2 offset) 
-{
-    offset = vec2(0);
-    vec2 texel_size = 1 / CROPPED_ROTATED_SIZE;
-    vec2 pixel_coord = SAMPLE_AREA_START_PIXEL_COORD + coord * CROPPED_ROTATED_SIZE + offset;
-
-    vec3 out_rgb = HSM_GetCroppedTexSample(in_sampler, coord + offset * texel_size).rgb;
-    out_rgb = pow(vec3(param.LCD_GAIN) * out_rgb, vec3(param.LCD_GAMMA));
-    out_rgb += vec3(param.LCD_AMBIENT / 100);
-    return out_rgb;
-}
-
-// integral of (1 - x^2 - x^4 + x^6)^2
-float coeffs_x[7] = float[](1.0, -2.0/3.0, -1.0/5.0, 4.0/7.0, -1.0/9.0, -2.0/11.0, 1.0/13.0);
-// integral of (1 - 2x^4 + x^6)^2
-float coeffs_y[7] = float[](1.0,      0.0, -4.0/5.0, 2.0/7.0,  4.0/9.0, -4.0/11.0, 1.0/13.0);
-
-float intsmear_func(float z, float coeffs[7])
-{
-    float z2 = z*z;
-    float zn = z;
-    float ret = 0.0;
-    for (int i = 0; i < 7; i++) {
-        ret += zn*coeffs[i];
-        zn *= z2;
-    }
-    return ret;
-}
-
-float intsmear(float x, float dx, float d, float coeffs[7])
-{
-    float zl = clamp((x-dx*0.5)/d,-1.0,1.0);
-    float zh = clamp((x+dx*0.5)/d,-1.0,1.0);
-    return d * ( intsmear_func(zh,coeffs) - intsmear_func(zl,coeffs) )/dx;
-}
-
-void main()
-{
-    // HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	// Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area 
-	HSM_GetBezelCoords(TUBE_DIFFUSE_COORD, 
-						TUBE_DIFFUSE_SCALE, 
-						TUBE_SCALE, 
-						SCREEN_ASPECT, 
-						false,
-						BEZEL_OUTSIDE_SCALE,
-						BEZEL_OUTSIDE_COORD, 
-						BEZEL_OUTSIDE_CURVED_COORD, 
-						FRAME_OUTSIDE_CURVED_COORD);
-	cache_bounds_coord = (BEZEL_OUTSIDE_COORD - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-			FragColor = vec4(0);
-			return;
-	}
-
-	// HSM Added
-	float raster_bloom_avg_lum = texture(AvgLumPass, vec2(0.5,0.5)).a;
-	vec2 screen_curved_coord = vec2(0.5);
-
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetCrtShaderFinalCoord(SCREEN_COORD,
-		SCREEN_SCALE,
-		raster_bloom_avg_lum,
-		screen_curved_coord);
-
-	vec2 curved_coord = screen_curved_coord_with_overscan_and_mirror;
-    vec2 texelSize = 1 / CROPPED_ROTATED_SIZE_WITH_RES_MULT;
-
-	float screen_mask = HSM_GetCornerMask((screen_curved_coord - 0.5) * 1.00 + 0.5, SCREEN_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_SCREEN_CORNER_RADIUS_SCALE, 0.9);
-    // End Addition
-
-    vec2 range = global.OutputSize.zw / SCREEN_SCALE;
-
-    vec3 cred   = pow(vec3(param.LCD_RSUBPIX_R, param.LCD_RSUBPIX_G, param.LCD_RSUBPIX_B), vec3(outgamma));
-    vec3 cgreen = pow(vec3(param.LCD_GSUBPIX_R, param.LCD_GSUBPIX_G, param.LCD_GSUBPIX_B), vec3(outgamma));
-    vec3 cblue  = pow(vec3(param.LCD_BSUBPIX_R, param.LCD_BSUBPIX_G, param.LCD_BSUBPIX_B), vec3(outgamma));
-
-    ivec2 tli = ivec2(floor(curved_coord/texelSize-vec2(0.4999)));
-
-    vec3 lcol, rcol;
-    float subpix = (curved_coord.x/texelSize.x - 0.4999 - float(tli.x))*3.0 - 0.33;
-    float rsubpix = range.x/texelSize.x * 3.0;
-
-    lcol = vec3(intsmear(subpix+1.0, rsubpix, 1.5, coeffs_x),
-                intsmear(subpix    , rsubpix, 1.5, coeffs_x),
-                intsmear(subpix-1.0, rsubpix, 1.5, coeffs_x));
-    rcol = vec3(intsmear(subpix-2.0, rsubpix, 1.5, coeffs_x),
-                intsmear(subpix-3.0, rsubpix, 1.5, coeffs_x),
-                intsmear(subpix-4.0, rsubpix, 1.5, coeffs_x));
-
-    if (param.LCD_BGR > 0.5) {
-        lcol.rgb = lcol.bgr;
-        rcol.rgb = rcol.bgr;
-    }
-
-    float tcol, bcol;
-    subpix = curved_coord.y/texelSize.y - 0.4999 - float(tli.y);
-    rsubpix = range.y/texelSize.y;
-    tcol = intsmear(subpix    ,rsubpix, 0.63, coeffs_y);
-    bcol = intsmear(subpix-1.0,rsubpix, 0.63, coeffs_y);
-
-    vec3 topLeftColor     = fetch_offset(Source, curved_coord, ivec2(-1, -1)) * lcol * vec3(tcol);
-    vec3 bottomRightColor = fetch_offset(Source, curved_coord, ivec2( 1,  1)) * rcol * vec3(bcol);
-    vec3 bottomLeftColor  = fetch_offset(Source, curved_coord, ivec2(-1,  1)) * lcol * vec3(bcol);
-    vec3 topRightColor    = fetch_offset(Source, curved_coord, ivec2( 1, -1)) * rcol * vec3(tcol);
-
-    vec3 averageColor = topLeftColor + bottomRightColor + bottomLeftColor + topRightColor;
-
-    // HSM Added
-    vec3 source_color = HSM_GetCroppedTexSample(Source, curved_coord).rgb;
-    vec3 averageColorOutsideScreen = mix(mat3(cred, cgreen, cblue) * pow(source_color, vec3(outgamma)), pow(source_color, vec3(outgamma)), 0.75);
-    averageColor = mix(averageColorOutsideScreen, averageColor, screen_mask);
-    
-    FragColor = vec4(averageColor, 1);
-	FragColor = pow(FragColor, vec4(1 / (HSM_GAMMA_OUT_CRT / DEFAULT_SRGB_GAMMA)));
-}
diff --git a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2.slang b/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
deleted file mode 100644
index eb533df229..0000000000
--- a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-#include "hsm-lcd-grid-v2.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/mdapt/README.md b/bezel/Mega_Bezel/shaders/mdapt/README.md
deleted file mode 100644
index 2f9983ee9e..0000000000
--- a/bezel/Mega_Bezel/shaders/mdapt/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# mdapt v2.8 - merge dithering and pseudo transparency
-
-## Introduction
-
-In many old arcade or console games you will find dithering effects which are there to compensate for platform weaknesses like missing transparency support or small color palettes. This works well since back then the monitors (CRTs) had scanline bleeding and other certain features which merged the dithering through the display technology. But nowadays every pixel will displayed perfectly so dithering won't look like it should be.
-
-There are already shaders out there who are trying to simulate how a CRT displays an image. mdapt though goes a different way and tries to detect dithering patterns by analyzing the relation between neighbored pixels. This way only these specific parts of the image are blended. The resulting image (still in the original resolution) is now a good base for further scaling with advanced algorithms (like xBR) which on there own usually have a hard time with dithering.
-
-## Algorithm
-
-mdapt can detect two basic dithering patterns. Checkerboard (CB) and vertical lines (VL). It actually doesn't matter of how many colors the pattern consists and mdapt doesn't use difference thresholds to determinie similarity at all. The algorithm just looks for regular "up and downs" between the pixels. There will always be errors though since the dithering process itself is lossy and not invertible. But mdapt tries to balance it by checking if there are enough detections in one local area.
-
-## Usage
-
-In RetroArch's shader options load one of the provided .cgp files. There are several configuration parameters which you can use via the parameter submenu.
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass0.slang b/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass0.slang
deleted file mode 100644
index bfcebbf0e5..0000000000
--- a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass0.slang
+++ /dev/null
@@ -1,111 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 0
-   by Sp00kyFox, 2014
-
-   Neighbor analysis via color metric and dot product of the difference vectors.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float MODE;
-	float PWR;
-    float HSM_DEDITHER_MODE;
-} params;
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_DEDITHERING_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter HSM_DEDITHERING_TITLE "[ --- MDAPT & HYLLIAN DE-DITHERING --- ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-// OFF | STRICT | RELAXED | HYLLIAN | HYL + Stripes | Stripes
-// #pragma parameter MODE "MDAPT Monochrome Analysis"	0.0 0.0 1.0 1.0
-// #pragma parameter PWR  "MDAPT Color Metric Exp"		2.0 0.0 10.0 0.1
-
-const float PWR = 2;
-
-#define dotfix(x,y) clamp(dot(x,y), 0.0, 1.0)	// NVIDIA Fix
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-// Reference: http://www.compuphase.com/cmetric.htm
-float eq(vec3 A, vec3 B)
-{
-	vec3 diff = A-B;
-	float  ravg = (A.x + B.x) * 0.5;
-
-	diff *= diff * vec3(2.0 + ravg, 4.0, 3.0 - ravg);
-	
-	return pow( smoothstep(3.0, 0.0, sqrt(diff.x + diff.y + diff.z)), PWR );
-}
-
-float and_(float a, float b, float c, float d, float e, float f){
-	return min(a, min(b, min(c, min(d, min(e,f)))));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	/*
-		  U
-		L C R
-		  D	
-	*/
-
-	if (HSM_DEDITHER_MODE < 1 || HSM_DEDITHER_MODE == 3)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	vec3 C = TEX( 0., 0.).xyz;
-	vec3 L = TEX(-1., 0.).xyz;
-	vec3 R = TEX( 1., 0.).xyz;
-	vec3 U = TEX( 0.,-1.).xyz;
-	vec3 D = TEX( 0., 1.).xyz;
-
-
-	vec3 res = vec3(0.0);
-
-	if(HSM_DEDITHER_MODE == 1){
-		res.x = float((L == R) && (C != L));
-		res.y = float((U == D) && (C != U));
-		res.z = float(bool(res.x) && bool(res.y) && (L == U));
-	}
-	else{
-		vec3 dCL = normalize(C-L), dCR = normalize(C-R), dCD = normalize(C-D), dCU = normalize(C-U);
-
-		res.x = dotfix(dCL, dCR) * eq(L,R);
-		res.y = dotfix(dCU, dCD) * eq(U,D);
-		res.z = and_(res.x, res.y, dotfix(dCL, dCU) * eq(L,U), dotfix(dCL, dCD) * eq(L,D), dotfix(dCR, dCU) * eq(R,U), dotfix(dCR, dCD) * eq(R,D));
-	}
-
-   FragColor = vec4(res, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass1.slang b/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass1.slang
deleted file mode 100644
index a3add89cb1..0000000000
--- a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass1.slang
+++ /dev/null
@@ -1,95 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 1
-   by Sp00kyFox, 2014
-
-   Preparing checkerboard patterns.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-    float HSM_DEDITHER_MODE;
-} params;
-
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-float and_(float a, float b){
-	return min(a,b);
-}
-
-float and_(float a, float b, float c){
-	return min(a, min(b,c));
-}
-
-float or_(float a, float b){
-	return max(a,b);
-}
-
-float or_(float a, float b, float c, float d, float e){
-	return max(a, max(b, max(c, max(d,e))));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	/*
-		UL U UR
-		L  C R
-		DL D DR
-	*/
-
-	if (HSM_DEDITHER_MODE < 1 || HSM_DEDITHER_MODE == 3)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	vec3 C = TEX( 0., 0.).xyz;
-	vec3 L = TEX(-1., 0.).xyz;
-	vec3 R = TEX( 1., 0.).xyz;
-	vec3 D = TEX( 0., 1.).xyz;
-	vec3 U = TEX( 0.,-1.).xyz;
-	
-	float UL = TEX(-1.,-1.).z;
-	float UR = TEX( 1.,-1.).z;
-	float DL = TEX(-1., 1.).z;
-	float DR = TEX( 1., 1.).z;
-
-	// Checkerboard Pattern Completion
-	float prCB = or_(C.z,
-		and_(L.z, R.z, or_(U.x, D.x)),
-		and_(U.z, D.z, or_(L.y, R.y)),
-		and_(C.x, or_(and_(UL, UR), and_(DL, DR))),
-		and_(C.y, or_(and_(UL, DL), and_(UR, DR))));
-   FragColor = vec4(C.x, prCB, 0.0, 0.0);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass2.slang b/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass2.slang
deleted file mode 100644
index d127804b15..0000000000
--- a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass2.slang
+++ /dev/null
@@ -1,121 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 2
-   by Sp00kyFox, 2014
-
-   Eliminating isolated detections.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float VL_LO;
-	float VL_HI;
-	float CB_LO;
-	float CB_HI;
-    float HSM_DEDITHER_MODE;
-} params;
-
-// #pragma parameter VL_LO "MDAPT VL LO Thresh" 1.25 0.0 10.0 0.05
-// #pragma parameter VL_HI "MDAPT VL HI Thresh" 1.75 0.0 10.0 0.05
-// #pragma parameter CB_LO "MDAPT CB LO Thresh" 5.25 0.0 25.0 0.05
-// #pragma parameter CB_HI "MDAPT CB HI Thresh" 5.75 0.0 25.0 0.05
-
-const float VL_LO = 1.25;
-const float VL_HI = 1.75;
-const float CB_LO = 5.25;
-const float CB_HI = 5.75;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-#define and(x,y) min(x,y)
-#define or(x,y)  max(x,y)
-
-vec2 sigmoid(vec2 signal){
-	return smoothstep(vec2(VL_LO, CB_LO), vec2(VL_HI, CB_HI), signal);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	/*
-		NW  UUL U2 UUR NE
-		ULL UL  U1 UR  URR
-		L2  L1  C  R1  R2
-		DLL DL  D1 DR  DRR	
-		SW  DDL D2 DDR SE
-	*/
-
-	if (HSM_DEDITHER_MODE < 1 || HSM_DEDITHER_MODE == 3)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-
-	vec2 C = TEX( 0., 0.).xy;
-	vec2 hits = vec2(0.0);
-	
-	//phase 1
-	vec2 L1 = TEX(-1., 0.).xy;
-	vec2 R1 = TEX( 1., 0.).xy;
-	vec2 U1 = TEX( 0.,-1.).xy;
-	vec2 D1 = TEX( 0., 1.).xy;
-
-	//phase 2
-	vec2 L2 = and(TEX(-2., 0.).xy, L1);
-	vec2 R2 = and(TEX( 2., 0.).xy, R1);
-	vec2 U2 = and(TEX( 0.,-2.).xy, U1);
-	vec2 D2 = and(TEX( 0., 2.).xy, D1);
-	vec2 UL = and(TEX(-1.,-1.).xy, or(L1, U1));
-	vec2 UR = and(TEX( 1.,-1.).xy, or(R1, U1));
-	vec2 DL = and(TEX(-1., 1.).xy, or(L1, D1));
-	vec2 DR = and(TEX( 1., 1.).xy, or(R1, D1));
-
-	//phase 3
-	vec2 ULL = and(TEX(-2.,-1.).xy, or(L2, UL));
-	vec2 URR = and(TEX( 2.,-1.).xy, or(R2, UR));
-	vec2 DRR = and(TEX( 2., 1.).xy, or(R2, DR));
-	vec2 DLL = and(TEX(-2., 1.).xy, or(L2, DL));
-	vec2 UUL = and(TEX(-1.,-2.).xy, or(U2, UL));
-	vec2 UUR = and(TEX( 1.,-2.).xy, or(U2, UR));
-	vec2 DDR = and(TEX( 1., 2.).xy, or(D2, DR));
-	vec2 DDL = and(TEX(-1., 2.).xy, or(D2, DL));
-
-	//phase 4
-	hits += and(TEX(-2.,-2.).xy, or(UUL, ULL));
-	hits += and(TEX( 2.,-2.).xy, or(UUR, URR));
-	hits += and(TEX(-2., 2.).xy, or(DDL, DLL));
-	hits += and(TEX( 2., 2.).xy, or(DDR, DRR));
-
-	hits += (ULL + URR + DRR + DLL + L2 + R2) + vec2(0.0, 1.0) * (C + U1 + U2 + D1 + D2 + L1 + R1 + UL + UR + DL + DR + UUL + UUR + DDR + DDL);
-
-   FragColor = vec4(C * sigmoid(hits), C);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass3.slang b/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass3.slang
deleted file mode 100644
index fbd9d9233d..0000000000
--- a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass3.slang
+++ /dev/null
@@ -1,105 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 3
-   by Sp00kyFox, 2014
-
-   Backpropagation and checkerboard smoothing.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-    float HSM_DEDITHER_MODE;
-} params;
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-#define TEX(dx,dy)   texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-#define TEXt0(dx,dy) texture(PreMdaptPass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-bool eq(vec3 A, vec3 B){
-	return (A == B);
-}
-
-float and_(float a, float b){
-	return min(a,b);
-}
-
-float or_(float a, float b, float c, float d, float e, float f, float g, float h, float i){
-	return max(a, max(b, max(c, max(d, max(e, max(f, max(g, max(h,i))))))));
-}
-
-vec2 and_(vec2 a, vec2 b){
-	return min(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b){
-	return max(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b, vec2 c, vec2 d){
-	return max(a, max(b, max(c,d)));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PreMdaptPass;
-
-void main()
-{
-	/*
-		UL U UR
-		L  C R
-		DL D DR
-	*/
-
-	if (HSM_DEDITHER_MODE < 1 || HSM_DEDITHER_MODE == 3)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-
-	vec4 C  = TEX( 0., 0.);		vec3 c  = TEXt0( 0., 0.).xyz;
-	vec2 L  = TEX(-1., 0.).xy;	vec3 l  = TEXt0(-1., 0.).xyz;
-	vec2 R  = TEX( 1., 0.).xy;	vec3 r  = TEXt0( 1., 0.).xyz;
-	vec2 U  = TEX( 0.,-1.).xy;	vec3 u  = TEXt0( 0.,-1.).xyz;
-	vec2 D  = TEX( 0., 1.).xy;	vec3 d  = TEXt0( 0., 1.).xyz;
-	float UL = TEX(-1.,-1.).y;	vec3 ul = TEXt0(-1.,-1.).xyz;
-	float UR = TEX( 1.,-1.).y;	vec3 ur = TEXt0( 1.,-1.).xyz;
-	float DL = TEX(-1., 1.).y;	vec3 dl = TEXt0(-1., 1.).xyz;
-	float DR = TEX( 1., 1.).y;	vec3 dr = TEXt0( 1., 1.).xyz;
-
-	// Backpropagation
-	C.xy = or_(C.xy, and_(C.zw, or_(L, R, U, D)));
-
-	// Checkerboard Smoothing
-	C.y = or_(C.y, min(U.y, float(eq(c,u))), min(D.y, float(eq(c,d))), min(L.y, float(eq(c,l))), min(R.y, float(eq(c,r))), min(UL, float(eq(c,ul))), min(UR, float(eq(c,ur))), min(DL, float(eq(c,dl))), min(DR, float(eq(c,dr))));
-
-   FragColor = vec4(C);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass4.slang b/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass4.slang
deleted file mode 100644
index 947f79507c..0000000000
--- a/bezel/Mega_Bezel/shaders/mdapt/hsm-mdapt-pass4.slang
+++ /dev/null
@@ -1,187 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 4
-   by Sp00kyFox, 2014
-
-   Blends pixels based on detected dithering patterns.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float VL;
-	float CB;
-	float DEBUG;
-	float linear_gamma;
-    float HSM_DEDITHER_MODE;
-    float CD_BLEND_LEVEL;
-} params;
-
-// #pragma parameter VL    "[DE-DITHERING]    MDAPT Vertical Lines"	0.0 0.0 1.0 1.0
-// #pragma parameter CB    "MDAPT Checkerboard"	1.0 0.0 1.0 1.0
-// #pragma parameter DEBUG "MDAPT Adjust View"	0.0 0.0 1.0 1.0
-// #pragma parameter linear_gamma "MDAPT Linear Gamma Blend"	0.0 0.0 1.0 1.0
-
-// const float VL = 0;
-const float CB = 1;
-const float DEBUG = 0;
-const float linear_gamma = 0;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES"	0 0 5 1
-#define HSM_DEDITHER_MODE  params.HSM_DEDITHER_MODE
-
-#pragma parameter CD_BLEND_LEVEL              "          Dedither Blend Amount"                1.0  0.0 1.0  0.02
-#define CD_BLEND_LEVEL             params.CD_BLEND_LEVEL
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PreMdaptPass;
-
-//#define TEX(dx,dy)   texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-//#define TEXt0(dx,dy) texture(PreMdaptPass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-vec4 TEX(float dx, float dy){
-	if(linear_gamma > 0.5) return pow(texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw), vec4(2.2));
-	else return texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw);
-}
-
-vec4 TEXt0(float dx, float dy){
-	if(linear_gamma > 0.5) return pow(texture(PreMdaptPass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw), vec4(2.2));
-	else return texture(PreMdaptPass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw);
-}
-
-bool eq(vec3 A, vec3 B){
-	return (A == B);
-}
-
-float and_(float a, float b){
-	return min(a,b);
-}
-
-float or_(float a, float b){
-	return max(a,b);
-}
-
-float or_(float a, float b, float c, float d, float e, float f, float g, float h, float i){
-	return max(a, max(b, max(c, max(d, max(e, max(f, max(g, max(h,i))))))));
-}
-
-vec2 and_(vec2 a, vec2 b){
-	return min(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b){
-	return max(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b, vec2 c, vec2 d){
-	return max(a, max(b, max(c,d)));
-}
-
-void main()
-{
-	/*
-		UL U UR
-		L  C R
-		DL D DR	
-	*/
-
-	if (HSM_DEDITHER_MODE < 1 || HSM_DEDITHER_MODE == 3)
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-
-	vec4 C = TEX( 0., 0.);		vec3 c = TEXt0( 0., 0.).xyz;
-	vec2 L = TEX(-1., 0.).xy;	vec3 l = TEXt0(-1., 0.).xyz;
-	vec2 R = TEX( 1., 0.).xy;	vec3 r = TEXt0( 1., 0.).xyz;
-	vec2 U = TEX( 0.,-1.).xy;
-	vec2 D = TEX( 0., 1.).xy;
-
-	float  prVL = 0.0,		prCB = 0.0;
-	vec3 fVL  = vec3(0.0),	fCB  = vec3(0.0);
-
-
-	// Backpropagation
-	C.xy = or_(C.xy, and_(C.zw, or_(L.xy, R.xy, U.xy, D.xy)));
-
-	// Modes 4 and 5 blend the Stripe/Jailbar dithering
-	if(HSM_DEDITHER_MODE > 3.5){
-		float prSum = L.x + R.x;		
-
-		prVL = max(L.x, R.x);
-		prVL = (prVL == 0.0) ? 1.0 : prSum/prVL;
-	
-		fVL  = (prVL*c + L.x*l + R.x*r)/(prVL + prSum);
-		prVL = C.x;
-	}
-
-
-	if(CB > 0.5){	
-		vec3 u = TEXt0( 0.,-1.).xyz;
-		vec3 d = TEXt0( 0., 1.).xyz;
-
-		float eqCL = float(eq(c,l));
-		float eqCR = float(eq(c,r));
-		float eqCU = float(eq(c,u));
-		float eqCD = float(eq(c,d));
-
-		float prU = or_(U.y, eqCU);
-		float prD = or_(D.y, eqCD);
-		float prL = or_(L.y, eqCL);
-		float prR = or_(R.y, eqCR);
-
-
-		float prSum = prU  + prD  + prL  + prR;
-
-		prCB = max(prL, max(prR, max(prU,prD)));
-		prCB = (prCB == 0.0) ? 1.0 : prSum/prCB; 
-		
-		//standard formula: C/2 + (L + R + D + U)/8
-		fCB = (prCB*c + prU*u + prD*d + prL*l + prR*r)/(prCB + prSum);
-
-
-		float UL = TEX(-1.,-1.).y;	vec3 ul = TEXt0(-1.,-1.).xyz;
-		float UR = TEX( 1.,-1.).y;	vec3 ur = TEXt0( 1.,-1.).xyz;
-		float DL = TEX(-1., 1.).y;	vec3 dl = TEXt0(-1., 1.).xyz;
-		float DR = TEX( 1., 1.).y;	vec3 dr = TEXt0( 1., 1.).xyz;
-
-		// Checkerboard Smoothing
-		prCB = or_(C.y, and_(L.y, eqCL), and_(R.y, eqCR), and_(U.y, eqCU), and_(D.y, eqCD), and_(UL, float(eq(c,ul))), and_(UR, float(eq(c,ur))), and_(DL, float(eq(c,dl))), and_(DR, float(eq(c,dr))));
-	}
-
-	if(DEBUG > 0.5)
-		FragColor = vec4(prVL, prCB, 0.0, 0.0);
-		
-	vec4 final = (prCB >= prVL) ? vec4(mix(c, fCB, prCB), 1.0) : vec4(mix(c, fVL, prVL), 1.0);
-
-	final = CD_BLEND_LEVEL * final + (1 - CD_BLEND_LEVEL) * texture(PreMdaptPass, vTexCoord);
-
-	FragColor = (linear_gamma > 0.5) ? pow(final, vec4(1.0 / 2.2)) : final;
-
-
-}
diff --git a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-hdr-pass.slang b/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-hdr-pass.slang
deleted file mode 100644
index 0b75ed6dd8..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-hdr-pass.slang
+++ /dev/null
@@ -1,108 +0,0 @@
-#version 450
-
-/* 
-A shader that tries to emulate a sony PVM type aperture grille screen but with full brightness.
-
-The novel thing about this shader is that it relies on the HDR shaders to brighten up the image so that when 
-we apply this shader which emulates the apperture grille the resulting screen isn't left too dark.  
-
-I think you need at least a DisplayHDR 600 monitor but to get close to CRT levels of brightness I think DisplayHDR 1000.
-
-Please Enable HDR in RetroArch 1.10+
-
-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.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen etc - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make and model are the make and model of the CRT you want.
-
-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
-{
-   // User Settings
-   float hcrt_hdr;
-   float hcrt_max_nits;
-   float hcrt_paper_white_nits;
-   float hcrt_expand_gamut;
-   float hcrt_colour_accurate;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} global;
-
-#include "include/parameters.h"
-
-#define HCRT_HDR                            params.hcrt_hdr
-#define HCRT_MAX_NITS                       params.hcrt_max_nits
-#define HCRT_PAPER_WHITE_NITS               params.hcrt_paper_white_nits
-#define HCRT_EXPAND_GAMUT                   params.hcrt_expand_gamut
-#define HCRT_COLOUR_ACCURATE                params.hcrt_colour_accurate
-
-#define COMPAT_TEXTURE(c, d) texture(c, d)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * vec2(1.00001);  // To resolve rounding issues when sampling
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "include/inverse_tonemap.h"
-#include "include/hdr10.h"
-
-vec3 InverseTonemapConditional(const vec3 linear)
-{
-   if(HCRT_HDR < 1.0f)
-   {
-      return linear;
-   }
-   else
-   {
-      return InverseTonemap(linear, HCRT_MAX_NITS, HCRT_PAPER_WHITE_NITS);
-   }
-}
- 
-void main()
-{
-   vec3 source = COMPAT_TEXTURE(Source, vTexCoord).rgb;
-
-   vec3 hdr_colour   = InverseTonemapConditional(source);
-
-   vec3 transformed_colour;
-
-   if((HCRT_HDR >= 1.0f) && (HCRT_COLOUR_ACCURATE < 1.0f))
-   {
-      const vec3 rec2020  = hdr_colour * k2020Gamuts[uint(HCRT_EXPAND_GAMUT)];
-      transformed_colour  = rec2020 * (HCRT_PAPER_WHITE_NITS / kMaxNitsFor2084);
-   }
-   else
-   {      
-      transformed_colour = hdr_colour;
-   }
-
-   FragColor = vec4(transformed_colour, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-no-reflect.slang b/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-no-reflect.slang
deleted file mode 100644
index 13c1bc1b8a..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-no-reflect.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-#define IS_NO_REFLECT_PRESET
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "crt-sony-megatron.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-potato.slang b/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-potato.slang
deleted file mode 100644
index a1c64a6e1c..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-potato.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-potato-params.inc"
-#include "../base/common/common-functions.inc"
-#include "crt-sony-megatron.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-source-pass.slang b/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-source-pass.slang
deleted file mode 100644
index 8feb7c1962..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron-source-pass.slang
+++ /dev/null
@@ -1,117 +0,0 @@
-#version 450
-
-/* 
-A shader that tries to emulate a sony PVM type aperture grille screen but with full brightness.
-
-The novel thing about this shader is that it relies on the HDR shaders to brighten up the image so that when 
-we apply this shader which emulates the apperture grille the resulting screen isn't left too dark.  
-
-I think you need at least a DisplayHDR 600 monitor but to get close to CRT levels of brightness I think DisplayHDR 1000.
-
-Please Enable HDR in RetroArch 1.10+
-
-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.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen etc - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make and model are the make and model of the CRT you want.
-
-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;
-   float hcrt_colour_space;
-   float hcrt_max_nits;
-   float hcrt_paper_white_nits;
-   float hcrt_lcd_resolution;
-   float hcrt_lcd_subpixel;
-   float hcrt_colour_system;
-   float hcrt_expand_gamut;
-   float hcrt_white_temperature;
-   float hcrt_brightness;
-   float hcrt_contrast;
-   float hcrt_saturation;
-   float hcrt_gamma_in;
-   float hcrt_colour_accurate;
-} params;
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} global;
-
-
-// #include "../base/common/globals-and-screen-scale-params.inc"
-// #include "../base/common/helper-functions.inc"
-
-#include "include/parameters.h"
-
-#define HCRT_HDR                            params.hcrt_hdr
-#define HCRT_OUTPUT_COLOUR_SPACE            params.hcrt_colour_space
-#define HCRT_CRT_COLOUR_SYSTEM              params.hcrt_colour_system
-#define HCRT_WHITE_TEMPERATURE              params.hcrt_white_temperature
-#define HCRT_BRIGHTNESS                     params.hcrt_brightness
-#define HCRT_CONTRAST                       params.hcrt_contrast
-#define HCRT_SATURATION                     params.hcrt_saturation
-#define HCRT_GAMMA_IN                       params.hcrt_gamma_in
-#define HCRT_COLOUR_ACCURATE                params.hcrt_colour_accurate
-
-#define COMPAT_TEXTURE(c, d) texture(c, d)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * vec2(1.00001);  // To resolve rounding issues when sampling
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "include/colour_grade.h"
-
-void main()
-{
-   vec3 source = COMPAT_TEXTURE(Source, vTexCoord).rgb;
-
-   const vec3 colour   = ColourGrade(source);
-
-   vec3 transformed_colour;
-
-   if((HCRT_HDR < 1.0f) && (HCRT_COLOUR_ACCURATE < 1.0f))
-   {
-      if(HCRT_OUTPUT_COLOUR_SPACE == 2.0f)
-      {
-         transformed_colour = (colour * k709_to_XYZ) * kXYZ_to_DCIP3; 
-      }
-      else
-      {
-         transformed_colour = colour;
-      }
-   }
-   else
-   {
-      transformed_colour = colour;
-   }
-
-   FragColor = vec4(transformed_colour, 1.0);
-}
diff --git a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron.inc b/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron.inc
deleted file mode 100644
index f524dd7db4..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron.inc
+++ /dev/null
@@ -1,1726 +0,0 @@
-/* 
-A shader that tries to emulate a sony PVM type aperture grille screen but with full brightness.
-
-The novel thing about this shader is that it relies on the HDR shaders to brighten up the image so that when 
-we apply this shader which emulates the apperture grille the resulting screen isn't left too dark.  
-
-I think you need at least a DisplayHDR 600 monitor but to get close to CRT levels of brightness I think DisplayHDR 1000.
-
-Please Enable HDR in RetroArch 1.10+
-
-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.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen etc - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make and model are the make and model of the CRT you want.
-
-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)
-*/
-
-#define ENABLE_BLACK_WHITE_MASKS 0
-
-// HSM Removed, For the Mega Bezel this is not the final pass
-// #pragma format A2B10G10R10_UNORM_PACK32
-
-layout(push_constant) uniform Push
-{
-   // User Settings
-   float hcrt_hdr;
-   float hcrt_colour_space;
-   float hcrt_max_nits;
-   float hcrt_paper_white_nits;
-   float hcrt_expand_gamut;
-   float hcrt_gamma_out;
-   float hcrt_colour_accurate;
-
-   float hcrt_lcd_resolution;
-   float hcrt_lcd_subpixel;
-
-   float hcrt_red_vertical_convergence;
-   float hcrt_green_vertical_convergence;
-   float hcrt_blue_vertical_convergence;
-   float hcrt_red_horizontal_convergence;
-   float hcrt_green_horizontal_convergence;
-   float hcrt_blue_horizontal_convergence;
-
-   // Developer Settings
-   float hcrt_crt_screen_type;
-   float hcrt_crt_resolution;
-
-   // Vertical Settings
-   float hcrt_red_scanline_min;
-   float hcrt_red_scanline_max;
-   float hcrt_red_scanline_attack;
-   float hcrt_green_scanline_min;
-   float hcrt_green_scanline_max;
-   float hcrt_green_scanline_attack;
-   float hcrt_blue_scanline_min;
-   float hcrt_blue_scanline_max;
-   float hcrt_blue_scanline_attack;
-
-   // Horizontal Settings
-   float hcrt_red_beam_sharpness;
-   float hcrt_red_beam_attack;
-   float hcrt_green_beam_sharpness;
-   float hcrt_green_beam_attack;
-   float hcrt_blue_beam_sharpness;
-   float hcrt_blue_beam_attack;
-
-} params;
-
-/* HSM Removed
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-
-   float hcrt_h_size;
-   float hcrt_v_size;
-   float hcrt_h_cent;
-   float hcrt_v_cent;
-   float hcrt_pin_phase;
-   float hcrt_pin_amp;
-} global;
-*/
-
-#include "include/parameters.h"
-
-#define HCRT_HDR                             params.hcrt_hdr
-#define HCRT_OUTPUT_COLOUR_SPACE             params.hcrt_colour_space
-#define HCRT_MAX_NITS                        params.hcrt_max_nits
-#define HCRT_PAPER_WHITE_NITS                params.hcrt_paper_white_nits
-#define HCRT_EXPAND_GAMUT                    params.hcrt_expand_gamut
-#define HCRT_GAMMA_OUT                       params.hcrt_gamma_out
-#define HCRT_COLOUR_ACCURATE                 params.hcrt_colour_accurate
-
-#define HCRT_LCD_RESOLUTION                  params.hcrt_lcd_resolution 
-#define HCRT_LCD_SUBPIXEL                    params.hcrt_lcd_subpixel
-#define HCRT_RED_VERTICAL_CONVERGENCE        params.hcrt_red_vertical_convergence
-#define HCRT_GREEN_VERTICAL_CONVERGENCE      params.hcrt_green_vertical_convergence
-#define HCRT_BLUE_VERTICAL_CONVERGENCE       params.hcrt_blue_vertical_convergence
-#define HCRT_RED_HORIZONTAL_CONVERGENCE      params.hcrt_red_horizontal_convergence
-#define HCRT_GREEN_HORIZONTAL_CONVERGENCE    params.hcrt_green_horizontal_convergence
-#define HCRT_BLUE_HORIZONTAL_CONVERGENCE     params.hcrt_blue_horizontal_convergence
-
-#define HCRT_CRT_SCREEN_TYPE                 params.hcrt_crt_screen_type
-#define HCRT_CRT_RESOLUTION                  params.hcrt_crt_resolution
-
-#define HCRT_RED_SCANLINE_MIN                params.hcrt_red_scanline_min
-#define HCRT_RED_SCANLINE_MAX                params.hcrt_red_scanline_max
-#define HCRT_RED_SCANLINE_ATTACK             params.hcrt_red_scanline_attack
-#define HCRT_GREEN_SCANLINE_MIN              params.hcrt_green_scanline_min
-#define HCRT_GREEN_SCANLINE_MAX              params.hcrt_green_scanline_max
-#define HCRT_GREEN_SCANLINE_ATTACK           params.hcrt_green_scanline_attack
-#define HCRT_BLUE_SCANLINE_MIN               params.hcrt_blue_scanline_min
-#define HCRT_BLUE_SCANLINE_MAX               params.hcrt_blue_scanline_max
-#define HCRT_BLUE_SCANLINE_ATTACK            params.hcrt_blue_scanline_attack
-
-#define HCRT_RED_BEAM_SHARPNESS              params.hcrt_red_beam_sharpness
-#define HCRT_RED_BEAM_ATTACK                 params.hcrt_red_beam_attack
-#define HCRT_GREEN_BEAM_SHARPNESS            params.hcrt_green_beam_sharpness
-#define HCRT_GREEN_BEAM_ATTACK               params.hcrt_green_beam_attack
-#define HCRT_BLUE_BEAM_SHARPNESS             params.hcrt_blue_beam_sharpness
-#define HCRT_BLUE_BEAM_ATTACK                params.hcrt_blue_beam_attack
-
-#define HCRT_H_SIZE                          global.hcrt_h_size
-#define HCRT_V_SIZE                          global.hcrt_v_size
-#define HCRT_H_CENT                          global.hcrt_h_cent
-#define HCRT_V_CENT                          global.hcrt_v_cent
-#define HCRT_PIN_PHASE                       global.hcrt_pin_phase
-#define HCRT_PIN_AMP                         global.hcrt_pin_amp
-
-/* HSM Removed
-#define COMPAT_TEXTURE(c, d) texture(c, d)
-*/
-
-// HSM Added
-#define COMPAT_TEXTURE(c,d) HSM_GetCroppedTexSample(c,d)
-// End Addition
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * vec2(1.00001);  // To resolve rounding issues when sampling
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D SourceSDR;
-layout(set = 0, binding = 3) uniform sampler2D SourceHDR;
-layout(set = 0, binding = 4) uniform sampler2D InfoCachePass;
-layout(set = 0, binding = 5) uniform sampler2D AvgLumPass;
-
-
-#define kChannelMask          3
-#define kFirstChannelShift    2
-#define kSecondChannelShift   4
-#define kThirdChannelShift    6
-
-#define kRedId   0
-#define kGreenId 1
-#define kBlueId  2
-
-#define kRed     (1 | (kRedId << kFirstChannelShift))
-#define kGreen   (1 | (kGreenId << kFirstChannelShift))
-#define kBlue    (1 | (kBlueId << kFirstChannelShift))
-#define kMagenta (2 | (kRedId << kFirstChannelShift) | (kBlueId << kSecondChannelShift))
-#define kYellow  (2 | (kRedId << kFirstChannelShift) | (kGreenId << kSecondChannelShift))
-#define kCyan    (2 | (kGreenId << kFirstChannelShift) | (kBlueId << kSecondChannelShift))
-#define kWhite   (3 | (kRedId << kFirstChannelShift) | (kGreenId << kSecondChannelShift) | (kBlueId << kThirdChannelShift))
-#define kBlack   0
-
-#define kRedChannel     vec3(1.0, 0.0, 0.0)
-#define kGreenChannel   vec3(0.0, 1.0, 0.0)
-#define kBlueChannel    vec3(0.0, 0.0, 1.0)
-
-const vec3 kColourMask[3] = { kRedChannel, kGreenChannel, kBlueChannel };
-
-#define kApertureGrille    0
-#define kShadowMask        1
-#define kSlotMask          2
-#define kBlackWhiteMask    3
-
-#define kBGRAxis           3
-#define kTVLAxis           4
-#define kResolutionAxis    3
-
-// APERTURE GRILLE MASKS
-
-const float kApertureGrilleMaskSize[kResolutionAxis][kTVLAxis] = { 
-   { 4.0f, 2.0f, 1.0f, 1.0f },      // 1080p:   300 TVL, 600 TVL, 800 TVL, 1000 TVL 
-   { 7.0f, 4.0f, 3.0f, 2.0f },      // 4K:      300 TVL, 600 TVL, 800 TVL, 1000 TVL   
-   { 13.0f, 7.0f, 5.0f, 4.0f } };   // 8K:      300 TVL, 600 TVL, 800 TVL, 1000 TVL
-
-
-// 1080p 
-
-// 300TVL
-#define kMaxApertureGrilleSize       4
-
-#define kRGBX           { kRed, kGreen, kBlue, kBlack }
-#define kRBGX           { kRed, kBlue, kGreen, kBlack }
-#define kBGRX           { kBlue, kGreen, kRed, kBlack }
-
-const uint kApertureGrilleMasks1080p300TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{
-   kRGBX, kRBGX, kBGRX
-};
-
-#undef kMaxApertureGrilleSize
-
-#undef kRGBX           
-#undef kRBGX           
-#undef kBGRX  
-
-// 600TVL
-#define kMaxApertureGrilleSize       2
-
-#define kMG             { kMagenta, kGreen }
-#define kYB             { kYellow, kBlue }
-#define kGM             { kGreen, kMagenta }
-
-const uint kApertureGrilleMasks1080p600TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{
-   kMG, kYB, kGM
-};
-
-#undef kMaxApertureGrilleSize
-
-#undef kMG             
-#undef kYB             
-#undef kGM             
-
-// 800TVL
-#define kMaxApertureGrilleSize       1
-
-#define kW              { kWhite }
-
-const uint kApertureGrilleMasks1080p800TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{
-   kW, kW, kW
-};
-
-// 1000TVL
-const uint kApertureGrilleMasks1080p1000TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{
-   kW, kW, kW
-};
-
-#undef kMaxApertureGrilleSize   
-
-#undef kW              
-
-
-// 4K 
-
-// 300TVL
-#define kMaxApertureGrilleSize       7
-
-#define kRRGGBBX        { kRed, kRed, kGreen, kGreen, kBlue, kBlue, kBlack }
-#define kRRBBGGX        { kRed, kRed, kBlue, kBlue, kGreen, kGreen, kBlack }
-#define kBBGGRRX        { kBlue, kBlue, kGreen, kGreen, kRed, kRed, kBlack }
-
-const uint kApertureGrilleMasks4K300TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kRRGGBBX, kRRBBGGX, kBBGGRRX
-};
-
-#undef kMaxApertureGrilleSize 
-
-#undef kRRGGBBX        
-#undef kRRBBGGX       
-#undef kBBGGRRX  
-
-// 600TVL
-#define kMaxApertureGrilleSize       4
-
-#define kRGBX           { kRed, kGreen, kBlue, kBlack }
-#define kRBGX           { kRed, kBlue, kGreen, kBlack }
-#define kBGRX           { kBlue, kGreen, kRed, kBlack }
-
-const uint kApertureGrilleMasks4K600TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kRGBX, kRBGX, kBGRX 
-};
-
-#undef kMaxApertureGrilleSize 
-
-#undef kRGBX           
-#undef kRBGX           
-#undef kBGRX             
-
-// 800TVL
-#define kMaxApertureGrilleSize       3
-
-#define kRGB            { kRed, kGreen, kBlue }
-#define kGBR            { kGreen, kBlue, kRed }
-#define kBGR            { kBlue, kGreen, kRed }
-
-const uint kApertureGrilleMasks4K800TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kBGR, kGBR, kRGB 
-};
-
-#undef kMaxApertureGrilleSize 
-
-#undef kRGB            
-#undef kGBR            
-#undef kBGR            
-
-// 1000TVL
-#define kMaxApertureGrilleSize       2
-
-#define kMG             { kMagenta, kGreen }
-#define kYB             { kYellow, kBlue }
-#define kGM             { kGreen, kMagenta }
-
-const uint kApertureGrilleMasks4K1000TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kMG, kYB, kGM
-};
-
-#undef kMaxApertureGrilleSize  
-
-#undef kMG             
-#undef kYB             
-#undef kGM             
-
-
-// 8K 
-
-// 300 TVL
-#define kMaxApertureGrilleSize       13
-
-#define kRRRRGGGGBBBBX  { kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kBlack }
-#define kRRRRBBBBGGGGX  { kRed, kRed, kRed, kRed, kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kBlack }
-#define kBBBBGGGGRRRRX  { kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kRed, kRed, kRed, kRed, kBlack }
-
-const uint kApertureGrilleMasks8K300TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kRRRRGGGGBBBBX, kRRRRBBBBGGGGX, kBBBBGGGGRRRRX
-};
-
-#undef kMaxApertureGrilleSize 
-
-#undef kRRRRGGGGBBBBX  
-#undef kRRRRBBBBGGGGX  
-#undef kBBBBGGGGRRRRX  
-
-// 600 TVL
-#define kMaxApertureGrilleSize       7
-
-#define kRRGGBBX        { kRed, kRed, kGreen, kGreen, kBlue, kBlue, kBlack }
-#define kRRBBGGX        { kRed, kRed, kBlue, kBlue, kGreen, kGreen, kBlack }
-#define kBBGGRRX        { kBlue, kBlue, kGreen, kGreen, kRed, kRed, kBlack }
-
-const uint kApertureGrilleMasks8K600TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kRRGGBBX, kRRBBGGX, kBBGGRRX 
-};
-
-#undef kMaxApertureGrilleSize 
-
-#undef kRRGGBBX        
-#undef kRRBBGGX       
-#undef kBBGGRRX        
-
-// 800 TVL
-#define kMaxApertureGrilleSize       5
-
-#define kRYCBX          { kRed, kYellow, kCyan, kBlue, kBlack }
-#define kRMCGX          { kRed, kMagenta, kCyan, kGreen, kBlack }
-#define kBCYRX          { kBlue, kCyan, kYellow, kRed, kBlack }
-
-const uint kApertureGrilleMasks8K800TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kRYCBX, kRMCGX, kBCYRX
-};
-
-#undef kMaxApertureGrilleSize 
-
-#undef kRYCBX          
-#undef kRMCGX          
-#undef kBCYRX          
-
-// 1000 TVL
-#define kMaxApertureGrilleSize       4
-
-#define kRGBX           { kRed, kGreen, kBlue, kBlack }
-#define kRBGX           { kRed, kBlue, kGreen, kBlack }
-#define kBGRX           { kBlue, kGreen, kRed, kBlack }
-
-const uint kApertureGrilleMasks8K1000TVL[kBGRAxis][kMaxApertureGrilleSize] = 
-{ 
-   kRGBX, kRBGX, kBGRX 
-};
-
-#undef kMaxApertureGrilleSize  
-
-#undef kRGBX           
-#undef kRBGX           
-#undef kBGRX            
-
-
-// SHADOW MASKS
-
-const float kShadowMaskSizeX[kResolutionAxis][kTVLAxis] = { { 6.0f, 2.0f, 1.0f, 1.0f }, { 12.0f, 6.0f, 2.0f, 2.0f }, { 12.0f, 12.0f, 6.0f, 6.0f } }; 
-const float kShadowMaskSizeY[kResolutionAxis][kTVLAxis] = { { 4.0f, 2.0f, 1.0f, 1.0f }, {  8.0f, 4.0f, 2.0f, 2.0f }, {  8.0f,  8.0f, 4.0f, 4.0f } }; 
-
-
-// 1080p 
-
-
-#define kXXXX              { kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-
-// 300 TVL
-#define kMaxShadowMaskSizeX     6
-#define kMaxShadowMaskSizeY     4
-
-#define kGRRBBG            { kGreen, kRed, kRed, kBlue, kBlue, kGreen }
-#define kBBGGRR            { kBlue, kBlue, kGreen, kGreen, kRed, kRed }
-
-#define kBRRGGB            { kBlue, kRed, kRed, kGreen, kGreen, kBlue }
-#define kGGBBRR            { kGreen, kGreen, kBlue, kBlue, kRed, kRed }
-
-#define kGBBRRG            { kGreen, kBlue, kBlue, kRed, kRed, kGreen }
-#define kRRGGBB            { kRed, kRed, kGreen, kGreen, kBlue, kBlue }
-
-#define kGRRBBG_GRRBBG_BBGGRR_BBGGRR  { kGRRBBG, kGRRBBG, kBBGGRR, kBBGGRR }
-#define kBRRGGB_BRRGGB_GGBBRR_GGBBRR  { kBRRGGB, kBRRGGB, kGGBBRR, kGGBBRR }
-#define kGBBRRG_GBBRRG_RRGGBB_RRGGBB  { kGBBRRG, kGBBRRG, kRRGGBB, kRRGGBB }
-
-const uint kShadowMasks1080p300TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kGRRBBG_GRRBBG_BBGGRR_BBGGRR, kBRRGGB_BRRGGB_GGBBRR_GGBBRR, kGBBRRG_GBBRRG_RRGGBB_RRGGBB        // 300 TVL
-};
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kGRRBBG           
-#undef kBBGGRR       
-    
-#undef kBRRGGB            
-#undef kGGBBRR       
-
-#undef kGBBRRG            
-#undef kRRGGBB            
-
-#undef kGRRBBG_GRRBBG_BBGGRR_BBGGRR  
-#undef kBRRGGB_BRRGGB_GGBBRR_GGBBRR  
-#undef kGBBRRG_GBBRRG_RRGGBB_RRGGBB 
-
-
-// 600 TVL
-#define kMaxShadowMaskSizeX     2
-#define kMaxShadowMaskSizeY     2
-
-#define kMG                { kMagenta, kGreen }
-#define kGM                { kGreen, kMagenta }
-
-#define kYB                { kYellow, kBlue }
-#define kBY                { kBlue, kYellow }
-
-#define kMG_GM             { kMG, kGM }
-#define kYB_BY             { kYB, kBY }
-#define kGM_MG             { kGM, kMG }
-
-const uint kShadowMasks1080p600TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kMG_GM, kYB_BY, kGM_MG                                                                          // 600 TVL
-};
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kMG               
-#undef kGM    
-
-#undef kYB                
-#undef kBY           
-
-#undef kMG_GM             
-#undef kYB_BY             
-#undef kGM_MG             
-
-// 800 TVL
-#define kMaxShadowMaskSizeX     1
-#define kMaxShadowMaskSizeY     1
-
-#define kW                 { kWhite }
-#define kW_W               { kW }
-
-const uint kShadowMasks1080p800TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kW_W, kW_W, kW_W                                                                                // 800 TVL
-};
-
-// 1000 TVL
-const uint kShadowMasks1080p1000TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kW_W, kW_W, kW_W                                                                                // 1000 TVL
-};
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kW       
-#undef kW_W
-
-
-// 4K
-
-// 300 TVL
-
-#define kMaxShadowMaskSizeX     12
-#define kMaxShadowMaskSizeY     8
-
-#define kGGRRRRBBBBGG      { kGreen, kGreen, kRed, kRed, kRed, kRed, kBlue, kBlue, kBlue, kBlue, kGreen, kGreen }
-#define kBBBBGGGGRRRR      { kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kRed, kRed, kRed, kRed }
-
-#define kBBRRRRGGGGBB      { kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue }
-#define kGGGGBBBBRRRR      { kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed }
-
-#define kGGBBBBRRRRGG      { kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen }
-#define kRRRRGGGGBBBB      { kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue }
-
-#define kGGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR  { kGGRRRRBBBBGG, kGGRRRRBBBBGG, kGGRRRRBBBBGG, kGGRRRRBBBBGG, kBBBBGGGGRRRR, kBBBBGGGGRRRR, kBBBBGGGGRRRR, kBBBBGGGGRRRR }
-#define kBBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR  { kBBRRRRGGGGBB, kBBRRRRGGGGBB, kBBRRRRGGGGBB, kBBRRRRGGGGBB, kGGGGBBBBRRRR, kGGGGBBBBRRRR, kGGGGBBBBRRRR, kGGGGBBBBRRRR }
-#define kGGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB  { kGGBBBBRRRRGG, kGGBBBBRRRRGG, kGGBBBBRRRRGG, kGGBBBBRRRRGG, kRRRRGGGGBBBB, kRRRRGGGGBBBB, kRRRRGGGGBBBB, kRRRRGGGGBBBB }
-
-const uint kShadowMasks4K300TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kGGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR, 
-   kBBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR,
-   kGGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB                                                                                         
-};
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kGGRRRRBBBBGG      
-#undef kBBBBGGGGRRRR   
-
-#undef kBBRRRRGGGGBB     
-#undef kGGGGBBBBRRRR    
-
-#undef kGGBBBBRRRRGG      
-#undef kRRRRGGGGBBBB      
-
-#undef kGGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR  
-#undef kBBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR  
-#undef kGGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB  
-
-
-// 600 TVL
-
-#define kMaxShadowMaskSizeX     6
-#define kMaxShadowMaskSizeY     4
-
-#define kGRRBBG            { kGreen, kRed, kRed, kBlue, kBlue, kGreen }
-#define kBBGGRR            { kBlue, kBlue, kGreen, kGreen, kRed, kRed }
-
-#define kBRRGGB            { kBlue, kRed, kRed, kGreen, kGreen, kBlue }
-#define kGGBBRR            { kGreen, kGreen, kBlue, kBlue, kRed, kRed }
-
-#define kGBBRRG            { kGreen, kBlue, kBlue, kRed, kRed, kGreen }
-#define kRRGGBB            { kRed, kRed, kGreen, kGreen, kBlue, kBlue }
-
-#define kGRRBBG_GRRBBG_BBGGRR_BBGGRR  { kGRRBBG, kGRRBBG, kBBGGRR, kBBGGRR }
-#define kBRRGGB_BRRGGB_GGBBRR_GGBBRR  { kBRRGGB, kBRRGGB, kGGBBRR, kGGBBRR }
-#define kGBBRRG_GBBRRG_RRGGBB_RRGGBB  { kGBBRRG, kGBBRRG, kRRGGBB, kRRGGBB }
-
-const uint kShadowMasks4K600TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kGRRBBG_GRRBBG_BBGGRR_BBGGRR, kBRRGGB_BRRGGB_GGBBRR_GGBBRR, kGBBRRG_GBBRRG_RRGGBB_RRGGBB
-};
-
-#undef kGRRBBG_GRRBBG_BBGGRR_BBGGRR  
-#undef kBRRGGB_BRRGGB_GGBBRR_GGBBRR  
-#undef kGBBRRG_GBBRRG_RRGGBB_RRGGBB 
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kGRRBBG           
-#undef kBBGGRR    
-
-#undef kBRRGGB            
-#undef kGGBBRR      
-
-#undef kGBBRRG            
-#undef kRRGGBB         
-
-
-// 800 TVL
-
-#define kMaxShadowMaskSizeX     2
-#define kMaxShadowMaskSizeY     2
-
-#define kMG                { kMagenta, kGreen }
-#define kGM                { kGreen, kMagenta }
-
-#define kYB                { kYellow, kBlue }
-#define kBY                { kBlue, kYellow }
-
-#define kMG_GM             { kMG, kGM }
-#define kYB_BY             { kYB, kBY }
-#define kGM_MG             { kGM, kMG }
-
-const uint kShadowMasks4K800TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kMG_GM, kYB_BY, kGM_MG
-};
-
-// 1000 TVL
-const uint kShadowMasks4K1000TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kMG_GM, kYB_BY, kGM_MG
-};
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kXXXX     
-
-#undef kMG               
-#undef kGM    
-
-#undef kYB                
-#undef kBY         
-
-#undef kMG_GM             
-#undef kYB_BY             
-#undef kGM_MG         
-
-
-// 8K 
-
-// 300 TVL
-#define kMaxShadowMaskSizeX     12
-#define kMaxShadowMaskSizeY     8
-
-#define kGGRRRRBBBBGG      { kGreen, kGreen, kRed, kRed, kRed, kRed, kBlue, kBlue, kBlue, kBlue, kGreen, kGreen }
-#define kBBBBGGGGRRRR      { kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kRed, kRed, kRed, kRed }
-
-#define kBBRRRRGGGGBB      { kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue }
-#define kGGGGBBBBRRRR      { kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed }
-
-#define kGGBBBBRRRRGG      { kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen }
-#define kRRRRGGGGBBBB      { kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue }
-
-#define kGGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR  { kGGRRRRBBBBGG, kGGRRRRBBBBGG, kGGRRRRBBBBGG, kGGRRRRBBBBGG, kBBBBGGGGRRRR, kBBBBGGGGRRRR, kBBBBGGGGRRRR, kBBBBGGGGRRRR }
-#define kBBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR  { kBBRRRRGGGGBB, kBBRRRRGGGGBB, kBBRRRRGGGGBB, kBBRRRRGGGGBB, kGGGGBBBBRRRR, kGGGGBBBBRRRR, kGGGGBBBBRRRR, kGGGGBBBBRRRR }
-#define kGGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB  { kGGBBBBRRRRGG, kGGBBBBRRRRGG, kGGBBBBRRRRGG, kGGBBBBRRRRGG, kRRRRGGGGBBBB, kRRRRGGGGBBBB, kRRRRGGGGBBBB, kRRRRGGGGBBBB }
-
-const uint kShadowMasks8K300TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kGGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR,
-   kBBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR,
-   kGGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB                    
-};
-
-// 600 TVL
-const uint kShadowMasks8K600TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kGGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR, 
-   kBBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR,
-   kGGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB
-};
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kGGRRRRBBBBGG      
-#undef kBBBBGGGGRRRR      
-
-#undef kBBRRRRGGGGBB     
-#undef kGGGGBBBBRRRR      
-
-#undef kGGBBBBRRRRGG      
-#undef kRRRRGGGGBBBB      
-
-#undef kGGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_GGRRRRBBBBGG_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR_BBBBGGGGRRRR  
-#undef kBBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_BBRRRRGGGGBB_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR_GGGGBBBBRRRR  
-#undef kGGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_GGBBBBRRRRGG_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB_RRRRGGGGBBBB  
-
-// 800 TVL
-#define kMaxShadowMaskSizeX     6
-#define kMaxShadowMaskSizeY     4
-
-#define kGRRBBG            { kGreen, kRed, kRed, kBlue, kBlue, kGreen }
-#define kBBGGRR            { kBlue, kBlue, kGreen, kGreen, kRed, kRed }
-
-#define kBRRGGB            { kBlue, kRed, kRed, kGreen, kGreen, kBlue }
-#define kGGBBRR            { kGreen, kGreen, kBlue, kBlue, kRed, kRed }
-
-#define kGBBRRG            { kGreen, kBlue, kBlue, kRed, kRed, kGreen }
-#define kRRGGBB            { kRed, kRed, kGreen, kGreen, kBlue, kBlue }
-
-#define kGRRBBG_GRRBBG_BBGGRR_BBGGRR  { kGRRBBG, kGRRBBG, kBBGGRR, kBBGGRR }
-#define kBRRGGB_BRRGGB_GGBBRR_GGBBRR  { kBRRGGB, kBRRGGB, kGGBBRR, kGGBBRR }
-#define kGBBRRG_GBBRRG_RRGGBB_RRGGBB  { kGBBRRG, kGBBRRG, kRRGGBB, kRRGGBB }
-
-const uint kShadowMasks8K800TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kGRRBBG_GRRBBG_BBGGRR_BBGGRR, kBRRGGB_BRRGGB_GGBBRR_GGBBRR, kGBBRRG_GBBRRG_RRGGBB_RRGGBB
-};
-
-// 1000 TVL
-const uint kShadowMasks8K1000TVL[kBGRAxis][kMaxShadowMaskSizeY][kMaxShadowMaskSizeX]  = 
-{
-   kGRRBBG_GRRBBG_BBGGRR_BBGGRR, kBRRGGB_BRRGGB_GGBBRR_GGBBRR, kGBBRRG_GBBRRG_RRGGBB_RRGGBB
-};
-
-#undef kMaxShadowMaskSizeX 
-#undef kMaxShadowMaskSizeY 
-
-#undef kGRRBBG           
-#undef kBBGGRR            
-
-#undef kBRRGGB            
-#undef kGGBBRR            
-
-#undef kGBBRRG            
-#undef kRRGGBB         
-
-#undef kGRRBBG_GRRBBG_BBGGRR_BBGGRR  
-#undef kBRRGGB_BRRGGB_GGBBRR_GGBBRR  
-#undef kGBBRRG_GBBRRG_RRGGBB_RRGGBB 
-
-// SLOT MASKS
-
-#define kMaxSlotSizeX      2
-
-const float kSlotMaskSizeX[kResolutionAxis][kTVLAxis] = { { 4.0f, 2.0f, 1.0f, 1.0f }, { 7.0f, 4.0f, 3.0f, 2.0f }, { 7.0f, 7.0f, 5.0f, 4.0f } }; //1080p: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   4K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   8K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL
-const float kSlotMaskSizeY[kResolutionAxis][kTVLAxis] = { { 4.0f, 4.0f, 1.0f, 1.0f }, { 8.0f, 6.0f, 4.0f, 4.0f }, { 6.0f, 6.0f, 4.0f, 4.0f } }; //1080p: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   4K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   8K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL
-
-
-// 1080p 
-
-
-// 300 TVL
-#define kMaxSlotMaskSize   4
-#define kMaxSlotSizeY      4
-
-#define kXXXX     { kBlack, kBlack, kBlack, kBlack }
-
-#define kRGBX     { kRed, kGreen, kBlue, kBlack }
-#define kRBGX     { kRed, kBlue, kGreen, kBlack }
-#define kBGRX     { kBlue, kGreen, kRed, kBlack }
-
-#define kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX   { { kRGBX, kRGBX }, { kRGBX, kXXXX }, { kRGBX, kRGBX }, { kXXXX, kRGBX } }
-#define kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX   { { kRBGX, kRBGX }, { kRBGX, kXXXX }, { kRBGX, kRBGX }, { kXXXX, kRBGX } }
-#define kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX   { { kBGRX, kBGRX }, { kBGRX, kXXXX }, { kBGRX, kBGRX }, { kXXXX, kBGRX } }
-
-const uint kSlotMasks1080p300TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX, kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX, kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX                                                                                       
-};
-
-#undef kMaxSlotMaskSize  
-#undef kMaxSlotSizeY     
-
-#undef kXXXX
-
-#undef kRGBX     
-#undef kRBGX
-#undef kBGRX     
-
-#undef kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX   
-#undef kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX   
-#undef kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX     
-
-
-// 600 TVL
-#define kMaxSlotMaskSize   2
-#define kMaxSlotSizeY      4
-
-#define kXX     { kBlack, kBlack }
-
-#define kMG       { kMagenta, kGreen }
-#define kYB       { kYellow, kBlue }
-#define kGM       { kGreen, kMagenta }
-
-#define kMGMG_MGXX_MGMG_XXMG   { { kMG, kMG }, { kMG, kXX }, { kMG, kMG }, { kXX, kMG } }
-#define kYBYB_YBXX_YBYB_XXYB   { { kYB, kYB }, { kYB, kXX }, { kYB, kYB }, { kXX, kYB } }
-#define kGMGM_GMXX_GMGM_XXGM   { { kGM, kGM }, { kGM, kXX }, { kGM, kGM }, { kXX, kGM } }
-
-const uint kSlotMasks1080p600TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kMGMG_MGXX_MGMG_XXMG, kYBYB_YBXX_YBYB_XXYB, kGMGM_GMXX_GMGM_XXGM
-};
-
-#undef kMaxSlotMaskSize  
-#undef kMaxSlotSizeY     
-
-#undef kXX
-
-#undef kMG     
-#undef kYB  
-#undef kGM        
-
-#undef kMGMG_MGXX_MGMG_XXMG  
-#undef kYBYB_YBXX_YBYB_XXYB   
-#undef kGMGM_GMXX_GMGM_XXGM  
-
-
-// 800 TVL
-#define kMaxSlotMaskSize   1
-#define kMaxSlotSizeY      4
-
-#define kX        { kBlack }
-#define kW        { kWhite }
-
-#define kW_W_W_W   { { kW, kW }, { kW, kX }, { kW, kW }, { kX, kW } }
-
-const uint kSlotMasks1080p800TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kW_W_W_W, kW_W_W_W, kW_W_W_W
-};
-
-// 1000 TVL
-const uint kSlotMasks1080p1000TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kW_W_W_W, kW_W_W_W, kW_W_W_W 
-};
-
-#undef kMaxSlotMaskSize  
-#undef kMaxSlotSizeY     
-
-#undef kX  
-#undef kW   
-
-#undef kW_W_W_W 
-
-
-// 4K
-
-// 300 TVL
-#define kMaxSlotMaskSize   7
-#define kMaxSlotSizeY      8
-
-#define kXXXX     { kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-
-#define kRRGGBBX  { kRed, kRed, kGreen, kGreen, kBlue, kBlue, kBlack }
-#define kRRBBGGX  { kRed, kRed, kBlue, kBlue, kGreen, kGreen, kBlack }
-#define kBBGGRRX  { kBlue, kBlue, kGreen, kGreen, kRed, kRed, kBlack }
-
-#define kRRGGBBXRRGGBBX_RRGGBBXRRGGBBX_RRGGBBXXXXX_RRGGBBXRRGGBBX_RRGGBBXRRGGBBX_XXXXRRGGBBX   { { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kXXXX }, { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kRRGGBBX }, { kXXXX, kRRGGBBX } }
-#define kRRBBGGXRRBBGGX_RRBBGGXRRBBGGX_RRBBGGXXXXX_RRBBGGXRRBBGGX_RRBBGGXRRBBGGX_XXXXRRBBGGX   { { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kXXXX }, { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kRRBBGGX }, { kXXXX, kRRBBGGX } }
-#define kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX   { { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kXXXX }, { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kBBGGRRX }, { kXXXX, kBBGGRRX } }
-
-const uint kSlotMasks4K300TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kRRGGBBXRRGGBBX_RRGGBBXRRGGBBX_RRGGBBXXXXX_RRGGBBXRRGGBBX_RRGGBBXRRGGBBX_XXXXRRGGBBX, kRRBBGGXRRBBGGX_RRBBGGXRRBBGGX_RRBBGGXXXXX_RRBBGGXRRBBGGX_RRBBGGXRRBBGGX_XXXXRRBBGGX, kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX
-};
-
-#undef kMaxSlotMaskSize   
-#undef kMaxSlotSizeY   
-
-#undef kXXXX    
-  
-#undef kRRGGBBX  
-#undef kRRBBGGX  
-#undef kBBGGRRX 
-
-#undef kRRGGBBXRRGGBBX_RRGGBBXRRGGBBX_RRGGBBXXXXX_RRGGBBXRRGGBBX_RRGGBBXRRGGBBX_XXXXRRGGBBX   
-#undef kRRBBGGXRRBBGGX_RRBBGGXRRBBGGX_RRBBGGXXXXX_RRBBGGXRRBBGGX_RRBBGGXRRBBGGX_XXXXRRBBGGX   
-#undef kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX   
-
-
-// 600 TVL
-#define kMaxSlotMaskSize   4
-#define kMaxSlotSizeY      6
-
-#define kXXXX     { kBlack, kBlack, kBlack, kBlack }
-
-#define kRGBX     { kRed, kGreen, kBlue, kBlack }
-#define kRBGX     { kRed, kBlue, kGreen, kBlack }
-#define kBGRX     { kBlue, kGreen, kRed, kBlack }
-
-#define kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX   { { kRGBX, kRGBX }, { kRGBX, kRGBX }, { kRGBX, kXXXX }, { kRGBX, kRGBX }, { kRGBX, kRGBX }, { kXXXX, kRGBX }}
-#define kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX   { { kRBGX, kRBGX }, { kRBGX, kRBGX }, { kRBGX, kXXXX }, { kRBGX, kRBGX }, { kRBGX, kRBGX }, { kXXXX, kRBGX }}
-#define kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX   { { kBGRX, kBGRX }, { kBGRX, kBGRX }, { kBGRX, kXXXX }, { kBGRX, kBGRX }, { kBGRX, kBGRX }, { kXXXX, kBGRX }}
-
-const uint kSlotMasks4K600TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX, kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX, kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX
-};
-
-#undef kMaxSlotMaskSize   
-#undef kMaxSlotSizeY   
-
-#undef kXXXX     
-
-#undef kRGBX     
-#undef kRBGX
-#undef kBGRX
-
-#undef kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX   
-#undef kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX   
-#undef kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX   
-
-
-// 800 TVL
-#define kMaxSlotMaskSize   3
-#define kMaxSlotSizeY      4
-
-#define kXXXX     { kBlack, kBlack, kBlack }
-
-#define kBGR      { kBlue, kGreen, kRed }
-#define kGBR      { kGreen, kBlue, kRed }
-#define kRGB      { kRed, kGreen, kBlue }
-
-#define kBGRBGR_BGRXXX_BGRBGR_XXXBGR   { { kBGR, kBGR }, { kBGR, kXXXX }, { kBGR, kBGR }, { kXXXX, kBGR } }
-#define kGBRGBR_GBRXXX_GBRGBR_XXXGBR   { { kGBR, kGBR }, { kGBR, kXXXX }, { kGBR, kGBR }, { kXXXX, kGBR } }
-#define kRGBRGB_RGBXXX_RGBRGB_XXXRGB   { { kRGB, kRGB }, { kRGB, kXXXX }, { kRGB, kRGB }, { kXXXX, kRGB } }
-
-const uint kSlotMasks4K800TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kBGRBGR_BGRXXX_BGRBGR_XXXBGR, kGBRGBR_GBRXXX_GBRGBR_XXXGBR, kRGBRGB_RGBXXX_RGBRGB_XXXRGB
-};
-
-#undef kMaxSlotMaskSize   
-#undef kMaxSlotSizeY   
-
-#undef kXXXX     
-
-#undef kBGR    
-#undef kGBR 
-#undef kRGB      
-
-#undef kBGRBGR_BGRXXX_BGRBGR_XXXBGR   
-#undef kGBRGBR_GBRXXX_GBRGBR_XXXGBR   
-#undef kRGBRGB_RGBXXX_RGBRGB_XXXRGB   
-
-
-// 1000 TVL
-#define kMaxSlotMaskSize   2
-#define kMaxSlotSizeY      4
-
-#define kXX     { kBlack, kBlack }
-
-#define kMG       { kMagenta, kGreen }
-#define kYB       { kYellow, kBlue }
-#define kGM       { kGreen, kMagenta }
-
-#define kMGMG_MGXX_MGMG_XXMG   { { kMG, kMG }, { kMG, kXX }, { kMG, kMG }, { kXX, kMG } }
-#define kYBYB_YBXX_YBYB_XXYB   { { kYB, kYB }, { kYB, kXX }, { kYB, kYB }, { kXX, kYB } }
-#define kGMGM_GMXX_GMGM_XXGM   { { kGM, kGM }, { kGM, kXX }, { kGM, kGM }, { kXX, kGM } }
-
-const uint kSlotMasks4K1000TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kMGMG_MGXX_MGMG_XXMG, kYBYB_YBXX_YBYB_XXYB, kGMGM_GMXX_GMGM_XXGM
-};
-
-#undef kMaxSlotMaskSize   
-#undef kMaxSlotSizeY   
-
-#undef kXX     
-
-#undef kMG     
-#undef kYB  
-#undef kGM        
-
-#undef kMGMG_MGXX_MGMG_XXMG  
-#undef kYBYB_YBXX_YBYB_XXYB   
-#undef kGMGM_GMXX_GMGM_XXGM   
-#undef kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX   
-
-
-// 8K
-
-// 300 TVL
-#define kMaxSlotMaskSize   7
-#define kMaxSlotSizeY      6
-
-#define kXXXX     { kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-
-#define kRRGGBBX  { kRed, kRed, kGreen, kGreen, kBlue, kBlue, kBlack }
-#define kRRBBGGX  { kRed, kRed, kBlue, kBlue, kGreen, kGreen, kBlack }
-#define kBBGGRRX  { kBlue, kBlue, kGreen, kGreen, kRed, kRed, kBlack }
-
-#define kRRGGBBXRRGGBBX_RRGGBBXRRGGBBX_RRGGBBXXXXX_RRGGBBXRRGGBBX_RRGGBBXRRGGBBX_XXXXRRGGBBX   { { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kXXXX }, { kRRGGBBX, kRRGGBBX }, { kRRGGBBX, kRRGGBBX }, { kXXXX, kRRGGBBX } }
-#define kRRBBGGXRRBBGGX_RRBBGGXRRBBGGX_RRBBGGXXXXX_RRBBGGXRRBBGGX_RRBBGGXRRBBGGX_XXXXRRBBGGX   { { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kXXXX }, { kRRBBGGX, kRRBBGGX }, { kRRBBGGX, kRRBBGGX }, { kXXXX, kRRBBGGX } }
-#define kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX   { { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kXXXX }, { kBBGGRRX, kBBGGRRX }, { kBBGGRRX, kBBGGRRX }, { kXXXX, kBBGGRRX } }
-
-const uint kSlotMasks8K300TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kRRGGBBXRRGGBBX_RRGGBBXRRGGBBX_RRGGBBXXXXX_RRGGBBXRRGGBBX_RRGGBBXRRGGBBX_XXXXRRGGBBX, kRRBBGGXRRBBGGX_RRBBGGXRRBBGGX_RRBBGGXXXXX_RRBBGGXRRBBGGX_RRBBGGXRRBBGGX_XXXXRRBBGGX, kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX 
-};
-
-// 600 TVL
-const uint kSlotMasks8K600TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kRRGGBBXRRGGBBX_RRGGBBXRRGGBBX_RRGGBBXXXXX_RRGGBBXRRGGBBX_RRGGBBXRRGGBBX_XXXXRRGGBBX, kRRBBGGXRRBBGGX_RRBBGGXRRBBGGX_RRBBGGXXXXX_RRBBGGXRRBBGGX_RRBBGGXRRBBGGX_XXXXRRBBGGX, kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX 
-};
-
-#undef kMaxSlotMaskSize   
-#undef kMaxSlotSizeY   
-
-#undef kXXXX    
-
-#undef kRRGGBBX  
-#undef kRRBBGGX  
-#undef kBBGGRRX 
-
-#undef kRRGGBBXRRGGBBX_RRGGBBXRRGGBBX_RRGGBBXXXXX_RRGGBBXRRGGBBX_RRGGBBXRRGGBBX_XXXXRRGGBBX   
-#undef kRRBBGGXRRBBGGX_RRBBGGXRRBBGGX_RRBBGGXXXXX_RRBBGGXRRBBGGX_RRBBGGXRRBBGGX_XXXXRRBBGGX   
-#undef kBBGGRRXBBGGRRX_BBGGRRXBBGGRRX_BBGGRRXXXXX_BBGGRRXBBGGRRX_BBGGRRXBBGGRRX_XXXXBBGGRRX   
-
-// 800 TVL
-#define kMaxSlotMaskSize   5
-#define kMaxSlotSizeY      4
-
-#define kXXXX     { kBlack, kBlack, kBlack, kBlack, kBlack }
-
-#define kRYCBX    { kRed, kYellow, kCyan, kBlue, kBlack }
-#define kRMCGX    { kRed, kMagenta, kCyan, kGreen, kBlack }
-#define kBCYRX    { kBlue, kCyan, kYellow, kRed, kBlack }
-
-#define kRYCBXRYCBX_RYCBXXXXX_RYCBXRYCBX_XXXXRYCBX   { { kRYCBX, kRYCBX }, { kRYCBX, kXXXX }, { kRYCBX, kRYCBX }, { kXXXX, kRYCBX } }
-#define kRMCGXRMCGX_RMCGXXXXX_RMCGXRMCGX_XXXXRMCGX   { { kRMCGX, kRMCGX }, { kRMCGX, kXXXX }, { kRMCGX, kRMCGX }, { kXXXX, kRMCGX } }
-#define kBCYRXBCYRX_BCYRXXXXX_BCYRXBCYRX_XXXXBCYRX   { { kBCYRX, kBCYRX }, { kBCYRX, kXXXX }, { kBCYRX, kBCYRX }, { kXXXX, kBCYRX } }
-
-const uint kSlotMasks8K800TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kRYCBXRYCBX_RYCBXXXXX_RYCBXRYCBX_XXXXRYCBX, kRMCGXRMCGX_RMCGXXXXX_RMCGXRMCGX_XXXXRMCGX, kBCYRXBCYRX_BCYRXXXXX_BCYRXBCYRX_XXXXBCYRX
-};
-
-#undef kMaxSlotMaskSize   
-#undef kMaxSlotSizeY   
-
-#undef kXXXX    
-
-#undef kRYCBX    
-#undef kRMCGX
-#undef kBCYRX    
-
-#undef kRYCBXRYCBX_RYCBXXXXX_RYCBXRYCBX_XXXXRYCBX   
-#undef kRMCGXRMCGX_RMCGXXXXX_RMCGXRMCGX_XXXXRMCGX   
-#undef kBCYRXBCYRX_BCYRXXXXX_BCYRXBCYRX_XXXXBCYRX   
-
-
-// 1000 TVL
-#define kMaxSlotMaskSize   4
-#define kMaxSlotSizeY      4
-
-#define kXXXX     { kBlack, kBlack, kBlack, kBlack }
-
-#define kRGBX     { kRed, kGreen, kBlue, kBlack }
-#define kRBGX     { kRed, kBlue, kGreen, kBlack }
-#define kBGRX     { kBlue, kGreen, kRed, kBlack }
-
-#define kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX   { { kRGBX, kRGBX }, { kRGBX, kXXXX }, { kRGBX, kRGBX }, { kXXXX, kRGBX } }
-#define kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX   { { kRBGX, kRBGX }, { kRBGX, kXXXX }, { kRBGX, kRBGX }, { kXXXX, kRBGX } }
-#define kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX   { { kBGRX, kBGRX }, { kBGRX, kXXXX }, { kBGRX, kBGRX }, { kXXXX, kBGRX } }
-
-const uint kSlotMasks8K1000TVL[kBGRAxis][kMaxSlotSizeY][kMaxSlotSizeX][kMaxSlotMaskSize] = 
-{
-   kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX, kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX, kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX 
-};
-
-#undef kMaxSlotMaskSize   
-#undef kMaxSlotSizeY   
-
-#undef kXXXX     
-
-#undef kRGBX    
-#undef kRBGX  
-#undef kBGRX     
- 
-#undef kRGBXRGBX_RGBXXXXX_RGBXRGBX_XXXXRGBX   
-#undef kRBGXRBGX_RBGXXXXX_RBGXRBGX_XXXXRBGX   
-#undef kBGRXBGRX_BGRXXXXX_BGRXBGRX_XXXXBGRX   
-
-// BLACK WHITE MASKS
-#if ENABLE_BLACK_WHITE_MASKS
-
-#define kMaxBlackWhiteSize       14
-
-#define kW                 { kWhite, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-
-#define kWX                { kWhite, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-#define kWWX               { kWhite, kWhite, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-#define kWWXX              { kWhite, kWhite, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-#define kWWWWX             { kWhite, kWhite, kWhite, kWhite, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-#define kWWWWWXX           { kWhite, kWhite, kWhite, kWhite, kWhite, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack, kBlack }
-#define kWWWWWWWWWWWXXX    { kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite, kWhite /*kBlack, kBlack, kBlack*/ }
-
-const float kBlackWhiteMaskSize[kResolutionAxis][kTVLAxis] = { { 4.0f, 2.0f, 1.0f, 1.0f }, { 7.0f, 4.0f, 3.0f, 2.0f }, { 14.0f, 7.0f, 5.0f, 4.0f } }; //4K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   8K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL
-
-const uint kBlackWhiteMasks[kResolutionAxis][kTVLAxis][kBGRAxis][kMaxBlackWhiteSize] = {
-   { // 1080p
-      { kWWXX, kWWXX, kWWXX },                                 // 300 TVL
-      { kWX, kWX, kWX },                                       // 600 TVL
-      { kW, kW, kW },                                          // 800 TVL
-      { kW, kW, kW }                                           // 1000 TVL
-   },
-   { // 4K
-      { kWWWWWXX, kWWWWWXX, kWWWWWXX },                        // 300 TVL
-      { kWWXX, kWWXX, kWWXX },                                 // 600 TVL
-      { kWWX, kWWX, kWWX },                                    // 800 TVL
-      { kWX, kWX, kWX }                                        // 1000 TVL
-   },
-   { // 8K
-      { kWWWWWWWWWWWXXX, kWWWWWWWWWWWXXX, kWWWWWWWWWWWXXX },   // 300 TVL
-      { kWWWWWXX, kWWWWWXX, kWWWWWXX },                        // 600 TVL
-      { kWWWWX, kWWWWX, kWWWWX },                              // 800 TVL
-      { kWWXX, kWWXX, kWWXX }                                  // 1000 TVL
-   }
-};
-
-#undef kW                
-#undef kWX                
-#undef kWWX               
-#undef kWWXX              
-#undef kWWWWX             
-#undef kWWWWWXX           
-#undef kWWWWWWWWWWWXXX 
-
-#endif // ENABLE_BLACK_WHITE_MASKS
-
-#include "include/scanline_generation.h"
-#include "include/gamma_correct.h"
-
-#define k1080p     0
-#define k4K        1
-#define k8K        2
-
-#define k300TVL    0
-#define k600TVL    1
-#define k800TVL    2
-#define k1000TVL   3
-
-void main()
-{
-// HSM Added
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-	vec2 cache_bounds_coord = SCREEN_COORD;
-
-// If it's the potato preset render the whole frame
-#ifndef IS_POTATO_PRESET
-#ifndef IS_NO_REFLECT_PRESET
-	vec2 bezel_outside_flat_coord;
-	vec2 frame_outside_flat_coord;
-	HSM_GetSimpleBezelCoords(TUBE_DIFFUSE_COORD, 
-							TUBE_DIFFUSE_SCALE, 
-							TUBE_SCALE, 
-							SCREEN_ASPECT,
-							bezel_outside_flat_coord, 
-							frame_outside_flat_coord);
-	cache_bounds_coord = (bezel_outside_flat_coord - 0.5) * 0.9 + 0.5;
-#endif
-#endif
-
-	if (HHLP_IsOutsideCoordSpace(cache_bounds_coord))
-	{
-			FragColor = vec4(0);
-			return;
-	}
-
-	// HSM Added
-	float raster_bloom_avg_lum = texture(AvgLumPass, vec2(0.5,0.5)).a;
-	vec2 screen_curved_coord = vec2(0.5);
-
-	vec2 screen_curved_coord_with_overscan_and_mirror = HSM_GetCrtShaderFinalCoord(SCREEN_COORD,
-		SCREEN_SCALE,
-		raster_bloom_avg_lum,
-		screen_curved_coord);
-
-	vec2 screen_final_coord = screen_curved_coord_with_overscan_and_mirror;
-   // End HSM Added
-
-   const uint screen_type           = uint(HCRT_CRT_SCREEN_TYPE);
-   const uint crt_resolution        = uint(HCRT_CRT_RESOLUTION);
-   const uint lcd_resolution        = uint(HCRT_LCD_RESOLUTION);
-   const uint lcd_subpixel_layout   = uint(HCRT_LCD_SUBPIXEL);
-   const vec2 source_size           = CROPPED_ROTATED_SIZE_WITH_RES_MULT;
-   const vec2 output_size           = global.OutputSize.xy;
-
-   vec2 tex_coord                   = screen_final_coord - vec2(0.5f);
-   tex_coord                        = tex_coord * vec2(1.0f + (HCRT_PIN_PHASE * tex_coord.y), 1.0f);
-   tex_coord                        = tex_coord * vec2(HCRT_H_SIZE, HCRT_V_SIZE);
-   tex_coord                        = tex_coord + vec2(0.5f);
-   tex_coord                        = tex_coord + (vec2(HCRT_H_CENT, HCRT_V_CENT) / output_size); 
-
-   const vec2 current_position      = vTexCoord * output_size;
-
-   uint colour_mask = 0;
-
-   switch(screen_type)
-   {
-      case kApertureGrille:
-      {
-         uint mask = uint(floor(mod(current_position.x, kApertureGrilleMaskSize[lcd_resolution][crt_resolution])));
-
-         switch(lcd_resolution)
-         {
-            case k1080p:
-            { 
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kApertureGrilleMasks1080p300TVL[lcd_subpixel_layout][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks1080p600TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks1080p800TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks1080p1000TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k4K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kApertureGrilleMasks4K300TVL[lcd_subpixel_layout][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks4K600TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks4K800TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks4K1000TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k8K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kApertureGrilleMasks8K300TVL[lcd_subpixel_layout][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks8K600TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks8K800TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kApertureGrilleMasks8K1000TVL[lcd_subpixel_layout][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            default:
-            {
-               break;
-            }                 
-         }
-
-         break;
-      }
-      case kShadowMask:
-      {
-         uint shadow_y = uint(floor(mod(current_position.y, kShadowMaskSizeY[lcd_resolution][crt_resolution])));
-
-         uint mask = uint(floor(mod(current_position.x, kShadowMaskSizeX[lcd_resolution][crt_resolution])));
-
-         switch(lcd_resolution)
-         {
-            case k1080p:
-            { 
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kShadowMasks1080p300TVL[lcd_subpixel_layout][shadow_y][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kShadowMasks1080p600TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kShadowMasks1080p800TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kShadowMasks1080p1000TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k4K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kShadowMasks4K300TVL[lcd_subpixel_layout][shadow_y][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kShadowMasks4K600TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kShadowMasks4K800TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kShadowMasks4K1000TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k8K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kShadowMasks8K300TVL[lcd_subpixel_layout][shadow_y][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kShadowMasks8K600TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kShadowMasks8K800TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kShadowMasks8K1000TVL[lcd_subpixel_layout][shadow_y][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            default:
-            {
-               break;
-            }                 
-         }
-
-         break;
-      }
-      case kSlotMask:
-      {
-         uint slot_x = uint(floor(mod(current_position.x / kSlotMaskSizeX[lcd_resolution][crt_resolution], kMaxSlotSizeX)));
-         uint slot_y = uint(floor(mod(current_position.y, kSlotMaskSizeY[lcd_resolution][crt_resolution])));
-
-         uint mask = uint(floor(mod(current_position.x, kSlotMaskSizeX[lcd_resolution][crt_resolution])));
-
-         switch(lcd_resolution)
-         {
-            case k1080p:
-            { 
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kSlotMasks1080p300TVL[lcd_subpixel_layout][slot_y][slot_x][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kSlotMasks1080p600TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kSlotMasks1080p800TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kSlotMasks1080p1000TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k4K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kSlotMasks4K300TVL[lcd_subpixel_layout][slot_y][slot_x][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kSlotMasks4K600TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kSlotMasks4K800TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kSlotMasks4K1000TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k8K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     colour_mask = kSlotMasks8K300TVL[lcd_subpixel_layout][slot_y][slot_x][mask];      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     colour_mask = kSlotMasks8K600TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kSlotMasks8K800TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kSlotMasks8K1000TVL[lcd_subpixel_layout][slot_y][slot_x][mask]; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            default:
-            {
-               break;
-            }                 
-         }
-
-         break;
-      }
-#if ENABLE_BLACK_WHITE_MASKS
-      case kBlackWhiteMask:
-      {
-         uint mask = uint(floor(mod(current_position.x, kBlackWhiteMaskSize[lcd_resolution][crt_resolution])));
-
-         colour_mask = kBlackWhiteMasks[lcd_resolution][crt_resolution][lcd_subpixel_layout][mask];      
-
-         switch(lcd_resolution)
-         {
-            case k1080p:
-            { 
-               break;
-            }
-            case k4K:
-            {
-               break;
-            }
-            case k8K:
-            {
-               break;
-            }
-            default:
-            {
-               break;
-            }                 
-         }
-
-         break;
-      }
-#endif // ENABLE_BLACK_WHITE_MASKS
-      default:
-      {
-         break;
-      }
-   }
-
-   const float scanline_size           = output_size.y / source_size.y;
-
-   const vec3 horizontal_convergence   = vec3(HCRT_RED_HORIZONTAL_CONVERGENCE, HCRT_GREEN_HORIZONTAL_CONVERGENCE, HCRT_BLUE_HORIZONTAL_CONVERGENCE);
-   const vec3 vertical_convergence     = vec3(HCRT_RED_VERTICAL_CONVERGENCE, HCRT_GREEN_VERTICAL_CONVERGENCE, HCRT_BLUE_VERTICAL_CONVERGENCE);
-   const vec3 beam_sharpness           = vec3(HCRT_RED_BEAM_SHARPNESS, HCRT_GREEN_BEAM_SHARPNESS, HCRT_BLUE_BEAM_SHARPNESS);
-   const vec3 beam_attack              = vec3(HCRT_RED_BEAM_ATTACK, HCRT_GREEN_BEAM_ATTACK, HCRT_BLUE_BEAM_ATTACK);
-   const vec3 scanline_min             = vec3(HCRT_RED_SCANLINE_MIN, HCRT_GREEN_SCANLINE_MIN, HCRT_BLUE_SCANLINE_MIN);
-   const vec3 scanline_max             = vec3(HCRT_RED_SCANLINE_MAX, HCRT_GREEN_SCANLINE_MAX, HCRT_BLUE_SCANLINE_MAX);
-   const vec3 scanline_attack          = vec3(HCRT_RED_SCANLINE_ATTACK, HCRT_GREEN_SCANLINE_ATTACK, HCRT_BLUE_SCANLINE_ATTACK);
-
-   const uint channel_count            = colour_mask & 3;
-
-   vec3 scanline_colour = vec3(0.0f);
-
-   if(channel_count > 0)
-   {
-      const uint channel_0             = (colour_mask >> kFirstChannelShift) & 3;
-
-      const float scanline_channel_0   = GenerateScanline(  channel_0,
-                                                            tex_coord,
-                                                            source_size.xy, 
-                                                            scanline_size, 
-                                                            horizontal_convergence[channel_0], 
-                                                            vertical_convergence[channel_0], 
-                                                            beam_sharpness[channel_0], 
-                                                            beam_attack[channel_0], 
-                                                            scanline_min[channel_0], 
-                                                            scanline_max[channel_0], 
-                                                            scanline_attack[channel_0]);
-
-      scanline_colour =  scanline_channel_0 * kColourMask[channel_0];
-   }
-
-   if(channel_count > 1)
-   {
-      const uint channel_1             = (colour_mask >> kSecondChannelShift) & 3;
-
-      const float scanline_channel_1   = GenerateScanline(channel_1,
-                                                          tex_coord,
-                                                          source_size.xy, 
-                                                          scanline_size, 
-                                                          horizontal_convergence[channel_1], 
-                                                          vertical_convergence[channel_1], 
-                                                          beam_sharpness[channel_1], 
-                                                          beam_attack[channel_1], 
-                                                          scanline_min[channel_1], 
-                                                          scanline_max[channel_1], 
-                                                          scanline_attack[channel_1]);
-
-      scanline_colour += scanline_channel_1 * kColourMask[channel_1];
-   }
-
-   if(channel_count > 2)
-   {
-      const uint channel_2             = (colour_mask >> kThirdChannelShift) & 3;
-
-      const float scanline_channel_2   = GenerateScanline(channel_2,
-                                                          tex_coord,
-                                                          source_size.xy, 
-                                                          scanline_size, 
-                                                          horizontal_convergence[channel_2], 
-                                                          vertical_convergence[channel_2], 
-                                                          beam_sharpness[channel_2], 
-                                                          beam_attack[channel_2], 
-                                                          scanline_min[channel_2], 
-                                                          scanline_max[channel_2], 
-                                                          scanline_attack[channel_2]);
-
-      scanline_colour += scanline_channel_2 * kColourMask[channel_2];
-   }
-
-/*
-   vec3 transformed_colour;
-
-   if(HCRT_COLOUR_ACCURATE >= 1.0f)
-   {
-      if(HCRT_HDR >= 1.0f)
-      {
-         const vec3 rec2020  = scanline_colour * k2020Gamuts[uint(HCRT_EXPAND_GAMUT)];
-         transformed_colour  = rec2020 * (HCRT_PAPER_WHITE_NITS / kMaxNitsFor2084);
-      }
-      else if(HCRT_OUTPUT_COLOUR_SPACE == 2.0f)
-      {
-         transformed_colour = (scanline_colour * k709_to_XYZ) * kXYZ_to_DCIP3; 
-      }
-      else
-      {
-         transformed_colour = scanline_colour;
-      }
-   } 
-   else
-   {      
-      transformed_colour = scanline_colour;
-   }
-
-   vec3 gamma_corrected; 
-   
-   GammaCorrect(transformed_colour, gamma_corrected);
-
-   FragColor = vec4(gamma_corrected, 1.0f);
-*/
-
-   scanline_colour = pow(scanline_colour, vec3(1 / (HSM_GAMMA_OUT_CRT / GAMMA_INPUT)));
-   FragColor = vec4(scanline_colour, 1.0f);
-
-/*
-   vec3 output_colour = vec3(0);
-   LinearToOutputColor(scanline_colour, output_colour);
-   FragColor = vec4(output_colour, 1.0f);
-*/
-}
diff --git a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron.slang b/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron.slang
deleted file mode 100644
index 8bff44457e..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/crt-sony-megatron.slang
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 450
-
-#include "../base/common/globals-and-screen-scale-params.inc"
-#include "../base/common/common-functions.inc"
-#include "../base/common/params-2-bezel.inc"
-#include "../base/common/common-functions-bezel.inc"
-#include "crt-sony-megatron.inc"
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/megatron/hdr10.slang b/bezel/Mega_Bezel/shaders/megatron/hdr10.slang
deleted file mode 100644
index 1eedb709ab..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/hdr10.slang
+++ /dev/null
@@ -1,54 +0,0 @@
-#version 450
-
-/* 
-Part of the crt-sony-megatron shader group. Does the exact same thing as RetroArch does internally to map into HDR10 space.
-
-This is used to do this mapping BEFORE screen effects are applied.
-
-Originally part of the crt\crt-sony-pvm-4k-hdr.slangp but can be used for any shader
-*/
-
-#pragma format A2B10G10R10_UNORM_PACK32
-
-#include "include\hdr10.h"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float PaperWhiteNits;
-   float ExpandGamut;
-} params;
-
-#pragma parameter PaperWhiteNits    "Paper White Luminance"    200.0    0.0 10000.0 10.0
-#pragma parameter ExpandGamut       "ExpandGamut"              1.0      0.0 1.0     1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 hdr_linear = texture(Source, vTexCoord);
-   FragColor = vec4(Hdr10(hdr_linear.rgb, params.PaperWhiteNits, params.ExpandGamut), hdr_linear.a); 
-}
-
diff --git a/bezel/Mega_Bezel/shaders/megatron/include/colour_grade.h b/bezel/Mega_Bezel/shaders/megatron/include/colour_grade.h
deleted file mode 100644
index c34417ce27..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/include/colour_grade.h
+++ /dev/null
@@ -1,187 +0,0 @@
-
-#define kColourSystems  4
-
-#define kD50            5003.0f
-#define kD55            5503.0f
-#define kD65            6504.0f
-#define kD75            7504.0f
-#define kD93            9305.0f
-
-const mat3 k709_to_XYZ = mat3(
-   0.412391f, 0.357584f, 0.180481f,
-   0.212639f, 0.715169f, 0.072192f,
-   0.019331f, 0.119195f, 0.950532f);
-
-const mat3 kPAL_to_XYZ = mat3(
-   0.430554f, 0.341550f, 0.178352f,
-   0.222004f, 0.706655f, 0.071341f,
-   0.020182f, 0.129553f, 0.939322f);
-
-const mat3 kNTSC_to_XYZ = mat3(
-   0.393521f, 0.365258f, 0.191677f,
-   0.212376f, 0.701060f, 0.086564f,
-   0.018739f, 0.111934f, 0.958385f);
-
-const mat3 kXYZ_to_709 = mat3(
-    3.240970f, -1.537383f, -0.498611f,
-   -0.969244f,  1.875968f,  0.041555f,
-    0.055630f, -0.203977f,  1.056972f);
-
-const mat3 kXYZ_to_DCIP3 = mat3 (
-    2.4934969119f, -0.9313836179f, -0.4027107845f,
-   -0.8294889696f,  1.7626640603f,  0.0236246858f,
-    0.0358458302f, -0.0761723893f,  0.9568845240f);   
-
-const mat3 kColourGamut[kColourSystems] = { k709_to_XYZ, kPAL_to_XYZ, kNTSC_to_XYZ, kNTSC_to_XYZ };
-
-const float kTemperatures[kColourSystems] = { kD65, kD65, kD65, kD93 }; 
-
-  // Values from: http://blenderartists.org/forum/showthread.php?270332-OSL-Goodness&p=2268693&viewfull=1#post2268693   
-const mat3 kWarmTemperature = mat3(
-   vec3(0.0, -2902.1955373783176,   -8257.7997278925690),
-	vec3(0.0,  1669.5803561666639,    2575.2827530017594),
-	vec3(1.0,     1.3302673723350029,    1.8993753891711275));
-
-const mat3 kCoolTemperature = mat3(
-   vec3( 1745.0425298314172,      1216.6168361476490,    -8257.7997278925690),
-   vec3(-2666.3474220535695,     -2173.1012343082230,     2575.2827530017594),
-	vec3(    0.55995389139931482,     0.70381203140554553,    1.8993753891711275));
-
-const mat4 kCubicBezier = mat4( 1.0f,  0.0f,  0.0f,  0.0f,
-                               -3.0f,  3.0f,  0.0f,  0.0f,
-                                3.0f, -6.0f,  3.0f,  0.0f,
-                               -1.0f,  3.0f, -3.0f,  1.0f );
-
-float Bezier(const float t0, const vec4 control_points)
-{
-   vec4 t = vec4(1.0, t0, t0*t0, t0*t0*t0);
-   return dot(t, control_points * kCubicBezier);
-}
-
-vec3 WhiteBalance(float temperature, vec3 colour)
-{
-   const mat3 m = (temperature < kD65) ? kWarmTemperature : kCoolTemperature;
-
-   const vec3 rgb_temperature = mix(clamp(vec3(m[0] / (vec3(clamp(temperature, 1000.0f, 40000.0f)) + m[1]) + m[2]), vec3(0.0f), vec3(1.0f)), vec3(1.0f), smoothstep(1000.0f, 0.0f, temperature));
-
-   vec3 result = colour * rgb_temperature;
-
-   result *= dot(colour, vec3(0.2126, 0.7152, 0.0722)) / max(dot(result, vec3(0.2126, 0.7152, 0.0722)), 1e-5); // Preserve luminance
-
-   return result;
-}
-
-float r601ToLinear_1(const float channel)
-{
-	//return (channel >= 0.081f) ? pow((channel + 0.099f) * (1.0f / 1.099f), (1.0f / 0.45f)) : channel * (1.0f / 4.5f);
-	//return (channel >= 0.081f) ? pow((channel + 0.099f) * (1.0f / 1.099f), HCRT_GAMMA_IN) : channel * (1.0f / 4.5f);
-   return pow((channel + 0.099f) * (1.0f / 1.099f), HCRT_GAMMA_IN);
-}
-
-vec3 r601ToLinear(const vec3 colour)
-{
-	return vec3(r601ToLinear_1(colour.r), r601ToLinear_1(colour.g), r601ToLinear_1(colour.b));
-}
-
-
-float r709ToLinear_1(const float channel)
-{
-	//return (channel >= 0.081f) ? pow((channel + 0.099f) * (1.0f / 1.099f), (1.0f / 0.45f)) : channel * (1.0f / 4.5f);
-	//return (channel >= 0.081f) ? pow((channel + 0.099f) * (1.0f / 1.099f), HCRT_GAMMA_IN) : channel * (1.0f / 4.5f);
-   return pow((channel + 0.099f) * (1.0f / 1.099f), HCRT_GAMMA_IN);
-}
-
-vec3 r709ToLinear(const vec3 colour)
-{
-	return vec3(r709ToLinear_1(colour.r), r709ToLinear_1(colour.g), r709ToLinear_1(colour.b));
-}
-
-// XYZ Yxy transforms found in Dogway's Grade.slang shader
-
-vec3 XYZtoYxy(const vec3 XYZ)
-{
-   const float XYZrgb   = XYZ.r + XYZ.g + XYZ.b;
-   const float Yxyg     = (XYZrgb <= 0.0f) ? 0.3805f : XYZ.r / XYZrgb;
-   const float Yxyb     = (XYZrgb <= 0.0f) ? 0.3769f : XYZ.g / XYZrgb;
-   return vec3(XYZ.g, Yxyg, Yxyb);
-}
-
-vec3 YxytoXYZ(const vec3 Yxy)
-{
-   const float Xs    = Yxy.r * (Yxy.g / Yxy.b);
-   const float Xsz   = (Yxy.r <= 0.0f) ? 0.0f : 1.0f;
-   const vec3 XYZ    = vec3(Xsz, Xsz, Xsz) * vec3(Xs, Yxy.r, (Xs / Yxy.g) - Xs - Yxy.r);
-   return XYZ;
-}
-
-const vec4 kTopBrightnessControlPoints    = vec4(0.0f, 1.0f, 1.0f, 1.0f);
-const vec4 kMidBrightnessControlPoints    = vec4(0.0f, 1.0f / 3.0f, (1.0f / 3.0f) * 2.0f, 1.0f);
-const vec4 kBottomBrightnessControlPoints = vec4(0.0f, 0.0f, 0.0f, 1.0f);
-
-float Brightness(const float luminance)
-{
-   if(HCRT_BRIGHTNESS >= 0.0f)
-   {
-      return Bezier(luminance, mix(kMidBrightnessControlPoints, kTopBrightnessControlPoints, HCRT_BRIGHTNESS));
-   }
-   else
-   {
-      return Bezier(luminance, mix(kMidBrightnessControlPoints, kBottomBrightnessControlPoints, abs(HCRT_BRIGHTNESS)));
-   }
-}
-
-const vec4 kTopContrastControlPoints    = vec4(0.0f, 0.0f, 1.0f, 1.0f);
-const vec4 kMidContrastControlPoints    = vec4(0.0f, 1.0f / 3.0f, (1.0f / 3.0f) * 2.0f, 1.0f);
-const vec4 kBottomContrastControlPoints = vec4(0.0f, 1.0f, 0.0f, 1.0f);
-
-float Contrast(const float luminance)
-{
-   if(HCRT_CONTRAST >= 0.0f)
-   {
-      return Bezier(luminance, mix(kMidContrastControlPoints, kTopContrastControlPoints, HCRT_CONTRAST));
-   }
-   else
-   {
-      return Bezier(luminance, mix(kMidContrastControlPoints, kBottomContrastControlPoints, abs(HCRT_CONTRAST)));
-   }
-}
-
-vec3 Saturation(const vec3 colour)
-{
-   const float luma           = dot(colour, vec3(0.2125, 0.7154, 0.0721));
-   const float saturation     = 0.5f + HCRT_SATURATION * 0.5f;
-
-   return clamp(mix(vec3(luma), colour, vec3(saturation) * 2.0f), 0.0f, 1.0f);
-}
-
-vec3 BrightnessContrastSaturation(const vec3 xyz)
-{
-   const vec3 Yxy             = XYZtoYxy(xyz);
-   const float Y_gamma        = clamp(pow(Yxy.x, 1.0f / 2.4f), 0.0f, 1.0f);
-   
-   const float Y_brightness   = Brightness(Y_gamma);
-
-   const float Y_contrast     = Contrast(Y_brightness);
-
-   const vec3 contrast_linear = vec3(pow(Y_contrast, 2.4f), Yxy.y, Yxy.z);
-   const vec3 contrast        = clamp(YxytoXYZ(contrast_linear) * kXYZ_to_709, 0.0f, 1.0f);
-
-   const vec3 saturation      = Saturation(contrast);
-
-   return saturation;
-}
-
-vec3 ColourGrade(const vec3 colour)
-{
-   const uint colour_system   = uint(HCRT_CRT_COLOUR_SYSTEM);
-
-   const vec3 white_point     = WhiteBalance(kTemperatures[colour_system] + HCRT_WHITE_TEMPERATURE, colour);
-
-   const vec3 linear          = r601ToLinear(white_point); //pow(white_point, vec3(HCRT_GAMMA_IN));
-
-   const vec3 xyz             = linear * kColourGamut[colour_system];
-
-   const vec3 graded          = BrightnessContrastSaturation(xyz); 
-
-   return graded;
-}
diff --git a/bezel/Mega_Bezel/shaders/megatron/include/gamma_correct.h b/bezel/Mega_Bezel/shaders/megatron/include/gamma_correct.h
deleted file mode 100644
index 63f3805ebc..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/include/gamma_correct.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "hdr10.h"
-
-// SDR Colour output spaces
-
-const mat3 k709_to_XYZ = mat3(
-   0.412391f, 0.357584f, 0.180481f,
-   0.212639f, 0.715169f, 0.072192f,
-   0.019331f, 0.119195f, 0.950532f);
-
-const mat3 kXYZ_to_DCIP3 = mat3 (
-    2.4934969119f, -0.9313836179f, -0.4027107845f,
-   -0.8294889696f,  1.7626640603f,  0.0236246858f,
-    0.0358458302f, -0.0761723893f,  0.9568845240f);
-
-float LinearTosRGB_1(const float channel)
-{
-	//return (channel > 0.0031308f) ? (1.055f * pow(channel, 1.0f / HCRT_GAMMA_OUT)) - 0.055f : channel * 12.92f; 
-   return (1.055f * pow(channel, 1.0f / HCRT_GAMMA_OUT)) - 0.055f; 
-}
-
-vec3 LinearTosRGB(const vec3 colour)
-{
-	return vec3(LinearTosRGB_1(colour.r), LinearTosRGB_1(colour.g), LinearTosRGB_1(colour.b));
-}
-
-float LinearTo709_1(const float channel)
-{
-	//return (channel >= 0.018f) ? pow(channel * 1.099f, 1.0f / (HCRT_GAMMA_OUT - 0.18f)) - 0.099f : channel * 4.5f;  // Gamma: 2.4 - 0.18 = 2.22
-   return pow(channel * 1.099f, 1.0f / (HCRT_GAMMA_OUT - 0.18f)) - 0.099f;
-}
-
-vec3 LinearTo709(const vec3 colour)
-{
-	return vec3(LinearTo709_1(colour.r), LinearTo709_1(colour.g), LinearTo709_1(colour.b));
-}
-
-float LinearToDCIP3_1(const float channel)
-{
-	return pow(channel, 1.0f / (HCRT_GAMMA_OUT + 0.2f));   // Gamma: 2.4 + 0.2 = 2.6
-}
-
-vec3 LinearToDCIP3(const vec3 colour)
-{
-	return vec3(LinearToDCIP3_1(colour.r), LinearToDCIP3_1(colour.g), LinearToDCIP3_1(colour.b));
-}
-
-void GammaCorrect(const vec3 scanline_colour, inout vec3 gamma_corrected)
-{
-   if(HCRT_HDR < 1.0f)
-   {
-      if(HCRT_OUTPUT_COLOUR_SPACE == 0.0f)
-      {
-         gamma_corrected = LinearTo709(scanline_colour);
-      }
-      else if(HCRT_OUTPUT_COLOUR_SPACE == 1.0f)
-      {
-         gamma_corrected = LinearTosRGB(scanline_colour);
-      }
-      else
-      {
-         gamma_corrected = LinearToDCIP3(scanline_colour);
-      }
-   }
-   else
-   {
-      gamma_corrected = LinearToST2084(scanline_colour);
-   }
-}
-
-void LinearToOutputColor(const vec3 scanline_colour, inout vec3 output_color)
-{
-  vec3 transformed_colour;
-
-   if(HCRT_COLOUR_ACCURATE >= 1.0f)
-   {
-      if(HCRT_HDR >= 1.0f)
-      {
-         const vec3 rec2020  = scanline_colour * k2020Gamuts[uint(HCRT_EXPAND_GAMUT)];
-         transformed_colour  = rec2020 * (HCRT_PAPER_WHITE_NITS / kMaxNitsFor2084);
-      }
-      else if(HCRT_OUTPUT_COLOUR_SPACE == 2.0f)
-      {
-         transformed_colour = (scanline_colour * k709_to_XYZ) * kXYZ_to_DCIP3; 
-      }
-      else
-      {
-         transformed_colour = scanline_colour;
-      }
-   } 
-   else
-   {      
-      transformed_colour = scanline_colour;
-   }
-
-   vec3 gamma_corrected; 
-   
-   GammaCorrect(transformed_colour, gamma_corrected);
-
-   output_color = gamma_corrected;
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/megatron/include/hdr10.h b/bezel/Mega_Bezel/shaders/megatron/include/hdr10.h
deleted file mode 100644
index c9c2cf0190..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/include/hdr10.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#define kMaxNitsFor2084     10000.0f
-
-const mat3 k709_to_2020 = mat3 (
-   0.6274040f, 0.3292820f, 0.0433136f,
-   0.0690970f, 0.9195400f, 0.0113612f,
-   0.0163916f, 0.0880132f, 0.8955950f);
-
-/* START Converted from (Copyright (c) Microsoft Corporation - Licensed under the MIT License.)  https://github.com/microsoft/Xbox-ATG-Samples/tree/master/Kits/ATGTK/HDR */
-const mat3 kExpanded709_to_2020 = mat3 (
-    0.6274040f,  0.3292820f, 0.0433136f,
-    0.0457456f,  0.941777f,  0.0124772f,
-   -0.00121055f, 0.0176041f, 0.983607f);
-
-const mat3 k2020Gamuts[2] = { k709_to_2020, kExpanded709_to_2020 };
-
-float LinearToST2084_1(const float channel)
-{
-   float ST2084 = pow((0.8359375f + 18.8515625f * pow(abs(channel), 0.1593017578f)) / (1.0f + 18.6875f * pow(abs(channel), 0.1593017578f)), 78.84375f);
-   return ST2084;  /* Don't clamp between [0..1], so we can still perform operations on scene values higher than 10,000 nits */
-}
-
-vec3 LinearToST2084(const vec3 colour)
-{
-	return vec3(LinearToST2084_1(colour.r), LinearToST2084_1(colour.g), LinearToST2084_1(colour.b));
-}
-
-/* END Converted from (Copyright (c) Microsoft Corporation - Licensed under the MIT License.)  https://github.com/microsoft/Xbox-ATG-Samples/tree/master/Kits/ATGTK/HDR */
-
-/* Convert into HDR10 */
-vec3 Hdr10(const vec3 hdr_linear, float paper_white_nits, float expand_gamut)
-{
-   const vec3 rec2020       = hdr_linear * k2020Gamuts[uint(expand_gamut)];
-   const vec3 linearColour  = rec2020 * (paper_white_nits / kMaxNitsFor2084);
-   vec3 hdr10               = LinearToST2084(linearColour);
-
-   return hdr10;
-}
-
diff --git a/bezel/Mega_Bezel/shaders/megatron/include/inverse_tonemap.h b/bezel/Mega_Bezel/shaders/megatron/include/inverse_tonemap.h
deleted file mode 100644
index 1e64c704d6..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/include/inverse_tonemap.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#define kMaxNitsFor2084     10000.0f
-#define kEpsilon            0.0001f
-
-vec3 InverseTonemap(const vec3 sdr_linear, const float max_nits, const float paper_white_nits)
-{
-   const float luma                 = dot(sdr_linear, vec3(0.2126, 0.7152, 0.0722));  /* Rec BT.709 luma coefficients - https://en.wikipedia.org/wiki/Luma_(video) */
-
-   /* Inverse reinhard tonemap */
-   const float max_value            = (max_nits / paper_white_nits) + kEpsilon;
-   const float elbow                = max_value / (max_value - 1.0f);                          
-   const float offset               = 1.0f - ((0.5f * elbow) / (elbow - 0.5f));              
-   
-   const float hdr_luma_inv_tonemap = offset + ((luma * elbow) / (elbow - luma));
-   const float sdr_luma_inv_tonemap = luma / ((1.0f + kEpsilon) - luma);                     /* Convert the srd < 0.5 to 0.0 -> 1.0 range */
-
-   const float luma_inv_tonemap     = (luma > 0.5f) ? hdr_luma_inv_tonemap : sdr_luma_inv_tonemap;
-   const vec3 hdr                   = sdr_linear / (luma + kEpsilon) * luma_inv_tonemap;
-
-   return hdr;
-}
diff --git a/bezel/Mega_Bezel/shaders/megatron/include/parameters-hdr-color.h b/bezel/Mega_Bezel/shaders/megatron/include/parameters-hdr-color.h
deleted file mode 100644
index ebb91ca5d3..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/include/parameters-hdr-color.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-layout(push_constant) uniform Push
-{
-   // User Settings
-   float hcrt_hdr;
-   float hcrt_colour_space;
-   float hcrt_colour_system;
-   float hcrt_colour_accurate;
-   float hcrt_max_nits;
-   float hcrt_paper_white_nits;
-   float hcrt_expand_gamut;
-   float hcrt_gamma_out;
-   float hcrt_white_temperature;
-   float hcrt_brightness;
-   float hcrt_contrast;
-   float hcrt_saturation;
-   float hcrt_gamma_in;
-} params;
-
-// #pragma parameter hcrt_color_settings                "[ COLOR SETTINGS HDR/SDR INPUT/OUTPUT by MajorPainTheCactus ]:"                                     0.0      0.0   0.0001   0.0001
-// #pragma parameter hcrt_space0                        " "                                                            0.0      0.0   0.0001   0.0001
-// #pragma parameter hcrt_support0                      "If image is dark, try turning up your TV's brightness"               0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support1                      "HDR mode: Set the peak luminance to that of your TV."         0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support2                      "Then adjust paper white luminance until it looks right"       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support3                      " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support4                      "Default white points for the different colour systems:"       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support5                      "    709, PAL & NTSC-U: 6500K, NTSC-J: 9300K"         0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_space1                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_user_settings                 "[ YOUR DISPLAY'S SETTINGS ]:"                                     0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_hdr                           "    SDR | HDR"                                                0.0      0.0   1.0      1.0
-#pragma parameter hcrt_colour_accurate               "    Mask Accurate/Colour Accurate"                            1.0      0.0   1.0      1.0
-#pragma parameter hcrt_colour_space                  "         Display's Colour Space: r709 | sRGB | DCI-P3"        1.0      0.0   2.0      1.0
-#pragma parameter hcrt_max_nits                      "    HDR: Display's Peak Luminance"                            1000.0    0.0   10000.0  10.0
-#pragma parameter hcrt_paper_white_nits              "    HDR: Display's Paper White Luminance"                     200.0    0.0   10000.0  10.0
-#pragma parameter hcrt_expand_gamut                  "    HDR: Original/Vivid"                                      0.0      0.0   1.0      1.0
-// #pragma parameter hcrt_lcd_resolution                "         Display's Resolution: 1080p | 4K | 8K"               1.0      0.0   2.0      1.0
-// #pragma parameter hcrt_lcd_subpixel                  "         Display's Subpixel Layout: RGB | RWBG (OLED) | BGR"  0.0      0.0   2.0      1.0
-#pragma parameter hcrt_space2                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_developer_settings            "[ CRT SETTINGS ]:"                                            0.0      0.0   0.0001   0.0001
-// #pragma parameter hcrt_title                         "[ --- SONY MEGATRON COLOUR VIDEO MONITOR --- ]"                    0.0      0.0   0.0001   0.0001
-// #pragma parameter hcrt_crt_screen_type               "         Screen Type: APERTURE GRILLE | SHADOW MASK | SLOT MASK"   0.0      0.0   2.0      1.0
-// #pragma parameter hcrt_crt_resolution                "         Resolution: 300TVL | 600TVL | 800TVL | 1000TVL"           1.0      0.0   3.0      1.0
-#pragma parameter hcrt_colour_system                 "         Colour System: r709 | PAL | NTSC-U | NTSC-J"              2.0      0.0   3.0      1.0
-#pragma parameter hcrt_white_temperature             "         White Temperature Offset (Kelvin)"                        0.0     -5000.0  12000.0      100.0
-#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_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
-// #pragma parameter hcrt_developer_settings0           "[ VERTICAL SETTINGS ]:"                                       0.0      0.0   0.0001   0.0001
-// #pragma parameter hcrt_v_size                        "        Vertical Size"                                        1.00     0.8   1.2      0.01
-// #pragma parameter hcrt_v_cent                        "        Vertical Center"                                      0.00  -200.0 200.0      1.0
-// #pragma parameter hcrt_red_vertical_convergence      "        Red Vertical Deconvergence"                           0.00     -10.0 10.0     0.01
-// #pragma parameter hcrt_green_vertical_convergence    "        Green Vertical Deconvergence"                         0.00     -10.0 10.0     0.01
-// #pragma parameter hcrt_blue_vertical_convergence     "        Blue Vertical Deconvergence"                          0.00     -10.0 10.0     0.01
-// #pragma parameter hcrt_red_scanline_min              "        Red Scanline Min"                                     0.50     0.0   2.0      0.01 
-// #pragma parameter hcrt_red_scanline_max              "        Red Scanline Max"                                     1.00     0.0   2.0      0.01 
-// #pragma parameter hcrt_red_scanline_attack           "        Red Scanline Attack"                                  0.20     0.0   1.0      0.01
-// #pragma parameter hcrt_green_scanline_min            "        Green Scanline Min"                                   0.50     0.0   2.0      0.01 
-// #pragma parameter hcrt_green_scanline_max            "        Green Scanline Max"                                   1.00     0.0   2.0      0.01 
-// #pragma parameter hcrt_green_scanline_attack         "        Green Scanline Attack"                                0.20     0.0   1.0      0.01
-// #pragma parameter hcrt_blue_scanline_min             "        Blue Scanline Min"                                    0.50     0.0   2.0      0.01 
-// #pragma parameter hcrt_blue_scanline_max             "        Blue Scanline Max"                                    1.00     0.0   2.0      0.01 
-// #pragma parameter hcrt_blue_scanline_attack          "        Blue Scanline Attack"                                 0.20     0.0   1.0      0.01
-// #pragma parameter hcrt_space4                        " "                                                            0.0      0.0   0.0001   0.0001
-// #pragma parameter hcrt_developer_settings1           "[ HORIZONTAL SETTINGS ]:"                                     0.0      0.0   0.0001   0.0001
-// #pragma parameter hcrt_h_size                        "        Horizontal Size"                                      1.00     0.8   1.2      0.01
-// #pragma parameter hcrt_h_cent                        "        Horizontal Center"                                    0.00  -200.0 200.0      1.0
-// #pragma parameter hcrt_red_horizontal_convergence    "        Red Horizontal Deconvergence"                         0.00     -10.0 10.0     0.01
-// #pragma parameter hcrt_green_horizontal_convergence  "        Green Horizontal Deconvergence"                       0.00     -10.0 10.0     0.01
-// #pragma parameter hcrt_blue_horizontal_convergence   "        Blue Horizontal Deconvergence"                        0.00     -10.0 10.0     0.01
-// #pragma parameter hcrt_red_beam_sharpness            "        Red Beam Sharpness"                                   1.75     0.0   5.0      0.05
-// #pragma parameter hcrt_red_beam_attack               "        Red Beam Attack"                                      0.50     0.0   2.0      0.01
-// #pragma parameter hcrt_green_beam_sharpness          "        Green Beam Sharpness"                                 1.75     0.0   5.0      0.05
-// #pragma parameter hcrt_green_beam_attack             "        Green Beam Attack"                                    0.50     0.0   2.0      0.01
-// #pragma parameter hcrt_blue_beam_sharpness           "        Blue Beam Sharpness"                                  1.75     0.0   5.0      0.05
-// #pragma parameter hcrt_blue_beam_attack              "        Blue Beam Attack"                                     0.50     0.0   2.0      0.01
-
-#define HCRT_HDR                             params.hcrt_hdr
-#define HCRT_COLOUR_ACCURATE                 params.hcrt_colour_accurate
-#define HCRT_OUTPUT_COLOUR_SPACE             params.hcrt_colour_space
-#define HCRT_CRT_COLOUR_SYSTEM               params.hcrt_colour_system
-#define HCRT_MAX_NITS                        params.hcrt_max_nits
-#define HCRT_PAPER_WHITE_NITS                params.hcrt_paper_white_nits
-#define HCRT_EXPAND_GAMUT                    params.hcrt_expand_gamut
-#define HCRT_GAMMA_OUT                       params.hcrt_gamma_out
-#define HCRT_WHITE_TEMPERATURE              params.hcrt_white_temperature
-#define HCRT_BRIGHTNESS                     params.hcrt_brightness
-#define HCRT_CONTRAST                       params.hcrt_contrast
-#define HCRT_SATURATION                     params.hcrt_saturation
-#define HCRT_GAMMA_IN                       params.hcrt_gamma_in
-#define HCRT_COLOUR_ACCURATE                params.hcrt_colour_accurate
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/megatron/include/parameters.h b/bezel/Mega_Bezel/shaders/megatron/include/parameters.h
deleted file mode 100644
index 254504d3de..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/include/parameters.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-#pragma parameter hcrt_title                         "[ --- SONY MEGATRON COLOUR VIDEO MONITOR --- ]"               0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_space0                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support0                      "If image is dark, try turning up your TV's brightness"        0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support1                      "HDR mode: Set the peak luminance to that of your TV."         0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support2                      "Then adjust paper white luminance until it looks right"       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support3                      " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support4                      "Default white points for the different colour systems:"       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support5                      "    709, PAL & NTSC-U: 6500K, NTSC-J: 9300K"                  0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_space1                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_user_settings                 "[ YOUR DISPLAY'S SETTINGS ]:"                                 0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_hdr                           "    SDR | HDR"                                                0.0      0.0   1.0      1.0
-#pragma parameter hcrt_colour_accurate               "    Mask Accurate/Colour Accurate"                            1.0      0.0   1.0      1.0
-#pragma parameter hcrt_colour_space                  "         Display's Colour Space: r709 | sRGB | DCI-P3"        1.0      0.0   2.0      1.0
-#pragma parameter hcrt_max_nits                      "    HDR: Display's Peak Luminance"                            1000.0    0.0   10000.0  10.0
-#pragma parameter hcrt_paper_white_nits              "    HDR: Display's Paper White Luminance"                     200.0    0.0   10000.0  10.0
-#pragma parameter hcrt_expand_gamut                  "    HDR: Original/Vivid"                                      0.0      0.0   1.0      1.0
-#pragma parameter hcrt_lcd_resolution                "         Display's Resolution: 1080p | 4K | 8K"               1.0      0.0   2.0      1.0
-#pragma parameter hcrt_lcd_subpixel                  "         Display's Subpixel Layout: RGB | RWBG (OLED) | BGR"  0.0      0.0   2.0      1.0
-#pragma parameter hcrt_space2                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_developer_settings            "[ CRT SETTINGS ]:"                                                 0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_crt_screen_type               "         Screen Type: APERTURE GRILLE | SHADOW MASK | SLOT MASK"   0.0      0.0   2.0      1.0
-#pragma parameter hcrt_crt_resolution                "         Resolution: 300TVL | 600TVL | 800TVL | 1000TVL"           1.0      0.0   3.0      1.0
-#pragma parameter hcrt_colour_system                 "         Colour System: r709 | PAL | NTSC-U | NTSC-J"              2.0      0.0   3.0      1.0
-#pragma parameter hcrt_white_temperature             "         White Temperature Offset (Kelvin)"                        0.0     -5000.0  12000.0      100.0
-#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_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
-#pragma parameter hcrt_developer_settings0           "[ VERTICAL SETTINGS ]:"                                       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_v_size                        "        Vertical Size"                                        1.00     0.8   1.2      0.01
-#pragma parameter hcrt_v_cent                        "        Vertical Center"                                      0.00  -200.0 200.0      1.0
-#pragma parameter hcrt_red_vertical_convergence      "        Red Vertical Deconvergence"                           0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_green_vertical_convergence    "        Green Vertical Deconvergence"                         0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_blue_vertical_convergence     "        Blue Vertical Deconvergence"                          0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_red_scanline_min              "        Red Scanline Min"                                     0.50     0.0   2.0      0.01 
-#pragma parameter hcrt_red_scanline_max              "        Red Scanline Max"                                     1.00     0.0   2.0      0.01 
-#pragma parameter hcrt_red_scanline_attack           "        Red Scanline Attack"                                  0.20     0.0   1.0      0.01
-#pragma parameter hcrt_green_scanline_min            "        Green Scanline Min"                                   0.50     0.0   2.0      0.01 
-#pragma parameter hcrt_green_scanline_max            "        Green Scanline Max"                                   1.00     0.0   2.0      0.01 
-#pragma parameter hcrt_green_scanline_attack         "        Green Scanline Attack"                                0.20     0.0   1.0      0.01
-#pragma parameter hcrt_blue_scanline_min             "        Blue Scanline Min"                                    0.50     0.0   2.0      0.01 
-#pragma parameter hcrt_blue_scanline_max             "        Blue Scanline Max"                                    1.00     0.0   2.0      0.01 
-#pragma parameter hcrt_blue_scanline_attack          "        Blue Scanline Attack"                                 0.20     0.0   1.0      0.01
-#pragma parameter hcrt_space4                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_developer_settings1           "[ HORIZONTAL SETTINGS ]:"                                     0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_h_size                        "        Horizontal Size"                                      1.00     0.8   1.2      0.01
-#pragma parameter hcrt_h_cent                        "        Horizontal Center"                                    0.00  -200.0 200.0      1.0
-#pragma parameter hcrt_red_horizontal_convergence    "        Red Horizontal Deconvergence"                         0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_green_horizontal_convergence  "        Green Horizontal Deconvergence"                       0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_blue_horizontal_convergence   "        Blue Horizontal Deconvergence"                        0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_red_beam_sharpness            "        Red Beam Sharpness"                                   1.75     0.0   5.0      0.05
-#pragma parameter hcrt_red_beam_attack               "        Red Beam Attack"                                      0.50     0.0   2.0      0.01
-#pragma parameter hcrt_green_beam_sharpness          "        Green Beam Sharpness"                                 1.75     0.0   5.0      0.05
-#pragma parameter hcrt_green_beam_attack             "        Green Beam Attack"                                    0.50     0.0   2.0      0.01
-#pragma parameter hcrt_blue_beam_sharpness           "        Blue Beam Sharpness"                                  1.75     0.0   5.0      0.05
-#pragma parameter hcrt_blue_beam_attack              "        Blue Beam Attack"                                     0.50     0.0   2.0      0.01
-
diff --git a/bezel/Mega_Bezel/shaders/megatron/include/scanline_generation.h b/bezel/Mega_Bezel/shaders/megatron/include/scanline_generation.h
deleted file mode 100644
index e42f718162..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/include/scanline_generation.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-#define kPi    3.1415926536f
-#define kEuler 2.718281828459f
-#define kMax   1.0f
-
-#define kBeamWidth 0.5f
-
-const vec4 kFallOffControlPoints    = vec4(0.0f, 0.0f, 0.0f, 1.0f);
-const vec4 kAttackControlPoints     = vec4(0.0f, 1.0f, 1.0f, 1.0f);
-//const vec4 kScanlineControlPoints = vec4(1.0f, 1.0f, 0.0f, 0.0f);
-
-const mat4 kCubicBezier = mat4( 1.0f,  0.0f,  0.0f,  0.0f,
-                               -3.0f,  3.0f,  0.0f,  0.0f,
-                                3.0f, -6.0f,  3.0f,  0.0f,
-                               -1.0f,  3.0f, -3.0f,  1.0f );
-
-float Bezier(const float t0, const vec4 control_points)
-{
-   vec4 t = vec4(1.0, t0, t0*t0, t0*t0*t0);
-   return dot(t, control_points * kCubicBezier);
-}
-
-vec4 BeamControlPoints(const float beam_attack, const bool falloff)
-{
-   const float inner_attack = clamp(beam_attack, 0.0f, 1.0);
-   const float outer_attack = clamp(beam_attack - 1.0f, 0.0f, 1.0);
-
-   return falloff ? kFallOffControlPoints + vec4(0.0f, outer_attack, inner_attack, 0.0f) : kAttackControlPoints - vec4(0.0f, inner_attack, outer_attack, 0.0f);
-}
-
-float ScanlineColour(const uint channel, 
-                     const vec2 tex_coord,
-                     const vec2 source_size, 
-                     const float scanline_size, 
-                     const float source_tex_coord_x, 
-                     const float narrowed_source_pixel_offset, 
-                     const float vertical_convergence, 
-                     const float beam_attack, 
-                     const float scanline_min, 
-                     const float scanline_max, 
-                     const float scanline_attack, 
-                     inout float next_prev)
-{
-   const float current_source_position_y  = ((tex_coord.y * source_size.y) - vertical_convergence) + next_prev;
-   const float current_source_center_y    = floor(current_source_position_y) + 0.5f; 
-   
-   const float source_tex_coord_y         = current_source_center_y / source_size.y; 
-
-   const float scanline_delta             = fract(current_source_position_y) - 0.5f;
-
-   // Slightly increase the beam width to get maximum brightness
-   float beam_distance                    = abs(scanline_delta - next_prev) - (kBeamWidth / scanline_size);
-   beam_distance                          = beam_distance < 0.0f ? 0.0f : beam_distance;
-   const float scanline_distance          = beam_distance * 2.0f;
-
-   next_prev = scanline_delta > 0.0f ? 1.0f : -1.0f;
-
-   const vec2 tex_coord_0                 = vec2(source_tex_coord_x, source_tex_coord_y);
-   const vec2 tex_coord_1                 = vec2(source_tex_coord_x + (1.0f / source_size.x), source_tex_coord_y);
-
-   const float sdr_channel_0              = COMPAT_TEXTURE(SourceSDR, tex_coord_0)[channel];
-   const float sdr_channel_1              = COMPAT_TEXTURE(SourceSDR, tex_coord_1)[channel];
-
-   const float hdr_channel_0              = COMPAT_TEXTURE(SourceHDR, tex_coord_0)[channel];
-   const float hdr_channel_1              = COMPAT_TEXTURE(SourceHDR, tex_coord_1)[channel];
-
-   /* Horizontal interpolation between pixels */ 
-   const float horiz_interp               = Bezier(narrowed_source_pixel_offset, BeamControlPoints(beam_attack, sdr_channel_0 > sdr_channel_1));  
-
-   const float hdr_channel                = mix(hdr_channel_0, hdr_channel_1, horiz_interp);
-   const float sdr_channel                = mix(sdr_channel_0, sdr_channel_1, horiz_interp);
-
-   const float channel_scanline_distance  = clamp(scanline_distance / ((sdr_channel * (scanline_max - scanline_min)) + scanline_min), 0.0f, 1.0f);
-
-   const vec4 channel_control_points      = vec4(1.0f, 1.0f, sdr_channel * scanline_attack,    0.0f);
-
-   const float luminance                  = Bezier(channel_scanline_distance, channel_control_points);
-
-   return luminance * hdr_channel;
-}
-
-float GenerateScanline( const uint channel, 
-                        const vec2 tex_coord,
-                        const vec2 source_size, 
-                        const float scanline_size, 
-                        const float horizontal_convergence, 
-                        const float vertical_convergence, 
-                        const float beam_sharpness, 
-                        const float beam_attack, 
-                        const float scanline_min, 
-                        const float scanline_max, 
-                        const float scanline_attack)
-{
-   const float current_source_position_x      = (tex_coord.x * source_size.x) - horizontal_convergence;
-   const float current_source_center_x        = floor(current_source_position_x) + 0.5f; 
-   
-   const float source_tex_coord_x             = current_source_center_x / source_size.x; 
-
-   const float source_pixel_offset            = fract(current_source_position_x);
-
-   const float narrowed_source_pixel_offset   = clamp(((source_pixel_offset - 0.5f) * beam_sharpness) + 0.5f, 0.0f, 1.0f);
-
-   float next_prev = 0.0f;
-
-   const float scanline_colour0  = ScanlineColour( channel, 
-                                                   tex_coord,
-                                                   source_size, 
-                                                   scanline_size, 
-                                                   source_tex_coord_x, 
-                                                   narrowed_source_pixel_offset, 
-                                                   vertical_convergence,  
-                                                   beam_attack, 
-                                                   scanline_min, 
-                                                   scanline_max, 
-                                                   scanline_attack, 
-                                                   next_prev);
-
-   // Optionally sample the neighbouring scanline
-   float scanline_colour1 = 0.0f;
-   if(scanline_max > 1.0f)
-   {
-      scanline_colour1           = ScanlineColour( channel, 
-                                                   tex_coord,
-                                                   source_size, 
-                                                   scanline_size, 
-                                                   source_tex_coord_x, 
-                                                   narrowed_source_pixel_offset,
-                                                   vertical_convergence,  
-                                                   beam_attack, 
-                                                   scanline_min, 
-                                                   scanline_max, 
-                                                   scanline_attack,  
-                                                   next_prev);
-   }
-
-   return scanline_colour0 + scanline_colour1;
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/megatron/inverse_tonemap.slang b/bezel/Mega_Bezel/shaders/megatron/inverse_tonemap.slang
deleted file mode 100644
index 03d63c3746..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/inverse_tonemap.slang
+++ /dev/null
@@ -1,63 +0,0 @@
-#version 450
-
-/* 
-Part of the crt-sony-megatron shader group. Does the exact same thing as RetroArch does internally to inverse tonemap from a SDR image to HDR.
-
-This is used to do this mapping BEFORE screen effects are applied.
-
-Originally part of the crt\crt-sony-pvm-4k-hdr.slangp but can be used for any shader
-*/
-
-#pragma format R16G16B16A16_SFLOAT
-
-#include "include\inverse_tonemap.h"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float Contrast;
-   float PaperWhiteNits;
-   float MaxNits;
-   float Saturation;
-   float DisplayGamma;
-} params;
-
-#pragma parameter Contrast          "Contrast"              3.75     0.0 10.0    0.05
-#pragma parameter PaperWhiteNits    "Paper White Luminance" 200.0    0.0 10000.0 10.0
-#pragma parameter MaxNits           "Peak Luminance"        1000.0   0.0 10000.0 10.0
-#pragma parameter Saturation        "Saturation"            0.25     0.0 1.0     0.01
-#pragma parameter DisplayGamma      "Display Gamma"         2.2      0.0 5.0     0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 source = texture(Source, vTexCoord);
-
-   vec3 sdr = pow(abs(source.rgb), vec3(params.Contrast / params.DisplayGamma));       /* Display Gamma - needs to be determined by calibration screen */
-
-   FragColor = vec4(InverseTonemap(sdr, params.MaxNits, params.PaperWhiteNits, params.Saturation), source.a); 
-}
-
diff --git a/bezel/Mega_Bezel/shaders/megatron/readme.md b/bezel/Mega_Bezel/shaders/megatron/readme.md
deleted file mode 100644
index ec0410f19e..0000000000
--- a/bezel/Mega_Bezel/shaders/megatron/readme.md
+++ /dev/null
@@ -1,28 +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.
-
-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
-
-DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-*/
-
diff --git a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-accumulate.slang b/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-accumulate.slang
deleted file mode 100644
index 10c8beebf5..0000000000
--- a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-accumulate.slang
+++ /dev/null
@@ -1,103 +0,0 @@
-#version 450
-
-// newpixie CRT
-// by Mattias Gustavsson
-// adapted for slang by hunterk
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses - you may choose the one you like.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2016 Mattias Gustavsson
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this 
-software, either in source code form or as a compiled binary, for any purpose, 
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this 
-software dedicate any and all copyright interest in the software to the public 
-domain. We make this dedication for the benefit of the public at large and to 
-the detriment of our heirs and successors. We intend this dedication to be an 
-overt act of relinquishment in perpetuity of all present and future rights to 
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float NPX_ACCUMULATE_MODULATION;
-} params;
-
-#pragma parameter NPX_TITLE		"[ --- NEWPIXIE --- ]:" 0 0 0.01 0.01
-
-#pragma parameter NPX_ACCUMULATE_MODULATION "          Accumulate Modulation" 0.65 0.0 1.0 0.01
-#define modulate params.NPX_ACCUMULATE_MODULATION
-
-//HSM Removed
-// #define tex0 PassFeedback1
-
-// HSM Added
-#define tex0 PassFeedback16
-
-#define tex1 Source
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-//HSM Removed
-// layout(set = 0, binding = 3) uniform sampler2D PassFeedback1;
-
-// HSM Added
-layout(set = 0, binding = 3) uniform sampler2D PassFeedback16;
-
-void main()
-{
-   vec4 a = texture(tex0, vTexCoord.xy) * vec4(modulate);
-   vec4 b = texture(tex1, vTexCoord.xy);
-   FragColor = max( a, b * 0.96 );
-}
diff --git a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-blur-horiz.slang b/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-blur-horiz.slang
deleted file mode 100644
index fbe843dcc5..0000000000
--- a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-blur-horiz.slang
+++ /dev/null
@@ -1,96 +0,0 @@
-#version 450
-
-// newpixie CRT
-// by Mattias Gustavsson
-// adapted for slang by hunterk
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses - you may choose the one you like.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2016 Mattias Gustavsson
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this 
-software, either in source code form or as a compiled binary, for any purpose, 
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this 
-software dedicate any and all copyright interest in the software to the public 
-domain. We make this dedication for the benefit of the public at large and to 
-the detriment of our heirs and successors. We intend this dedication to be an 
-overt act of relinquishment in perpetuity of all present and future rights to 
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float NPX_BLUR_HORIZ;
-} params;
-
-#pragma parameter NPX_BLUR_HORIZ "          Horizontal Blur" 1.0 0.75 5.0 0.25
-
-vec2 blur = vec2(params.NPX_BLUR_HORIZ, 0.0) * params.OutputSize.zw;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec2 uv = vTexCoord.xy;
-   vec4 sum = texture( Source, uv ) * 0.2270270270;
-   sum += texture(Source, vec2( uv.x - 4.0 * blur.x, uv.y - 4.0 * blur.y ) ) * 0.0162162162;
-   sum += texture(Source, vec2( uv.x - 3.0 * blur.x, uv.y - 3.0 * blur.y ) ) * 0.0540540541;
-   sum += texture(Source, vec2( uv.x - 2.0 * blur.x, uv.y - 2.0 * blur.y ) ) * 0.1216216216;
-   sum += texture(Source, vec2( uv.x - 1.0 * blur.x, uv.y - 1.0 * blur.y ) ) * 0.1945945946;
-   sum += texture(Source, vec2( uv.x + 1.0 * blur.x, uv.y + 1.0 * blur.y ) ) * 0.1945945946;
-   sum += texture(Source, vec2( uv.x + 2.0 * blur.x, uv.y + 2.0 * blur.y ) ) * 0.1216216216;
-   sum += texture(Source, vec2( uv.x + 3.0 * blur.x, uv.y + 3.0 * blur.y ) ) * 0.0540540541;
-   sum += texture(Source, vec2( uv.x + 4.0 * blur.x, uv.y + 4.0 * blur.y ) ) * 0.0162162162;
-   FragColor = sum;
-}
diff --git a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-blur-vert.slang b/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-blur-vert.slang
deleted file mode 100644
index c92ded0fa0..0000000000
--- a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-blur-vert.slang
+++ /dev/null
@@ -1,96 +0,0 @@
-#version 450
-
-// newpixie CRT
-// by Mattias Gustavsson
-// adapted for slang by hunterk
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses - you may choose the one you like.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2016 Mattias Gustavsson
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this 
-software, either in source code form or as a compiled binary, for any purpose, 
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this 
-software dedicate any and all copyright interest in the software to the public 
-domain. We make this dedication for the benefit of the public at large and to 
-the detriment of our heirs and successors. We intend this dedication to be an 
-overt act of relinquishment in perpetuity of all present and future rights to 
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float NPX_BLUR_VERT;
-} params;
-
-#pragma parameter NPX_BLUR_VERT "          Vertical Blur" 1.0 0.0 5.0 0.25
-
-vec2 blur = vec2(0.0, params.NPX_BLUR_VERT) * params.OutputSize.zw;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec2 uv = vTexCoord.xy;
-   vec4 sum = texture( Source, uv ) * 0.2270270270;
-   sum += texture(Source, vec2( uv.x - 4.0 * blur.x, uv.y - 4.0 * blur.y ) ) * 0.0162162162;
-   sum += texture(Source, vec2( uv.x - 3.0 * blur.x, uv.y - 3.0 * blur.y ) ) * 0.0540540541;
-   sum += texture(Source, vec2( uv.x - 2.0 * blur.x, uv.y - 2.0 * blur.y ) ) * 0.1216216216;
-   sum += texture(Source, vec2( uv.x - 1.0 * blur.x, uv.y - 1.0 * blur.y ) ) * 0.1945945946;
-   sum += texture(Source, vec2( uv.x + 1.0 * blur.x, uv.y + 1.0 * blur.y ) ) * 0.1945945946;
-   sum += texture(Source, vec2( uv.x + 2.0 * blur.x, uv.y + 2.0 * blur.y ) ) * 0.1216216216;
-   sum += texture(Source, vec2( uv.x + 3.0 * blur.x, uv.y + 3.0 * blur.y ) ) * 0.0540540541;
-   sum += texture(Source, vec2( uv.x + 4.0 * blur.x, uv.y + 4.0 * blur.y ) ) * 0.0162162162;
-   FragColor = sum;
-}
diff --git a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-crt.slang b/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-crt.slang
deleted file mode 100644
index 75b6a3abaf..0000000000
--- a/bezel/Mega_Bezel/shaders/newpixie/hsm-newpixie-crt.slang
+++ /dev/null
@@ -1,269 +0,0 @@
-#version 450
-
-// newpixie CRT
-// by Mattias Gustavsson
-// adapted for slang by hunterk
-// Integration for Mega Bexel by HyperspaceMadness
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses - you may choose the one you like.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2016 Mattias Gustavsson
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this 
-software, either in source code form or as a compiled binary, for any purpose, 
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this 
-software dedicate any and all copyright interest in the software to the public 
-domain. We make this dedication for the benefit of the public at large and to 
-the detriment of our heirs and successors. We intend this dedication to be an 
-overt act of relinquishment in perpetuity of all present and future rights to 
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/
-
-// HSM Added
-#include "../base/common/globals-and-screen-scale-params.inc"
-// End Addition
-
-// HSM Removed
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float use_frame;
-	float curvature;
-    float wiggle_toggle;
-} params;
-
-// HSM Removed
-// #pragma parameter use_frame "Use Frame Image" 0.0 0.0 1.0 1.0
-// #define use_frame params.use_frame
-// #pragma parameter curvature "Curvature" 2.0 0.0001 4.0 0.25
-#pragma parameter wiggle_toggle "[NEWPIXIE]   Interference" 0.0 0.0 1.0 1.0
-
-#define gl_FragCoord (vTexCoord.xy * global.OutputSize.xy)
-#define backbuffer accum1
-#define blurbuffer blur2
-
-// HSM Removed
-// #define frametexture frametexture
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    // vec4 modpos = vec4(Position.x, 1.-Position.y, Position.z, Position.w);
-    // gl_Position = global.MVP * modpos;
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-
-layout(location = 0) out vec4 FragColor;
-
-layout(set = 0, binding = 2) uniform sampler2D InfoCachePass;
-
-layout(set = 0, binding = 4) uniform sampler2D accum1;
-layout(set = 0, binding = 5) uniform sampler2D blur2;
-
-vec3 tsample( sampler2D samp, vec2 tc, float offs, vec2 resolution )
-    {
-    // tc = tc * vec2(1.025, 0.92) + vec2(-0.0125, 0.04);
-    // HSM Removed
-    // vec3 s = pow( abs( texture( samp, vec2( tc.x, 1.0-tc.y ) ).rgb), vec3( 2.2 ) );
-    
-    // HSM Added
-    vec3 s = pow( abs( HSM_GetCroppedTexSample( samp, vec2(tc.x, tc.y) ).rgb), vec3( 2.2 ) );
-    
-    return s*vec3(1.25);
-    }
-		
-vec3 filmic( vec3 LinearColor )
-    {
-    vec3 x = max( vec3(0.0), LinearColor-vec3(0.004));
-    return (x*(6.2*x+0.5))/(x*(6.2*x+1.7)+0.06);
-    }
-
-// HSM Removed
-// vec2 curve( vec2 uv )
-//     {
-//     uv = (uv - 0.5);// * 2.0;
-// //    uv.x *= 0.75;
-//     uv *= vec2(0.925, 1.095);  
-//     uv *= params.curvature;
-//     uv.x *= 1.0 + pow((abs(uv.y) / 4.0), 2.0);
-//     uv.y *= 1.0 + pow((abs(uv.x) / 3.0), 2.0);
-//     uv /= params.curvature;
-//     uv  += 0.5;
-//     uv =  uv *0.92 + 0.04;
-//     return uv;
-//     }
-		
-float rand(vec2 co)
-    {
-    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-    }
-    
-// HSM Removed
-// #define resolution global.OutputSize.xy
-
-// HSM Added
-#define resolution global.OutputSize.xy
-
-void main()
-{
-	vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord);
-	HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, vTexCoord);
-
-   // stop time variable so the screen doesn't wiggle
-    float time = 1.0;
-    vec2 uv = SCREEN_COORD.xy;
-    /* Curve */
-    // HSM Removed
-    // vec2 curved_uv = mix( curve( uv ), uv, 0.4 );
-
-    vec2 screen_curved_coord = HSM_GetCurvedCoord(uv, HSM_CRT_CURVATURE_SCALE, SCREEN_ASPECT);
-    vec2 curved_uv = HSM_GetMirrorWrappedCoord(screen_curved_coord);
-    // vec2 screen_curved_coord = curve(uv);
-    // vec2 curved_uv = mix( screen_curved_coord, uv, 0.4 );
-
-    // HSM Removed - we don't need to scale to fit inside the frame
-    // float scale = -0.101;
-    // vec2 scuv = curved_uv*(1.0-scale)+scale/2.0+vec2(0.003, -0.001);
-
-    // HSM Added
-    vec2 scuv = curved_uv;
-    
-    // HSM Removed
-    // uv = scuv;
-		
-    /* Main color, Bleed */
-    vec3 col;
-    float x = params.wiggle_toggle * sin(0.1*time+curved_uv.y*13.0)*sin(0.23*time+curved_uv.y*19.0)*sin(0.3+0.11*time+curved_uv.y*23.0)*0.0012;
-    float o = sin(gl_FragCoord.y*1.5)/resolution.x;
-    x+=o*0.25;
-
-    // make time do something again
-    time = float(mod(global.FrameCount, 640) * 1); 
-    col.r = tsample(backbuffer,vec2(x+scuv.x+0.0009,scuv.y+0.0009),resolution.y/800.0, resolution ).x+0.02;
-    col.g = tsample(backbuffer,vec2(x+scuv.x+0.0000,scuv.y-0.0011),resolution.y/800.0, resolution ).y+0.02;
-    col.b = tsample(backbuffer,vec2(x+scuv.x-0.0015,scuv.y+0.0000),resolution.y/800.0, resolution ).z+0.02;
-    float i = clamp(col.r*0.299 + col.g*0.587 + col.b*0.114, 0.0, 1.0 );
-    i = pow( 1.0 - pow(i,2.0), 1.0 );
-    i = (1.0-i) * 0.85 + 0.15; 
-    
-    /* Ghosting */
-    float ghs = 0.15;
-    vec3 r = tsample(   blurbuffer,    
-                        vec2(x-0.014*1.0, -0.027)*0.85+0.007*vec2( 0.35*sin(1.0/7.0 + 15.0*curved_uv.y + 0.9*time), 
-                        0.35*sin( 2.0/7.0 + 10.0*curved_uv.y + 1.37*time) )+vec2(scuv.x+0.001,scuv.y+0.001),
-                        5.5+1.3*sin( 3.0/9.0 + 31.0*curved_uv.x + 1.70*time),resolution).xyz*vec3(0.5,0.25,0.25);
-    vec3 g = tsample(   blurbuffer, 
-                        vec2(x-0.019*1.0, -0.020)*0.85+0.007*vec2( 0.35*cos(1.0/9.0 + 15.0*curved_uv.y + 0.5*time), 
-                        0.35*sin( 2.0/9.0 + 10.0*curved_uv.y + 1.50*time) )+vec2(scuv.x+0.000,scuv.y-0.002),
-                        5.4+1.3*sin( 3.0/3.0 + 71.0*curved_uv.x + 1.90*time),resolution).xyz*vec3(0.25,0.5,0.25);
-    vec3 b = tsample(   blurbuffer, 
-                        vec2(x-0.017*1.0, -0.003)*0.85+0.007*vec2( 0.35*sin(2.0/3.0 + 15.0*curved_uv.y + 0.7*time), 
-                        0.35*cos( 2.0/3.0 + 10.0*curved_uv.y + 1.63*time) )+vec2(scuv.x-0.002,scuv.y+0.000),
-                        5.3+1.3*sin( 3.0/7.0 + 91.0*curved_uv.x + 1.65*time),resolution).xyz*vec3(0.25,0.25,0.5);
-		
-    col += vec3(ghs*(1.0-0.299))*pow(clamp(vec3(3.0)*r,vec3(0.0),vec3(1.0)),vec3(2.0))*vec3(i);
-    col += vec3(ghs*(1.0-0.587))*pow(clamp(vec3(3.0)*g,vec3(0.0),vec3(1.0)),vec3(2.0))*vec3(i);
-    col += vec3(ghs*(1.0-0.114))*pow(clamp(vec3(3.0)*b,vec3(0.0),vec3(1.0)),vec3(2.0))*vec3(i);
-		
-    /* Level adjustment (curves) */
-    col *= vec3(0.95,1.05,0.95);
-    col = clamp(col*1.3 + 0.75*col*col + 1.25*col*col*col*col*col,vec3(0.0),vec3(10.0));
-	
-    // HSM Removed - Vignette is added in Grade
-    // /* Vignette */
-    // float vig = (0.1 + 1.0*16.0*curved_uv.x*curved_uv.y*(1.0-curved_uv.x)*(1.0-curved_uv.y));
-    // vig = 1.3*pow(vig,0.5);
-    // col *= vig;
-		
-    /* Scanlines */
-
-    // HSM Removed
-    // float scans = clamp( 0.35+0.18*sin(6.0*time-curved_uv.y*resolution.y*1.5), 0.0, 1.0);
-
-    // HSM Added
-    vec2 mixed_uv_for_scanline = mix( curved_uv, uv, 0.4 );
-    mixed_uv_for_scanline.y = 1 - mixed_uv_for_scanline.y;
-    float scans = clamp( 0.35 + 0.18 * sin(6.0 * time - mixed_uv_for_scanline.y * CROPPED_ROTATED_SIZE_WITH_RES_MULT.y * 8), 0.0, 1.0);
-
-    float s = pow(scans,0.9);
-
-    // Approximate adjustments to get a similar result to what newpixie generates at this point
-    // col = HSM_Linearize(HSM_GetCroppedTexSample(backbuffer, curved_uv), 2).rgb;
-    // col *= 1.25;
-    // col *= vec3(1.1, 1.20, 1.1);
-    // col = clamp(col*1.3 + 0.75*col*col + 1.25*col*col*col*col*col,vec3(0.0),vec3(10.0));
-
-    float outside_screen_mask = 1 - HSM_GetCornerMask(screen_curved_coord, SCREEN_ASPECT, 0, 1);
-    s = mix(s, 0.4, outside_screen_mask);
-
-    col = col * vec3(s);
-		
-    /* Vertical lines (shadow mask) */
-    col*=1.0-0.23*(clamp((mod(gl_FragCoord.xy.x, 3.0))/2.0,0.0,1.0));
-		
-    /* Tone map */
-    col = filmic( col );
-
-    /* Noise */
-    /*vec2 seed = floor(curved_uv*resolution.xy*vec2(0.5))/resolution.xy;*/
-    vec2 seed = curved_uv*resolution.xy;
-    /* seed = curved_uv; */
-    col -= 0.015*pow(vec3(rand( seed +time ), rand( seed +time*2.0 ), rand( seed +time * 3.0 ) ), vec3(1.5) );
-		
-    /* Flicker */
-    col *= (1.0-0.004*(sin(50.0*time+curved_uv.y*2.0)*0.5+0.5));
-
-    // HSM Removed
-    // uv = curved_uv;
-
-    /* Frame */
-    // vec2 fscale = vec2( 0.026, -0.018);//vec2( -0.018, -0.013 );
-    // uv = vec2(uv.x, 1.-uv.y);
-
-    // vec4 f=texture(frametexture,uv*((1.0)+2.0*fscale)-fscale-vec2(-0.0, 0.005));
-    // f.xyz = mix( f.xyz, vec3(0.5,0.5,0.5), 0.5 );
-
-    // float fvig = clamp( -0.00+512.0*uv.x*uv.y*(1.0-uv.x)*(1.0-uv.y), 0.2, 0.8 );
-    // col = mix( col, mix( max( col, 0.0), pow( abs( f.xyz ), vec3( 1.4 ) ) * fvig, f.w * f.w), vec3( use_frame ) );
-    
-    FragColor = vec4( col, 1.0 );
-}
diff --git a/bezel/Mega_Bezel/shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang b/bezel/Mega_Bezel/shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
deleted file mode 100644
index 9f41486dca..0000000000
--- a/bezel/Mega_Bezel/shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang
+++ /dev/null
@@ -1,86 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-    float PS1_BOX_BLUR_MODE;
-    float PS1_BOX_BLUR_BLEND;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter HSM_BOXBLUR_EMPTY_LINE							" " 0 0 0.001 0.001
-#pragma parameter PS1_BOXBLUR_TITLE		"[ --- PS1 BOX BLUR --- ]:" 0 0 0.01 0.01
-
-#pragma parameter PS1_BOX_BLUR_MODE     "          Box Blur ON" 0.0 0.0 1.0 1.0
-#define PS1_BOX_BLUR_MODE params.PS1_BOX_BLUR_MODE
-
-#pragma parameter PS1_BOX_BLUR_BLEND     "          Blend Amount" 100 0.0 100 10.0
-#define PS1_BOX_BLUR_BLEND params.PS1_BOX_BLUR_BLEND / 100
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec4 orig_pass_full = texture(Source, vTexCoord);
-    if (PS1_BOX_BLUR_MODE < 0.5)
-    {
-        FragColor = orig_pass_full;
-        return;
-    }
-
-    vec3 OriginPass  = orig_pass_full.xyz;//No blending
-
-    //Blend 4 pixels together by sampling between them with linear interpolation
-    vec2 SquareBlend = (vTexCoord * params.SourceSize.xy - 0.5) * params.SourceSize.zw;
-    //Blend 2 horizontal pixels together the same way as before
-    vec2 HorizoBlend = (vTexCoord * params.SourceSize.xy - vec2(0.5,0.0)) * params.SourceSize.zw;
-    vec3 SquarePass  = texture(Source, SquareBlend).xyz;
-    vec3 HorizoPass  = texture(Source, HorizoBlend).xyz;
-    
-    //Edge Detection for SquareBlend
-    vec3 SquareEdge = texture(Source, (SquareBlend * params.SourceSize.xy + vec2( 0.0, 1.0)) * params.SourceSize.zw).xyz + 
-                      texture(Source, (SquareBlend * params.SourceSize.xy + vec2( 1.0, 0.0)) * params.SourceSize.zw).xyz +
-                      texture(Source, (SquareBlend * params.SourceSize.xy + vec2( 1.0, 1.0)) * params.SourceSize.zw).xyz;
-    SquareEdge      = abs((SquareEdge / 3.0) - SquarePass);
-    //Try to adjust white / black range so that edges are black and non-edges are white
-    float SquareEdgeMask = 1.0-pow(1.0-pow(1.0-max(SquareEdge.x,max(SquareEdge.y,SquareEdge.z)),30.0),2.0);
-    
-    //Edge Detection for HorizoBlend
-    vec3 HorizoEdge = texture(Source, (HorizoBlend * params.SourceSize.xy + vec2( 0.0, 1.0)) * params.SourceSize.zw).xyz + 
-                      texture(Source, (HorizoBlend * params.SourceSize.xy + vec2( 1.0, 0.0)) * params.SourceSize.zw).xyz +
-                      texture(Source, (HorizoBlend * params.SourceSize.xy + vec2( 1.0, 1.0)) * params.SourceSize.zw).xyz;
-    HorizoEdge      = abs((HorizoEdge / 3.0) - HorizoPass);
-    //Try to adjust white / black range so that edges are black and non-edges are white
-    float HorizoEdgeMask = 1.0-pow(1.0-pow(1.0-max(HorizoEdge.x,max(HorizoEdge.y,HorizoEdge.z)),10.0),2.0);
-    
-    //If SquarePass has a detected edge, use HorizoPass
-    vec3 Result = mix(HorizoPass,SquarePass,SquareEdgeMask);
-
-    //If HorizoPass has a detected edge, use OriginPass
-    Result      = mix(OriginPass,Result,HorizoEdgeMask);
-
-    // It's complete
-    // Blend with Original
-    FragColor = vec4(mix(OriginPass, Result, PS1_BOX_BLUR_BLEND), 1);
-}
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass0.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass0.slang
deleted file mode 100644
index 04fe89832e..0000000000
--- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass0.slang
+++ /dev/null
@@ -1,108 +0,0 @@
-#version 450
-
-/*
-	ScaleFX - Pass 0
-	by Sp00kyFox, 2017-03-01
-
-Filter:	Nearest
-Scale:	1x
-
-ScaleFX is an edge interpolation algorithm specialized in pixel art. It was
-originally intended as an improvement upon Scale3x but became a new filter in
-its own right.
-ScaleFX interpolates edges up to level 6 and makes smooth transitions between
-different slopes. The filtered picture will only consist of colours present
-in the original.
-
-Pass 0 prepares metric data for the next pass.
-
-
-
-Copyright (c) 2016 Sp00kyFox - ScaleFX@web.de
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-#include "hsm-scalefx.inc"
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-
-
-// Reference: http://www.compuphase.com/cmetric.htm
-float dist(vec3 A, vec3 B)
-{
-	float r = 0.5 * (A.r + B.r);
-	vec3 d = A - B;
-	vec3 c = vec3(2 + r, 4, 3 - r);
-
-	return sqrt(dot(c*d, d)) / 3;
-}
-
-
-void main()
-{
-	if (HSM_SCALEFX_ON < 0.5) 
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	/*	grid		metric
-
-		A B C		x y z
-		  E F		  o w
-	*/
-
-// HSM Removed
-// #define TEX(x, y) textureOffset(Source, vTexCoord, ivec2(x, y)).rgb
-
-// HSM Added
-#define TEX(x, y) HSM_TextureOffset(Source, vTexCoord, vec2(x, y), params.SourceSize.xy).rgb
-
-	// read texels
-	vec3 A = TEX(-1,-1);
-	vec3 B = TEX( 0,-1);
-	vec3 C = TEX( 1,-1);
-	vec3 E = TEX( 0, 0);
-	vec3 F = TEX( 1, 0);
-
-	// output
-	FragColor = vec4(dist(E,A), dist(E,B), dist(E,C), dist(E,F));
-}
diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass1.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass1.slang
deleted file mode 100644
index e723cba7b1..0000000000
--- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass1.slang
+++ /dev/null
@@ -1,117 +0,0 @@
-#version 450
-
-/*
-	ScaleFX - Pass 1
-	by Sp00kyFox, 2017-03-01
-
-Filter:	Nearest
-Scale:	1x
-
-ScaleFX is an edge interpolation algorithm specialized in pixel art. It was
-originally intended as an improvement upon Scale3x but became a new filter in
-its own right.
-ScaleFX interpolates edges up to level 6 and makes smooth transitions between
-different slopes. The filtered picture will only consist of colours present
-in the original.
-
-Pass 1 calculates the strength of interpolation candidates.
-
-
-
-Copyright (c) 2016 Sp00kyFox - ScaleFX@web.de
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-#include "hsm-scalefx.inc"
-
-// #pragma parameter SFX_CLR "ScaleFX Threshold" 0.50 0.01 1.00 0.01
-// #define SFX_CLR 0.5
-
-// #pragma parameter SFX_SAA "ScaleFX Filter AA" 1.00 0.00 1.00 1.00
-// #define SFX_SAA 1
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-
-
-// corner strength
-float str(float d, vec2 a, vec2 b){
-	float diff = a.x - a.y;
-	float wght1 = max(SFX_CLR - d, 0) / SFX_CLR;
-	float wght2 = clamp((1-d) + (min(a.x, b.x) + a.x > min(a.y, b.y) + a.y ? diff : -diff), 0., 1.);
-	return (SFX_SAA == 1. || 2.*d < a.x + a.y) ? (wght1 * wght2) * (a.x * a.y) : 0.;
-}
-
-
-void main()
-{
-	if (HSM_SCALEFX_ON < 0.5) 
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	/*	grid		metric		pattern
-
-		A B		x y z		x y
-		D E F		  o w		w z
-		G H I
-	*/
-
-// HSM Removed
-// #define TEX(x, y) textureOffset(Source, vTexCoord, ivec2(x, y))
-
-// HSM Added
-#define TEX(x, y) HSM_TextureOffset(Source, vTexCoord, vec2(x, y), params.SourceSize.xy)
-
-	// metric data
-	vec4 A = TEX(-1,-1), B = TEX( 0,-1);
-	vec4 D = TEX(-1, 0), E = TEX( 0, 0), F = TEX( 1, 0);
-	vec4 G = TEX(-1, 1), H = TEX( 0, 1), I = TEX( 1, 1);
-
-	// corner strength
-	vec4 res;
-	res.x = str(D.z, vec2(D.w, E.y), vec2(A.w, D.y));
-	res.y = str(F.x, vec2(E.w, E.y), vec2(B.w, F.y));
-	res.z = str(H.z, vec2(E.w, H.y), vec2(H.w, I.y));
-	res.w = str(H.x, vec2(D.w, H.y), vec2(G.w, G.y));
-		
-	FragColor = res;
-}
diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass2.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass2.slang
deleted file mode 100644
index ac7742914b..0000000000
--- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass2.slang
+++ /dev/null
@@ -1,162 +0,0 @@
-#version 450
-
-/*
-	ScaleFX - Pass 2
-	by Sp00kyFox, 2017-03-01
-
-Filter:	Nearest
-Scale:	1x
-
-ScaleFX is an edge interpolation algorithm specialized in pixel art. It was
-originally intended as an improvement upon Scale3x but became a new filter in
-its own right.
-ScaleFX interpolates edges up to level 6 and makes smooth transitions between
-different slopes. The filtered picture will only consist of colours present
-in the original.
-
-Pass 2 resolves ambiguous configurations of corner candidates at pixel junctions.
-
-
-
-Copyright (c) 2016 Sp00kyFox - ScaleFX@web.de
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-#include "hsm-scalefx.inc"
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord*1.0001;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-layout(binding = 2) uniform sampler2D scalefx_pass0;
-
-
-#define LE(x, y) (1 - step(y, x))
-#define GE(x, y) (1 - step(x, y))
-#define LEQ(x, y) step(x, y)
-#define GEQ(x, y) step(y, x)
-#define NOT(x) (1 - (x))
-
-// corner dominance at junctions
-vec4 dom(vec3 x, vec3 y, vec3 z, vec3 w){
-	return 2 * vec4(x.y, y.y, z.y, w.y) - (vec4(x.x, y.x, z.x, w.x) + vec4(x.z, y.z, z.z, w.z));
-}
-
-// necessary but not sufficient junction condition for orthogonal edges
-float clear(vec2 crn, vec2 a, vec2 b){
-	return (crn.x >= max(min(a.x, a.y), min(b.x, b.y))) && (crn.y >= max(min(a.x, b.y), min(b.x, a.y))) ? 1. : 0.;
-}
-
-
-void main()
-{
-	if (HSM_SCALEFX_ON < 0.5) 
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	/*	grid		metric		pattern
-
-		A B C		x y z		x y
-		D E F		  o w		w z
-		G H I
-	*/
-
-// HSM Removed
-// #define TEXm(x, y) textureOffset(scalefx_pass0, vTexCoord, ivec2(x, y))
-// #define TEXs(x, y) textureOffset(Source, vTexCoord, ivec2(x, y))
-
-// HSM Added
-#define TEXm(x, y) HSM_TextureOffset(scalefx_pass0, vTexCoord, vec2(x, y), params.scalefx_pass0Size.xy)
-#define TEXs(x, y) HSM_TextureOffset(Source, 		vTexCoord, vec2(x, y), params.SourceSize.xy)
-
-	// metric data
-	vec4 A = TEXm(-1,-1), B = TEXm( 0,-1);
-	vec4 D = TEXm(-1, 0), E = TEXm( 0, 0), F = TEXm( 1, 0);
-	vec4 G = TEXm(-1, 1), H = TEXm( 0, 1), I = TEXm( 1, 1);	
-
-	// strength data
-	vec4 As = TEXs(-1,-1), Bs = TEXs( 0,-1), Cs = TEXs( 1,-1);
-	vec4 Ds = TEXs(-1, 0), Es = TEXs( 0, 0), Fs = TEXs( 1, 0);
-	vec4 Gs = TEXs(-1, 1), Hs = TEXs( 0, 1), Is = TEXs( 1, 1);
-
-	// strength & dominance junctions
-	vec4 jSx = vec4(As.z, Bs.w, Es.x, Ds.y), jDx = dom(As.yzw, Bs.zwx, Es.wxy, Ds.xyz);
-	vec4 jSy = vec4(Bs.z, Cs.w, Fs.x, Es.y), jDy = dom(Bs.yzw, Cs.zwx, Fs.wxy, Es.xyz);
-	vec4 jSz = vec4(Es.z, Fs.w, Is.x, Hs.y), jDz = dom(Es.yzw, Fs.zwx, Is.wxy, Hs.xyz);
-	vec4 jSw = vec4(Ds.z, Es.w, Hs.x, Gs.y), jDw = dom(Ds.yzw, Es.zwx, Hs.wxy, Gs.xyz);
-
-
-	// majority vote for ambiguous dominance junctions
-	vec4 zero4 = vec4(0);
-	vec4 jx = min(GE(jDx, zero4) * (LEQ(jDx.yzwx, zero4) * LEQ(jDx.wxyz, zero4) + GE(jDx + jDx.zwxy, jDx.yzwx + jDx.wxyz)), 1);
-	vec4 jy = min(GE(jDy, zero4) * (LEQ(jDy.yzwx, zero4) * LEQ(jDy.wxyz, zero4) + GE(jDy + jDy.zwxy, jDy.yzwx + jDy.wxyz)), 1);
-	vec4 jz = min(GE(jDz, zero4) * (LEQ(jDz.yzwx, zero4) * LEQ(jDz.wxyz, zero4) + GE(jDz + jDz.zwxy, jDz.yzwx + jDz.wxyz)), 1);
-	vec4 jw = min(GE(jDw, zero4) * (LEQ(jDw.yzwx, zero4) * LEQ(jDw.wxyz, zero4) + GE(jDw + jDw.zwxy, jDw.yzwx + jDw.wxyz)), 1);
-
-
-	// inject strength without creating new contradictions
-	vec4 res;
-	res.x = min(jx.z + NOT(jx.y) * NOT(jx.w) * GE(jSx.z, 0) * (jx.x + GE(jSx.x + jSx.z, jSx.y + jSx.w)), 1);
-	res.y = min(jy.w + NOT(jy.z) * NOT(jy.x) * GE(jSy.w, 0) * (jy.y + GE(jSy.y + jSy.w, jSy.x + jSy.z)), 1);
-	res.z = min(jz.x + NOT(jz.w) * NOT(jz.y) * GE(jSz.x, 0) * (jz.z + GE(jSz.x + jSz.z, jSz.y + jSz.w)), 1);
-	res.w = min(jw.y + NOT(jw.x) * NOT(jw.z) * GE(jSw.y, 0) * (jw.w + GE(jSw.y + jSw.w, jSw.x + jSw.z)), 1);	
-
-
-	// single pixel & end of line detection
-	res = min(res * (vec4(jx.z, jy.w, jz.x, jw.y) + NOT(res.wxyz * res.yzwx)), 1);
-
-
-	// output
-
-	vec4 clr;
-	clr.x = clear(vec2(D.z, E.x), vec2(D.w, E.y), vec2(A.w, D.y));
-	clr.y = clear(vec2(F.x, E.z), vec2(E.w, E.y), vec2(B.w, F.y));
-	clr.z = clear(vec2(H.z, I.x), vec2(E.w, H.y), vec2(H.w, I.y));
-	clr.w = clear(vec2(H.x, G.z), vec2(D.w, H.y), vec2(G.w, G.y));
-
-	vec4 h = vec4(min(D.w, A.w), min(E.w, B.w), min(E.w, H.w), min(D.w, G.w));
-	vec4 v = vec4(min(E.y, D.y), min(E.y, F.y), min(H.y, I.y), min(H.y, G.y));
-
-	vec4 orien = GE(h + vec4(D.w, E.w, E.w, D.w), v + vec4(E.y, E.y, H.y, H.y));	// orientation
-	vec4 hori  = LE(h, v) * clr;	// horizontal edges
-	vec4 vert  = GE(h, v) * clr;	// vertical edges
-
-	FragColor = (res + 2 * hori + 4 * vert + 8 * orien) / 15;
-}
diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass3.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass3.slang
deleted file mode 100644
index d015ec41f1..0000000000
--- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass3.slang
+++ /dev/null
@@ -1,183 +0,0 @@
-#version 450
-
-/*
-	ScaleFX - Pass 3
-	by Sp00kyFox, 2017-03-01
-
-Filter:	Nearest
-Scale:	1x
-
-ScaleFX is an edge interpolation algorithm specialized in pixel art. It was
-originally intended as an improvement upon Scale3x but became a new filter in
-its own right.
-ScaleFX interpolates edges up to level 6 and makes smooth transitions between
-different slopes. The filtered picture will only consist of colours present
-in the original.
-
-Pass 3 determines which edge level is present and prepares tags for subpixel
-output in the final pass.
-
-
-
-Copyright (c) 2016 Sp00kyFox - ScaleFX@web.de
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-
-#include "hsm-scalefx.inc"
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-
-
-// extract first bool4 from float4 - corners
-bvec4 loadCorn(vec4 x){
-	return bvec4(floor(mod(x*15 + 0.5, 2)));
-}
-
-// extract second bool4 from float4 - horizontal edges
-bvec4 loadHori(vec4 x){
-	return bvec4(floor(mod(x*7.5 + 0.25, 2)));
-}
-
-// extract third bool4 from float4 - vertical edges
-bvec4 loadVert(vec4 x){
-	return bvec4(floor(mod(x*3.75 + 0.125, 2)));
-}
-
-// extract fourth bool4 from float4 - orientation
-bvec4 loadOr(vec4 x){
-	return bvec4(floor(mod(x*1.875 + 0.0625, 2)));
-}
-
-
-
-void main()
-{
-	if (HSM_SCALEFX_ON < 0.5) 
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	/*	grid		corners		mids		
-
-		  B		x   y	  	  x
-		D E F				w   y
-		  H		w   z	  	  z
-	*/
-
-// HSM Removed
-// #define TEX(x, y) textureOffset(Source, vTexCoord, ivec2(x, y))
-
-// HSM Added
-#define TEX(x, y) HSM_TextureOffset(Source, vTexCoord, vec2(x, y), params.SourceSize.xy)
-
-	// read data
-	vec4 E = TEX( 0, 0);
-	vec4 D = TEX(-1, 0), D0 = TEX(-2, 0), D1 = TEX(-3, 0);
-	vec4 F = TEX( 1, 0), F0 = TEX( 2, 0), F1 = TEX( 3, 0);
-	vec4 B = TEX( 0,-1), B0 = TEX( 0,-2), B1 = TEX( 0,-3);
-	vec4 H = TEX( 0, 1), H0 = TEX( 0, 2), H1 = TEX( 0, 3);
-
-	// extract data
-	bvec4 Ec = loadCorn(E), Eh = loadHori(E), Ev = loadVert(E), Eo = loadOr(E);
-	bvec4 Dc = loadCorn(D),	Dh = loadHori(D), Do = loadOr(D), D0c = loadCorn(D0), D0h = loadHori(D0), D1h = loadHori(D1);
-	bvec4 Fc = loadCorn(F),	Fh = loadHori(F), Fo = loadOr(F), F0c = loadCorn(F0), F0h = loadHori(F0), F1h = loadHori(F1);
-	bvec4 Bc = loadCorn(B),	Bv = loadVert(B), Bo = loadOr(B), B0c = loadCorn(B0), B0v = loadVert(B0), B1v = loadVert(B1);
-	bvec4 Hc = loadCorn(H),	Hv = loadVert(H), Ho = loadOr(H), H0c = loadCorn(H0), H0v = loadVert(H0), H1v = loadVert(H1);
-
-	
-	// lvl1 corners (hori, vert)
-	bool lvl1x = Ec.x && (Dc.z || Bc.z || SFX_SCN == 1);
-	bool lvl1y = Ec.y && (Fc.w || Bc.w || SFX_SCN == 1);
-	bool lvl1z = Ec.z && (Fc.x || Hc.x || SFX_SCN == 1);
-	bool lvl1w = Ec.w && (Dc.y || Hc.y || SFX_SCN == 1);
-
-	// lvl2 mid (left, right / up, down)
-	bvec2 lvl2x = bvec2((Ec.x && Eh.y) && Dc.z, (Ec.y && Eh.x) && Fc.w);
-	bvec2 lvl2y = bvec2((Ec.y && Ev.z) && Bc.w, (Ec.z && Ev.y) && Hc.x);
-	bvec2 lvl2z = bvec2((Ec.w && Eh.z) && Dc.y, (Ec.z && Eh.w) && Fc.x);
-	bvec2 lvl2w = bvec2((Ec.x && Ev.w) && Bc.z, (Ec.w && Ev.x) && Hc.y);
-
-	// lvl3 corners (hori, vert)
-	bvec2 lvl3x = bvec2(lvl2x.y && (Dh.y && Dh.x) && Fh.z, lvl2w.y && (Bv.w && Bv.x) && Hv.z);
-	bvec2 lvl3y = bvec2(lvl2x.x && (Fh.x && Fh.y) && Dh.w, lvl2y.y && (Bv.z && Bv.y) && Hv.w);
-	bvec2 lvl3z = bvec2(lvl2z.x && (Fh.w && Fh.z) && Dh.x, lvl2y.x && (Hv.y && Hv.z) && Bv.x);
-	bvec2 lvl3w = bvec2(lvl2z.y && (Dh.z && Dh.w) && Fh.y, lvl2w.x && (Hv.x && Hv.w) && Bv.y);
-
-	// lvl4 corners (hori, vert)
-	bvec2 lvl4x = bvec2((Dc.x && Dh.y && Eh.x && Eh.y && Fh.x && Fh.y) && (D0c.z && D0h.w), (Bc.x && Bv.w && Ev.x && Ev.w && Hv.x && Hv.w) && (B0c.z && B0v.y));
-	bvec2 lvl4y = bvec2((Fc.y && Fh.x && Eh.y && Eh.x && Dh.y && Dh.x) && (F0c.w && F0h.z), (Bc.y && Bv.z && Ev.y && Ev.z && Hv.y && Hv.z) && (B0c.w && B0v.x));
-	bvec2 lvl4z = bvec2((Fc.z && Fh.w && Eh.z && Eh.w && Dh.z && Dh.w) && (F0c.x && F0h.y), (Hc.z && Hv.y && Ev.z && Ev.y && Bv.z && Bv.y) && (H0c.x && H0v.w));
-	bvec2 lvl4w = bvec2((Dc.w && Dh.z && Eh.w && Eh.z && Fh.w && Fh.z) && (D0c.y && D0h.x), (Hc.w && Hv.x && Ev.w && Ev.x && Bv.w && Bv.x) && (H0c.y && H0v.z));
-
-	// lvl5 mid (left, right / up, down)
-	bvec2 lvl5x = bvec2(lvl4x.x && (F0h.x && F0h.y) && (D1h.z && D1h.w), lvl4y.x && (D0h.y && D0h.x) && (F1h.w && F1h.z));
-	bvec2 lvl5y = bvec2(lvl4y.y && (H0v.y && H0v.z) && (B1v.w && B1v.x), lvl4z.y && (B0v.z && B0v.y) && (H1v.x && H1v.w));
-	bvec2 lvl5z = bvec2(lvl4w.x && (F0h.w && F0h.z) && (D1h.y && D1h.x), lvl4z.x && (D0h.z && D0h.w) && (F1h.x && F1h.y));
-	bvec2 lvl5w = bvec2(lvl4x.y && (H0v.x && H0v.w) && (B1v.z && B1v.y), lvl4w.y && (B0v.w && B0v.x) && (H1v.y && H1v.z));
-
-	// lvl6 corners (hori, vert)
-	bvec2 lvl6x = bvec2(lvl5x.y && (D1h.y && D1h.x), lvl5w.y && (B1v.w && B1v.x));
-	bvec2 lvl6y = bvec2(lvl5x.x && (F1h.x && F1h.y), lvl5y.y && (B1v.z && B1v.y));
-	bvec2 lvl6z = bvec2(lvl5z.x && (F1h.w && F1h.z), lvl5y.x && (H1v.y && H1v.z));
-	bvec2 lvl6w = bvec2(lvl5z.y && (D1h.z && D1h.w), lvl5w.x && (H1v.x && H1v.w));
-
-	
-	// subpixels - 0 = E, 1 = D, 2 = D0, 3 = F, 4 = F0, 5 = B, 6 = B0, 7 = H, 8 = H0
-
-	vec4 crn;
-	crn.x = (lvl1x && Eo.x || lvl3x.x && Eo.y || lvl4x.x && Do.x || lvl6x.x && Fo.y) ? 5 : (lvl1x || lvl3x.y && !Eo.w || lvl4x.y && !Bo.x || lvl6x.y && !Ho.w) ? 1 : lvl3x.x ? 3 : lvl3x.y ? 7 : lvl4x.x ? 2 : lvl4x.y ? 6 : lvl6x.x ? 4 : lvl6x.y ? 8 : 0;
-	crn.y = (lvl1y && Eo.y || lvl3y.x && Eo.x || lvl4y.x && Fo.y || lvl6y.x && Do.x) ? 5 : (lvl1y || lvl3y.y && !Eo.z || lvl4y.y && !Bo.y || lvl6y.y && !Ho.z) ? 3 : lvl3y.x ? 1 : lvl3y.y ? 7 : lvl4y.x ? 4 : lvl4y.y ? 6 : lvl6y.x ? 2 : lvl6y.y ? 8 : 0;
-	crn.z = (lvl1z && Eo.z || lvl3z.x && Eo.w || lvl4z.x && Fo.z || lvl6z.x && Do.w) ? 7 : (lvl1z || lvl3z.y && !Eo.y || lvl4z.y && !Ho.z || lvl6z.y && !Bo.y) ? 3 : lvl3z.x ? 1 : lvl3z.y ? 5 : lvl4z.x ? 4 : lvl4z.y ? 8 : lvl6z.x ? 2 : lvl6z.y ? 6 : 0;
-	crn.w = (lvl1w && Eo.w || lvl3w.x && Eo.z || lvl4w.x && Do.w || lvl6w.x && Fo.z) ? 7 : (lvl1w || lvl3w.y && !Eo.x || lvl4w.y && !Ho.w || lvl6w.y && !Bo.x) ? 1 : lvl3w.x ? 3 : lvl3w.y ? 5 : lvl4w.x ? 2 : lvl4w.y ? 8 : lvl6w.x ? 4 : lvl6w.y ? 6 : 0;
-
-	vec4 mid;
-	mid.x = (lvl2x.x &&  Eo.x || lvl2x.y &&  Eo.y || lvl5x.x &&  Do.x || lvl5x.y &&  Fo.y) ? 5 : lvl2x.x ? 1 : lvl2x.y ? 3 : lvl5x.x ? 2 : lvl5x.y ? 4 : (Ec.x && Dc.z && Ec.y && Fc.w) ? ( Eo.x ?  Eo.y ? 5 : 3 : 1) : 0;
-	mid.y = (lvl2y.x && !Eo.y || lvl2y.y && !Eo.z || lvl5y.x && !Bo.y || lvl5y.y && !Ho.z) ? 3 : lvl2y.x ? 5 : lvl2y.y ? 7 : lvl5y.x ? 6 : lvl5y.y ? 8 : (Ec.y && Bc.w && Ec.z && Hc.x) ? (!Eo.y ? !Eo.z ? 3 : 7 : 5) : 0;
-	mid.z = (lvl2z.x &&  Eo.w || lvl2z.y &&  Eo.z || lvl5z.x &&  Do.w || lvl5z.y &&  Fo.z) ? 7 : lvl2z.x ? 1 : lvl2z.y ? 3 : lvl5z.x ? 2 : lvl5z.y ? 4 : (Ec.z && Fc.x && Ec.w && Dc.y) ? ( Eo.z ?  Eo.w ? 7 : 1 : 3) : 0;
-	mid.w = (lvl2w.x && !Eo.x || lvl2w.y && !Eo.w || lvl5w.x && !Bo.x || lvl5w.y && !Ho.w) ? 1 : lvl2w.x ? 5 : lvl2w.y ? 7 : lvl5w.x ? 6 : lvl5w.y ? 8 : (Ec.w && Hc.y && Ec.x && Bc.z) ? (!Eo.w ? !Eo.x ? 1 : 5 : 7) : 0;
-
-
-	// ouput
-	FragColor = (crn + 9 * mid) / 80;
-
-}
diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4-hybrid.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4-hybrid.slang
deleted file mode 100644
index d58a9040f4..0000000000
--- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4-hybrid.slang
+++ /dev/null
@@ -1,161 +0,0 @@
-#version 450
-
-/*
-	ScaleFX - Pass 4
-	by Sp00kyFox, 2017-03-01
-
-Filter:	Nearest
-Scale:	3x
-
-ScaleFX is an edge interpolation algorithm specialized in pixel art. It was
-originally intended as an improvement upon Scale3x but became a new filter in
-its own right.
-ScaleFX interpolates edges up to level 6 and makes smooth transitions between
-different slopes. The filtered picture will only consist of colours present
-in the original.
-
-Pass 4 outputs subpixels based on previously calculated tags.
-
-
-
-Copyright (c) 2016 Sp00kyFox - ScaleFX@web.de
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-#include "hsm-scalefx.inc"
-
-// #pragma parameter SFX_RAA "ScaleFX rAA Sharpness" 2.0 0.0 10.0 0.05
-#define SFX_RAA 2
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-layout(binding = 2) uniform sampler2D refpass;
-
-
-// extract corners
-vec4 loadCrn(vec4 x){
-	return floor(mod(x*80 + 0.5, 9));
-}
-
-// extract mids
-vec4 loadMid(vec4 x){
-	return floor(mod(x*8.888888 + 0.055555, 9));
-}
-
-vec3 res2x(vec3 pre2, vec3 pre1, vec3 px, vec3 pos1, vec3 pos2)
-{
-	vec3 t, m;
-	mat4x3 pre = mat4x3(pre2, pre1,   px, pos1);
-	mat4x3 pos = mat4x3(pre1,   px, pos1, pos2);
-	mat4x3  df = pos - pre;
-	
-	m = mix(px, 1-px, step(px, vec3(0.5)));	
-	m = SFX_RAA * min(m, min(abs(df[1]), abs(df[2])));
-	t = (7 * (df[1] + df[2]) - 3 * (df[0] + df[3])) / 16;
-	t = clamp(t, -m, m);
-   
-	return t;
-}
-
-
-void main()
-{
-	if (HSM_SCALEFX_ON < 0.5) 
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	/*	grid		corners		mids
-
-		  B		x   y	  	  x
-		D E F				w   y
-		  H		w   z	  	  z
-	*/
-
-
-	// read data
-	vec4 E = texture(Source, vTexCoord);
-
-	// determine subpixel
-	vec2 fc = fract(vTexCoord * params.SourceSize.xy);
-	vec2 fp = floor(3.0 * fc);
-	
-	// check adjacent pixels to prevent artifacts
-	vec4 hn = texture(Source, vTexCoord + vec2(fp.x - 1, 0) / params.SourceSize.xy);
-	vec4 vn = texture(Source, vTexCoord + vec2(0, fp.y - 1) / params.SourceSize.xy);
-
-	// extract data
-	vec4 crn = loadCrn(E), hc = loadCrn(hn), vc = loadCrn(vn);
-	vec4 mid = loadMid(E), hm = loadMid(hn), vm = loadMid(vn);
-
-	vec3 res = fp.y == 0 ? (fp.x == 0 ? vec3(crn.x, hc.y, vc.w) : fp.x == 1 ? vec3(mid.x, 0, vm.z) : vec3(crn.y, hc.x, vc.z)) : (fp.y == 1 ? (fp.x == 0 ? vec3(mid.w, hm.y, 0) : fp.x == 1 ? vec3(0) : vec3(mid.y, hm.w, 0)) : (fp.x == 0 ? vec3(crn.w, hc.z, vc.x) : fp.x == 1 ? vec3(mid.z, 0, vm.x) : vec3(crn.z, hc.w, vc.y)));	
-
-// HSM Removed
-// #define TEX(x, y) textureOffset(refpass, vTexCoord, ivec2(x, y)).rgb
-
-// HSM Added
-#define TEXs(x, y) HSM_TextureOffset(refpass, vTexCoord, vec2(x, y), params.refpassSize.xy).rgb
-
-	// reverseAA
-	vec3 E0 = TEX( 0, 0);
-	vec3 B0 = TEX( 0,-1), B1 = TEX( 0,-2), H0 = TEX( 0, 1), H1 = TEX( 0, 2);
-	vec3 D0 = TEX(-1, 0), D1 = TEX(-2, 0), F0 = TEX( 1, 0), F1 = TEX( 2, 0);
-
-	// output coordinate - 0 = E0, 1 = D0, 2 = D1, 3 = F0, 4 = F1, 5 = B0, 6 = B1, 7 = H0, 8 = H1
-	vec3 sfx = res.x == 1. ? D0 : res.x == 2. ? D1 : res.x == 3. ? F0 : res.x == 4. ? F1 : res.x == 5. ? B0 : res.x == 6. ? B1 : res.x == 7. ? H0 : H1;
-
-	// rAA weight
-	vec2 w = 2. * fc - 1.;
-	w.x = res.y == 0. ? w.x : 0.;
-	w.y = res.z == 0. ? w.y : 0.;
-
-	// rAA filter
-	vec3 t1 = res2x(D1, D0, E0, F0, F1);
-	vec3 t2 = res2x(B1, B0, E0, H0, H1);
-
-	vec3 a = min(min(min(min(B0,D0),E0),F0),H0);
-	vec3 b = max(max(max(max(B0,D0),E0),F0),H0);
-	vec3 raa = clamp(E0 + w.x*t1 + w.y*t2, a, b);
-
-	// hybrid output
-	FragColor = vec4((res.x != 0.) ? sfx : raa, 0.);	
-}
diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4.slang
deleted file mode 100644
index 3bb9e1fe76..0000000000
--- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4.slang
+++ /dev/null
@@ -1,113 +0,0 @@
-#version 450
-
-/*
-	ScaleFX - Pass 4
-	by Sp00kyFox, 2017-03-01
-
-Filter:	Nearest
-Scale:	3x
-
-ScaleFX is an edge interpolation algorithm specialized in pixel art. It was
-originally intended as an improvement upon Scale3x but became a new filter in
-its own right.
-ScaleFX interpolates edges up to level 6 and makes smooth transitions between
-different slopes. The filtered picture will only consist of colours present
-in the original.
-
-Pass 4 outputs subpixels based on previously calculated tags.
-
-
-
-Copyright (c) 2016 Sp00kyFox - ScaleFX@web.de
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-#include "hsm-scalefx.inc"
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-layout(binding = 2) uniform sampler2D refpass;
-
-
-// extract corners
-vec4 loadCrn(vec4 x){
-	return floor(mod(x*80 + 0.5, 9));
-}
-
-// extract mids
-vec4 loadMid(vec4 x){
-	return floor(mod(x*8.888888 + 0.055555, 9));
-}
-
-
-void main()
-{
-	if (HSM_SCALEFX_ON < 0.5) 
-	{
-		FragColor = texture(Source, vTexCoord);
-		return;
-	}
-
-	/*	grid		corners		mids
-
-		  B		x   y	  	  x
-		D E F				w   y
-		  H		w   z	  	  z
-	*/
-
-
-	// read data
-	vec4 E = texture(Source, vTexCoord);
-
-	// extract data
-	vec4 crn = loadCrn(E);
-	vec4 mid = loadMid(E);
-
-	// determine subpixel
-	vec2 fp = floor(3.0 * fract(vTexCoord * params.SourceSize.xy));
-	float sp = fp.y == 0. ? (fp.x == 0. ? crn.x : fp.x == 1. ? mid.x : crn.y) : (fp.y == 1. ? (fp.x == 0. ? mid.w : fp.x == 1. ? 0. : mid.y) : (fp.x == 0. ? crn.w : fp.x == 1. ? mid.z : crn.z));
-
-	// output coordinate - 0 = E, 1 = D, 2 = D0, 3 = F, 4 = F0, 5 = B, 6 = B0, 7 = H, 8 = H0
-	vec2 res = sp == 0. ? vec2(0,0) : sp == 1. ? vec2(-1,0) : sp == 2. ? vec2(-2,0) : sp == 3. ? vec2(1,0) : sp == 4. ? vec2(2,0) : sp == 5. ? vec2(0,-1) : sp == 6. ? vec2(0,-2) : sp == 7. ? vec2(0,1) : vec2(0,2);
-
-	// ouput
-	FragColor = texture(refpass, vTexCoord + res / params.SourceSize.xy);
-}
diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx.inc b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx.inc
deleted file mode 100644
index b3b0523da6..0000000000
--- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 scalefx_pass0Size;
-	float HSM_SCALEFX_ON;
-	float SFX_CLR;
-	float SFX_SAA;
-	float SFX_SCN;
-	float SFX_RAA;
-	// float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR;
-} params;
-
-#pragma parameter HSM_SCALEFX_EMPTY_LINE		" " 0 0 0.001 0.001
-#pragma parameter HSM_SCALEFX_TITLE	            "[ --- SMOOTHING - SCALEFX ---- ]:" 0 0 0.01 0.01
-
-#pragma parameter HSM_SCALEFX_ON 	            "          ScaleFx ON - Must Increase Core Res Sampling" 0 0 1 1
-#define HSM_SCALEFX_ON params.HSM_SCALEFX_ON
-
-#pragma parameter SFX_CLR 						"          ScaleFX Threshold" 0.43 0.01 1.00 0.01
-#define SFX_CLR params.SFX_CLR
-
-#pragma parameter SFX_SAA 						"          ScaleFX Filter AA" 1.00 0.00 1.00 1.00
-#define SFX_SAA params.SFX_SAA
-
-#pragma parameter SFX_SCN 						"          ScaleFX Filter Corners" 0 0.0 1.0 1.0
-#define SFX_SCN params.SFX_SCN
-
-vec4 HSM_TextureOffset(in sampler2D in_sampler, vec2 in_coord, vec2 pixel_offset, vec2 texture_size)
-{
-	vec2 uv_offset = pixel_offset / params.SourceSize.xy;
-	return texture(in_sampler, in_coord + uv_offset);
-}
diff --git a/bezel/Mega_Bezel/shaders/textures/128x128-blue-noise-texture.png b/bezel/Mega_Bezel/shaders/textures/128x128-blue-noise-texture.png
deleted file mode 100644
index a24d079d53..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/128x128-blue-noise-texture.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/BackgroundImage_Carbon_3840x2160.png b/bezel/Mega_Bezel/shaders/textures/BackgroundImage_Carbon_3840x2160.png
deleted file mode 100644
index a25857dc18..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/BackgroundImage_Carbon_3840x2160.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Baked_Frame_Carbonfiber_Background.png b/bezel/Mega_Bezel/shaders/textures/Baked_Frame_Carbonfiber_Background.png
deleted file mode 100644
index 1b0a19469b..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Baked_Frame_Carbonfiber_Background.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png b/bezel/Mega_Bezel/shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png
deleted file mode 100644
index d1c45b4a71..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Baked_Frame_Carbonfiber_Background_Vert.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/ColoredGel_Red_Green.png b/bezel/Mega_Bezel/shaders/textures/ColoredGel_Red_Green.png
deleted file mode 100644
index 383455b286..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/ColoredGel_Red_Green.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Colored_Gel_Rainbow.png b/bezel/Mega_Bezel/shaders/textures/Colored_Gel_Rainbow.png
deleted file mode 100644
index b837b6e406..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Colored_Gel_Rainbow.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/FrameTexture_2800x2120.png b/bezel/Mega_Bezel/shaders/textures/FrameTexture_2800x2120.png
deleted file mode 100644
index d8e38d923c..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/FrameTexture_2800x2120.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/HSM_Duimon_Super_Famicom_3840x2160.png b/bezel/Mega_Bezel/shaders/textures/HSM_Duimon_Super_Famicom_3840x2160.png
deleted file mode 100644
index 2fec61fa22..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/HSM_Duimon_Super_Famicom_3840x2160.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/IntroImage_MegaBezelLogo.png b/bezel/Mega_Bezel/shaders/textures/IntroImage_MegaBezelLogo.png
deleted file mode 100644
index d6563f5fd0..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/IntroImage_MegaBezelLogo.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/NightLightingClose_1920x1080.png b/bezel/Mega_Bezel/shaders/textures/NightLightingClose_1920x1080.png
deleted file mode 100644
index 16acdbb6c4..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/NightLightingClose_1920x1080.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/NightLightingFar_1920x1080.png b/bezel/Mega_Bezel/shaders/textures/NightLightingFar_1920x1080.png
deleted file mode 100644
index dffbcb9119..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/NightLightingFar_1920x1080.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Placeholder_Black_16x16.png b/bezel/Mega_Bezel/shaders/textures/Placeholder_Black_16x16.png
deleted file mode 100644
index 33e8025efb..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Placeholder_Black_16x16.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Placeholder_Transparent_16x16.png b/bezel/Mega_Bezel/shaders/textures/Placeholder_Transparent_16x16.png
deleted file mode 100644
index 1349ce5133..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Placeholder_Transparent_16x16.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Placeholder_White_16x16.png b/bezel/Mega_Bezel/shaders/textures/Placeholder_White_16x16.png
deleted file mode 100644
index 23fb18c0c4..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Placeholder_White_16x16.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/TopLayerImageGradient_3840x2160.png b/bezel/Mega_Bezel/shaders/textures/TopLayerImageGradient_3840x2160.png
deleted file mode 100644
index 30b3e1cd67..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/TopLayerImageGradient_3840x2160.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png b/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png
deleted file mode 100644
index 8c3d69188c..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImage_3840x2160.png b/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImage_3840x2160.png
deleted file mode 100644
index 6c492da582..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImage_3840x2160.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImage_Night_3840x2160.png b/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImage_Night_3840x2160.png
deleted file mode 100644
index ae07bfb537..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/TubeGlassOverlayImage_Night_3840x2160.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Tube_Diffuse_2390x1792.png b/bezel/Mega_Bezel/shaders/textures/Tube_Diffuse_2390x1792.png
deleted file mode 100644
index 9c0b0f384a..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Tube_Diffuse_2390x1792.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/Tube_Shadow_1600x1200.png b/bezel/Mega_Bezel/shaders/textures/Tube_Shadow_1600x1200.png
deleted file mode 100644
index 8bb2296a4e..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/Tube_Shadow_1600x1200.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/16.png b/bezel/Mega_Bezel/shaders/textures/lut/16.png
deleted file mode 100644
index fc0f026e00..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/16.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/32.png b/bezel/Mega_Bezel/shaders/textures/lut/32.png
deleted file mode 100644
index ef5610a186..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/32.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/64.png b/bezel/Mega_Bezel/shaders/textures/lut/64.png
deleted file mode 100644
index 253d12a5a6..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/64.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/GBA-Unaltered_Gamma.png b/bezel/Mega_Bezel/shaders/textures/lut/GBA-Unaltered_Gamma.png
deleted file mode 100644
index 06585b1307..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/GBA-Unaltered_Gamma.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/GBA.png b/bezel/Mega_Bezel/shaders/textures/lut/GBA.png
deleted file mode 100644
index 6fcb7a7494..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/GBA.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D65_EBU.png b/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D65_EBU.png
deleted file mode 100644
index e8c7974490..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D65_EBU.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D65_Rec601.png b/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D65_Rec601.png
deleted file mode 100644
index acd68b06c3..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D65_Rec601.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D93_Rec601.png b/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D93_Rec601.png
deleted file mode 100644
index 4801db9384..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/Kurozumi_64_D93_Rec601.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/Mitsubishi_Diamond_Pro_750SB_9300K.png b/bezel/Mega_Bezel/shaders/textures/lut/Mitsubishi_Diamond_Pro_750SB_9300K.png
deleted file mode 100644
index 2d1cb1eb1b..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/Mitsubishi_Diamond_Pro_750SB_9300K.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/NDS.png b/bezel/Mega_Bezel/shaders/textures/lut/NDS.png
deleted file mode 100644
index f15b84ffba..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/NDS.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/NEC_MultiSync_FE990_9300K.png b/bezel/Mega_Bezel/shaders/textures/lut/NEC_MultiSync_FE990_9300K.png
deleted file mode 100644
index 9d314d5187..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/NEC_MultiSync_FE990_9300K.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/NEC_XM29plus_capture.png b/bezel/Mega_Bezel/shaders/textures/lut/NEC_XM29plus_capture.png
deleted file mode 100644
index d156174fd2..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/NEC_XM29plus_capture.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/Sony_Trinitron_Std_50_no_gamma.png b/bezel/Mega_Bezel/shaders/textures/lut/Sony_Trinitron_Std_50_no_gamma.png
deleted file mode 100644
index 96a843c30d..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/Sony_Trinitron_Std_50_no_gamma.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/other1_32.png b/bezel/Mega_Bezel/shaders/textures/lut/other1_32.png
deleted file mode 100644
index d059c9ac8e..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/other1_32.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/readme.txt b/bezel/Mega_Bezel/shaders/textures/lut/readme.txt
deleted file mode 100644
index 35c3fb0537..0000000000
--- a/bezel/Mega_Bezel/shaders/textures/lut/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-LUT's kindly provided by torridgristle.
\ No newline at end of file
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/sony_trinitron1_32.png b/bezel/Mega_Bezel/shaders/textures/lut/sony_trinitron1_32.png
deleted file mode 100644
index 87731e8c60..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/sony_trinitron1_32.png and /dev/null differ
diff --git a/bezel/Mega_Bezel/shaders/textures/lut/sony_trinitron2_32.png b/bezel/Mega_Bezel/shaders/textures/lut/sony_trinitron2_32.png
deleted file mode 100644
index 0f6f48f7e5..0000000000
Binary files a/bezel/Mega_Bezel/shaders/textures/lut/sony_trinitron2_32.png and /dev/null differ
diff --git a/bfi/120hz-smart-BFI.slangp b/bfi/120hz-smart-BFI.slangp
deleted file mode 100644
index f3aede0205..0000000000
--- a/bfi/120hz-smart-BFI.slangp
+++ /dev/null
@@ -1,20 +0,0 @@
-shaders = 3
-
-shader0 = ../stock.slang
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
-alias0 = bfiRefPass
-
-shader1 = shaders/120hz-smart-BFI/calculations.slang
-scale_type1 = source
-scale1 = 1.0
-filter_linear1 = false
-wrap_mode1 = mirrored_repeat
-mipmap_input1 = true
-alias1 = calcPass
-
-shader2 = shaders/120hz-smart-BFI/bfi_flicker.slang
-scale_type2 = source
-scale2 = 1.0
-filter_linear2 = false
\ No newline at end of file
diff --git a/bilinear.slangp b/bilinear.slangp
deleted file mode 100644
index 61bf5216df..0000000000
--- a/bilinear.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = stock.slang
-filter_linear0 = true
diff --git a/blurs/dual_filter_2_pass.slangp b/blurs/dual_filter_2_pass.slangp
deleted file mode 100644
index 621e1c7324..0000000000
--- a/blurs/dual_filter_2_pass.slangp
+++ /dev/null
@@ -1,31 +0,0 @@
-shaders = 4
-
-shader0 = shaders/kawase/linearize.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 1.0
-scale_y0 = 1.0
-float_framebuffer0 = true
-
-shader1 = shaders/dual_filter/downsample.slang
-filter_linear1 = true
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 0.5
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = shaders/dual_filter/upsample.slang
-filter_linear2 = true
-scale_type2 = source
-scale_x2 = 2.0
-scale_y2 = 2.0
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/kawase/delinearize.slang
-filter_linear3 = true
-scale_type3 = viewport
-scale_x3 = 1.0
-scale_y3 = 1.0
-float_framebuffer3 = true
diff --git a/blurs/dual_filter_4_pass.slangp b/blurs/dual_filter_4_pass.slangp
deleted file mode 100644
index a352a952bc..0000000000
--- a/blurs/dual_filter_4_pass.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = 6
-
-shader0 = shaders/kawase/linearize.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 1.0
-scale_y0 = 1.0
-float_framebuffer0 = true
-
-shader1 = shaders/dual_filter/downsample.slang
-filter_linear1 = true
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 0.5
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = shaders/dual_filter/downsample.slang
-filter_linear2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 0.5
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/dual_filter/upsample.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 2.0
-scale_y3 = 2.0
-float_framebuffer3 = true
-wrap_mode3 = mirrored_repeat
-
-shader4 = shaders/dual_filter/upsample.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 2.0
-scale_y4 = 2.0
-float_framebuffer4 = true
-wrap_mode4 = mirrored_repeat
-
-shader5 = shaders/kawase/delinearize.slang
-filter_linear5 = true
-scale_type5 = viewport
-scale_x5 = 1.0
-scale_y5 = 1.0
-float_framebuffer5 = true
-
diff --git a/blurs/dual_filter_6_pass.slangp b/blurs/dual_filter_6_pass.slangp
deleted file mode 100644
index 873e487756..0000000000
--- a/blurs/dual_filter_6_pass.slangp
+++ /dev/null
@@ -1,63 +0,0 @@
-shaders = 8
-
-shader0 = shaders/kawase/linearize.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 1.0
-scale_y0 = 1.0
-float_framebuffer0 = true
-
-shader1 = shaders/dual_filter/downsample.slang
-filter_linear1 = true
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 0.5
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = shaders/dual_filter/downsample.slang
-filter_linear2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 0.5
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/dual_filter/downsample.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 0.5
-scale_y3 = 0.5
-float_framebuffer3 = true
-wrap_mode3 = mirrored_repeat
-
-shader4 = shaders/dual_filter/upsample.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 2.0
-scale_y4 = 2.0
-float_framebuffer4 = true
-wrap_mode4 = mirrored_repeat
-
-shader5 = shaders/dual_filter/upsample.slang
-filter_linear5 = true
-scale_type5 = source
-scale_x5 = 2.0
-scale_y5 = 2.0
-float_framebuffer5 = true
-wrap_mode5 = mirrored_repeat
-
-shader6 = shaders/dual_filter/upsample.slang
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 2.0
-scale_y6 = 2.0
-float_framebuffer6 = true
-wrap_mode6 = mirrored_repeat
-
-shader7 = shaders/kawase/delinearize.slang
-filter_linear7 = true
-scale_type7 = viewport
-scale_x7 = 1.0
-scale_y7 = 1.0
-float_framebuffer7 = true
diff --git a/blurs/dual_filter_bloom.slangp b/blurs/dual_filter_bloom.slangp
deleted file mode 100644
index 32bd54fc50..0000000000
--- a/blurs/dual_filter_bloom.slangp
+++ /dev/null
@@ -1,187 +0,0 @@
-shaders = 24
-
-parameters = "BLUR_RADIUS"
-BLUR_RADIUS = 2.0
-
-shader0 = shaders/kawase/linearize.slang
-scale_type0 = source
-scale0 = 1.0
-float_framebuffer0 = true
-alias0 = "Input"
-
-
-shader1 = shaders/dual_filter/downsample_bloom.slang
-filter_linear1 = true
-scale_type1 = viewport
-scale1 = 0.7
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = shaders/dual_filter/upsample.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/dual_filter/downsample.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-float_framebuffer3 = true
-wrap_mode3 = mirrored_repeat
-
-shader4 = shaders/dual_filter/upsample.slang
-filter_linear4 = true
-scale_type4 = source
-scale4 = 2.0
-float_framebuffer4 = true
-wrap_mode4 = mirrored_repeat
-alias4 = "Scale1"
-
-
-shader5 = shaders/dual_filter/downsample.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 0.5
-float_framebuffer5 = true
-wrap_mode5 = mirrored_repeat
-
-shader6 = shaders/dual_filter/downsample.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 0.5
-float_framebuffer6 = true
-wrap_mode6 = mirrored_repeat
-
-shader7 = shaders/dual_filter/upsample.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 2.0
-float_framebuffer7 = true
-wrap_mode7 = mirrored_repeat
-alias7 = "Scale2"
-
-
-shader8 = shaders/dual_filter/downsample.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 0.5
-float_framebuffer8 = true
-wrap_mode8 = mirrored_repeat
-
-shader9 = shaders/dual_filter/downsample.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 0.5
-float_framebuffer9 = true
-wrap_mode9 = mirrored_repeat
-
-shader10 = shaders/dual_filter/upsample.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 2.0
-float_framebuffer10 = true
-wrap_mode10 = mirrored_repeat
-alias10 = "Scale3"
-
-
-shader11 = shaders/dual_filter/downsample.slang
-filter_linear11 = true
-scale_type11 = source
-scale11 = 0.5
-float_framebuffer11 = true
-wrap_mode11 = mirrored_repeat
-
-shader12 = shaders/dual_filter/downsample.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 0.5
-float_framebuffer12 = true
-wrap_mode12 = mirrored_repeat
-
-shader13 = shaders/dual_filter/upsample.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 2.0
-float_framebuffer13 = true
-wrap_mode13 = mirrored_repeat
-alias13 = "Scale4"
-
-
-shader14 = shaders/dual_filter/downsample.slang
-filter_linear14 = true
-scale_type14 = source
-scale14 = 0.5
-float_framebuffer14 = true
-wrap_mode14 = mirrored_repeat
-
-shader15 = shaders/dual_filter/downsample.slang
-filter_linear15 = true
-scale_type15 = source
-scale15 = 0.5
-float_framebuffer15 = true
-wrap_mode15 = mirrored_repeat
-
-shader16 = shaders/dual_filter/upsample.slang
-filter_linear16 = true
-scale_type16 = source
-scale16 = 2.0
-float_framebuffer16 = true
-wrap_mode16 = mirrored_repeat
-alias16 = "Scale5"
-
-
-shader17 = shaders/dual_filter/downsample.slang
-filter_linear17 = true
-scale_type17 = source
-scale17 = 0.5
-float_framebuffer17 = true
-wrap_mode17 = mirrored_repeat
-
-shader18 = shaders/dual_filter/downsample.slang
-filter_linear18 = true
-scale_type18 = source
-scale18 = 0.5
-float_framebuffer18 = true
-wrap_mode18 = mirrored_repeat
-
-shader19 = shaders/dual_filter/upsample.slang
-filter_linear19 = true
-scale_type19 = source
-scale19 = 2.0
-float_framebuffer19 = true
-wrap_mode19 = mirrored_repeat
-alias19 = "Scale6"
-
-
-shader20 = shaders/dual_filter/naive_resample.slang
-filter_linear20 = true
-scale_type20 = absolute
-scale_x20 = 128
-scale_y20 = 128
-float_framebuffer20 = true
-wrap_mode20 = mirrored_repeat
-
-shader21 = shaders/dual_filter/moving_avg.slang
-filter_linear21 = true
-scale_type21 = absolute
-scale_x21 = 2
-scale_y21 = 2
-float_framebuffer21 = true
-mipmap_input21 = true
-alias21 = "MovingAverage"
-
-
-shader22 = shaders/dual_filter/bloom_blend.slang
-filter_linear22 = true
-scale_type22 = viewport
-scale22 = 1.0
-float_framebuffer22 = true
-
-
-shader23 = shaders/kawase/delinearize.slang
-filter_linear23 = true
-scale_type23 = viewport
-scal23 = 1.0
-float_framebuffer23 = true
diff --git a/blurs/dual_filter_bloom_fast.slangp b/blurs/dual_filter_bloom_fast.slangp
deleted file mode 100644
index 4a3c08b136..0000000000
--- a/blurs/dual_filter_bloom_fast.slangp
+++ /dev/null
@@ -1,138 +0,0 @@
-shaders = 18
-
-shader0 = shaders/kawase/linearize.slang
-scale_type0 = source
-scale0 = 1.0
-float_framebuffer0 = true
-alias0 = "Input"
-
-
-shader1 = shaders/dual_filter/downsample_bloom.slang
-filter_linear1 = true
-scale_type1 = viewport
-scale1 = 0.4
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = shaders/dual_filter/upsample.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/dual_filter/downsample.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-float_framebuffer3 = true
-wrap_mode3 = mirrored_repeat
-
-shader4 = shaders/dual_filter/upsample.slang
-filter_linear4 = true
-scale_type4 = source
-scale4 = 2.0
-float_framebuffer4 = true
-wrap_mode4 = mirrored_repeat
-alias4 = "Scale1"
-
-
-shader5 = shaders/dual_filter/downsample.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 0.5
-float_framebuffer5 = true
-wrap_mode5 = mirrored_repeat
-
-shader6 = shaders/dual_filter/downsample.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 0.5
-float_framebuffer6 = true
-wrap_mode6 = mirrored_repeat
-
-shader7 = shaders/dual_filter/upsample.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 2.0
-float_framebuffer7 = true
-wrap_mode7 = mirrored_repeat
-alias7 = "Scale2"
-
-
-shader8 = shaders/dual_filter/downsample.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 0.5
-float_framebuffer8 = true
-wrap_mode8 = mirrored_repeat
-
-shader9 = shaders/dual_filter/downsample.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 0.5
-float_framebuffer9 = true
-wrap_mode9 = mirrored_repeat
-
-shader10 = shaders/dual_filter/upsample.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 2.0
-float_framebuffer10 = true
-wrap_mode10 = mirrored_repeat
-alias10 = "Scale3"
-
-
-shader11 = shaders/dual_filter/downsample.slang
-filter_linear11 = true
-scale_type11 = source
-scale11 = 0.5
-float_framebuffer11 = true
-wrap_mode11 = mirrored_repeat
-
-shader12 = shaders/dual_filter/downsample.slang
-filter_linear12 = true
-scale_type12 = source
-scale12 = 0.5
-float_framebuffer12 = true
-wrap_mode12 = mirrored_repeat
-
-shader13 = shaders/dual_filter/upsample.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 2.0
-float_framebuffer13 = true
-wrap_mode13 = mirrored_repeat
-alias13 = "Scale4"
-
-
-shader14 = shaders/dual_filter/naive_resample.slang
-filter_linear14 = true
-scale_type14 = absolute
-scale_x14 = 64
-scale_y14 = 64
-float_framebuffer14 = true
-wrap_mode14 = mirrored_repeat
-
-shader15 = shaders/dual_filter/moving_avg.slang
-filter_linear15 = true
-scale_type15 = absolute
-scale_x15 = 2
-scale_y15 = 2
-float_framebuffer15 = true
-mipmap_input15 = true
-alias15 = "MovingAverage"
-
-
-shader16 = shaders/dual_filter/bloom_blend_fast.slang
-filter_linear16 = true
-scale_type16 = viewport
-scale16 = 1.0
-float_framebuffer16 = true
-
-
-shader17 = shaders/kawase/delinearize.slang
-filter_linear17 = true
-scale_type17 = viewport
-scal17 = 1.0
-float_framebuffer17 = true
diff --git a/blurs/dual_filter_bloom_fastest.slangp b/blurs/dual_filter_bloom_fastest.slangp
deleted file mode 100644
index 3c97ea274f..0000000000
--- a/blurs/dual_filter_bloom_fastest.slangp
+++ /dev/null
@@ -1,65 +0,0 @@
-shaders = 8
-
-parameters = "MIN_EXP_INTENSITY"
-MIN_EXP_INTENSITY = 0.45
-
-shader0 = shaders/kawase/linearize.slang
-scale_type0 = source
-scale0 = 1.0
-float_framebuffer0 = true
-alias0 = "Input"
-
-shader1 = shaders/dual_filter/downsample_bloom.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 0.5
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-alias1 = "Downsample1"
-
-shader2 = shaders/dual_filter/downsample.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 0.5
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-alias2 = "Downsample2"
-
-shader3 = shaders/dual_filter/upsample.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 2.0
-float_framebuffer3 = true
-wrap_mode3 = mirrored_repeat
-alias3 = "Upsample"
-
-shader4 = shaders/dual_filter/naive_resample.slang
-filter_linear4 = true
-scale_type4 = absolute
-scale_x4 = 64
-scale_y4 = 64
-float_framebuffer4 = true
-
-shader5 = shaders/dual_filter/moving_avg.slang
-filter_linear5 = true
-scale_type5 = absolute
-scale_x5 = 2
-scale_y5 = 2
-float_framebuffer5 = true
-wrap_mode5 = mirrored_repeat
-mipmap_input5 = true
-alias5 = "MovingAverage"
-
-shader6 = shaders/dual_filter/bloom_blend_fastest.slang
-filter_linear6 = true
-scale_type6 = viewport
-scale6 = 1.0
-wrap_mode6 = mirrored_repeat
-float_framebuffer6 = true
-
-shader7 = shaders/kawase/delinearize.slang
-filter_linear7 = false
-scale_type7 = viewport
-scale7 = 1.0
-float_framebuffer7 = true
-
diff --git a/blurs/kawase_blur_5pass.slangp b/blurs/kawase_blur_5pass.slangp
deleted file mode 100644
index a3a324a76d..0000000000
--- a/blurs/kawase_blur_5pass.slangp
+++ /dev/null
@@ -1,38 +0,0 @@
-shaders = 7
-
-shader0 = shaders/kawase/linearize.slang
-srgb_framebuffer0 = true
-scale_type0 = source
-
-shader1 = shaders/kawase/kawase0.slang
-filter_linear1 = true
-srgb_framebuffer1 = true
-scale_type1 = source
-wrap_mode1 = mirrored_repeat
-
-shader2 = shaders/kawase/kawase1.slang
-filter_linear2 = true
-srgb_framebuffer2 = true
-scale_type2 = source
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/kawase/kawase1.slang
-filter_linear3 = true
-srgb_framebuffer3 = true
-scale_type3 = source
-wrap_mode3 = mirrored_repeat
-
-shader4 = shaders/kawase/kawase2.slang
-filter_linear4 = true
-srgb_framebuffer4 = true
-scale_type4 = source
-wrap_mode4 = mirrored_repeat
-
-shader5 = shaders/kawase/kawase3.slang
-filter_linear5 = true
-srgb_framebuffer5 = true
-scale_type5 = source
-wrap_mode5 = mirrored_repeat
-
-shader6 = shaders/kawase/delinearize.slang
-filter_linear6 = true
diff --git a/blurs/kawase_blur_9pass.slangp b/blurs/kawase_blur_9pass.slangp
deleted file mode 100644
index 319ac87222..0000000000
--- a/blurs/kawase_blur_9pass.slangp
+++ /dev/null
@@ -1,62 +0,0 @@
-shaders = 11
-
-shader0 = shaders/kawase/linearize.slang
-srgb_framebuffer0 = true
-scale_type0 = source
-
-shader1 = shaders/kawase/kawase0.slang
-filter_linear1 = true
-srgb_framebuffer1 = true
-scale_type1 = source
-wrap_mode1 = mirrored_repeat
-
-shader2 = shaders/kawase/kawase1.slang
-filter_linear2 = true
-srgb_framebuffer2 = true
-scale_type2 = source
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/kawase/kawase2.slang
-filter_linear3 = true
-srgb_framebuffer3 = true
-scale_type3 = source
-wrap_mode3 = mirrored_repeat
-
-shader4 = shaders/kawase/kawase3.slang
-filter_linear4 = true
-srgb_framebuffer4 = true
-scale_type4 = source
-wrap_mode4 = mirrored_repeat
-
-shader5 = shaders/kawase/kawase4.slang
-filter_linear5 = true
-srgb_framebuffer5 = true
-scale_type5 = source
-wrap_mode5 = mirrored_repeat
-
-shader6 = shaders/kawase/kawase4.slang
-filter_linear6 = true
-srgb_framebuffer6 = true
-scale_type6 = source
-wrap_mode6 = mirrored_repeat
-
-shader7 = shaders/kawase/kawase5.slang
-filter_linear7 = true
-srgb_framebuffer7 = true
-scale_type7 = source
-wrap_mode7 = mirrored_repeat
-
-shader8 = shaders/kawase/kawase6.slang
-filter_linear8 = true
-srgb_framebuffer8 = true
-scale_type8 = source
-wrap_mode8 = mirrored_repeat
-
-shader9 = shaders/kawase/kawase7.slang
-filter_linear9 = true
-srgb_framebuffer9 = true
-scale_type9 = source
-wrap_mode9 = mirrored_repeat
-
-shader10 = shaders/kawase/delinearize.slang
-filter_linear10 = true
diff --git a/blurs/kawase_glow.slangp b/blurs/kawase_glow.slangp
deleted file mode 100644
index a2a98ee872..0000000000
--- a/blurs/kawase_glow.slangp
+++ /dev/null
@@ -1,44 +0,0 @@
-shaders = 9
-
-shader0 = ../stock.slang
-scale_type0 = source
-alias0 = Reference
-
-shader1 = shaders/kawase/linearize.slang
-srgb_framebuffer1 = true
-scale_type1 = source
-
-shader2 = shaders/kawase/kawase0.slang
-filter_linear2 = true
-srgb_framebuffer2 = true
-scale_type2 = source
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/kawase/kawase1.slang
-filter_linear3 = true
-srgb_framebuffer3 = true
-scale_type3 = source
-wrap_mode3 = mirrored_repeat
-
-shader4 = shaders/kawase/kawase1.slang
-filter_linear4 = true
-srgb_framebuffer4 = true
-scale_type4 = source
-wrap_mode4 = mirrored_repeat
-
-shader5 = shaders/kawase/kawase2.slang
-filter_linear5 = true
-srgb_framebuffer5 = true
-scale_type5 = source
-wrap_mode5 = mirrored_repeat
-
-shader6 = shaders/kawase/kawase3.slang
-filter_linear6 = true
-srgb_framebuffer6 = true
-scale_type6 = source
-wrap_mode6 = mirrored_repeat
-
-shader7 = shaders/kawase/delinearize.slang
-filter_linear7 = true
-
-shader8 = shaders/kawase/screen_combine.slang
diff --git a/blurs/shaders/bilateral.slang b/blurs/shaders/bilateral.slang
deleted file mode 100644
index 823fb65256..0000000000
--- a/blurs/shaders/bilateral.slang
+++ /dev/null
@@ -1,107 +0,0 @@
-#version 450
-
-/*
-	Bilateral v1.0
-	by Sp00kyFox, 2014
-Bilateral Filter, calculates a weighted mean of surrounding pixels based on color and spatial distance.
-This can be used to smooth color transitions or blend dithering to some extent while preserving sharp edges.
-Increasing the radius leads to more pixel lookups and therefore to a lower shader performance.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float RAD;
-	float CLR;
-	float CWGHT;
-} params;
-
-#pragma parameter RAD "Bilateral Radius" 2.0 0.0 12.0 0.25
-#define RAD params.RAD
-#pragma parameter CLR "Bilateral Color Thresh" 0.15 0.01 1.0 0.01
-#define CLR params.CLR
-#pragma parameter CWGHT "Bilateral Central Wght" 0.25 0.0 2.0 0.05
-#define CWGHT params.CWGHT
-
-#define TEX(dx,dy) texture(Source, vTexCoord + vec2((dx),(dy)) * t1)
-#define mul(a,b) (b*a)
-#define saturate(c) clamp(c, 0.0, 1.0)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-const vec4 unit4  = vec4(1.0);
-
-int   steps = int(ceil(RAD));
-float clr   = -CLR * CLR;
-float sigma = RAD * RAD / 2.0;
-float cwght = 1.0 + CWGHT * max(1.0, 2.87029746*sigma + 0.43165242*RAD - 0.25219746);
-
-float domain[13] = float[13](1.0, exp( -1.0/sigma), exp( -4.0/sigma), exp( -9.0/sigma), exp( -16.0/sigma), exp( -25.0/sigma), exp( -36.0/sigma),
-				exp(-49.0/sigma), exp(-64.0/sigma), exp(-81.0/sigma), exp(-100.0/sigma), exp(-121.0/sigma), exp(-144.0/sigma));
-
-float dist2(vec3 pt1, vec3 pt2)
-{
-	vec3 v = pt1 - pt2;
-	return dot(v,v);
-}
-
-vec4 weight(int i, int j, vec3 org, mat4x3 A)
-{
-	return domain[i] * domain[j] * exp(vec4(dist2(org,A[0]), dist2(org,A[1]), dist2(org,A[2]), dist2(org,A[3]))/clr);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 t1;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   t1 = params.SourceSize.zw;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 t1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	mat4x3 A, B;
-	vec4 wghtA, wghtB;
-	vec3 org = TEX(0.,0.).rgb, result = cwght*org;
-	float  norm = cwght;
-	
-		for(int x = 1; x <= RAD; x++){
-		
-			A = mat4x3(TEX( x, 0.).rgb, TEX(-x, 0.).rgb, TEX( 0., x).rgb, TEX( 0.,-x).rgb);
-			B = mat4x3(TEX( x, x).rgb, TEX( x,-x).rgb, TEX(-x, x).rgb, TEX(-x,-x).rgb);
-
-			wghtA = weight(x, 0, org, A); wghtB = weight(x, x, org, B);	
-
-			result += mul(wghtA, A)     + mul(wghtB, B);
-			norm   += dot(wghtA, unit4) + dot(wghtB, unit4);
-		
-			for(int y = 1; y < x; y++){
-					
-				A = mat4x3(TEX( x, y).rgb, TEX( x,-y).rgb, TEX(-x, y).rgb, TEX(-x,-y).rgb);
-				B = mat4x3(TEX( y, x).rgb, TEX( y,-x).rgb, TEX(-y, x).rgb, TEX(-y,-x).rgb);
-
-				wghtA = weight(x, y, org, A); wghtB = weight(y, x, org, B);	
-
-				result += mul(wghtA, A)     + mul(wghtB, B);
-				norm   += dot(wghtA, unit4) + dot(wghtB, unit4);
-			}
-		}
-    FragColor = vec4(result/norm, 1.0);
-}
\ No newline at end of file
diff --git a/blurs/shaders/blur-gauss-h.slang b/blurs/shaders/blur-gauss-h.slang
deleted file mode 100644
index 9d5693d1aa..0000000000
--- a/blurs/shaders/blur-gauss-h.slang
+++ /dev/null
@@ -1,56 +0,0 @@
-#version 450
-
-// Implementation based on the article "Efficient Gaussian blur with linear sampling"
-// http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
-/* A version for MasterEffect Reborn, a standalone version, and a custom shader version for SweetFX can be 
-   found at http://reshade.me/forum/shader-presentation/27-gaussian-blur-bloom-unsharpmask */
- /*-----------------------------------------------------------.
-/                  Gaussian Blur settings                     /
-'-----------------------------------------------------------*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define HW 1.00
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 texcoord  = vTexCoord;
-	vec2 PIXEL_SIZE = params.SourceSize.zw;
-
-	float sampleOffsets[5] = { 0.0, 1.4347826, 3.3478260, 5.2608695, 7.1739130 };
-	float sampleWeights[5] = { 0.16818994, 0.27276957, 0.11690125, 0.024067905, 0.0021112196 };
-
-	vec4 color = texture(Source, texcoord) * sampleWeights[0];
-	for(int i = 1; i < 5; ++i) {
-		color += texture(Source, texcoord + vec2(sampleOffsets[i]*HW * PIXEL_SIZE.x, 0.0)) * sampleWeights[i];
-		color += texture(Source, texcoord - vec2(sampleOffsets[i]*HW * PIXEL_SIZE.x, 0.0)) * sampleWeights[i];
-	}
-   FragColor = vec4(color);
-}
\ No newline at end of file
diff --git a/blurs/shaders/blur-gauss-v.slang b/blurs/shaders/blur-gauss-v.slang
deleted file mode 100644
index 7eb304ac0c..0000000000
--- a/blurs/shaders/blur-gauss-v.slang
+++ /dev/null
@@ -1,56 +0,0 @@
-#version 450
-
-// Implementation based on the article "Efficient Gaussian blur with linear sampling"
-// http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
-/* A version for MasterEffect Reborn, a standalone version, and a custom shader version for SweetFX can be 
-   found at http://reshade.me/forum/shader-presentation/27-gaussian-blur-bloom-unsharpmask */
- /*-----------------------------------------------------------.
-/                  Gaussian Blur settings                     /
-'-----------------------------------------------------------*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define VW 1.00
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 texcoord  = vTexCoord;
-	vec2 PIXEL_SIZE = params.SourceSize.zw;
-
-	float sampleOffsets[5] = { 0.0, 1.4347826, 3.3478260, 5.2608695, 7.1739130 };
-	float sampleWeights[5] = { 0.16818994, 0.27276957, 0.11690125, 0.024067905, 0.0021112196 };
-
-	vec4 color = texture(Source, texcoord) * sampleWeights[0];
-	for(int i = 1; i < 5; ++i) {
-		color += texture(Source, texcoord + vec2(0.0, sampleOffsets[i]*VW * PIXEL_SIZE.y)) * sampleWeights[i];
-		color += texture(Source, texcoord - vec2(0.0, sampleOffsets[i]*VW * PIXEL_SIZE.y)) * sampleWeights[i];
-	}
-   FragColor = vec4(color);
-}
\ No newline at end of file
diff --git a/blurs/shaders/dual_filter/naive_resample.slang b/blurs/shaders/dual_filter/naive_resample.slang
deleted file mode 100644
index 6f2c89f136..0000000000
--- a/blurs/shaders/dual_filter/naive_resample.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-// This is simply stock.slang with a custom input sampler.
-
-layout(push_constant) uniform Push {
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-}
-params;
-
-layout(std140, set = 0, binding = 0) uniform UBO {
-    mat4 MVP;
-}
-global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main() {
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Input;
-
-void main() {
-    FragColor = vec4(texture(Input, vTexCoord).rgb, 1.0);
-}
diff --git a/blurs/shaders/kawase/delinearize.slang b/blurs/shaders/kawase/delinearize.slang
deleted file mode 100644
index d90ad6f14a..0000000000
--- a/blurs/shaders/kawase/delinearize.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = pow(vec4(texture(Source, vTexCoord).rgb, 1.0), vec4(1.0 / 2.2));
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/kawase0.slang b/blurs/shaders/kawase/kawase0.slang
deleted file mode 100644
index 65f988e6ce..0000000000
--- a/blurs/shaders/kawase/kawase0.slang
+++ /dev/null
@@ -1,58 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float bloom_threshold;
-} params;
-
-#pragma parameter bloom_threshold "Glow Threshold" 0.0 0.0 1.0 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-#include "../../../include/colorspace-tools.h"
-
-void main()
-{
-   FragColor = vec4(YIQtoRGB(RGBtoYIQ(reSample(0., vTexCoord, Source).rgb) - vec3(params.bloom_threshold, 0.,0.)), 1.0);
-}
diff --git a/blurs/shaders/kawase/kawase1.slang b/blurs/shaders/kawase/kawase1.slang
deleted file mode 100644
index 3286abb53c..0000000000
--- a/blurs/shaders/kawase/kawase1.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-void main()
-{
-   FragColor = reSample(1., vTexCoord, Source);
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/kawase2.slang b/blurs/shaders/kawase/kawase2.slang
deleted file mode 100644
index 1a88ca3bd6..0000000000
--- a/blurs/shaders/kawase/kawase2.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-void main()
-{
-   FragColor = reSample(2., vTexCoord, Source);
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/kawase3.slang b/blurs/shaders/kawase/kawase3.slang
deleted file mode 100644
index 62c69f8571..0000000000
--- a/blurs/shaders/kawase/kawase3.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-void main()
-{
-   FragColor = reSample(3., vTexCoord, Source);
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/kawase4.slang b/blurs/shaders/kawase/kawase4.slang
deleted file mode 100644
index 5ebaf25d83..0000000000
--- a/blurs/shaders/kawase/kawase4.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-void main()
-{
-   FragColor = reSample(4., vTexCoord, Source);
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/kawase5.slang b/blurs/shaders/kawase/kawase5.slang
deleted file mode 100644
index b28d1e5471..0000000000
--- a/blurs/shaders/kawase/kawase5.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-void main()
-{
-   FragColor = reSample(5., vTexCoord, Source);
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/kawase6.slang b/blurs/shaders/kawase/kawase6.slang
deleted file mode 100644
index 95d8f40e25..0000000000
--- a/blurs/shaders/kawase/kawase6.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-void main()
-{
-   FragColor = reSample(7., vTexCoord, Source);
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/kawase7.slang b/blurs/shaders/kawase/kawase7.slang
deleted file mode 100644
index 95d8f40e25..0000000000
--- a/blurs/shaders/kawase/kawase7.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-// Kuwase Blur
-// based on a shadertoy by Kubuxu
-// https://www.shadertoy.com/view/Xl3XW7
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 reSample(float d, vec2 uv, sampler2D decal)
-{
- 
-    vec2 step1 = (vec2(d) + 0.5) * params.SourceSize.zw;
-    vec4 color = vec4(0.);
-    color += texture(decal, uv + step1) / 4.;
-    color += texture(decal,  uv - step1) / 4.;
-  	vec2 step2 = step1;
-    step2.x = -step2.x;
-    color += texture(decal, uv + step2) / 4.;
-    color += texture(decal,  uv - step2) / 4.;
-    return color;
-}
-
-void main()
-{
-   FragColor = reSample(7., vTexCoord, Source);
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/linearize.slang b/blurs/shaders/kawase/linearize.slang
deleted file mode 100644
index a50f5ba4ae..0000000000
--- a/blurs/shaders/kawase/linearize.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = pow(vec4(texture(Source, vTexCoord).rgb, 1.0), vec4(2.2));
-}
\ No newline at end of file
diff --git a/blurs/shaders/kawase/screen_combine.slang b/blurs/shaders/kawase/screen_combine.slang
deleted file mode 100644
index a8602c7983..0000000000
--- a/blurs/shaders/kawase/screen_combine.slang
+++ /dev/null
@@ -1,37 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Reference;
-
-void main()
-{
-   FragColor = 1.0 - (1.0 - texture(Source, vTexCoord)) * (1.0 - texture(Reference, vTexCoord));
-   FragColor = pow(FragColor, vec4(2.2));
-}
diff --git a/blurs/shaders/royale/README.md b/blurs/shaders/royale/README.md
deleted file mode 100644
index 6c00263256..0000000000
--- a/blurs/shaders/royale/README.md
+++ /dev/null
@@ -1,129 +0,0 @@
-This info pertains to the Blurs by TroggleMonkey:
-
-DESCRIPTION:
-Gaussian blurs are common building blocks in multi-pass shaders, and this
-library of optimized and tested blurs should make it easier to use whatever size
-blur you need.  All of these shaders are based on the tex2Dblur* functions in
-include/blur-functions.h, so you can use those directly if you ever need to
-add more processing to the same pass as a Gaussian blur.
-
-PICK THE RIGHT BLUR FOR YOUR USE CASE:
-There are several different types of blurs, ranging in size from 3-12 texels:
-a.) "Resize" separable blurs use vertical and horizontal passes and require N
-    taps for an Nx blur.  These are arbitrarily resizable.
-b.) "Fast" separable blurs use vertical and horizontal passes and require N taps
-    for an (N*2 - 1)x blur.  They exploit bilinear filtering to reduce the
-    required taps from e.g. 9 to 5.  These are always faster, but they have
-    strict image scale requirements.
-c.) "Resize" one-pass blurs combine the vertical/horizontal passes of the
-    "resize" separable blurs, and they require NxN taps for an NxN blur.  These
-    perform slowly enough that only tex2Dblur3x3resize is useful/included.
-d.) Other one-pass blurs combine the vertical/horizontal passes of the "fast"
-    separable blurs, and they exploit bilinear filtering the same way.  They're
-    faster than separable blurs at 3x3, competitive at 5x5 depending on options,
-    and slower at 7x7 and above...but larger blurs may still be useful if you're
-    hurting for passes.
-e.) "Shared" one-pass blurs go a step further: They also use quad-pixel
-    communication with fine-grained derivatives to distribute texture samples
-    across a 2x2 pixel quad.  (ddx() and ddy() are required, as well as a GPU
-    that uses fine-grained derivatives).  These blurs are faster than the other
-    one-pass blurs, but they have some artifacts from combining sample-sharing
-    with bilinear sampling, so they're best reserved for reblurring an already-
-    blurred input.
-
-Every blur expects linear filtering.  Except for resize separable blurs, all
-require a pass scale of (1/(2^M)) for some M >= 0.  That is, the output image
-has to have a 1:1 pixel:texel ratio with some mipmap of the input image, so use
-e.g. scaleN = "1.0" or scaleN = "0.25", not scaleN = "0.33" or scaleN = "2.0".
-Note: mipmap_inputN must = "true" in your .slangp file for scales other than 1.0.
-
-There are two suffixes on the .slang files relating to gamma correction:
-* Blurs with no suffix assume linear RGB input and output.
-* Blurs with a "-last-pass" suffix use pow() to gamma-correct their output.
-* Blurs with a "-gamma-encode-every-fbo" suffix use pow() to linearize each
-  input sample and again to gamma-correct the output.  These blurs are MUCH
-  slower than blurs without this suffix, but they're provided in case you want
-  to be [almost] gamma-correct on platforms without sRGB FBO's.  (The "almost"
-  is because bilinear filtering still won't be gamma-correct without sRGB.)
-* There are also blurs with both suffixes.  This may seem redundant, but they
-  make it easier to use a different output gamma for the last pass than for
-  the rest of the pipeline (such as when simulating another display device like
-  a Game Boy Advance or CRT).  See srgb-helpers/README.txt for more information.
-
-BENCHMARK RESULTS:
-Blurs have different performance characteristics depending on whether the input
-is mipmapped and depending on whether they're gamma-encoding every FBO.  Here's
-an excerpt from the blur-functions.h description with a comparison.  Note that
-benchmarks without an sRGB heading use "-gamma-encode-every-fbo" suffixes, and
-you can just look at the sRGB performance figures if you don't care about gamma:
-//  Here are some framerates from a GeForce 8800GTS.  The first pass resizes to
-//  viewport size (4x in this test) and linearizes for sRGB codepaths, and the
-//  remaining passes perform 6 full blurs.  Mipmapped tests are performed at the
-//  same scale, so they just measure the cost of mipmapping each FBO (only every
-//  other FBO is mipmapped for separable blurs, to mimic realistic usage).
-//  Mipmap      Neither     sRGB+Mipmap sRGB        Function
-//  76.0        92.3        131.3       193.7       tex2Dblur3fast
-//  63.2        74.4        122.4       175.5       tex2Dblur3resize
-//  93.7        121.2       159.3       263.2       tex2Dblur3x3
-//  59.7        68.7        115.4       162.1       tex2Dblur3x3resize
-//  63.2        74.4        122.4       175.5       tex2Dblur5fast
-//  49.3        54.8        100.0       132.7       tex2Dblur5resize
-//  59.7        68.7        115.4       162.1       tex2Dblur5x5
-//  64.9        77.2        99.1        137.2       tex2Dblur6x6shared
-//  55.8        63.7        110.4       151.8       tex2Dblur7fast
-//  39.8        43.9        83.9        105.8       tex2Dblur7resize
-//  40.0        44.2        83.2        104.9       tex2Dblur7x7
-//  56.4        65.5        71.9        87.9        tex2Dblur8x8shared
-//  49.3        55.1        99.9        132.5       tex2Dblur9fast
-//  33.3        36.2        72.4        88.0        tex2Dblur9resize
-//  27.8        29.7        61.3        72.2        tex2Dblur9x9
-//  37.2        41.1        52.6        60.2        tex2Dblur10x10shared
-//  44.4        49.5        91.3        117.8       tex2Dblur11fast
-//  28.8        30.8        63.6        75.4        tex2Dblur11resize
-//  33.6        36.5        40.9        45.5        tex2Dblur12x12shared
-
-BASIC USAGE:
-The .slangp presets in the quality-test-presets folder provide usage examples
-for basically every .slang blur shader.  The "-srgb" suffix on some .slangp
-presets is an explicit notice that they use sRGB FBO's.  Note how and when the
-"-last-pass" suffix is used for each .slang file, etc.
-
-The provided .slangp files with the "-mipmap" suffix are used to test quality and
-benchmarking with mipmapping enabled, but none of them actually use mipmapping
-as a feature in and of itself.  The following contrived .slangp would do that:
-    shaders = "4"
-
-    # Pass0: Linearize RGB:
-    shader0 = ../../srgb-helpers/first-pass-linearize.slang
-    filter_linear0 = "true"
-    scale_type0 = "source"
-    scale0 = "1.0"
-    srgb_framebuffer0 = "true"
-    
-    # Pass1: Upsize to 4x.  Pretend this pass does significant processing at 4x.
-    shader1 = ../../stock.slang
-    filter_linear1 = "true"
-    scale_type1 = "source"
-    scale1 = "4.0"
-    srgb_framebuffer1 = "true"
-    
-    # Pass2: Blur a source-sized mipmap 9x vertically; just shrink horizontally.
-    shader2 = ../blur9fast-vertical.slang
-    filter_linear2 = "true"
-    scale_type2 = "source"
-    scale2 = "0.25"
-    srgb_framebuffer2 = "true"
-    mipmap_input = "true"
-
-    # Pass3: Blur 9x horizontally
-    shader3 = ../blur9fast-horizontal.slang
-    filter_linear3 = "true"
-    scale_type3 = "source"
-    scale3 = "1.0"
-    srgb_framebuffer3 = "true"
-
-    # Pass4: Scale to the screen size and gamma-correct the output:
-    shader4 = ../../srgb-helpers/last-pass-gamma-correct.slang
-    filter_linear4 = "true"
-    scale_type4 = "viewport"
-    scale4 = "1.0"
diff --git a/blurs/shaders/royale/blur10x10shared-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur10x10shared-gamma-encode-every-fbo.slang
deleted file mode 100644
index 0056e52074..0000000000
--- a/blurs/shaders/royale/blur10x10shared-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur10x10shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur10x10shared-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur10x10shared-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index de57d2764a..0000000000
--- a/blurs/shaders/royale/blur10x10shared-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur10x10shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur10x10shared-last-pass.slang b/blurs/shaders/royale/blur10x10shared-last-pass.slang
deleted file mode 100644
index 96c404e50a..0000000000
--- a/blurs/shaders/royale/blur10x10shared-last-pass.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur10x10shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur10x10shared.slang b/blurs/shaders/royale/blur10x10shared.slang
deleted file mode 100644
index 4a6d6fbfe8..0000000000
--- a/blurs/shaders/royale/blur10x10shared.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur10x10shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur11fast-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur11fast-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index e99263c97f..0000000000
--- a/blurs/shaders/royale/blur11fast-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11fast-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur11fast-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index ee88e8286d..0000000000
--- a/blurs/shaders/royale/blur11fast-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11fast-horizontal-last-pass.slang b/blurs/shaders/royale/blur11fast-horizontal-last-pass.slang
deleted file mode 100644
index 23a868a465..0000000000
--- a/blurs/shaders/royale/blur11fast-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11fast-horizontal.slang b/blurs/shaders/royale/blur11fast-horizontal.slang
deleted file mode 100644
index 69b0ee1574..0000000000
--- a/blurs/shaders/royale/blur11fast-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11fast-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur11fast-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index b64d40aeb0..0000000000
--- a/blurs/shaders/royale/blur11fast-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11fast-vertical.slang b/blurs/shaders/royale/blur11fast-vertical.slang
deleted file mode 100644
index ba24bcf55e..0000000000
--- a/blurs/shaders/royale/blur11fast-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11resize-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur11resize-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index d3a29e8088..0000000000
--- a/blurs/shaders/royale/blur11resize-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11resize-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur11resize-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index a73feac4f2..0000000000
--- a/blurs/shaders/royale/blur11resize-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11resize-horizontal-last-pass.slang b/blurs/shaders/royale/blur11resize-horizontal-last-pass.slang
deleted file mode 100644
index aa327772e7..0000000000
--- a/blurs/shaders/royale/blur11resize-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11resize-horizontal.slang b/blurs/shaders/royale/blur11resize-horizontal.slang
deleted file mode 100644
index 1fbfde7ad8..0000000000
--- a/blurs/shaders/royale/blur11resize-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11resize-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur11resize-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index 67e6b8d8aa..0000000000
--- a/blurs/shaders/royale/blur11resize-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur11resize-vertical.slang b/blurs/shaders/royale/blur11resize-vertical.slang
deleted file mode 100644
index 5ade191f8b..0000000000
--- a/blurs/shaders/royale/blur11resize-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur11resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur12x12shared-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur12x12shared-gamma-encode-every-fbo.slang
deleted file mode 100644
index e520dcc11f..0000000000
--- a/blurs/shaders/royale/blur12x12shared-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur12x12shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur12x12shared-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur12x12shared-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 04f32ed5a7..0000000000
--- a/blurs/shaders/royale/blur12x12shared-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur12x12shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur12x12shared-last-pass.slang b/blurs/shaders/royale/blur12x12shared-last-pass.slang
deleted file mode 100644
index 28a4ba78a4..0000000000
--- a/blurs/shaders/royale/blur12x12shared-last-pass.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur12x12shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur12x12shared.slang b/blurs/shaders/royale/blur12x12shared.slang
deleted file mode 100644
index f8daa78cf1..0000000000
--- a/blurs/shaders/royale/blur12x12shared.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-//  blur-functions.h needs to know our profile's capabilities:
-//  1.) DRIVERS_ALLOW_DERIVATIVES is mandatory for one-pass shared-sample blurs.
-//  2.) DRIVERS_ALLOW_TEX2DLOD is optional, but mipmapped blurs will have awful
-//      artifacts without it due to funky texture sampling derivatives.
-#define DRIVERS_ALLOW_DERIVATIVES
-#define DRIVERS_ALLOW_TEX2DLOD
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-shared-sample.h"
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex_uv;
-layout(location = 1) in vec4 output_pixel_num;
-layout(location = 2) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-    //  Get the integer output pixel number from two origins (uv and screen):
-    float4 output_pixel_num_integer = floor(output_pixel_num);
-    //  Get the fragment's position in the pixel quad and do a shared-sample blur:
-    float4 quad_vector = get_quad_vector(output_pixel_num_integer);
-    float3 color = tex2Dblur12x12shared(input_texture, tex_uv,
-        blur_dxdy, quad_vector);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur3fast-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3fast-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index 8206f0f6b4..0000000000
--- a/blurs/shaders/royale/blur3fast-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,78 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3fast-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3fast-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 7a6de41c11..0000000000
--- a/blurs/shaders/royale/blur3fast-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,78 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3fast-horizontal-last-pass.slang b/blurs/shaders/royale/blur3fast-horizontal-last-pass.slang
deleted file mode 100644
index b62c3fb841..0000000000
--- a/blurs/shaders/royale/blur3fast-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3fast-horizontal.slang b/blurs/shaders/royale/blur3fast-horizontal.slang
deleted file mode 100644
index f869509c7f..0000000000
--- a/blurs/shaders/royale/blur3fast-horizontal.slang
+++ /dev/null
@@ -1,78 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3fast-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3fast-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index 21bea3e2b4..0000000000
--- a/blurs/shaders/royale/blur3fast-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3fast-vertical.slang b/blurs/shaders/royale/blur3fast-vertical.slang
deleted file mode 100644
index 5487224508..0000000000
--- a/blurs/shaders/royale/blur3fast-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3resize-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3resize-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index a2a4771311..0000000000
--- a/blurs/shaders/royale/blur3resize-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3resize-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3resize-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 79128ac3b3..0000000000
--- a/blurs/shaders/royale/blur3resize-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3resize-horizontal-last-pass.slang b/blurs/shaders/royale/blur3resize-horizontal-last-pass.slang
deleted file mode 100644
index 6c787a3278..0000000000
--- a/blurs/shaders/royale/blur3resize-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3resize-horizontal.slang b/blurs/shaders/royale/blur3resize-horizontal.slang
deleted file mode 100644
index b8918f0967..0000000000
--- a/blurs/shaders/royale/blur3resize-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3resize-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3resize-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index 4538a15e82..0000000000
--- a/blurs/shaders/royale/blur3resize-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3resize-vertical.slang b/blurs/shaders/royale/blur3resize-vertical.slang
deleted file mode 100644
index 893e5c9a0e..0000000000
--- a/blurs/shaders/royale/blur3resize-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3x3-gamma-encode-every-fbo.slang
deleted file mode 100644
index f55ae42a5f..0000000000
--- a/blurs/shaders/royale/blur3x3-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3x3-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index bbd382dfae..0000000000
--- a/blurs/shaders/royale/blur3x3-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3-last-pass.slang b/blurs/shaders/royale/blur3x3-last-pass.slang
deleted file mode 100644
index 86fbb01353..0000000000
--- a/blurs/shaders/royale/blur3x3-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3.slang b/blurs/shaders/royale/blur3x3.slang
deleted file mode 100644
index e7ca3aa53c..0000000000
--- a/blurs/shaders/royale/blur3x3.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3resize-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3x3resize-gamma-encode-every-fbo.slang
deleted file mode 100644
index 65ef68b36f..0000000000
--- a/blurs/shaders/royale/blur3x3resize-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-resize.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3resize-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur3x3resize-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 37c8d7448c..0000000000
--- a/blurs/shaders/royale/blur3x3resize-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-resize.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3resize-last-pass.slang b/blurs/shaders/royale/blur3x3resize-last-pass.slang
deleted file mode 100644
index af93c9896b..0000000000
--- a/blurs/shaders/royale/blur3x3resize-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-resize.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur3x3resize.slang b/blurs/shaders/royale/blur3x3resize.slang
deleted file mode 100644
index edb3ce212f..0000000000
--- a/blurs/shaders/royale/blur3x3resize.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass-resize.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur3x3resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur43fast-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur43fast-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index 98c7f0df60..0000000000
--- a/blurs/shaders/royale/blur43fast-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur43fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur43fast-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur43fast-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 45365eb7b9..0000000000
--- a/blurs/shaders/royale/blur43fast-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur43fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur43fast-horizontal-last-pass.slang b/blurs/shaders/royale/blur43fast-horizontal-last-pass.slang
deleted file mode 100644
index 40bc0524aa..0000000000
--- a/blurs/shaders/royale/blur43fast-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur43fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur43fast-horizontal.slang b/blurs/shaders/royale/blur43fast-horizontal.slang
deleted file mode 100644
index e84dda616c..0000000000
--- a/blurs/shaders/royale/blur43fast-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur43fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur43fast-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur43fast-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index 0b29ba1cee..0000000000
--- a/blurs/shaders/royale/blur43fast-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur43fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur43fast-vertical.slang b/blurs/shaders/royale/blur43fast-vertical.slang
deleted file mode 100644
index 84a70f453d..0000000000
--- a/blurs/shaders/royale/blur43fast-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur43fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5fast-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5fast-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index 6b05fa1865..0000000000
--- a/blurs/shaders/royale/blur5fast-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5fast-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5fast-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 28dc3f270d..0000000000
--- a/blurs/shaders/royale/blur5fast-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5fast-horizontal-last-pass.slang b/blurs/shaders/royale/blur5fast-horizontal-last-pass.slang
deleted file mode 100644
index e857337e45..0000000000
--- a/blurs/shaders/royale/blur5fast-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5fast-horizontal.slang b/blurs/shaders/royale/blur5fast-horizontal.slang
deleted file mode 100644
index 1cf7391421..0000000000
--- a/blurs/shaders/royale/blur5fast-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5fast-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5fast-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index a4a5f1c323..0000000000
--- a/blurs/shaders/royale/blur5fast-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5fast-vertical.slang b/blurs/shaders/royale/blur5fast-vertical.slang
deleted file mode 100644
index 6c0bafe40c..0000000000
--- a/blurs/shaders/royale/blur5fast-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5resize-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5resize-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index 1ca7a38177..0000000000
--- a/blurs/shaders/royale/blur5resize-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5resize-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5resize-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 4f0c6d6242..0000000000
--- a/blurs/shaders/royale/blur5resize-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5resize-horizontal-last-pass.slang b/blurs/shaders/royale/blur5resize-horizontal-last-pass.slang
deleted file mode 100644
index 1317a56a9c..0000000000
--- a/blurs/shaders/royale/blur5resize-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5resize-horizontal.slang b/blurs/shaders/royale/blur5resize-horizontal.slang
deleted file mode 100644
index 4915b0885d..0000000000
--- a/blurs/shaders/royale/blur5resize-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5resize-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5resize-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index 4c3977da5d..0000000000
--- a/blurs/shaders/royale/blur5resize-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5resize-vertical.slang b/blurs/shaders/royale/blur5resize-vertical.slang
deleted file mode 100644
index eaeda253da..0000000000
--- a/blurs/shaders/royale/blur5resize-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5x5-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5x5-gamma-encode-every-fbo.slang
deleted file mode 100644
index 4b34451cd2..0000000000
--- a/blurs/shaders/royale/blur5x5-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,76 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//  #included by vertex shader:
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec3 color = tex2Dblur5x5(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5x5-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur5x5-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 8f7a05d61f..0000000000
--- a/blurs/shaders/royale/blur5x5-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5x5(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5x5-last-pass.slang b/blurs/shaders/royale/blur5x5-last-pass.slang
deleted file mode 100644
index 2ec712a816..0000000000
--- a/blurs/shaders/royale/blur5x5-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5x5(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur5x5.slang b/blurs/shaders/royale/blur5x5.slang
deleted file mode 100644
index 4b2b6c457c..0000000000
--- a/blurs/shaders/royale/blur5x5.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur5x5(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7fast-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7fast-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index 204ad8915c..0000000000
--- a/blurs/shaders/royale/blur7fast-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7fast-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7fast-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 5fcad90bdf..0000000000
--- a/blurs/shaders/royale/blur7fast-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7fast-horizontal-last-pass.slang b/blurs/shaders/royale/blur7fast-horizontal-last-pass.slang
deleted file mode 100644
index 512f391833..0000000000
--- a/blurs/shaders/royale/blur7fast-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7fast-horizontal.slang b/blurs/shaders/royale/blur7fast-horizontal.slang
deleted file mode 100644
index a4624ce9eb..0000000000
--- a/blurs/shaders/royale/blur7fast-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7fast-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7fast-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index e2a8c25486..0000000000
--- a/blurs/shaders/royale/blur7fast-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7fast-vertical.slang b/blurs/shaders/royale/blur7fast-vertical.slang
deleted file mode 100644
index 2677030729..0000000000
--- a/blurs/shaders/royale/blur7fast-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7resize-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7resize-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index 615cd59552..0000000000
--- a/blurs/shaders/royale/blur7resize-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7resize-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7resize-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index da3e92d338..0000000000
--- a/blurs/shaders/royale/blur7resize-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7resize-horizontal-last-pass.slang b/blurs/shaders/royale/blur7resize-horizontal-last-pass.slang
deleted file mode 100644
index bdea0651a1..0000000000
--- a/blurs/shaders/royale/blur7resize-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7resize-horizontal.slang b/blurs/shaders/royale/blur7resize-horizontal.slang
deleted file mode 100644
index 2fdc1b2f81..0000000000
--- a/blurs/shaders/royale/blur7resize-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7resize-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7resize-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index 73980dcaa3..0000000000
--- a/blurs/shaders/royale/blur7resize-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7resize-vertical.slang b/blurs/shaders/royale/blur7resize-vertical.slang
deleted file mode 100644
index 89cbbb3c05..0000000000
--- a/blurs/shaders/royale/blur7resize-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7x7-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7x7-gamma-encode-every-fbo.slang
deleted file mode 100644
index b1bfd9d269..0000000000
--- a/blurs/shaders/royale/blur7x7-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7x7(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7x7-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur7x7-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 4b5cee1d7a..0000000000
--- a/blurs/shaders/royale/blur7x7-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7x7(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7x7-last-pass.slang b/blurs/shaders/royale/blur7x7-last-pass.slang
deleted file mode 100644
index d2cfb2db19..0000000000
--- a/blurs/shaders/royale/blur7x7-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7x7(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur7x7.slang b/blurs/shaders/royale/blur7x7.slang
deleted file mode 100644
index cf18344ebf..0000000000
--- a/blurs/shaders/royale/blur7x7.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur7x7(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9fast-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9fast-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100755
index b4469d81fc..0000000000
--- a/blurs/shaders/royale/blur9fast-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100755
index 9b5433a148..0000000000
--- a/blurs/shaders/royale/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9fast-horizontal-last-pass.slang b/blurs/shaders/royale/blur9fast-horizontal-last-pass.slang
deleted file mode 100755
index 1994862163..0000000000
--- a/blurs/shaders/royale/blur9fast-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9fast-horizontal.slang b/blurs/shaders/royale/blur9fast-horizontal.slang
deleted file mode 100755
index 80b6c02f28..0000000000
--- a/blurs/shaders/royale/blur9fast-horizontal.slang
+++ /dev/null
@@ -1,76 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur9fast-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9fast-vertical-gamma-encode-every-fbo.slang
deleted file mode 100755
index 28d72a0d97..0000000000
--- a/blurs/shaders/royale/blur9fast-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9fast(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9fast-vertical.slang b/blurs/shaders/royale/blur9fast-vertical.slang
deleted file mode 100755
index 9adb738bf0..0000000000
--- a/blurs/shaders/royale/blur9fast-vertical.slang
+++ /dev/null
@@ -1,76 +0,0 @@
-#version 450
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-fast-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9fast(input_texture, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/blurs/shaders/royale/blur9resize-horizontal-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9resize-horizontal-gamma-encode-every-fbo.slang
deleted file mode 100644
index 1f76f42fd3..0000000000
--- a/blurs/shaders/royale/blur9resize-horizontal-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9resize-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9resize-horizontal-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index 2a82a8b688..0000000000
--- a/blurs/shaders/royale/blur9resize-horizontal-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9resize-horizontal-last-pass.slang b/blurs/shaders/royale/blur9resize-horizontal-last-pass.slang
deleted file mode 100644
index 2d0d3c4b14..0000000000
--- a/blurs/shaders/royale/blur9resize-horizontal-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9resize-horizontal.slang b/blurs/shaders/royale/blur9resize-horizontal.slang
deleted file mode 100644
index 05673f4a17..0000000000
--- a/blurs/shaders/royale/blur9resize-horizontal.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-horizontal.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9resize-vertical-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9resize-vertical-gamma-encode-every-fbo.slang
deleted file mode 100644
index a42206ffc2..0000000000
--- a/blurs/shaders/royale/blur9resize-vertical-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9resize-vertical.slang b/blurs/shaders/royale/blur9resize-vertical.slang
deleted file mode 100644
index f32a63bd55..0000000000
--- a/blurs/shaders/royale/blur9resize-vertical.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-resize-vertical.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9resize(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9x9-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9x9-gamma-encode-every-fbo.slang
deleted file mode 100644
index c5f5afb302..0000000000
--- a/blurs/shaders/royale/blur9x9-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9x9(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9x9-last-pass-gamma-encode-every-fbo.slang b/blurs/shaders/royale/blur9x9-last-pass-gamma-encode-every-fbo.slang
deleted file mode 100644
index fe887f8cd3..0000000000
--- a/blurs/shaders/royale/blur9x9-last-pass-gamma-encode-every-fbo.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9x9(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9x9-last-pass.slang b/blurs/shaders/royale/blur9x9-last-pass.slang
deleted file mode 100644
index b6227e9154..0000000000
--- a/blurs/shaders/royale/blur9x9-last-pass.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9x9(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/blur9x9.slang b/blurs/shaders/royale/blur9x9.slang
deleted file mode 100644
index 47df94beeb..0000000000
--- a/blurs/shaders/royale/blur9x9.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-//#define GAMMA_ENCODE_EVERY_FBO
-//#define FIRST_PASS
-//#define LAST_PASS
-//#define SIMULATE_CRT_ON_LCD
-//#define SIMULATE_GBA_ON_LCD
-//#define SIMULATE_LCD_ON_CRT
-//#define SIMULATE_GBA_ON_CRT
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../include/compat_macros.inc"
-#pragma stage vertex
-#include "vertex-shader-blur-one-pass.h"
-
-///////////////////////////////  FRAGMENT SHADER  //////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-/////////////////////////////  FRAGMENT INCLUDES  /////////////////////////////
-#include "../../../include/gamma-management.h"
-#include "../../../include/blur-functions.h"
-
-void main()
-{
-	vec3 color = tex2Dblur9x9(Source, tex_uv, blur_dxdy);
-    //  Encode and output the blurred image:
-   FragColor = encode_output(vec4(color, 1.0));
-}
\ No newline at end of file
diff --git a/blurs/shaders/royale/vertex-shader-blur-fast-horizontal.h b/blurs/shaders/royale/vertex-shader-blur-fast-horizontal.h
deleted file mode 100644
index 26bb927e36..0000000000
--- a/blurs/shaders/royale/vertex-shader-blur-fast-horizontal.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef VERTEX_SHADER_BLUR_FAST_HORIZONTAL_H
-#define VERTEX_SHADER_BLUR_FAST_HORIZONTAL_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  Pass settings should be set by the shader file that #includes this one.
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//#include "../../../include/gamma-management.h"
-//#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 blur_dxdy;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord;
-
-	//  Get the uv sample distance between output pixels.  Blurs are not generic
-    //  Gaussian resizers, and correct blurs require:
-    //  1.) OutputSize.xy == SourceSize.xy * 2^m, where m is an integer <= 0.
-    //  2.) mipmap_inputN = "true" for this pass in .cgp preset if m != 0
-    //  3.) filter_linearN = "true" except for 1x scale nearest neighbor blurs
-    //  Gaussian resizers would upsize using the distance between input texels
-    //  (not output pixels), but we avoid this and consistently blur at the
-    //  destination size.  Otherwise, combining statically calculated weights
-    //  with bilinear sample exploitation would result in terrible artifacts.   
-    const vec2 dxdy_scale = params.SourceSize.xy * params.OutputSize.zw;
-	const vec2 dxdy = dxdy_scale * params.SourceSize.zw;
-    //  This blur is horizontal-only, so zero out the vertical offset:
-	blur_dxdy = vec2(dxdy.x, 0.0);
-}
-
-#endif  //  VERTEX_SHADER_BLUR_FAST_HORIZONTAL_H
\ No newline at end of file
diff --git a/blurs/shaders/royale/vertex-shader-blur-fast-vertical.h b/blurs/shaders/royale/vertex-shader-blur-fast-vertical.h
deleted file mode 100644
index 297d2a806a..0000000000
--- a/blurs/shaders/royale/vertex-shader-blur-fast-vertical.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef VERTEX_SHADER_BLUR_FAST_VERTICAL_H
-#define VERTEX_SHADER_BLUR_FAST_VERTICAL_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//#include "../../../include/gamma-management.h"
-//#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 blur_dxdy;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord;
-
-	//  Get the uv sample distance between output pixels.  Blurs are not generic
-    //  Gaussian resizers, and correct blurs require:
-    //  1.) OutputSize.xy == SourceSize.xy * 2^m, where m is an integer <= 0.
-    //  2.) mipmap_inputN = "true" for this pass in .cgp preset if m != 0
-    //  3.) filter_linearN = "true" except for 1x scale nearest neighbor blurs
-    //  Gaussian resizers would upsize using the distance between input texels
-    //  (not output pixels), but we avoid this and consistently blur at the
-    //  destination size.  Otherwise, combining statically calculated weights
-    //  with bilinear sample exploitation would result in terrible artifacts.   
-    const float2 dxdy_scale = IN.video_size/IN.output_size;
-	const float2 dxdy = dxdy_scale/IN.texture_size;
-    //  This blur is vertical-only, so zero out the horizontal offset:
-	blur_dxdy = float2(0.0, dxdy.y);
-}
-
-#endif  //  VERTEX_SHADER_BLUR_FAST_VERTICAL_H
\ No newline at end of file
diff --git a/blurs/shaders/royale/vertex-shader-blur-one-pass-resize.h b/blurs/shaders/royale/vertex-shader-blur-one-pass-resize.h
deleted file mode 100644
index 8022b8eacc..0000000000
--- a/blurs/shaders/royale/vertex-shader-blur-one-pass-resize.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef VERTEX_SHADER_BLUR_ONE_PASS_RESIZE_H
-#define VERTEX_SHADER_BLUR_ONE_PASS_RESIZE_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  Pass settings should be set by the shader file that #includes this one.
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//#include "../../../include/gamma-management.h"
-//#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 blur_dxdy;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord;
-   	//  Get the uv sample distance between output pixels.  Blurs are not generic
-    //  Gaussian resizers, and correct blurs require:
-    //  1.) OutputSize.xy == SourceSize.xy * 2^m, where m is an integer <= 0.
-    //  2.) mipmap_inputN = "true" for this pass in .cgp preset if m != 0
-    //  3.) filter_linearN = "true" except for 1x scale nearest neighbor blurs
-    //  Arbitrary upsizing will be acceptable if filter_linearN = "true", and
-    //  arbitrary downsizing will be acceptable if mipmap_inputN = "true" too.
-    //  Only the "resize" blurs can manage this though, and they still aren't
-    //  proper Gaussian resizers (because they sample between texels and always
-    //  blur after resizing, not during).
-   const vec2 dxdy_scale = params.SourceSize.xy * params.OutputSize.zw;
-   blur_dxdy = dxdy_scale * params.SourceSize.zw;
-}
-
-#endif  //  VERTEX_SHADER_BLUR_ONE_PASS_H
\ No newline at end of file
diff --git a/blurs/shaders/royale/vertex-shader-blur-one-pass-shared-sample.h b/blurs/shaders/royale/vertex-shader-blur-one-pass-shared-sample.h
deleted file mode 100644
index db024a127f..0000000000
--- a/blurs/shaders/royale/vertex-shader-blur-one-pass-shared-sample.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef VERTEX_SHADER_BLUR_ONE_PASS_SHARED_SAMPLE_H
-#define VERTEX_SHADER_BLUR_ONE_PASS_SHARED_SAMPLE_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  Pass settings should be set by the shader file that #includes this one.
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//#include "../../../include/gamma-management.h"
-//#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec4 tex_uv;
-layout(location = 1) out vec4 output_pixel_num;
-layout(location = 2) out vec2 blur_dxdy;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vec2 tex_uv_ = TexCoord;
-
-	//  Get the uv sample distance between output pixels.  Blurs are not generic
-    //  Gaussian resizers, and correct blurs require:
-    //  1.) OutputSize.xy == SourceSize.xy * 2^m, where m is an integer <= 0.
-    //  2.) mipmap_inputN = "true" for this pass in the preset if m < 0
-    //  3.) filter_linearN = "true" for all one-pass blurs
-    //  4.) #define DRIVERS_ALLOW_TEX2DLOD for shared-sample blurs
-    //  Gaussian resizers would upsize using the distance between input texels
-    //  (not output pixels), but we avoid this and consistently blur at the
-    //  destination size.  Otherwise, combining statically calculated weights
-    //  with bilinear sample exploitation would result in terrible artifacts.
-    const vec2 dxdy_scale = params.SourceSize.xy * params.OutputSize.zw;
-    blur_dxdy = dxdy_scale * params.SourceSize.zw;
-
-    //  Get the output pixel number in ([0, xres), [0, yres)) with respect to
-    //  the uv origin (.xy components) and the screen origin (.zw components).
-    //  Both are useful.  Don't round until the fragment shader.
-    const float2 video_uv = tex_uv_;
-    output_pixel_num.xy = params.OutputSize.xy * vec2(video_uv.x, video_uv.y);
-    output_pixel_num.zw = params.OutputSize.xy *
-        (gl_Position.xy * 0.5 + vec2(0.5));
-
-    //  Set the mip level correctly for shared-sample blurs (where the
-    //  derivatives are unreliable):
-    const float mip_level = log2(params.SourceSize.xy * params.OutputSize.zw).y;
-    tex_uv = vec4(tex_uv_, 0.0, mip_level);
-}
-
-#endif  //  VERTEX_SHADER_BLUR_ONE_PASS_SHARED_SAMPLE_H
\ No newline at end of file
diff --git a/blurs/shaders/royale/vertex-shader-blur-one-pass.h b/blurs/shaders/royale/vertex-shader-blur-one-pass.h
deleted file mode 100644
index 5a4bf7fc41..0000000000
--- a/blurs/shaders/royale/vertex-shader-blur-one-pass.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef VERTEX_SHADER_BLUR_ONE_PASS_H
-#define VERTEX_SHADER_BLUR_ONE_PASS_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  Pass settings should be set by the shader file that #includes this one.
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//#include "../../../include/gamma-management.h"
-//#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 blur_dxdy;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord;
-
-	//  Get the uv sample distance between output pixels.  Blurs are not generic
-    //  Gaussian resizers, and correct blurs require:
-    //  1.) OutputSize.xy == SourceSize.xy * 2^m, where m is an integer <= 0.
-    //  2.) mipmap_inputN = "true" for this pass in the preset if m < 0
-    //  3.) filter_linearN = "true" for all one-pass blurs
-    //  Gaussian resizers would upsize using the distance between input texels
-    //  (not output pixels), but we avoid this and consistently blur at the
-    //  destination size.  Otherwise, combining statically calculated weights
-    //  with bilinear sample exploitation would result in terrible artifacts.
-   const vec2 dxdy_scale = params.SourceSize.xy * params.OutputSize.zw;
-   blur_dxdy = dxdy_scale * params.SourceSize.zw;
-}
-
-#endif  //  VERTEX_SHADER_BLUR_ONE_PASS_H
\ No newline at end of file
diff --git a/blurs/shaders/royale/vertex-shader-blur-resize-horizontal.h b/blurs/shaders/royale/vertex-shader-blur-resize-horizontal.h
deleted file mode 100644
index b7df2fd272..0000000000
--- a/blurs/shaders/royale/vertex-shader-blur-resize-horizontal.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef VERTEX_SHADER_BLUR_RESIZE_HORIZONTAL_H
-#define VERTEX_SHADER_BLUR_RESIZE_HORIZONTAL_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  Pass settings should be set by the shader file that #includes this one.
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//#include "../../../include/gamma-management.h"
-//#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 blur_dxdy;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord;
-
-	//  Get the uv sample distance between output pixels.  Blurs are not generic
-    //  Gaussian resizers, and correct blurs require:
-    //  1.) OutputSize.xy == SourceSize.xy * 2^m, where m is an integer <= 0.
-    //  2.) mipmap_inputN = "true" for this pass in .cgp preset if m != 0
-    //  3.) filter_linearN = "true" except for 1x scale nearest neighbor blurs
-    //  Arbitrary upsizing will be acceptable if filter_linearN = "true", and
-    //  arbitrary downsizing will be acceptable if mipmap_inputN = "true" too.
-    //  Only the "resize" blurs can manage this though, and they still aren't
-    //  proper Gaussian resizers (because they sample between texels and always
-    //  blur after resizing, not during).
-    const vec2 dxdy_scale = params.SourceSize.xy * params.OutputSize.zw;
-	const vec2 dxdy = dxdy_scale * params.SourceSize.zw;
-    //  This blur is horizontal-only, so zero out the vertical offset:
-	blur_dxdy = vec2(dxdy.x, 0.0);
-}
-
-#endif  //  VERTEX_SHADER_BLUR_RESIZE_HORIZONTAL_H
\ No newline at end of file
diff --git a/blurs/shaders/royale/vertex-shader-blur-resize-vertical.h b/blurs/shaders/royale/vertex-shader-blur-resize-vertical.h
deleted file mode 100644
index 88c16c15c5..0000000000
--- a/blurs/shaders/royale/vertex-shader-blur-resize-vertical.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef VERTEX_SHADER_BLUR_RESIZE_VERTICAL_H
-#define VERTEX_SHADER_BLUR_RESIZE_VERTICAL_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//  
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  Pass settings should be set by the shader file that #includes this one.
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//#include "../../../include/gamma-management.h"
-//#include "../../../include/blur-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 blur_dxdy;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord;
-   
-   	//  Get the uv sample distance between output pixels.  Blurs are not generic
-    //  Gaussian resizers, and correct blurs require:
-    //  1.) OutputSize.xy == SourceSize.xy * 2^m, where m is an integer <= 0.
-    //  2.) mipmap_inputN = "true" for this pass in .cgp preset if m != 0
-    //  3.) filter_linearN = "true" except for 1x scale nearest neighbor blurs
-    //  Arbitrary upsizing will be acceptable if filter_linearN = "true", and
-    //  arbitrary downsizing will be acceptable if mipmap_inputN = "true" too.
-    //  Only the "resize" blurs can manage this though, and they still aren't
-    //  proper Gaussian resizers (because they sample between texels and always
-    //  blur after resizing, not during).
-    const vec2 dxdy_scale = params.SourceSize.xy * params.OutputSize.zw;
-	const vec2 dxdy = dxdy_scale * params.SourceSize.zw;
-    //  This blur is vertical-only, so zero out the horizontal offset:
-	blur_dxdy = vec2(0.0, dxdy.y);
-}
-
-#endif  //  VERTEX_SHADER_BLUR_RESIZE_VERTICAL_H
\ No newline at end of file
diff --git a/blurs/shaders/sunset_gaussian/sunset_horz.slang b/blurs/shaders/sunset_gaussian/sunset_horz.slang
deleted file mode 100644
index eec97835c3..0000000000
--- a/blurs/shaders/sunset_gaussian/sunset_horz.slang
+++ /dev/null
@@ -1,48 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 blurCoordinates[5];
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-	blurCoordinates[0] = vTexCoord.xy;
-	blurCoordinates[1] = vTexCoord.xy + params.OutputSize.zw * vec2(1.407333,0.0);
-	blurCoordinates[2] = vTexCoord.xy - params.OutputSize.zw * vec2(1.407333,0.0);
-	blurCoordinates[3] = vTexCoord.xy + params.OutputSize.zw * vec2(3.294215,0.0);
-	blurCoordinates[4] = vTexCoord.xy - params.OutputSize.zw * vec2(3.294215,0.0);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 blurCoordinates[5];
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec4 sum = vec4(0.0);
-	sum += texture(Source, blurCoordinates[0]) * 0.204164;
-	sum += texture(Source, blurCoordinates[1]) * 0.304005;
-	sum += texture(Source, blurCoordinates[2]) * 0.304005;
-	sum += texture(Source, blurCoordinates[3]) * 0.093913;
-	sum += texture(Source, blurCoordinates[4]) * 0.093913;
-	FragColor = sum;
-}
diff --git a/blurs/shaders/sunset_gaussian/sunset_vert.slang b/blurs/shaders/sunset_gaussian/sunset_vert.slang
deleted file mode 100644
index 2aabefc69a..0000000000
--- a/blurs/shaders/sunset_gaussian/sunset_vert.slang
+++ /dev/null
@@ -1,48 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 blurCoordinates[5];
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-	blurCoordinates[0] = vTexCoord.xy;
-	blurCoordinates[1] = vTexCoord.xy + params.OutputSize.zw * vec2(0.0,1.407333);
-	blurCoordinates[2] = vTexCoord.xy - params.OutputSize.zw * vec2(0.0,1.407333);
-	blurCoordinates[3] = vTexCoord.xy + params.OutputSize.zw * vec2(0.0,3.294215);
-	blurCoordinates[4] = vTexCoord.xy - params.OutputSize.zw * vec2(0.0,3.294215);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 blurCoordinates[5];
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec4 sum = vec4(0.0);
-	sum += texture(Source, blurCoordinates[0]) * 0.204164;
-	sum += texture(Source, blurCoordinates[1]) * 0.304005;
-	sum += texture(Source, blurCoordinates[2]) * 0.304005;
-	sum += texture(Source, blurCoordinates[3]) * 0.093913;
-	sum += texture(Source, blurCoordinates[4]) * 0.093913;
-	FragColor = sum;
-}
diff --git a/border/ambient-glow.slangp b/border/ambient-glow.slangp
deleted file mode 100644
index 7bdf322baa..0000000000
--- a/border/ambient-glow.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-shaders = 2
-
-shader0 = ../motionblur/shaders/feedback.slang
-filter_linear0 = true
-
-shader1 = shaders/ambient-glow.slang
-filter_linear1 = true
-mipmap_input1 = true
-scale_type1 = viewport
-
-parameters = "mixfactor;aspect_x;integer_scale;OS_MASK_TOP;OS_MASK_BOTTOM"
-mixfactor = 0.95
diff --git a/border/average_fill.slangp b/border/average_fill.slangp
deleted file mode 100644
index a88ac8bf8c..0000000000
--- a/border/average_fill.slangp
+++ /dev/null
@@ -1,59 +0,0 @@
-shaders = 7
-
-shader0 = ../blurs/shaders/kawase/linearize.slang
-scale_type0 = source
-scale_x0 = 1.0
-scale_y0 = 1.0
-float_framebuffer0 = true
-alias0 = "Input"
-
-shader1 = shaders/average_fill/crop_and_sample_top.slang
-filter_linear1 = true
-scale_type1 = absolute
-scale_x1 = 512
-scale_y1 = 64
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-alias1 = "Top"
-
-shader2 = shaders/average_fill/crop_and_sample_bottom.slang
-filter_linear2 = true
-scale_type2 = absolute
-scale_x2 = 512
-scale_y2 = 64
-float_framebuffer2 = true
-mipmap_input2 = true
-alias2 = "Bottom"
-
-shader3 = shaders/average_fill/crop_and_sample_left.slang
-filter_linear3 = true
-scale_type3 = absolute
-scale_x3 = 64
-scale_y3 = 512
-float_framebuffer3 = true
-mipmap_input3 = true
-alias3 = "Left"
-
-shader4 = shaders/average_fill/crop_and_sample_right.slang
-filter_linear4 = true
-scale_type4 = absolute
-scale_x4 = 64
-scale_y4 = 512
-float_framebuffer4 = true
-mipmap_input4 = true
-alias4 = "Right"
-
-shader5 = shaders/average_fill/compose.slang
-filter_linear5 = true
-scale_type5 = viewport
-scale_x5 = 1.0
-scale_y5 = 1.0
-float_framebuffer5 = true
-mipmap_input5 = true
-
-shader6 = ../blurs/shaders/kawase/delinearize.slang
-filter_linear6 = true
-scale_type6 = viewport
-scale_x6 = 1.0
-scale_y6 = 1.0
-float_framebuffer6 = true
diff --git a/border/bigblur.slangp b/border/bigblur.slangp
deleted file mode 100644
index 3a3ef4ab70..0000000000
--- a/border/bigblur.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = 9
-
-shader0 = ../stock.slang
-alias0 = Reference
-
-shader1 = ../blurs/shaders/kawase/linearize.slang
-srgb_framebuffer1 = true
-scale_type1 = source
-
-shader2 = ../blurs/shaders/kawase/kawase0.slang
-filter_linear2 = true
-srgb_framebuffer2 = true
-scale_type2 = source
-wrap_mode2 = mirrored_repeat
-
-shader3 = ../blurs/shaders/kawase/kawase1.slang
-filter_linear3 = true
-srgb_framebuffer3 = true
-scale_type3 = source
-wrap_mode3 = mirrored_repeat
-
-shader4 = ../blurs/shaders/kawase/kawase1.slang
-filter_linear4 = true
-srgb_framebuffer4 = true
-scale_type4 = source
-wrap_mode4 = mirrored_repeat
-
-shader5 = ../blurs/shaders/kawase/kawase2.slang
-filter_linear5 = true
-srgb_framebuffer5 = true
-scale_type5 = source
-wrap_mode5 = mirrored_repeat
-
-shader6 = ../blurs/shaders/kawase/kawase3.slang
-filter_linear6 = true
-srgb_framebuffer6 = true
-scale_type6 = source
-wrap_mode6 = mirrored_repeat
-
-shader7 = ../blurs/shaders/kawase/delinearize.slang
-filter_linear7 = true
-
-shader8 = shaders/bigblur.slang
-filter_linear8 = true
-scale_type8 = viewport
diff --git a/border/blur_fill.slangp b/border/blur_fill.slangp
deleted file mode 100644
index 8302d308c3..0000000000
--- a/border/blur_fill.slangp
+++ /dev/null
@@ -1,89 +0,0 @@
-shaders = 12
-
-parameters = "SIGMA;BLUR_RADIUS"
-SIGMA = 1.0
-BLUR_RADIUS = 2.0
-
-shader0 = ../blurs/shaders/kawase/linearize.slang
-scale_type0 = source
-scale0 = 1.0
-float_framebuffer0 = true
-alias0 = "Input"
-
-shader1 = ../blurs/shaders/gauss_4tap/gauss_2tap_h.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = ../blurs/shaders/gauss_4tap/gauss_2tap_v.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/blur_fill/render_sampling_areas.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.1
-scale_y3 = 1.1
-float_framebuffer3 = true
-alias3 = "Tiled"
-
-shader4 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.5
-float_framebuffer4 = true
-wrap_mode4 = mirrored_repeat
-
-shader5 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 0.5
-float_framebuffer5 = true
-wrap_mode5 = mirrored_repeat
-
-shader6 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 0.5
-float_framebuffer6 = true
-wrap_mode6 = mirrored_repeat
-
-shader7 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 2.0
-float_framebuffer7 = true
-wrap_mode7 = mirrored_repeat
-
-shader8 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 2.0
-float_framebuffer8 = true
-wrap_mode8 = mirrored_repeat
-
-shader9 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 2.0
-float_framebuffer9 = true
-wrap_mode9 = mirrored_repeat
-alias9 = "Blurred"
-
-shader10 = shaders/blur_fill/compose.slang
-filter_linear10 = true
-scale_type10 = viewport
-scale10 = 1.0
-float_framebuffer10 = true
-wrap_mode10 = mirrored_repeat
-
-shader11 = ../blurs/shaders/kawase/delinearize.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale11 = 1.0
-float_framebuffer11 = true
diff --git a/border/blur_fill_stronger_blur.slangp b/border/blur_fill_stronger_blur.slangp
deleted file mode 100644
index 3f555716b6..0000000000
--- a/border/blur_fill_stronger_blur.slangp
+++ /dev/null
@@ -1,89 +0,0 @@
-shaders = 12
-
-parameters = "SIGMA;BLUR_RADIUS"
-SIGMA = 1.5
-BLUR_RADIUS = 3.0
-
-shader0 = ../blurs/shaders/kawase/linearize.slang
-scale_type0 = source
-scale0 = 1.0
-float_framebuffer0 = true
-alias0 = "Input"
-
-shader1 = ../blurs/shaders/gauss_4tap/gauss_2tap_h.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = ../blurs/shaders/gauss_4tap/gauss_2tap_v.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/blur_fill/render_sampling_areas.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 0.7
-scale_y3 = 0.7
-float_framebuffer3 = true
-alias3 = "Tiled"
-
-shader4 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.5
-float_framebuffer4 = true
-wrap_mode4 = mirrored_repeat
-
-shader5 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 0.5
-float_framebuffer5 = true
-wrap_mode5 = mirrored_repeat
-
-shader6 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 0.5
-float_framebuffer6 = true
-wrap_mode6 = mirrored_repeat
-
-shader7 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 2.0
-float_framebuffer7 = true
-wrap_mode7 = mirrored_repeat
-
-shader8 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 2.0
-float_framebuffer8 = true
-wrap_mode8 = mirrored_repeat
-
-shader9 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 2.0
-float_framebuffer9 = true
-wrap_mode9 = mirrored_repeat
-alias9 = "Blurred"
-
-shader10 = shaders/blur_fill/compose.slang
-filter_linear10 = true
-scale_type10 = viewport
-scale10 = 1.0
-float_framebuffer10 = true
-wrap_mode10 = mirrored_repeat
-
-shader11 = ../blurs/shaders/kawase/delinearize.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale11 = 1.0
-float_framebuffer11 = true
diff --git a/border/blur_fill_weaker_blur.slangp b/border/blur_fill_weaker_blur.slangp
deleted file mode 100644
index abd615d40f..0000000000
--- a/border/blur_fill_weaker_blur.slangp
+++ /dev/null
@@ -1,89 +0,0 @@
-shaders = 12
-
-parameters = "SIGMA;BLUR_RADIUS"
-SIGMA = 1.0
-BLUR_RADIUS = 1.0
-
-shader0 = ../blurs/shaders/kawase/linearize.slang
-scale_type0 = source
-scale0 = 1.0
-float_framebuffer0 = true
-alias0 = "Input"
-
-shader1 = ../blurs/shaders/gauss_4tap/gauss_2tap_h.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-wrap_mode1 = mirrored_repeat
-
-shader2 = ../blurs/shaders/gauss_4tap/gauss_2tap_v.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-wrap_mode2 = mirrored_repeat
-
-shader3 = shaders/blur_fill/render_sampling_areas.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 2.0
-scale_y3 = 2.0
-float_framebuffer3 = true
-alias3 = "Tiled"
-
-shader4 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.5
-float_framebuffer4 = true
-wrap_mode4 = mirrored_repeat
-
-shader5 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 0.5
-float_framebuffer5 = true
-wrap_mode5 = mirrored_repeat
-
-shader6 = ../blurs/shaders/dual_filter/downsample.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 0.5
-float_framebuffer6 = true
-wrap_mode6 = mirrored_repeat
-
-shader7 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 2.0
-float_framebuffer7 = true
-wrap_mode7 = mirrored_repeat
-
-shader8 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 2.0
-float_framebuffer8 = true
-wrap_mode8 = mirrored_repeat
-
-shader9 = ../blurs/shaders/dual_filter/upsample.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 2.0
-float_framebuffer9 = true
-wrap_mode9 = mirrored_repeat
-alias9 = "Blurred"
-
-shader10 = shaders/blur_fill/compose.slang
-filter_linear10 = true
-scale_type10 = viewport
-scale10 = 1.0
-float_framebuffer10 = true
-wrap_mode10 = mirrored_repeat
-
-shader11 = ../blurs/shaders/kawase/delinearize.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale11 = 1.0
-float_framebuffer11 = true
diff --git a/border/effect-border-iq.slangp b/border/effect-border-iq.slangp
deleted file mode 100644
index bc8a400a21..0000000000
--- a/border/effect-border-iq.slangp
+++ /dev/null
@@ -1,14 +0,0 @@
-shaders = 1
-
-shader0 = shaders/effect-border-iq.slang
-filter_linear0 = false
-scale_type0 = viewport
-scale0 = 1.0
-alias0 = "BORDERS"
-framecount_mod0 = 10000.0
-
-textures = "iChannel0"
-iChannel0 = textures/tex11.png
-iChannel0_linear = true
-iChannel0_wrap_mode = repeat
-iChannel0_mipmap = true
\ No newline at end of file
diff --git a/border/gameboy-player/README.md b/border/gameboy-player/README.md
deleted file mode 100644
index 99d5309808..0000000000
--- a/border/gameboy-player/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Game Boy Player border shader
-
-These shader presets will allow you to apply a 608x448 Game Boy Player border around a 240x160 input image from a Game Boy Advance core, with the input being scaled 2x to fit the border.
-
-Please note that RetroArch's integer scaling function will not automatically set a correct integer scale for the output image, as it will only take the Game Boy Advance core's reported resolution of 240x160 into account, and not the output image's 608x448 resolution.
-
-One option to display it integer scaled is to set a custom viewport size, either with the Custom Ratio menu option or defining custom_viewport_width and custom_viewport_height in the config file, setting Aspect Ratio Index to "Custom", and enabling Integer Scaling to center the image automatically.
-
-The other option is to use one of the auto-box shaders in the last pass of the shader chain to integer scale or center the output of the border shader within the viewport. You may need to disable RetroArch's Integer Scaling and set the Aspect Ratio equal to your screen aspect ratio to see the whole image.
-
-An example border is included, you can swap it out with another 608x448 Game Boy Player border in png format with the center 240x160 transparent. The borders included with this shader were ripped from a Game Boy Player disc by a kind anonymous user and were edited to appear correct with a GBA image fully shown.
-
-Using CRT-Royale with this border shader may result in flickering. This is due to it displaying the border shader as 480i, due to the output image being greater than 400px vertically. Disable interlacing detection in CRT Royale's user-settings.h if want 480p instead.
\ No newline at end of file
diff --git a/border/gameboy-player/gameboy-player-crt-easymode.slangp b/border/gameboy-player/gameboy-player-crt-easymode.slangp
deleted file mode 100644
index e3d452a74c..0000000000
--- a/border/gameboy-player/gameboy-player-crt-easymode.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-shaders = "2"
-shader0 = "../shaders/imgborder-gbp.slang"
-shader1 = "../../crt/shaders/crt-easymode.slang"
-
-scale_type_x0 = "absolute"
-scale_x0 = "608"
-scale_type_y0 = "absolute"
-scale_y0 = "448"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "2.000000"
-location = "0.500000"
-in_res_x = "240.000000"
-in_res_y = "160.000000"
-out_res_x = "608.000000"
-out_res_y = "448.000000"
-
-textures = "BORDER"
-BORDER = "gameboy-player.png"
diff --git a/border/gameboy-player/gameboy-player-crt-royale.slangp b/border/gameboy-player/gameboy-player-crt-royale.slangp
deleted file mode 100644
index 2c68072d1b..0000000000
--- a/border/gameboy-player/gameboy-player-crt-royale.slangp
+++ /dev/null
@@ -1,215 +0,0 @@
-#CRT Royale with Game Boy Player border emulation
-
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "13"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;BORDER"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-BORDER = "gameboy-player.png"
-
-# Pass0: Apply Game Boy Player border
-shader0 = "../shaders/imgborder-gbp.slang"
-scale_type_x0 = "absolute"
-scale_x0 = "608"
-scale_type_y0 = "absolute"
-scale_y0 = "448"
-
-# Pass1: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader1 = "../../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias1 = "ORIG_LINEARIZED"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader2 = "../../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias2 = "VERTICAL_SCANLINES"
-filter_linear2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.0"
-scale_type_y2 = "viewport"
-scale_y2 = "1.0"
-#float_framebuffer2 = "true"
-srgb_framebuffer2 = "true"
-
-# Pass3: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader3 = "../../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias3 = "BLOOM_APPROX"
-filter_linear3 = "true"
-scale_type3 = "absolute"
-scale_x3 = "320"
-scale_y3 = "240"
-srgb_framebuffer3 = "true"
-
-# Pass4: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader4 = "../../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader5 = "../../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias5 = "HALATION_BLUR"
-filter_linear5 = "true"
-scale_type5 = "source"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x5 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.5 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y5 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y5 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x6 = scale_y5
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y5 = 4.0/3.0 * 2.0/(341.33333 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-cgp-constants.h!
-shader6 = "../../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Pass7: Lanczos-resize the phosphor mask horizontally.  scale_x6 = scale_y5.
-# TODO: Check again if the shaders actually require equal scales.
-shader7 = "../../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Pass8: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-#float_framebuffer8 = "true"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Pass 10: Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Pass 11: Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-
-# Pass 12: Compute curvature/AA:
-shader12 = "../../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear12 = "true"
-scale_type12 = "viewport"
-mipmap_input12 = "true"
-texture_wrap_mode12 = "clamp_to_edge"
-
diff --git a/border/gameboy-player/gameboy-player-gba-color+crt-easymode.slangp b/border/gameboy-player/gameboy-player-gba-color+crt-easymode.slangp
deleted file mode 100644
index ebaa4a0edc..0000000000
--- a/border/gameboy-player/gameboy-player-gba-color+crt-easymode.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-shaders = "3"
-shader0 = "../../handheld/shaders/color/gba-color.slang"
-shader1 = "../shaders/imgborder-gbp.slang"
-shader2 = "../../crt/shaders/crt-easymode.slang"
-
-scale_type0 = "source"
-scale0 = "1.000"
-
-scale_type_x1 = "absolute"
-scale_x1 = "608"
-scale_type_y1 = "absolute"
-scale_y1 = "448"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "2.000000"
-location = "0.500000"
-in_res_x = "240.000000"
-in_res_y = "160.000000"
-
-textures = "BORDER"
-BORDER = "gameboy-player.png"
diff --git a/border/handheld-nebula/README.md b/border/handheld-nebula/README.md
deleted file mode 100644
index 3a7168cdd2..0000000000
--- a/border/handheld-nebula/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# handheld-nebula border shader
-
-These shader presets will allow you to apply a 280x224* border around an input image from one of the following handheld cores:
-
-* 160x144 : Nintendo - Game Boy
-* 160x144 : Nintendo - Game Boy Color
-* 240x160 : Nintendo - Game Boy Advance
-* 160x144 : Sega - Game Gear
-
-I've posted images of the shaders in use to [this imgur album](https://imgur.com/a/nqzDnYa).
-
-*The Game Gear version of this shader uses a 248x224 image with a 160x144 hole cut in it, this is then stretched to "280x224" via aspect ratio settings to ensure ideal sampling.*
-
-**Set your video aspect ration to 4:3 when using these shaders.** RetroArch's "core provided" scaling function will not automatically set a correct aspect ratio for the output image, as it will only take the handheld core's reported resolution into account and not the output image's 280x224 resolution.
-
-Please note that RetroArch's integer scaling function will not automatically set a correct integer scale for the output image, as it will only take the handheld core's reported resolution into account, and not the output image's 280x224 resolution.
-
-One option to display it integer scaled is to set a custom viewport size, either with the Custom Ratio menu option or defining custom_viewport_width and custom_viewport_height in the config file, setting Aspect Ratio Index to "Custom", and enabling Integer Scaling to center the image automatically.
-
-The other option is to use one of the auto-box shaders in the last pass of the shader chain to integer scale or center the output of the border shader within the viewport. You may need to disable  RetroArch's Integer Scaling and set the Aspect Ratio equal to your screen aspect ratio to see the whole image.
-
-A template image is included, you can swap it out with another 280x224 image in png format with the center XY pixels transparent per the relevant handheld. The default image is [“Cosmic Cliffs� in the Carina Nebula](https://webbtelescope.org/contents/media/images/2022/031/01G77PKB8NKR7S8Z6HBXMYATGJ) taken by the James Webb Space Telescope. It has been cropped to a 4:3 aspect ratio, then downsampled to 256x224.
-
-Here are [Copyright Details](https://webbtelescope.org/copyright) for the work, and an excerpt in case that URL goes down.
-
-> Unless otherwise stated, all material on the site was produced by NASA and the Space Telescope Science Institute (STScI). Material on this site produced by STScI was created, authored, and/or prepared for NASA under Contract NAS5-03127. Unless otherwise specifically stated, no claim to copyright is being asserted by STScI and material on this site may be freely used as in the public domain in accordance with NASA's contract. However, it is requested that in any subsequent use of this work NASA and STScI be given appropriate acknowledgement.
\ No newline at end of file
diff --git a/border/handheld-nebula/handheld-nebula-gb+lcd-grid-v2.slangp b/border/handheld-nebula/handheld-nebula-gb+lcd-grid-v2.slangp
deleted file mode 100644
index b464ba5a8f..0000000000
--- a/border/handheld-nebula/handheld-nebula-gb+lcd-grid-v2.slangp
+++ /dev/null
@@ -1,17 +0,0 @@
-shaders = "2"
-shader0 = "../shaders/imgborder.slang"
-shader1 = "../../handheld/shaders/lcd-cgwg/lcd-grid-v2.slang"
-
-scale_type_x0 = "absolute"
-scale_x0 = "280"
-scale_type_y0 = "absolute"
-scale_y0 = "224"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "1.000000"
-location = "0.500000"
-in_res_x = "160.000000"
-in_res_y = "144.000000"
-
-textures = "BORDER"
-BORDER = "handheld-nebula-gb.png"
diff --git a/border/handheld-nebula/handheld-nebula-gba+lcd-grid-v2.slangp b/border/handheld-nebula/handheld-nebula-gba+lcd-grid-v2.slangp
deleted file mode 100644
index 4541932415..0000000000
--- a/border/handheld-nebula/handheld-nebula-gba+lcd-grid-v2.slangp
+++ /dev/null
@@ -1,17 +0,0 @@
-shaders = "2"
-shader0 = "../shaders/imgborder.slang"
-shader1 = "../../handheld/shaders/lcd-cgwg/lcd-grid-v2.slang"
-
-scale_type_x0 = "absolute"
-scale_x0 = "280"
-scale_type_y0 = "absolute"
-scale_y0 = "224"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "1.000000"
-location = "0.500000"
-in_res_x = "240.000000"
-in_res_y = "160.000000"
-
-textures = "BORDER"
-BORDER = "handheld-nebula-gba.png"
diff --git a/border/handheld-nebula/handheld-nebula-gg+lcd-grid-v2.slangp b/border/handheld-nebula/handheld-nebula-gg+lcd-grid-v2.slangp
deleted file mode 100644
index 2cd0b65ec5..0000000000
--- a/border/handheld-nebula/handheld-nebula-gg+lcd-grid-v2.slangp
+++ /dev/null
@@ -1,17 +0,0 @@
-shaders = "2"
-shader0 = "../shaders/imgborder.slang"
-shader1 = "../../handheld/shaders/lcd-cgwg/lcd-grid-v2.slang"
-
-scale_type_x0 = "absolute"
-scale_x0 = "248"
-scale_type_y0 = "absolute"
-scale_y0 = "224"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "1.000000"
-location = "0.500000"
-in_res_x = "160.000000"
-in_res_y = "144.000000"
-
-textures = "BORDER"
-BORDER = "handheld-nebula-gg.png"
diff --git a/border/lightgun-border.slangp b/border/lightgun-border.slangp
deleted file mode 100644
index 9b1cf398bc..0000000000
--- a/border/lightgun-border.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/lightgun-border.slang
-scale_type0 = viewport
-scale0 = 1.0
diff --git a/border/sgb/README.md b/border/sgb/README.md
deleted file mode 100644
index 09be7ada4d..0000000000
--- a/border/sgb/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Super Game Boy border shader
-
-These shader presets will allow you to apply a 256x224 Super Game Boy border around a 160x144 input image from a Game Boy core.
-
-Please note that RetroArch's integer scaling function will not automatically set a correct integer scale for the output image, as it will only take the Game Boy core's reported resolution of 160x144 into account, and not the output image's 256x224 resolution.
-
-One option to display it integer scaled is to set a custom viewport size, either with the Custom Ratio menu option or defining custom_viewport_width and custom_viewport_height in the config file, setting Aspect Ratio Index to "Custom", and enabling Integer Scaling to center the image automatically.
-
-The other option is to use one of the auto-box shaders in the last pass of the shader chain to integer scale or center the output of the border shader within the viewport. You may need to disable  RetroArch's Integer Scaling and set the Aspect Ratio equal to your screen aspect ratio to see the whole image.
-
-An example border is included, you can swap it out with another 256x224 Super Game Boy border in png format with the center 160x144 transparent. Borders derived from an emulator screenshot may be shifted up one pixel and off center, so you would need to shift it down one pixel to center it. The "Super Game Boy Color" borders were created by BLUEamnesiac.
\ No newline at end of file
diff --git a/border/sgb/sample-borders/Mega Man.png b/border/sgb/sample-borders/Mega Man.png
deleted file mode 100644
index 8478769bd1..0000000000
Binary files a/border/sgb/sample-borders/Mega Man.png and /dev/null differ
diff --git a/border/sgb/sample-borders/Pokemon2.png b/border/sgb/sample-borders/Pokemon2.png
deleted file mode 100644
index ae96a039a7..0000000000
Binary files a/border/sgb/sample-borders/Pokemon2.png and /dev/null differ
diff --git a/border/sgb/sample-borders/bomberman.png b/border/sgb/sample-borders/bomberman.png
deleted file mode 100644
index e103a02e43..0000000000
Binary files a/border/sgb/sample-borders/bomberman.png and /dev/null differ
diff --git a/border/sgb/sample-borders/castlevania.png b/border/sgb/sample-borders/castlevania.png
deleted file mode 100644
index fad1a50bfc..0000000000
Binary files a/border/sgb/sample-borders/castlevania.png and /dev/null differ
diff --git a/border/sgb/sample-borders/cinema.png b/border/sgb/sample-borders/cinema.png
deleted file mode 100644
index d77a8d7341..0000000000
Binary files a/border/sgb/sample-borders/cinema.png and /dev/null differ
diff --git a/border/sgb/sample-borders/donkey-kong-country.png b/border/sgb/sample-borders/donkey-kong-country.png
deleted file mode 100644
index 3b5ecb5185..0000000000
Binary files a/border/sgb/sample-borders/donkey-kong-country.png and /dev/null differ
diff --git a/border/sgb/sample-borders/donkey-kong.png b/border/sgb/sample-borders/donkey-kong.png
deleted file mode 100644
index 7ca96641ca..0000000000
Binary files a/border/sgb/sample-borders/donkey-kong.png and /dev/null differ
diff --git a/border/sgb/sample-borders/game-and-watch.png b/border/sgb/sample-borders/game-and-watch.png
deleted file mode 100644
index 12f2efc255..0000000000
Binary files a/border/sgb/sample-borders/game-and-watch.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gbc-berry.png b/border/sgb/sample-borders/gbc-berry.png
deleted file mode 100644
index fedf7723a7..0000000000
Binary files a/border/sgb/sample-borders/gbc-berry.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gbc-dandelion.png b/border/sgb/sample-borders/gbc-dandelion.png
deleted file mode 100644
index 3a8ea582d1..0000000000
Binary files a/border/sgb/sample-borders/gbc-dandelion.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gbc-grape.png b/border/sgb/sample-borders/gbc-grape.png
deleted file mode 100644
index 2f05e1d35d..0000000000
Binary files a/border/sgb/sample-borders/gbc-grape.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gbc-kiwi.png b/border/sgb/sample-borders/gbc-kiwi.png
deleted file mode 100644
index 6f40e1fea6..0000000000
Binary files a/border/sgb/sample-borders/gbc-kiwi.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gbc-red.png b/border/sgb/sample-borders/gbc-red.png
deleted file mode 100644
index effc50519d..0000000000
Binary files a/border/sgb/sample-borders/gbc-red.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gbc-teal.png b/border/sgb/sample-borders/gbc-teal.png
deleted file mode 100644
index 74e1965a55..0000000000
Binary files a/border/sgb/sample-borders/gbc-teal.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gblight.png b/border/sgb/sample-borders/gblight.png
deleted file mode 100644
index d2ed9339a9..0000000000
Binary files a/border/sgb/sample-borders/gblight.png and /dev/null differ
diff --git a/border/sgb/sample-borders/gbpocket.png b/border/sgb/sample-borders/gbpocket.png
deleted file mode 100644
index 9d5f3ae290..0000000000
Binary files a/border/sgb/sample-borders/gbpocket.png and /dev/null differ
diff --git a/border/sgb/sample-borders/kirby-2.png b/border/sgb/sample-borders/kirby-2.png
deleted file mode 100644
index e201dc5d10..0000000000
Binary files a/border/sgb/sample-borders/kirby-2.png and /dev/null differ
diff --git a/border/sgb/sample-borders/libretro-arcade.png b/border/sgb/sample-borders/libretro-arcade.png
deleted file mode 100644
index 50c006cb4e..0000000000
Binary files a/border/sgb/sample-borders/libretro-arcade.png and /dev/null differ
diff --git a/border/sgb/sample-borders/pokemon-blue.png b/border/sgb/sample-borders/pokemon-blue.png
deleted file mode 100644
index a877a2c48f..0000000000
Binary files a/border/sgb/sample-borders/pokemon-blue.png and /dev/null differ
diff --git a/border/sgb/sample-borders/pokemon-crystal.png b/border/sgb/sample-borders/pokemon-crystal.png
deleted file mode 100644
index cd5cc0fa53..0000000000
Binary files a/border/sgb/sample-borders/pokemon-crystal.png and /dev/null differ
diff --git a/border/sgb/sample-borders/pokemon-gold.png b/border/sgb/sample-borders/pokemon-gold.png
deleted file mode 100644
index f3f532b8e5..0000000000
Binary files a/border/sgb/sample-borders/pokemon-gold.png and /dev/null differ
diff --git a/border/sgb/sample-borders/pokemon-green.png b/border/sgb/sample-borders/pokemon-green.png
deleted file mode 100644
index 72cd8822a9..0000000000
Binary files a/border/sgb/sample-borders/pokemon-green.png and /dev/null differ
diff --git a/border/sgb/sample-borders/pokemon-red.png b/border/sgb/sample-borders/pokemon-red.png
deleted file mode 100644
index 199f75bc89..0000000000
Binary files a/border/sgb/sample-borders/pokemon-red.png and /dev/null differ
diff --git a/border/sgb/sample-borders/pokemon-silver.png b/border/sgb/sample-borders/pokemon-silver.png
deleted file mode 100644
index 92447dac5a..0000000000
Binary files a/border/sgb/sample-borders/pokemon-silver.png and /dev/null differ
diff --git a/border/sgb/sample-borders/pokemon-yellow.png b/border/sgb/sample-borders/pokemon-yellow.png
deleted file mode 100644
index 689866ee10..0000000000
Binary files a/border/sgb/sample-borders/pokemon-yellow.png and /dev/null differ
diff --git a/border/sgb/sample-borders/sgb-default.png b/border/sgb/sample-borders/sgb-default.png
deleted file mode 100644
index 9a5403098b..0000000000
Binary files a/border/sgb/sample-borders/sgb-default.png and /dev/null differ
diff --git a/border/sgb/sample-borders/sgb2-circuitboard.png b/border/sgb/sample-borders/sgb2-circuitboard.png
deleted file mode 100644
index 3ebd466171..0000000000
Binary files a/border/sgb/sample-borders/sgb2-circuitboard.png and /dev/null differ
diff --git a/border/sgb/sample-borders/sgb2-default.png b/border/sgb/sample-borders/sgb2-default.png
deleted file mode 100644
index 69666b6eb9..0000000000
Binary files a/border/sgb/sample-borders/sgb2-default.png and /dev/null differ
diff --git a/border/sgb/sample-borders/space-invaders.png b/border/sgb/sample-borders/space-invaders.png
deleted file mode 100644
index 29fe8aaecc..0000000000
Binary files a/border/sgb/sample-borders/space-invaders.png and /dev/null differ
diff --git a/border/sgb/sample-borders/street-fighter-2.png b/border/sgb/sample-borders/street-fighter-2.png
deleted file mode 100644
index 10239b8f65..0000000000
Binary files a/border/sgb/sample-borders/street-fighter-2.png and /dev/null differ
diff --git a/border/sgb/sample-borders/tetris.png b/border/sgb/sample-borders/tetris.png
deleted file mode 100644
index 92f28bea26..0000000000
Binary files a/border/sgb/sample-borders/tetris.png and /dev/null differ
diff --git a/border/sgb/sample-borders/wario-land.png b/border/sgb/sample-borders/wario-land.png
deleted file mode 100644
index ffc6c6a2f5..0000000000
Binary files a/border/sgb/sample-borders/wario-land.png and /dev/null differ
diff --git a/border/sgb/sample-borders/zelda.png b/border/sgb/sample-borders/zelda.png
deleted file mode 100644
index bd64b2f15e..0000000000
Binary files a/border/sgb/sample-borders/zelda.png and /dev/null differ
diff --git a/border/sgb/sgb+crt-easymode.slangp b/border/sgb/sgb+crt-easymode.slangp
deleted file mode 100644
index 86c9134468..0000000000
--- a/border/sgb/sgb+crt-easymode.slangp
+++ /dev/null
@@ -1,17 +0,0 @@
-shaders = "2"
-shader0 = "../shaders/imgborder-sgb.slang"
-shader1 = "../../crt/shaders/crt-easymode.slang"
-
-scale_type_x0 = "absolute"
-scale_x0 = "256"
-scale_type_y0 = "absolute"
-scale_y0 = "224"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "1.000000"
-location = "0.500000"
-in_res_x = "160.000000"
-in_res_y = "144.000000"
-
-textures = "BORDER"
-BORDER = "sgb.png"
diff --git a/border/sgb/sgb-crt-geom-1x.slangp b/border/sgb/sgb-crt-geom-1x.slangp
deleted file mode 100644
index 9b95ab3917..0000000000
--- a/border/sgb/sgb-crt-geom-1x.slangp
+++ /dev/null
@@ -1,20 +0,0 @@
-shaders = 2
-
-textures = "BORDER"
-BORDER = "sgb.png"
-BORDER_linear = true
-
-# Pass0: Apply Game Boy Player border
-shader0 = "../shaders/imgborder-sgb.slang"
-scale_type_x0 = "absolute"
-scale_x0 = "256"
-scale_type_y0 = "absolute"
-scale_y0 = "224"
-
-shader1 = "../../crt/shaders/crt-geom.slang"
-
-parameters = "box_scale;in_res_x;in_res_y;border_on_top"
-box_scale = 1.0
-in_res_x = 160.0
-in_res_y = 144.0
-border_on_top = 0.0
diff --git a/border/sgb/sgb-crt-royale.slangp b/border/sgb/sgb-crt-royale.slangp
deleted file mode 100644
index 4f512ebd26..0000000000
--- a/border/sgb/sgb-crt-royale.slangp
+++ /dev/null
@@ -1,215 +0,0 @@
-#CRT Royale with SGB border emulation
-
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "13"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;BORDER"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-BORDER = "sgb.png"
-
-# Pass0: Apply SGB border
-shader0 = "../shaders/imgborder-sgb.slang"
-scale_type_x0 = "absolute"
-scale_x0 = "256"
-scale_type_y0 = "absolute"
-scale_y0 = "224"
-
-# Pass1: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader1 = "../../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias1 = "ORIG_LINEARIZED"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader2 = "../../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias2 = "VERTICAL_SCANLINES"
-filter_linear2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.0"
-scale_type_y2 = "viewport"
-scale_y2 = "1.0"
-#float_framebuffer2 = "true"
-srgb_framebuffer2 = "true"
-
-# Pass3: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader3 = "../../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias3 = "BLOOM_APPROX"
-filter_linear3 = "true"
-scale_type3 = "absolute"
-scale_x3 = "320"
-scale_y3 = "240"
-srgb_framebuffer3 = "true"
-
-# Pass4: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader4 = "../../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader5 = "../../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias5 = "HALATION_BLUR"
-filter_linear5 = "true"
-scale_type5 = "source"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x5 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.5 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y5 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y5 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x6 = scale_y5
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y5 = 4.0/3.0 * 2.0/(341.33333 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-cgp-constants.h!
-shader6 = "../../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Pass7: Lanczos-resize the phosphor mask horizontally.  scale_x6 = scale_y5.
-# TODO: Check again if the shaders actually require equal scales.
-shader7 = "../../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Pass8: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-#float_framebuffer8 = "true"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Pass 10: Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Pass 11: Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-
-# Pass 12: Compute curvature/AA:
-shader12 = "../../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear12 = "true"
-scale_type12 = "viewport"
-mipmap_input12 = "true"
-texture_wrap_mode12 = "clamp_to_edge"
-
diff --git a/border/sgb/sgb-gbc-color-tvout+interlacing.slangp b/border/sgb/sgb-gbc-color-tvout+interlacing.slangp
deleted file mode 100644
index 9aad6a607a..0000000000
--- a/border/sgb/sgb-gbc-color-tvout+interlacing.slangp
+++ /dev/null
@@ -1,38 +0,0 @@
-shaders = 6
-shader0 = ../../handheld/shaders/color/gbc-color.slang
-shader1 = ../shaders/imgborder-sgb.slang
-shader2 = ../../crt/shaders/tvout-tweaks.slang
-shader3 = ../../misc/shaders/image-adjustment.slang
-shader4 = ../../misc/shaders/interlacing.slang
-shader5 = ../../auto-box/box-center.slang
-
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-
-scale_type_x1 = absolute
-scale_x1 = 256
-scale_type_y1 = absolute
-scale_y1 = 224
-
-scale_type_x2 = viewport
-scale_x2 = 1.000000
-scale_type_y2 = source
-scale_y2 = 1.000000
-
-scale_type_y4 = source
-scale_y4 = 2.000000
-
-filter_linear5 = false
-
-parameters = box_scale;location;in_res_x;in_res_y;TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS
-box_scale = 1.000000
-location = 0.500000
-in_res_x = 160.000000
-in_res_y = 144.000000
-TVOUT_RESOLUTION = 320.000000
-TVOUT_COMPOSITE_CONNECTION = 0.000000
-TVOUT_TV_COLOR_LEVELS = 0.000000
-
-textures = BORDER
-BORDER = sgb.png
diff --git a/border/sgb/sgb-gbc-color.slangp b/border/sgb/sgb-gbc-color.slangp
deleted file mode 100644
index fc2f16b116..0000000000
--- a/border/sgb/sgb-gbc-color.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-shaders = "2"
-shader0 = "../../handheld/shaders/color/gbc-color.slang"
-shader1 = "../shaders/imgborder-sgb.slang"
-
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-
-scale_type_x1 = "absolute"
-scale_x1 = "256"
-scale_type_y1 = "absolute"
-scale_y1 = "224"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "1.000000"
-location = "0.500000"
-in_res_x = "160.000000"
-in_res_y = "144.000000"
-
-textures = "BORDER"
-BORDER = "sgb.png"
diff --git a/border/sgb/sgb-tvout+interlacing.slangp b/border/sgb/sgb-tvout+interlacing.slangp
deleted file mode 100644
index deac851a9f..0000000000
--- a/border/sgb/sgb-tvout+interlacing.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-shaders = 5
-shader0 = ../shaders/imgborder-sgb.slang
-shader1 = ../../crt/shaders/tvout-tweaks.slang
-shader2 = ../../misc/shaders/image-adjustment.slang
-shader3 = ../../misc/shaders/interlacing.slang
-shader4 = ../../auto-box/box-center.slang
-
-scale_type_x0 = absolute
-scale_x0 = 256
-scale_type_y0 = absolute
-scale_y0 = 224
-
-scale_type_x1 = viewport
-scale_x1 = 1.000000
-scale_type_y1 = source
-scale_y1 = 1.000000
-
-scale_type_y3 = source
-scale_y3 = 2.000000
-
-filter_linear4 = false
-
-parameters = box_scale;location;in_res_x;in_res_y;TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS
-box_scale = 1.000000
-location = 0.500000
-in_res_x = 160.000000
-in_res_y = 144.000000
-TVOUT_RESOLUTION = 320.000000
-TVOUT_COMPOSITE_CONNECTION = 0.000000
-TVOUT_TV_COLOR_LEVELS = 0.000000
-
-textures = BORDER
-BORDER = sgb.png
diff --git a/border/sgb/sgb.png b/border/sgb/sgb.png
deleted file mode 100644
index 9a5403098b..0000000000
Binary files a/border/sgb/sgb.png and /dev/null differ
diff --git a/border/sgb/sgb.slangp b/border/sgb/sgb.slangp
deleted file mode 100644
index b720e1e9df..0000000000
--- a/border/sgb/sgb.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = "1"
-shader0 = "../shaders/imgborder-sgb.slang"
-
-scale_type_x0 = "absolute"
-scale_x0 = "256"
-scale_type_y0 = "absolute"
-scale_y0 = "224"
-
-parameters = "box_scale;location;in_res_x;in_res_y"
-box_scale = "1.000000"
-location = "0.500000"
-in_res_x = "160.000000"
-in_res_y = "144.000000"
-
-textures = "BORDER"
-BORDER = "sgb.png"
diff --git a/border/sgba/README.md b/border/sgba/README.md
deleted file mode 100644
index 0e6b699e86..0000000000
--- a/border/sgba/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Super Game Boy Advance border shader
-
-These shader presets will allow you to apply a 320x240 Super Game Boy Advance border around a 240x160 input image from a Game Boy Advance core.
-
-Please note that RetroArch's integer scaling function will not automatically set a correct integer scale for the output image, as it will only take the Game Boy Advance core's reported resolution of 240x160 into account, and not the output image's 320x240 resolution.
-
-One option to display it integer scaled is to set a custom viewport size, either with the Custom Ratio menu option or defining custom_viewport_width and custom_viewport_height in the config file, setting Aspect Ratio Index to "Custom", and enabling Integer Scaling to center the image automatically.
-
-The other option is to use one of the auto-box shaders in the last pass of the shader chain to integer scale or center the output of the border shader within the viewport. You may need to disable RetroArch's Integer Scaling and set the Aspect Ratio equal to your screen aspect ratio to see the whole image.
-
-An example border is included, you can swap it out with another 320x240 Super Game Boy Advance border in png format with the center 240x160 transparent. The borders included with this shader were created by EndUser based on a concept by BLUEamnesiac.
\ No newline at end of file
diff --git a/border/sgba/sample-borders/sgba-black.png b/border/sgba/sample-borders/sgba-black.png
deleted file mode 100644
index 78702eb32a..0000000000
Binary files a/border/sgba/sample-borders/sgba-black.png and /dev/null differ
diff --git a/border/sgba/sample-borders/sgba-indigo.png b/border/sgba/sample-borders/sgba-indigo.png
deleted file mode 100644
index 02eba329bd..0000000000
Binary files a/border/sgba/sample-borders/sgba-indigo.png and /dev/null differ
diff --git a/border/sgba/sample-borders/sgba-platinum.png b/border/sgba/sample-borders/sgba-platinum.png
deleted file mode 100644
index 033883d030..0000000000
Binary files a/border/sgba/sample-borders/sgba-platinum.png and /dev/null differ
diff --git a/border/sgba/sample-borders/sgba-spice.png b/border/sgba/sample-borders/sgba-spice.png
deleted file mode 100644
index 8815b3ad45..0000000000
Binary files a/border/sgba/sample-borders/sgba-spice.png and /dev/null differ
diff --git a/border/sgba/sgba-gba-color.slangp b/border/sgba/sgba-gba-color.slangp
deleted file mode 100644
index 07cd7d8b36..0000000000
--- a/border/sgba/sgba-gba-color.slangp
+++ /dev/null
@@ -1,20 +0,0 @@
-shaders = "2"
-shader0 = "../../handheld/shaders/color/gba-color.slang"
-shader1 = "../shaders/imgborder-sgba.slang"
-
-scale_type0 = "source"
-scale0 = "1.0000"
-filter_linear0 = "false"
-
-scale_type_x1 = "absolute"
-scale_x1 = "320"
-scale_type_y1 = "absolute"
-scale_y1 = "240"
-
-parameters = "box_scale;in_res_x;in_res_y"
-box_scale = "1.000000"
-in_res_x = "240.000000"
-in_res_y = "160.000000"
-
-textures = "BORDER"
-BORDER = "sgba.png"
diff --git a/border/sgba/sgba-tvout+interlacing.slangp b/border/sgba/sgba-tvout+interlacing.slangp
deleted file mode 100644
index 1fd76047ab..0000000000
--- a/border/sgba/sgba-tvout+interlacing.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-shaders = 5
-shader0 = ../shaders/imgborder-sgba.slang
-shader1 = ../../crt/shaders/tvout-tweaks.slang
-shader2 = ../../misc/shaders/image-adjustment.slang
-shader3 = ../../misc/shaders/interlacing.slang
-shader4 = ../../auto-box/box-center.slang
-
-scale_type_x0 = absolute
-scale_x0 = 320
-scale_type_y0 = absolute
-scale_y0 = 240
-
-scale_type_x1 = viewport
-scale_x1 = 1.000000
-scale_type_y1 = source
-scale_y1 = 1.000000
-
-scale_type_y3 = source
-scale_y3 = 2.000000
-
-filter_linear4 = false
-
-parameters = box_scale;location;in_res_x;in_res_y;TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS
-box_scale = 1.000000
-location = 0.500000
-in_res_x = 240.000000
-in_res_y = 160.000000
-TVOUT_RESOLUTION = 512.000000
-TVOUT_COMPOSITE_CONNECTION = 0.000000
-TVOUT_TV_COLOR_LEVELS = 1.000000
-
-textures = BORDER
-BORDER = sgba.png
diff --git a/border/sgba/sgba-tvout-gba-color+interlacing.slangp b/border/sgba/sgba-tvout-gba-color+interlacing.slangp
deleted file mode 100644
index 4cbdd8eca6..0000000000
--- a/border/sgba/sgba-tvout-gba-color+interlacing.slangp
+++ /dev/null
@@ -1,37 +0,0 @@
-shaders = 6
-shader0 = ../../handheld/shaders/color/gba-color.slang
-shader1 = ../shaders/imgborder-sgba.slang
-shader2 = ../../crt/shaders/tvout-tweaks.slang
-shader3 = ../../misc/shaders/image-adjustment.slang
-shader4 = ../../misc/shaders/interlacing.slang
-shader5 = ../../auto-box/box-center.slang
-
-scale_type0 = source
-scale0 = 1.0
-
-scale_type_x1 = absolute
-scale_x1 = 320
-scale_type_y1 = absolute
-scale_y1 = 240
-
-scale_type_x2 = viewport
-scale_x2 = 1.000000
-scale_type_y2 = source
-scale_y2 = 1.000000
-
-scale_type_y4 = source
-scale_y4 = 2.000000
-
-filter_linear5 = false
-
-parameters = box_scale;location;in_res_x;in_res_y;TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS
-box_scale = 1.000000
-location = 0.500000
-in_res_x = 240.000000
-in_res_y = 160.000000
-TVOUT_RESOLUTION = 512.000000
-TVOUT_COMPOSITE_CONNECTION = 0.000000
-TVOUT_TV_COLOR_LEVELS = 1.000000
-
-textures = BORDER
-BORDER = sgba.png
diff --git a/border/sgba/sgba.png b/border/sgba/sgba.png
deleted file mode 100644
index 02eba329bd..0000000000
Binary files a/border/sgba/sgba.png and /dev/null differ
diff --git a/border/sgba/sgba.slangp b/border/sgba/sgba.slangp
deleted file mode 100644
index 8dd00e2d1b..0000000000
--- a/border/sgba/sgba.slangp
+++ /dev/null
@@ -1,15 +0,0 @@
-shaders = "1"
-shader0 = "../shaders/imgborder-sgba.slang"
-
-scale_type_x0 = "absolute"
-scale_x0 = "320"
-scale_type_y0 = "absolute"
-scale_y0 = "240"
-
-parameters = "box_scale;in_res_x;in_res_y"
-box_scale = "1.000000"
-in_res_x = "240.000000"
-in_res_y = "160.000000"
-
-textures = "BORDER"
-BORDER = "sgba.png"
diff --git a/border/shaders/ambient-glow.slang b/border/shaders/ambient-glow.slang
deleted file mode 100644
index a468f65610..0000000000
--- a/border/shaders/ambient-glow.slang
+++ /dev/null
@@ -1,117 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 OriginalSize;
-	vec4 SourceSize;
-	uint FrameCount;
-	float integer_scale;
-	float overscale;
-	float effect;
-	float scanline_toggle;
-	float SCANLINE_BASE_BRIGHTNESS;
-	float SCANLINE_SINE_COMP_A;
-	float SCANLINE_SINE_COMP_B;
-	float interp_toggle;
-	float OS_MASK_TOP;
-	float OS_MASK_BOTTOM;
-	float OS_MASK_LEFT;
-	float OS_MASK_RIGHT;
-	float aspect_x;
-	float aspect_y;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter effect "Glow Brightness" 1.0 0.1 3.0 0.1
-#pragma parameter aspect_x "Aspect Ratio Numerator" 64.0 1.0 256. 1.0
-#pragma parameter aspect_y "Aspect Ratio Denominator" 49.0 1.0 256. 1.0
-#pragma parameter integer_scale "Force Integer Scaling" 1.0 0.0 1.0 1.0
-#pragma parameter overscale "Integer Overscale" 0.0 0.0 1.0 1.0
-#pragma parameter interp_toggle "Sharpen Linear Scaling" 0.0 0.0 1.0 1.0
-#pragma parameter scanline_toggle "Scanline Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter SCANLINE_BASE_BRIGHTNESS "Scanline Base Brightness" 0.95 0.0 1.0 0.01
-#pragma parameter SCANLINE_SINE_COMP_A "Scanline Sine Comp A" 0.00 0.0 0.10 0.01
-#pragma parameter SCANLINE_SINE_COMP_B "Scanline Intensity" 0.15 0.0 1.0 0.05
-#pragma parameter OS_MASK_TOP "Overscan Mask Top" 0.0 0.0 1.0 0.005
-#pragma parameter OS_MASK_BOTTOM "Overscan Mask Bottom" 0.0 0.0 1.0 0.005
-#pragma parameter OS_MASK_LEFT "Overscan Mask Left" 0.0 0.0 1.0 0.005
-#pragma parameter OS_MASK_RIGHT "Overscan Mask Right" 0.0 0.0 1.0 0.005
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 border_coord;
-layout(location = 1) out vec2 screen_coord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vec2 out_res = params.OutputSize.xy;
-	vec2 corrected_size = params.SourceSize.xy * vec2(params.aspect_x / params.aspect_y, 1.0)
-		 * vec2(params.SourceSize.y / params.SourceSize.x, 1.0);
-	float full_scale = (params.integer_scale > 0.5) ? floor(params.OutputSize.y /
-		params.SourceSize.y) + params.overscale : params.OutputSize.y / params.SourceSize.y;
-	vec2 scale = (params.OutputSize.xy / corrected_size) / full_scale;
-	vec2 middle = vec2(0.49999, 0.49999);
-	vec2 diff = TexCoord.xy - middle;
-	screen_coord = middle + diff * scale;
-	border_coord = TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 border_coord;
-layout(location = 1) in vec2 screen_coord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-
-vec4 scanline(vec2 coord, vec4 frame)
-{
-	vec2 omega = vec2(3.1415 * params.OutputSize.x, 2.0 * 3.1415 * params.SourceSize.y);
-	vec2 sine_comp = vec2(params.SCANLINE_SINE_COMP_A, params.SCANLINE_SINE_COMP_B);
-	vec3 res = frame.xyz;
-	vec3 scanline = res * (params.SCANLINE_BASE_BRIGHTNESS + dot(sine_comp * sin(coord * omega), vec2(1.0, 1.0)));
-	return vec4(scanline.x, scanline.y, scanline.z, 1.0);
-}
-
-vec2 interp_coord(vec2 coord, vec2 texture_size)
-{
-	vec2 p = coord.xy;
-	p = p * texture_size.xy + vec2(0.5, 0.5);
-	vec2 i = floor(p);
-	vec2 f = p - i;
-	// Smoothstep - amazingly, smoothstep() is slower than calculating directly the expression!
-	f = f * f * f * f * (f * (f * (-20.0 * f + vec2(70.0, 70.0)) - vec2(84.0, 84.0)) + vec2(35.0, 35.0));
-	p = i + f;
-	p = (p - vec2(0.5, 0.5)) * 1.0 / texture_size;
-	return p;
-}
-
-vec4 border(vec2 screen_coord, vec2 border_coord, vec2 texture_size, vec2 video_size,
-	vec2 output_size, float frame_count, sampler2D decal)
-{
-	vec4 background;
-	vec4 color = texture(Source, border_coord, 10.0) * 1.25 + 0.125; // use mipmapping to get an average of the entire screen
-	background = color * color * params.effect;
-	
-	vec2 coord = (params.interp_toggle < 0.5) ? screen_coord : interp_coord(screen_coord, texture_size);
-	vec4 frame = texture(decal, coord);
-	frame = (params.scanline_toggle > 0.5) ? scanline(coord, frame) : frame;
-	vec2 fragcoord = (coord.xy);
-	if (fragcoord.x < 1.0 - params.OS_MASK_RIGHT && fragcoord.x > 0.0 + params.OS_MASK_LEFT &&
-		fragcoord.y < 1.0 - params.OS_MASK_BOTTOM && fragcoord.y > 0.0 + params.OS_MASK_TOP)
-			return frame;
-	
-	else return background;
-}
-
-void main()
-{
-	FragColor = border(screen_coord, border_coord, params.SourceSize.xy, params.SourceSize.xy, 
-		params.OutputSize.xy, float(params.FrameCount), Original);
-}
\ No newline at end of file
diff --git a/border/shaders/average_fill/compose.slang b/border/shaders/average_fill/compose.slang
deleted file mode 100644
index f73f0b047e..0000000000
--- a/border/shaders/average_fill/compose.slang
+++ /dev/null
@@ -1,308 +0,0 @@
-#version 450
-
-/*
-    Average fill v1.9 by fishku
-    Copyright (C) 2023-2024
-    Public domain license (CC0)
-
-    This shader preset allows cropping the image on any side, and filling the
-    cropped area with the average color of an adjustable area next to it.
-    This is useful for certain games that do not render a full image to maintain
-    the overall aspect ratio and to avoid burn-in.
-
-    The preset also allows you to extend the original content to a larger
-    screen. It's recommended to set the video scaling options as follows:
-    - Turn integer scaling OFF
-    - Set aspect ratio to FULL
-    The shader will then take over and handle the proper scaling and aspect
-    ratio of the input.
-
-    In case the image is cropped on multiple sides, different blend modes for
-    the corner are available. Simply change the parameter for the "corner blend
-    mode".
-    The available corner blend modes are:
-    0 = Draw horizontal bars on top
-    1 = Draw vertical bars on top
-    2 = Blend bars by weighted averaging
-    3 = Smooth angle-based blending
-
-    Changelog:
-    v1.9: Update input transform library.
-    v1.8: Add shift option from input transform library.
-    v1.7: Add overscale option from crop and scale library.
-    v1.6: Refactor for new scaling library. Add rotation support.
-    v1.5: Optimize. Update to new Pixel AA version.
-    v1.4: Add anti-aliased interpolation for non-integer scaling.
-    v1.3: Fix scaling bugs.
-    v1.2: Fix scaling bugs.
-    v1.1: Add extension modes from blur fill; Add average gamma adjustment.
-    v1.0: Initial release.
-*/
-
-// clang-format off
-#include "parameters.inc"
-#include "../../../pixel-art-scaling/shaders/pixel_aa/parameters.inc"
-// clang-format on
-
-#include "../../../misc/shaders/input_transform/input_transform.inc"
-#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.inc"
-
-layout(push_constant) uniform Push {
-    vec4 InputSize;
-    vec4 OutputSize;
-    uint Rotation;
-    // Own settings
-    float EXTEND_H;
-    float EXTEND_V;
-    float CORNER_BLEND_MODE;
-    float FILL_GAMMA;
-    float SAMPLE_SIZE;
-    // From input transform library, scaling section
-    float FORCE_ASPECT_RATIO;
-    float ASPECT_H;
-    float ASPECT_V;
-    float FORCE_INTEGER_SCALING_H;
-    float FORCE_INTEGER_SCALING_V;
-    float OVERSCALE;
-    // From input transform library, cropping section
-    float OS_CROP_TOP;
-    float OS_CROP_BOTTOM;
-    float OS_CROP_LEFT;
-    float OS_CROP_RIGHT;
-    // From input transform library, moving section
-    float SHIFT_H;
-    float SHIFT_V;
-    float CENTER_AFTER_CROPPING;
-    // From pixel AA
-    float PIX_AA_SHARP;
-    float PIX_AA_SUBPX;
-    float PIX_AA_SUBPX_ORIENTATION;
-}
-param;
-
-layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; }
-global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec4 input_corners;
-layout(location = 1) out vec2 vTexCoord;
-layout(location = 2) out vec2 scale_i2o;
-layout(location = 3) out vec2 input_center;
-layout(location = 4) out vec2 tx_coord;
-layout(location = 5) out vec2 tx_per_px;
-layout(location = 6) out vec2 tx_to_uv;
-layout(location = 7) out vec2 cropped_input_size;
-
-void main() {
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-    const vec4 crop = vec4(param.OS_CROP_TOP, param.OS_CROP_LEFT,
-                           param.OS_CROP_BOTTOM, param.OS_CROP_RIGHT);
-    scale_i2o = get_scale_i2o(
-        param.InputSize.xy, param.OutputSize.xy, crop, param.Rotation,
-        param.CENTER_AFTER_CROPPING, param.FORCE_ASPECT_RATIO,
-        vec2(param.ASPECT_H, param.ASPECT_V),
-        vec2(param.FORCE_INTEGER_SCALING_H, param.FORCE_INTEGER_SCALING_V),
-        param.OVERSCALE);
-    const vec2 shift = vec2(param.SHIFT_H, param.SHIFT_V);
-    input_center = get_input_center(param.InputSize.xy, param.OutputSize.xy,
-                                    scale_i2o, crop, shift, param.Rotation,
-                                    param.CENTER_AFTER_CROPPING);
-    tx_coord = transform(TexCoord, vec2(0.5), param.OutputSize.xy / scale_i2o,
-                         input_center);
-    tx_per_px = 1.0 / scale_i2o;
-    tx_to_uv = param.InputSize.zw;
-
-    input_corners = get_input_corners(param.InputSize.xy, crop, param.Rotation);
-    const vec4 rotated_crop = get_rotated_crop(crop, param.Rotation);
-    cropped_input_size =
-        param.InputSize.xy -
-        vec2(rotated_crop.y + rotated_crop.w, rotated_crop.x + rotated_crop.z);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec4 input_corners;
-layout(location = 1) in vec2 vTexCoord;
-layout(location = 2) in vec2 scale_i2o;
-layout(location = 3) in vec2 input_center;
-layout(location = 4) in vec2 tx_coord;
-layout(location = 5) in vec2 tx_per_px;
-layout(location = 6) in vec2 tx_to_uv;
-layout(location = 7) in vec2 cropped_input_size;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Input;
-layout(set = 0, binding = 3) uniform sampler2D Top;
-layout(set = 0, binding = 4) uniform sampler2D Bottom;
-layout(set = 0, binding = 5) uniform sampler2D Left;
-layout(set = 0, binding = 6) uniform sampler2D Right;
-
-#define PI 3.1415926538
-
-// For mipmap sampling, use a big offset to get the average of a PoT input.
-#define BIG_NUMBER 9000.1
-
-vec3 blend_corner(vec3 a,      // The first color to blend
-                  vec3 b,      // The second color to blend
-                  float wa,    // The weight of the first color
-                  float wb,    // The weight of the second color
-                  vec2 coord,  // The coordinate to evaluate the blend for
-                  vec2 corner_coord,  // The coordinate of the corner of the
-                                      // content after cropping
-                  vec2 gap_size  // The component-wise distance from the corner
-                                 // of the content to the corner of the viewport
-) {
-    switch (int(param.CORNER_BLEND_MODE)) {
-        case 0:
-            // Horizontal bars on top
-            return b;
-        case 1:
-            // Vertical bars on top
-            return a;
-        case 2:
-            // Weighted average of averages
-            return mix(a, b, wa / (wa + wb));
-        case 3:
-        default:
-            // Angle blend
-            const vec2 delta = (coord - corner_coord) / gap_size;
-            // Use absolutes to always operate in 1st quadrant.
-            // This makes the angle work out to be correct in all cases when
-            // carefully choosing argument ordering.
-            const float angle = atan(abs(delta.y), abs(delta.x)) / (PI * 0.5);
-            // Smoothstep makes the transition perceptually smoother.
-            return mix(a, b, smoothstep(0.0, 1.0, angle));
-    }
-}
-
-void main() {
-    const vec2 extend_fill =
-        get_rotated_size(vec2(param.EXTEND_H, param.EXTEND_V), param.Rotation);
-    if (tx_coord.x < input_corners.x) {
-        if (extend_fill.x < 0.5) {
-            FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-            return;
-        }
-        const vec3 left = textureLod(Left, vec2(0.5), BIG_NUMBER).rgb;
-        if (tx_coord.y < input_corners.y) {
-            if (extend_fill.y < 0.5) {
-                FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-                return;
-            }
-            // Top left corner
-            const vec3 top = textureLod(Top, vec2(0.5), BIG_NUMBER).rgb;
-            const vec2 content_corner =
-                transform(input_corners.xy, input_center,
-                          scale_i2o / param.OutputSize.xy, vec2(0.5));
-            const vec2 viewport_corner = vec2(0.0, 0.0);
-            FragColor = vec4(
-                blend_corner(left, top, cropped_input_size.y,
-                             cropped_input_size.x, vTexCoord, content_corner,
-                             viewport_corner - content_corner),
-                1.0);
-            FragColor.rgb = pow(FragColor.rgb, vec3(param.FILL_GAMMA));
-        } else if (tx_coord.y < input_corners.w) {
-            // Left bar
-            FragColor = vec4(pow(left, vec3(param.FILL_GAMMA)), 1.0);
-        } else {
-            if (extend_fill.y < 0.5) {
-                FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-                return;
-            }
-            // Bottom left corner
-            const vec3 bottom = textureLod(Bottom, vec2(0.5), BIG_NUMBER).rgb;
-            const vec2 content_corner =
-                transform(input_corners.xw, input_center,
-                          scale_i2o / param.OutputSize.xy, vec2(0.5));
-            const vec2 viewport_corner = vec2(0.0, 1.0);
-            FragColor = vec4(
-                blend_corner(left, bottom, cropped_input_size.y,
-                             cropped_input_size.x, vTexCoord, content_corner,
-                             viewport_corner - content_corner),
-                1.0);
-            FragColor.rgb = pow(FragColor.rgb, vec3(param.FILL_GAMMA));
-        }
-    } else if (tx_coord.x < input_corners.z) {
-        if (tx_coord.y < input_corners.y) {
-            if (extend_fill.y < 0.5) {
-                FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-                return;
-            }
-            // Top bar
-            FragColor = vec4(textureLod(Top, vec2(0.5), BIG_NUMBER).rgb, 1.0);
-            FragColor.rgb = pow(FragColor.rgb, vec3(param.FILL_GAMMA));
-        } else if (tx_coord.y < input_corners.w) {
-            // Uncropped
-            if (param.FORCE_INTEGER_SCALING_H > 0.5 &&
-                param.FORCE_INTEGER_SCALING_V > 0.5) {
-                // Do a perfectly sharp (nearest neighbor) sampling.
-                FragColor = vec4(
-                    texture(Input, (floor(tx_coord) + 0.5) * param.InputSize.zw)
-                        .rgb,
-                    1.0);
-            } else {
-                // Do a sharp anti-aliased interpolation.
-                // Do not correct for gamma additionally because the input is
-                // already in linear color space.
-                FragColor = pixel_aa(
-                    Input, tx_per_px, tx_to_uv, tx_coord, param.PIX_AA_SHARP,
-                    /* gamma_correct = */ false, param.PIX_AA_SUBPX > 0.5,
-                    uint(param.PIX_AA_SUBPX_ORIENTATION), param.Rotation);
-            }
-        } else {
-            if (extend_fill.y < 0.5) {
-                FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-                return;
-            }
-            // Bottom bar
-            FragColor =
-                vec4(textureLod(Bottom, vec2(0.5), BIG_NUMBER).rgb, 1.0);
-            FragColor.rgb = pow(FragColor.rgb, vec3(param.FILL_GAMMA));
-        }
-    } else {
-        if (extend_fill.x < 0.5) {
-            FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-            return;
-        }
-        const vec3 right = textureLod(Right, vec2(0.5), BIG_NUMBER).rgb;
-        if (tx_coord.y < input_corners.y) {
-            if (extend_fill.y < 0.5) {
-                FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-                return;
-            }
-            // Top right corner
-            const vec3 top = textureLod(Top, vec2(0.5), BIG_NUMBER).rgb;
-            const vec2 content_corner =
-                transform(input_corners.zy, input_center,
-                          scale_i2o / param.OutputSize.xy, vec2(0.5));
-            const vec2 viewport_corner = vec2(1.0, 0.0);
-            FragColor = vec4(
-                blend_corner(right, top, cropped_input_size.y,
-                             cropped_input_size.x, vTexCoord, content_corner,
-                             viewport_corner - content_corner),
-                1.0);
-            FragColor.rgb = pow(FragColor.rgb, vec3(param.FILL_GAMMA));
-        } else if (tx_coord.y < input_corners.w) {
-            // Right bar
-            FragColor = vec4(pow(right, vec3(param.FILL_GAMMA)), 1.0);
-        } else {
-            if (extend_fill.y < 0.5) {
-                FragColor = vec4(0.0, 0.0, 0.0, 1.0);
-                return;
-            }
-            // Bottom right corner
-            const vec3 bottom = textureLod(Bottom, vec2(0.5), BIG_NUMBER).rgb;
-            const vec2 content_corner =
-                transform(input_corners.zw, input_center,
-                          scale_i2o / param.OutputSize.xy, vec2(0.5));
-            const vec2 viewport_corner = vec2(1.0, 1.0);
-            FragColor = vec4(
-                blend_corner(right, bottom, cropped_input_size.y,
-                             cropped_input_size.x, vTexCoord, content_corner,
-                             viewport_corner - content_corner),
-                1.0);
-            FragColor.rgb = pow(FragColor.rgb, vec3(param.FILL_GAMMA));
-        }
-    }
-}
diff --git a/border/shaders/average_fill/crop_and_sample_bottom.slang b/border/shaders/average_fill/crop_and_sample_bottom.slang
deleted file mode 100644
index f642a4417e..0000000000
--- a/border/shaders/average_fill/crop_and_sample_bottom.slang
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 450
-
-// See compose.slang for copyright and other information.
-
-// Crop is rotated already.
-vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) {
-    return input_size.zwzw * vec4(crop.y,                               //
-                                  input_size.y - crop.z - sample_size,  //
-                                  input_size.x - crop.w,                //
-                                  input_size.y - crop.z);
-}
-
-#include "crop_and_sample_common.inc"
diff --git a/border/shaders/average_fill/crop_and_sample_common.inc b/border/shaders/average_fill/crop_and_sample_common.inc
deleted file mode 100644
index 6dc941e1b0..0000000000
--- a/border/shaders/average_fill/crop_and_sample_common.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-// See compose.slang for copyright and other information.
-
-#include "../../../misc/shaders/input_transform/input_transform.inc"
-#include "parameters.inc"
-
-layout(push_constant) uniform Push {
-    vec4 InputSize;
-    uint Rotation;
-    // Own settings
-    float SAMPLE_SIZE;
-    // From input transform library, cropping section
-    float OS_CROP_TOP;
-    float OS_CROP_BOTTOM;
-    float OS_CROP_LEFT;
-    float OS_CROP_RIGHT;
-}
-param;
-
-layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; }
-global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main() {
-    gl_Position = global.MVP * Position;
-    const vec4 rotated_crop =
-        get_rotated_crop(vec4(param.OS_CROP_TOP, param.OS_CROP_LEFT,
-                              param.OS_CROP_BOTTOM, param.OS_CROP_RIGHT),
-                         param.Rotation);
-    const vec4 effective_corners =
-        get_effective_corners(rotated_crop, param.InputSize, param.SAMPLE_SIZE);
-    vTexCoord = mix(effective_corners.xy, effective_corners.zw, TexCoord);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Input;
-
-void main() { FragColor = vec4(texture(Input, vTexCoord).rgb, 1.0); }
diff --git a/border/shaders/average_fill/crop_and_sample_left.slang b/border/shaders/average_fill/crop_and_sample_left.slang
deleted file mode 100644
index f763dd2e58..0000000000
--- a/border/shaders/average_fill/crop_and_sample_left.slang
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 450
-
-// See compose.slang for copyright and other information.
-
-vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) {
-    return input_size.zwzw * vec4(crop.y,                //
-                                  crop.x,                //
-                                  crop.y + sample_size,  //
-                                  input_size.y - crop.z);
-}
-
-#include "crop_and_sample_common.inc"
diff --git a/border/shaders/average_fill/crop_and_sample_right.slang b/border/shaders/average_fill/crop_and_sample_right.slang
deleted file mode 100644
index bbece6d05a..0000000000
--- a/border/shaders/average_fill/crop_and_sample_right.slang
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 450
-
-// See compose.slang for copyright and other information.
-
-vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) {
-    return input_size.zwzw * vec4(input_size.x - crop.w - sample_size,  //
-                                  crop.x,                               //
-                                  input_size.x - crop.w,                //
-                                  input_size.y - crop.z);
-}
-
-#include "crop_and_sample_common.inc"
diff --git a/border/shaders/average_fill/crop_and_sample_top.slang b/border/shaders/average_fill/crop_and_sample_top.slang
deleted file mode 100644
index baa4210ec0..0000000000
--- a/border/shaders/average_fill/crop_and_sample_top.slang
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 450
-
-// See compose.slang for copyright and other information.
-
-vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) {
-    return input_size.zwzw * vec4(crop.y,                 //
-                                  crop.x,                 //
-                                  input_size.x - crop.w,  //
-                                  crop.x + sample_size);
-}
-
-#include "crop_and_sample_common.inc"
diff --git a/border/shaders/average_fill/parameters.inc b/border/shaders/average_fill/parameters.inc
deleted file mode 100644
index a6795b2218..0000000000
--- a/border/shaders/average_fill/parameters.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-// See compose.slang for copyright and other information.
-
-// clang-format off
-#pragma parameter AVERAGE_FILL_SETTINGS "=== Average fill v1.9 settings ===" 0.0 0.0 1.0 1.0
-
-#include "../../../misc/shaders/input_transform/parameters.inc"
-
-#pragma parameter OTHER_SETTINGS "= Other parameters =" 0.0 0.0 1.0 1.0
-#pragma parameter EXTEND_H "Extend the fill horizontally" 1.0 0.0 1.0 1.0
-#pragma parameter EXTEND_V "Extend the fill vertically" 1.0 0.0 1.0 1.0
-
-#pragma parameter CORNER_BLEND_MODE "Cropped corner blend mode" 0.0 0.0 3.0 1.0
-
-#pragma parameter FILL_GAMMA "Background fill gamma adjustment" 1.0 0.5 2.0 0.1
-
-#pragma parameter SAMPLE_SIZE "No. of lines for calculating the average" 8.0 1.0 64.0 1.0
-// clang-format on
diff --git a/border/shaders/blur_fill/compose.slang b/border/shaders/blur_fill/compose.slang
deleted file mode 100644
index f70fbdaed5..0000000000
--- a/border/shaders/blur_fill/compose.slang
+++ /dev/null
@@ -1,168 +0,0 @@
-#version 450
-
-/*
-    Blur fill v1.9 by fishku
-    Copyright (C) 2023-2024
-    Public domain license (CC0)
-
-    This shader preset allows cropping the image on any side, and filling the
-    cropped area with a blurred version of the input image borders.
-    This is useful for certain games that do not render a full image to maintain
-    the overall aspect ratio and to avoid burn-in.
-
-    The preset also allows you to extend the original content to a larger
-    screen. It's recommended to set the video scaling options as follows:
-    - Turn integer scaling OFF
-    - Set aspect ratio to FULL
-    The shader will then take over and handle the proper scaling and aspect
-    ratio of the input.
-
-    The preset comes in three variants which differ only in the strength of the
-    blur.
-    Since the blur strength in the dual filter blur depends on the input
-    resolution, and because there is currently no mechanism to set resolution
-    based on user parameters, the three variants provide different sampling
-    resolutions which affect the strength of the blur.
-    Additionally to the resolution, a blur radius parameter controls the
-    strength of the blur.
-
-    Changelog:
-    v1.10: Update input transform library.
-    v1.9: Add shift option from input transform library.
-    v1.8: Add overscale option from crop and scale library.
-    v1.7: Refactor for new scaling library. Add rotation support.
-    v1.6: Optimize. Update to new Pixel AA version. Tune default blur strength.
-    v1.5: Add anti-aliased interpolation for non-integer scaling.
-    v1.4: Fix scaling bugs.
-    v1.3: Reduce shimmering artifacts.
-    v1.2: Fix scaling bugs.
-    v1.1: Fix bug with glcore driver.
-    v1.0: Initial release.
-*/
-
-// clang-format off
-#include "parameters.inc"
-#include "../../../blurs/shaders/dual_filter/parameters.inc"
-#include "../../../pixel-art-scaling/shaders/pixel_aa/parameters.inc"
-// clang-format on
-
-#include "../../../misc/shaders/input_transform/input_transform.inc"
-#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.inc"
-
-layout(push_constant) uniform Push {
-    vec4 InputSize;
-    vec4 TiledSize;
-    vec4 OutputSize;
-    uint Rotation;
-    // Own settings
-    float FILL_GAMMA;
-    float SAMPLE_SIZE;
-    // From input transform library, scaling section
-    float FORCE_ASPECT_RATIO;
-    float ASPECT_H;
-    float ASPECT_V;
-    float FORCE_INTEGER_SCALING_H;
-    float FORCE_INTEGER_SCALING_V;
-    float OVERSCALE;
-    // From input transform library, cropping section
-    float OS_CROP_TOP;
-    float OS_CROP_BOTTOM;
-    float OS_CROP_LEFT;
-    float OS_CROP_RIGHT;
-    // From input transform library, moving section
-    float SHIFT_H;
-    float SHIFT_V;
-    float CENTER_AFTER_CROPPING;
-    // From dual filter blur
-    float BLUR_RADIUS;
-    // From pixel AA
-    float PIX_AA_SHARP;
-    float PIX_AA_SUBPX;
-    float PIX_AA_SUBPX_ORIENTATION;
-}
-param;
-
-layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; }
-global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 tx_coord;
-layout(location = 2) out vec2 tx_per_px;
-layout(location = 3) out vec2 tx_to_uv;
-layout(location = 4) out vec4 input_corners;
-
-void main() {
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-    const vec4 crop = vec4(param.OS_CROP_TOP, param.OS_CROP_LEFT,
-                           param.OS_CROP_BOTTOM, param.OS_CROP_RIGHT);
-    const vec2 scale_i2o = get_scale_i2o(
-        param.InputSize.xy, param.OutputSize.xy, crop, param.Rotation,
-        param.CENTER_AFTER_CROPPING, param.FORCE_ASPECT_RATIO,
-        vec2(param.ASPECT_H, param.ASPECT_V),
-        vec2(param.FORCE_INTEGER_SCALING_H, param.FORCE_INTEGER_SCALING_V),
-        param.OVERSCALE);
-    const vec2 shift = vec2(param.SHIFT_H, param.SHIFT_V);
-    const vec2 input_center = get_input_center(
-        param.InputSize.xy, param.OutputSize.xy, scale_i2o, crop, shift,
-        param.Rotation, param.CENTER_AFTER_CROPPING);
-    tx_coord = transform(TexCoord, vec2(0.5), param.OutputSize.xy / scale_i2o,
-                         input_center);
-    tx_per_px = 1.0 / scale_i2o;
-    tx_to_uv = param.InputSize.zw;
-    input_corners = get_input_corners(param.InputSize.xy, crop, param.Rotation);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 tx_coord;
-layout(location = 2) in vec2 tx_per_px;
-layout(location = 3) in vec2 tx_to_uv;
-layout(location = 4) in vec4 input_corners;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Input;
-layout(set = 0, binding = 3) uniform sampler2D Tiled;
-layout(set = 0, binding = 4) uniform sampler2D Blurred;
-
-void main() {
-    if (any(lessThan(tx_coord, input_corners.xy)) ||
-        any(greaterThanEqual(tx_coord, input_corners.zw))) {
-        if (param.BLUR_RADIUS > 0.0) {
-            // Sample blur.
-            FragColor = vec4(
-                pow(texture(Blurred, vTexCoord).rgb, vec3(param.FILL_GAMMA)),
-                1.0);
-        } else {
-            // Sample tiled pattern.
-            // Do a perfectly sharp (nearest neighbor) resampling.
-            FragColor =
-                vec4(pow(texture(Tiled,
-                                 (floor(vTexCoord * param.TiledSize.xy) + 0.5) *
-                                     param.TiledSize.zw)
-                             .rgb,
-                         vec3(param.FILL_GAMMA)),
-                     1.0);
-        }
-    } else {
-        // Sample original.
-        if (param.FORCE_INTEGER_SCALING_H > 0.5 &&
-            param.FORCE_INTEGER_SCALING_V > 0.5) {
-            // Do a perfectly sharp (nearest neighbor) sampling.
-            FragColor = vec4(
-                texture(Input, (floor(tx_coord) + 0.5) * param.InputSize.zw)
-                    .rgb,
-                1.0);
-        } else {
-            // Do a sharp anti-aliased interpolation.
-            // Do not correct for gamma additionally because the input is
-            // already in linear color space.
-            FragColor = pixel_aa(
-                Input, tx_per_px, tx_to_uv, tx_coord, param.PIX_AA_SHARP,
-                /* gamma_correct = */ false, param.PIX_AA_SUBPX > 0.5,
-                uint(param.PIX_AA_SUBPX_ORIENTATION), param.Rotation);
-        }
-    }
-}
diff --git a/border/shaders/blur_fill/parameters.inc b/border/shaders/blur_fill/parameters.inc
deleted file mode 100644
index a315a1249a..0000000000
--- a/border/shaders/blur_fill/parameters.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-// See compose.slang for copyright and other information.
-
-// clang-format off
-#pragma parameter BLUR_FILL_SETTINGS "=== Blur fill v1.10 settings ===" 0.0 0.0 1.0 1.0
-
-#include "../../../misc/shaders/input_transform/parameters.inc"
-
-#pragma parameter OTHER_SETTINGS "= Other parameters =" 0.0 0.0 1.0 1.0
-#pragma parameter EXTEND_H "Extend the fill horizontally" 0.0 0.0 1.0 1.0
-#pragma parameter EXTEND_V "Extend the fill vertically" 0.0 0.0 1.0 1.0
-
-#pragma parameter MIRROR_BLUR "Mirror the blur" 0.0 0.0 1.0 1.0
-
-#pragma parameter FILL_GAMMA "Background fill gamma adjustment" 1.4 0.5 2.0 0.1
-
-#pragma parameter SAMPLE_SIZE "No. of lines for rendering the blur" 16.0 1.0 1024.0 1.0
-// clang-format on
diff --git a/border/shaders/blur_fill/render_sampling_areas.slang b/border/shaders/blur_fill/render_sampling_areas.slang
deleted file mode 100644
index c6537afc1c..0000000000
--- a/border/shaders/blur_fill/render_sampling_areas.slang
+++ /dev/null
@@ -1,259 +0,0 @@
-#version 450
-
-// See compose.slang for copyright and other information.
-
-#include "../../../misc/shaders/input_transform/input_transform.inc"
-#include "parameters.inc"
-
-layout(push_constant) uniform Push {
-    vec4 InputSize;
-    vec4 FinalViewportSize;
-    uint Rotation;
-    // Own settings
-    float EXTEND_H;
-    float EXTEND_V;
-    float MIRROR_BLUR;
-    float SAMPLE_SIZE;
-    // From input transform library, scaling section
-    float FORCE_ASPECT_RATIO;
-    float ASPECT_H;
-    float ASPECT_V;
-    float FORCE_INTEGER_SCALING_H;
-    float FORCE_INTEGER_SCALING_V;
-    float OVERSCALE;
-    // From input transform library, cropping section
-    float OS_CROP_TOP;
-    float OS_CROP_BOTTOM;
-    float OS_CROP_LEFT;
-    float OS_CROP_RIGHT;
-    // From input transform library, moving section
-    float SHIFT_H;
-    float SHIFT_V;
-    float CENTER_AFTER_CROPPING;
-}
-param;
-
-layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; }
-global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 tx_coord;
-layout(location = 2) out vec4 input_corners;
-
-void main() {
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-    const vec4 crop = vec4(param.OS_CROP_TOP, param.OS_CROP_LEFT,
-                           param.OS_CROP_BOTTOM, param.OS_CROP_RIGHT);
-    // Because RA "rotates" the final viewport size on rotated cores, we need to
-    // undo that rotation so that the math checks out. The 0 and 180 degree
-    // rotations and the 90 and 270 rotations are symmetric for 2D sizes, which
-    // is why we can use param.Rotation directly here.
-    const vec2 final_viewport_size_rotated =
-        get_rotated_size(param.FinalViewportSize.xy, param.Rotation);
-    const vec2 scale_i2o = get_scale_i2o(
-        param.InputSize.xy, final_viewport_size_rotated, crop, param.Rotation,
-        param.CENTER_AFTER_CROPPING, param.FORCE_ASPECT_RATIO,
-        vec2(param.ASPECT_H, param.ASPECT_V),
-        vec2(param.FORCE_INTEGER_SCALING_H, param.FORCE_INTEGER_SCALING_V),
-        param.OVERSCALE);
-    const vec2 shift = vec2(param.SHIFT_H, param.SHIFT_V);
-    const vec2 input_center = get_input_center(
-        param.InputSize.xy, final_viewport_size_rotated, scale_i2o, crop, shift,
-        param.Rotation, param.CENTER_AFTER_CROPPING);
-    tx_coord = transform(TexCoord, vec2(0.5),
-                         final_viewport_size_rotated / scale_i2o, input_center);
-    input_corners = get_input_corners(param.InputSize.xy, crop, param.Rotation);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 tx_coord;
-layout(location = 2) in vec4 input_corners;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-float min_of_vec4(vec4 i) { return min(min(i.x, i.y), min(i.z, i.w)); }
-
-int argmin(vec4 i) {
-    const vec4 m = vec4(min_of_vec4(i));
-    const vec4 ma = step(i, m) * vec4(0.0, -1.0, -2.0, -3.0);
-    return -int(min_of_vec4(ma));
-}
-
-// Returns a coordinate in [0, w) when repeating that interval (and optionally
-// mirroring).
-float mirrored_repeat(float w, float x) {
-    const float phase = mod(x, w);
-    if (param.MIRROR_BLUR < 0.5) {
-        return phase;
-    }
-    const int period = int(x / w);
-    return period % 2 == 1 != x > 0.0 ? phase : w - phase;
-}
-
-float extend_left(vec2 coord, vec4 input_corners) {
-    return input_corners.x +
-           mirrored_repeat(param.SAMPLE_SIZE, coord.x - input_corners.x);
-}
-
-float extend_right(vec2 coord, vec4 input_corners) {
-    return input_corners.z -
-           mirrored_repeat(param.SAMPLE_SIZE, input_corners.z - coord.x);
-}
-
-float extend_top(vec2 coord, vec4 input_corners) {
-    return input_corners.y +
-           mirrored_repeat(param.SAMPLE_SIZE, coord.y - input_corners.y);
-}
-
-float extend_bottom(vec2 coord, vec4 input_corners) {
-    return input_corners.w -
-           mirrored_repeat(param.SAMPLE_SIZE, input_corners.w - coord.y);
-}
-
-// This function samples in a very specific way which is the foundation for
-// blurring later.
-// - If the sample coordinate is outside of the cropped input, Either black is
-// returned if blur extension is turned off, or a repeated pattern from the
-// sampling frame band is returned.
-// - If the coordinate is inside the cropped input and within the frame band
-// given by SAMPLE_SIZE, the original texture sample is returned.
-// - If the coordinate is further inside than the frame band, a mirrored
-// repeating sample is returned. The side of the frame that is sampled is given
-// by the one that is closest to the sampled point.
-vec3 sample_mirrored_frame(sampler2D tex, vec2 tx_coord, vec4 input_corners) {
-    const vec2 extend_fill =
-        get_rotated_size(vec2(param.EXTEND_H, param.EXTEND_V), param.Rotation);
-    if (tx_coord.x < input_corners.x) {
-        if (extend_fill.x < 0.5) {
-            return vec3(0.0);
-        }
-        if (tx_coord.y < input_corners.y) {
-            // Top left corner extension
-            if (extend_fill.y < 0.5) {
-                return vec3(0.0);
-            }
-            return texture(tex, vec2(extend_left(tx_coord, input_corners),
-                                     extend_top(tx_coord, input_corners)) *
-                                    param.InputSize.zw)
-                .rgb;
-        } else if (tx_coord.y < input_corners.w) {
-            // Left extension
-            return texture(tex, vec2(extend_left(tx_coord, input_corners),
-                                     tx_coord.y) *
-                                    param.InputSize.zw)
-                .rgb;
-        } else {
-            // Bottom left corner extension
-            if (extend_fill.y < 0.5) {
-                return vec3(0.0);
-            }
-            return texture(tex, vec2(extend_left(tx_coord, input_corners),
-                                     extend_bottom(tx_coord, input_corners)) *
-                                    param.InputSize.zw)
-                .rgb;
-        }
-    } else if (tx_coord.x < input_corners.z) {
-        if (tx_coord.y < input_corners.y) {
-            if (extend_fill.y < 0.5) {
-                return vec3(0.0);
-            }
-            // Top extension
-            return texture(tex, vec2(tx_coord.x,
-                                     extend_top(tx_coord, input_corners)) *
-                                    param.InputSize.zw)
-                .rgb;
-        } else if (tx_coord.y < input_corners.w) {
-            const vec4 inner_corners =
-                input_corners + vec4(param.SAMPLE_SIZE, param.SAMPLE_SIZE,
-                                     -param.SAMPLE_SIZE, -param.SAMPLE_SIZE);
-            if (any(lessThan(tx_coord, inner_corners.xy)) ||
-                any(greaterThanEqual(tx_coord, inner_corners.zw))) {
-                // In frame band
-                return texture(tex, tx_coord * param.InputSize.zw).rgb;
-            }
-            // Innermost -- mirrored repeat sampling from nearest side
-            const vec4 distances = vec4(
-                tx_coord.x - inner_corners.x, inner_corners.z - tx_coord.x,
-                tx_coord.y - inner_corners.y, inner_corners.w - tx_coord.y);
-            switch (argmin(distances)) {
-                case 0:
-                    // left
-                    return texture(tex,
-                                   vec2(extend_left(tx_coord, input_corners),
-                                        tx_coord.y) *
-                                       param.InputSize.zw)
-                        .rgb;
-                case 1:
-                    // right
-                    return texture(tex,
-                                   vec2(extend_right(tx_coord, input_corners),
-                                        tx_coord.y) *
-                                       param.InputSize.zw)
-                        .rgb;
-                case 2:
-                    // top
-                    return texture(tex,
-                                   vec2(tx_coord.x,
-                                        extend_top(tx_coord, input_corners)) *
-                                       param.InputSize.zw)
-                        .rgb;
-                case 3:
-                default:
-                    // bottom
-                    return texture(tex, vec2(tx_coord.x,
-                                             extend_bottom(tx_coord,
-                                                           input_corners)) *
-                                            param.InputSize.zw)
-                        .rgb;
-            }
-        } else {
-            if (extend_fill.y < 0.5) {
-                return vec3(0.0);
-            }
-            // Bottom extension
-            return texture(tex, vec2(tx_coord.x,
-                                     extend_bottom(tx_coord, input_corners)) *
-                                    param.InputSize.zw)
-                .rgb;
-        }
-    } else {
-        if (extend_fill.x < 0.5) {
-            return vec3(0.0);
-        }
-        if (tx_coord.y < input_corners.y) {
-            // Top right corner extension
-            if (extend_fill.y < 0.5) {
-                return vec3(0.0);
-            }
-            return texture(tex, vec2(extend_right(tx_coord, input_corners),
-                                     extend_top(tx_coord, input_corners)) *
-                                    param.InputSize.zw)
-                .rgb;
-        } else if (tx_coord.y < input_corners.w) {
-            // Right extension
-            return texture(tex, vec2(extend_right(tx_coord, input_corners),
-                                     tx_coord.y) *
-                                    param.InputSize.zw)
-                .rgb;
-        } else {
-            // Bottom right corner extension
-            if (extend_fill.y < 0.5) {
-                return vec3(0.0);
-            }
-            return texture(tex, vec2(extend_right(tx_coord, input_corners),
-                                     extend_bottom(tx_coord, input_corners)) *
-                                    param.InputSize.zw)
-                .rgb;
-        }
-    }
-}
-
-void main() {
-    FragColor =
-        vec4(sample_mirrored_frame(Source, tx_coord, input_corners), 1.0);
-}
diff --git a/border/shaders/effect-border-iq.slang b/border/shaders/effect-border-iq.slang
deleted file mode 100644
index fbfb4d7888..0000000000
--- a/border/shaders/effect-border-iq.slang
+++ /dev/null
@@ -1,481 +0,0 @@
-#version 450
-
-// All effects created by inigo quilez - iq/2013-2017
-// Hexagons - distance : https://www.shadertoy.com/view/Xd2GR3
-// Voronoi - smooth    : https://www.shadertoy.com/view/ldB3zc
-// Color grid          : https://www.shadertoy.com/view/4dBSRK
-// Voronoi - metrics   : https://www.shadertoy.com/view/MdSGRc
-// Iterations - shiny  : https://www.shadertoy.com/view/MslXz8
-// Fractal Tiling      : https://www.shadertoy.com/view/Ml2GWy
-// Bubbles             : https://www.shadertoy.com/view/4dl3zn
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-// modified for slang border shader by hunterk
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 OriginalSize;
-	vec4 SourceSize;
-	uint FrameCount;
-	float aspect_x;
-	float aspect_y;
-	float integer_scale;
-	float overscale;
-	float border_zoom;
-	float border_speed;
-	float effect;
-	float scanline_toggle;
-	float interp_toggle;
-	float THICKNESS;
-	float DARKNESS;
-	float OS_MASK_TOP;
-	float OS_MASK_BOTTOM;
-	float OS_MASK_LEFT;
-	float OS_MASK_RIGHT;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter effect "Effect Choice" 1.0 1.0 7.0 1.0
-#pragma parameter aspect_x "Aspect Ratio Numerator" 64.0 1.0 256. 1.0
-#pragma parameter aspect_y "Aspect Ratio Denominator" 49.0 1.0 256. 1.0
-#pragma parameter integer_scale "Force Integer Scaling" 1.0 0.0 1.0 1.0
-#pragma parameter overscale "Integer Overscale" 0.0 0.0 1.0 1.0
-#pragma parameter border_zoom "Border Zoom" 8.0 0.5 16.0 0.5
-#pragma parameter border_speed "Border Animation Speed" 0.5 0.5 10 0.5
-#pragma parameter interp_toggle "Sharpen Linear Scaling" 0.0 0.0 1.0 1.0
-#pragma parameter scanline_toggle "Scanline Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter THICKNESS "Scanline Thickness" 2.0 1.0 12.0 1.0
-#pragma parameter DARKNESS "Scanline Darkness" 0.35 0.0 1.0 0.05
-#pragma parameter OS_MASK_TOP "Overscan Mask Top" 0.0 0.0 1.0 0.005
-#pragma parameter OS_MASK_BOTTOM "Overscan Mask Bottom" 0.0 0.0 1.0 0.005
-#pragma parameter OS_MASK_LEFT "Overscan Mask Left" 0.0 0.0 1.0 0.005
-#pragma parameter OS_MASK_RIGHT "Overscan Mask Right" 0.0 0.0 1.0 0.005
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 border_coord;
-layout(location = 1) out vec2 screen_coord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vec2 out_res = params.OutputSize.xy;
-	vec2 corrected_size = params.SourceSize.xy * vec2(params.aspect_x / params.aspect_y, 1.0)
-		 * vec2(params.SourceSize.y / params.SourceSize.x, 1.0);
-	float full_scale = (params.integer_scale > 0.5) ? floor(params.OutputSize.y /
-		params.SourceSize.y) + params.overscale : params.OutputSize.y / params.SourceSize.y;
-	vec2 scale = (params.OutputSize.xy / corrected_size) / full_scale;
-	vec2 middle = vec2(0.49999, 0.49999);
-	vec2 diff = TexCoord.xy - middle;
-	screen_coord = middle + diff * scale;
-	border_coord = TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 border_coord;
-layout(location = 1) in vec2 screen_coord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D iChannel0;
-
-vec4 fractal_tiling(vec2 iResolution, vec2 fragCoord)
-{
-    vec2 pos = 256.0*fragCoord.xy/iResolution.x + params.FrameCount / (15.0 / params.border_speed);
-
-    vec3 col = vec3(0.0);
-    for( int i=0; i<6; i++ ) 
-    {
-        vec2 a = floor(pos);
-        vec2 b = fract(pos);
-        
-        vec4 w = fract((sin(a.x*7.0+31.0*a.y + 0.01* params.FrameCount / (15.0 / params.border_speed))+vec4(0.035,0.01,0.0,0.7))*13.545317); // randoms
-                
-        col += w.xyz *                                   // color
-               smoothstep(0.45,0.55,w.w) *               // intensity
-               sqrt( 16.0*b.x*b.y*(1.0-b.x)*(1.0-b.y) ); // pattern
-        
-        pos /= 2.0; // lacunarity
-        col /= 2.0; // attenuate high frequencies
-    }
-    
-    col = pow( 2.5*col, vec3(1.0,1.0,0.7) );    // contrast and color shape
-    
-    return vec4( col, 1.0 );
-}
-
-vec4 bubbles(vec2 iResolution, vec2 fragCoord)
-{
-	vec2 uv = -1.0 + 2.0*fragCoord.xy / iResolution.xy;
-	uv.x *=  iResolution.x / iResolution.y;
-
-    // background	 
-	vec3 color = vec3(0.8 + 0.2*uv.y);
-
-    // bubbles	
-	for( int i=0; i<20; i++ )
-	{
-        // bubble seeds
-		float pha =      sin(float(i)*546.13+1.0)*0.5 + 0.5;
-		float siz = pow( sin(float(i)*651.74+5.0)*0.5 + 0.5, 4.0 );
-		float pox =      sin(float(i)*321.55+4.1) * iResolution.x / iResolution.y;
-
-        // buble size, position and color
-		float rad = 0.1 + 0.5*siz;
-		vec2  pos = vec2( pox, -1.0 * (-1.0-rad + (2.0+2.0*rad)*mod(pha+0.1*(params.FrameCount / (15.0 / params.border_speed))*(0.2+0.8*siz),1.0)));
-		float dis = length( uv - pos );
-		vec3  col = mix( vec3(0.94,0.3,0.0), vec3(0.1,0.4,0.8), 0.5+0.5*sin(float(i)*1.2+1.9));
-		//    col+= 8.0*smoothstep( rad*0.95, rad, dis );
-		
-        // render
-		float f = length(uv-pos)/rad;
-		f = sqrt(clamp(1.0-f*f,0.0,1.0));
-		color -= col.zyx *(1.0-smoothstep( rad*0.95, rad, dis )) * f;
-	}
-
-    // vigneting	
-	color *= sqrt(1.5-0.5*length(uv));
-
-	return vec4(color,1.0);
-}
-
-vec4 hexagon( vec2 p ) 
-{
-	vec2 q = vec2( p.x*2.0*0.5773503, p.y + p.x*0.5773503 );
-	
-	vec2 pi = floor(q);
-	vec2 pf = fract(q);
-
-	float v = mod(pi.x + pi.y, 3.0);
-
-	float ca = step(1.0,v);
-	float cb = step(2.0,v);
-	vec2  ma = step(pf.xy,pf.yx);
-	
-    // distance to borders
-	float e = dot( ma, 1.0-pf.yx + ca*(pf.x+pf.y-1.0) + cb*(pf.yx-2.0*pf.xy) );
-
-	// distance to center	
-	p = vec2( q.x + floor(0.5+p.y/1.5), 4.0*p.y/3.0 )*0.5 + 0.5;
-	float f = length( (fract(p) - 0.5)*vec2(1.0,0.85) );		
-	
-	return vec4( pi + ca - cb*ma, e, f );
-}
-
-float hash( vec2  p )
-{
-	float n = dot(p,vec2(127.1,311.7) );
-	return fract(sin(n)*43758.5453);
-}
-
-float hash1( float n )
-{
-	return fract(sin(n)*43758.5453);
-}
-
-vec2  hash2( vec2  p )
-{
-	p = vec2( dot(p,vec2(127.1,311.7)), dot(p,vec2(269.5,183.3)) );
-	return fract(sin(p)*43758.5453);
-}
-
-float noise( in vec3 x )
-{
-    vec3 p = floor(x);
-    vec3 f = fract(x);
-	f = f*f*(3.0-2.0*f);
-	vec2 uv = (p.xy+vec2(37.0,17.0)*p.z) + f.xy;
-	vec2 rg = texture(iChannel0, (uv+0.5) / 32.0, -1.0).yx;
-	return mix( rg.x, rg.y, f.z );
-}
-
-vec4 hexagons_bg(vec2 coord, vec2 output_size, float frame_count)
-{
-    vec2 uv = coord;
-	vec2 pos = (-output_size.xy + 8.0 * (coord * output_size.xy))/ output_size.y;
-	float timer = frame_count * 0.05 * params.border_speed;
-	
-    // distort
-	pos *= 1.0 + 0.9*length(pos);
-	
-    // gray
-	vec4 h = hexagon(8.0*pos + 0.5*timer);
-	float n = noise( vec3(0.3*h.xy+timer*0.1,timer) );
-	vec3 col = 0.15 + 0.15*hash(h.xy+1.2)*vec3(1.0);
-	col *= smoothstep( 0.10, 0.11, h.z );
-	col *= smoothstep( 0.10, 0.11, h.w );
-	col *= 1.0 + 0.15*sin(40.0*h.z);
-	col *= 0.75 + 0.5*h.z*n;
-
-	// red
-	h = hexagon(6.0*pos + 0.6*timer);
-	n = noise( vec3(0.3*h.xy+timer*0.1, timer) );
-	vec3 colb = 0.9 + 0.8*sin( hash(h.xy)*1.5 + 2.0 + vec3(0.0,1.0,1.0) );
-	colb *= smoothstep( 0.10, 0.11, h.z );
-	colb *= 1.0 + 0.15*sin(40.0*h.z);
-	colb *= 0.75 + 0.5*h.z*n;
-
-	h = hexagon(6.0*(pos+0.1*vec2(-1.3,1.0)) + 0.6*timer);
-    col *= 1.0-0.8*smoothstep(0.45,0.451,noise( vec3(0.3*h.xy+timer*0.1,timer) ));
-
-	col = mix( col, colb, smoothstep(0.45,0.451,n) );
-
-	
-	col *= pow( 16.0*uv.x*(1.0-uv.x)*uv.y*(1.0-uv.y), 0.1 );
-	return vec4(col, 1.0);
-}
-
-vec4 voronoi_1( in vec2 x, float w, float frame_count )
-{
-    vec2 n = floor( x );
-    vec2 f = fract( x );
-
-	vec4 m = vec4( 8.0, 0.0, 0.0, 0.0 );
-    for( int j=-1; j<=2; j++ )
-    for( int i=-1; i<=2; i++ )
-    {
-        vec2 g = vec2( float(i),float(j) );
-        vec2 o = vec2(hash( n + g ));
-		
-		// animate
-        o = 0.5 + 0.5*sin( 0.01 * frame_count + 6.2831*o );
-
-        // distance to cell		
-		float d = length(g - f + o);
-		
-        // do the smooth min for colors and distances		
-		vec3 col = 0.5 + 0.5*sin( hash1(dot(n+g,vec2(7.0,113.0)))*2.5 + 3.5 + vec3(2.0,3.0,0.0));
-		float h = smoothstep( 0.0, 1.0, 0.5 + 0.5*(m.x-d)/w );
-		
-	    m.x   = mix( m.x,     d, h ) - h*(1.0-h)*w/(1.0+3.0*w); // distance
-		m.yzw = mix( m.yzw, col, h ) - h*(1.0-h)*w/(1.0+3.0*w); // cioloe
-    }
-	
-	return m;
-}
-
-vec4 voronoi_smooth(vec2 texture_size, float frame_count, vec2 uv)
-{
-    vec2 p = uv * vec2(2.0,1.0);
-	
-	float k = 2.0 + 70.0 * pow( 0.5 + 0.5*sin(0.25*6.2831*0.03 * frame_count), 4.0 );
-	k = 0.5 - 0.5*cos(0.25*6.2831*0.01 * frame_count);
-    vec4 c = voronoi_1( 6.0*p, k, frame_count );
-
-    vec3 col = c.yzw;
-	
-	col *= 1.0 - 0.8*c.x*step(p.y,0.33);
-	col *= mix(c.x,1.0,step(p.y,0.66));
-	
-	col *= smoothstep( 0.005, 0.007, abs(p.y-0.33) );
-	col *= smoothstep( 0.005, 0.007, abs(p.y-0.66) );
-	
-	return vec4( col, 1.0 );
-}
-
-vec4 voronoi_2( in vec2 x, float mode, float timer )
-{
-    vec2 n = floor( x );
-    vec2 f = fract( x );
-
-	vec3 m = vec3( 8.0 );
-	float m2 = 8.0;
-    for( int j=-1; j<=2; j++ )
-    for( int i=-1; i<=2; i++ )
-    {
-        vec2 g = vec2( float(i),float(j) );
-        vec2 o = hash2( n + g );
-
-		// animate
-        o = 0.5 + 0.5*sin( timer + 6.2831*o );
-
-		vec2 r = g - f + o;
-
-        // euclidean		
-		vec2 d0 = vec2( sqrt(dot(r,r)), 1.0 );
-        // manhattam		
-		vec2 d1 = vec2( 0.71*(abs(r.x) + abs(r.y)), 1.0 );
-        // triangular		
-		vec2 d2 = vec2( max(abs(r.x)*0.866025+r.y*0.5,-r.y), 
-				        step(0.0,0.5*abs(r.x)+0.866025*r.y)*(1.0+step(0.0,r.x)) );
-
-		vec2 d = d0; 
-		if( mode<3.0 ) d=mix( d2, d0, fract(mode) );
-		if( mode<2.0 ) d=mix( d1, d2, fract(mode) );
-		if( mode<1.0 ) d=mix( d0, d1, fract(mode) );
-		
-        if( d.x<m.x )
-        {
-			m2 = m.x;
-            m.x = d.x;
-            m.y = hash1( dot(n+g,vec2(7.0,113.0) ) );
-			m.z = d.y;
-        }
-		else if( d.x<m2 )
-		{
-			m2 = d.x;
-		}
-
-    }
-    return vec4( m, m2-m.x );
-}
-
-vec4 voronoi_metrics(vec2 texture_size, float frame_count, vec2 uv)
-{
-	float mode = 2.0;//mod(frame_count/5.0,3.0);
-//	mode = floor(mode) + smoothstep( 0.8, 1.0, fract(mode) );
-	
-    vec2 p = -uv.xy/texture_size.xx;
-    vec4 c = voronoi_2( 8.0*p, mode, frame_count / 4.0 );
-
-    vec3 col = 0.5 + 0.5*sin( c.y*2.5 + vec3(1.5,1.0,1.0) );
-    col *= sqrt( clamp( 1.0 - c.x, 0.0, 1.0 ) );
-	col *= clamp( 0.5 + (1.0-c.z/2.0)*0.5, 0.0, 1.0 );
-	col *= 0.4 + 0.6*sqrt(clamp( 4.0*c.w, 0.0, 1.0 ));
-	
-	
-    return vec4( col, 1.0 );
-}
-
-vec4 colorgrid(vec2 texture_size, float frame_count, vec2 uv)
-{
-    vec2  px = 1000.0 *(-texture_size.xy + 2.0 * params.border_zoom * uv) / texture_size.y / 5.0;
-	
-    float id = 0.5 + 0.5*cos(frame_count * 0.01 * params.border_speed + sin(dot(floor(px+0.5),vec2(113.1,17.81)))*43758.545);
-    
-    vec3  co = 0.5 + 0.5*cos(frame_count * 0.01 + 3.5*id + vec3(0.0,1.57,3.14) );
-    
-    vec2  pa = smoothstep( 0.0, 0.2, id*(0.5 + 0.5*cos(6.2831*px)) );
-
-	return vec4( co*pa.x*pa.y, 1.0 );
-}
-
-vec4 shiny_iterations(vec2 texture_size, float frame_count, vec2 uv)
-{
-	vec2 pc = uv * 5.0;
-
-	vec2 pa = pc + vec2(0.04,0.0);
-	vec2 pb = pc + vec2(0.0,0.04);
-	
-    // shape (3 times for diferentials)
-	vec2 zc = pc;
-	vec3 fc = vec3( 0.0, 0.0, 0.0 );
-	for( int i=0; i<8; i++ ) 
-	{
-        // transform		
-		zc += cos(zc.yx + cos(zc.yx + cos(zc.yx+frame_count * 0.01 * params.border_speed) ) );
-
-        // orbit traps		
-		float d = dot( zc-pc, zc-pc ); 
-		fc.x += 1.0/(1.0+d);
-		fc.y += d;
-		fc.z += sin(atan(zc.x-pc.x, zc.y-pc.y));
-	}
-	fc /= 8.0;
-	vec3 sc = fc;
-	
-	vec2 za = pa;
-	vec3 fa = vec3( 0.0, 0.0, 0.0 );
-		for( int j=0; j<8; j++ ) 
-	{
-        // transform		
-		za += cos(za.yx + cos(za.yx + cos(za.yx+frame_count * 0.01 * params.border_speed) ) );
-
-        // orbit traps		
-		float d = dot( za-pa, za-pa ); 
-		fa.x += 1.0/(1.0+d);
-		fa.y += d;
-		fa.z += sin(atan(zc.x-pc.x, zc.y-pc.y));
-	}
-	fa /= 8.0;
-	vec3 sa = fa;
-	
-	vec2 zb = pb;
-	vec3 fb = vec3( 0.0, 0.0, 0.0 );
-		for( int k=0; k<8; k++ ) 
-	{
-        // transform		
-		zb += cos(zb.yx + cos(zb.yx + cos(zb.yx+frame_count * 0.01 * params.border_speed) ) );
-
-        // orbit traps		
-		float d = dot( zb-pb, zb-pb ); 
-		fb.x += 1.0/(1.0+d);
-		fb.y += d;
-		fb.z += sin(atan(zc.x-pc.x, zc.y-pc.y));
-	}
-	fb /= 8.0;
-	vec3 sb = fb;
-
-    // color	
-	vec3 col = mix( vec3(0.08,0.02,0.15), vec3(0.6,1.1,1.6), sc.x );
-	col = mix( col, col.zxy, smoothstep(-0.5,0.5,cos(0.01*frame_count * 0.5)) );
-	col *= 0.15*sc.y;
-	col += 0.4*abs(sc.z) - 0.1;
-
-    // light	
-	vec3 nor = normalize( vec3( sa.x-sc.x, 0.01, sb.x-sc.x ) );
-	float dif = clamp(0.5 + 0.5*dot( nor,vec3(0.5773, 0.5773, 0.5773) ),0.0,1.0);
-	col *= 1.0 + 0.7*dif*col;
-	col += 0.3 * pow(nor.y,128.0);
-
-    // vignetting	
-	col *= 1.0 - 0.1*length(pc);
-	return vec4(col, 1.0);
-}
-
-vec4 scanlines(vec4 frame, vec2 coord, vec2 texture_size, vec2
-	video_size, vec2 output_size)
-{
-	float lines = fract(coord.y * texture_size.y);
-	float scale_factor = floor((output_size.y / video_size.y) + 0.4999);
-    float lightness = 1.0 - params.DARKNESS;
-	return (params.scanline_toggle > 0.5 && (lines < (1.0 / scale_factor * params.THICKNESS)))
-		? frame * vec4(lightness, lightness, lightness, lightness) : frame;
-}
-
-vec2 interp_coord(vec2 coord, vec2 texture_size)
-{
-	vec2 p = coord.xy;
-	p = p * texture_size.xy + vec2(0.5, 0.5);
-	vec2 i = floor(p);
-	vec2 f = p - i;
-	// Smoothstep - amazingly, smoothstep() is slower than calculating directly the expression!
-	f = f * f * f * f * (f * (f * (-20.0 * f + vec2(70.0, 70.0)) - vec2(84.0, 84.0)) + vec2(35.0, 35.0));
-	p = i + f;
-	p = (p - vec2(0.5, 0.5)) * 1.0 / texture_size;
-	return p;
-}
-
-vec4 border(vec2 screen_coord, vec2 border_coord, vec2 texture_size, vec2 video_size,
-	vec2 output_size, float frame_count, sampler2D decal)
-{
-	vec4 background;
-	if (params.effect == 1.0) background = hexagons_bg(border_coord * (2.0 / params.border_zoom), output_size.xy, frame_count);
-	else if (params.effect == 2.0) background = voronoi_smooth(texture_size, frame_count, border_coord);
-	else if (params.effect == 3.0) background = colorgrid(texture_size, frame_count * 6.0, border_coord / vec2(output_size.y / output_size.x, 1.0));
-	else if (params.effect == 4.0) background = shiny_iterations(texture_size, frame_count, border_coord);
-	else if (params.effect == 5.0) background = bubbles(texture_size.xy, border_coord / vec2(output_size.y / output_size.x, 1.0) * (15.0 * params.border_zoom));
-	else if (params.effect == 6.0) background = voronoi_metrics(texture_size, frame_count / 10 * params.border_speed, border_coord * 75.0 * params.border_zoom);
-	else background = fractal_tiling(texture_size.xy, border_coord / vec2(output_size.y / output_size.x, 1.0) * (30.0 * params.border_zoom));
-	
-	vec2 coord = (params.interp_toggle < 0.5) ? screen_coord : interp_coord(screen_coord, texture_size);
-	vec4 frame = texture(decal, coord);
-	frame = scanlines(frame, coord * 1.0001, texture_size, video_size, output_size);
-	vec2 fragcoord = (coord.xy);
-	if (fragcoord.x < 1.0 - params.OS_MASK_RIGHT && fragcoord.x > 0.0 + params.OS_MASK_LEFT &&
-		fragcoord.y < 1.0 - params.OS_MASK_BOTTOM && fragcoord.y > 0.0 + params.OS_MASK_TOP)
-			return frame;
-	
-	else return background;
-}
-
-void main()
-{
-	FragColor = border(screen_coord, border_coord, params.SourceSize.xy, params.SourceSize.xy, 
-		params.OutputSize.xy, float(params.FrameCount), Source);
-}
\ No newline at end of file
diff --git a/border/shaders/lightgun-border.slang b/border/shaders/lightgun-border.slang
deleted file mode 100644
index f191e12498..0000000000
--- a/border/shaders/lightgun-border.slang
+++ /dev/null
@@ -1,66 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	uint TotalSubFrames;
-	uint CurrentSubFrame;
-	vec4 FinalViewportSize;
-	float bordersize, bordercolor;
-} params;
-
-#pragma parameter bordersize "Border Thickness" 0.02 0.0 1.0 0.01
-#pragma parameter bordercolor "Border Color" 1.0 1.0 6.0 1.0
-int col = int(params.bordercolor);
-
-const vec4 red = vec4(1.,0.,0.,1.);
-const vec4 magenta = vec4(1.,0.,1.,1.);
-const vec4 green = vec4(0.,1.,0.,1.);
-const vec4 blue = vec4(0.,0.,1.,1.);
-const vec4 cyan = vec4(0.,1.,1.,1.);
-const vec4 yellow = vec4(1.,1.,0.,1.);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 sindenBorder;
-layout(location = 2) out vec4 borderCol;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   float borderthick = params.bordersize * 0.25;
-   // aspect-corrected width
-   sindenBorder.x = borderthick * (params.FinalViewportSize.y * params.FinalViewportSize.z);
-   sindenBorder.y = 1.-sindenBorder.x;
-   sindenBorder.z = borderthick;
-   sindenBorder.w = 1.-borderthick;
-   if(col == 2) borderCol = yellow;
-   else if(col == 3) borderCol = green;
-   else if(col == 4) borderCol = cyan;
-   else if(col == 5) borderCol = blue;
-   else if(col == 6) borderCol = magenta;
-   else borderCol = red;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 sindenBorder;
-layout(location = 2) in vec4 borderCol;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	FragColor = (vTexCoord.x < sindenBorder.x || vTexCoord.x > sindenBorder.y || vTexCoord.y < sindenBorder.z || vTexCoord.y > sindenBorder.w) ? borderCol : texture(Source, vTexCoord);
-}
diff --git a/cel/MMJ_Cel_Shader.slangp b/cel/MMJ_Cel_Shader.slangp
deleted file mode 100644
index c85e72d49b..0000000000
--- a/cel/MMJ_Cel_Shader.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-shaders = 1
-
-shader0 = shaders/MMJ_Cel/MMJ_Cel_Shader.slang
\ No newline at end of file
diff --git a/cel/MMJ_Cel_Shader_MP.slangp b/cel/MMJ_Cel_Shader_MP.slangp
deleted file mode 100644
index 766e4d913b..0000000000
--- a/cel/MMJ_Cel_Shader_MP.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-alias0 = MMJ_MP_refpass
-
-shader1 = shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_H.slang
-alias1 = MMJ_BlurPass_H
-
-shader2 = shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_V.slang
-alias2 = MMJ_BlurPass_V
-
-shader3 = shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Outline.slang
-alias3 = MMJ_OutlinePass
-
-shader4 = shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Color.slang
-alias4 = MMJ_ColorPass
diff --git a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader.slang b/cel/shaders/MMJ_Cel/MMJ_Cel_Shader.slang
deleted file mode 100644
index b5b133185b..0000000000
--- a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader.slang
+++ /dev/null
@@ -1,246 +0,0 @@
-#version 450
-
-/*
-MMJ's Cel Shader - v1.03
-----------------------------------------------------------------
--- 180403 --
-This is a port of my old shader from around 2006 for Pete's OGL2 
-plugin for ePSXe. It started out as a shader based on the 
-"CComic" shader by Maruke. I liked his concept, but I was 
-looking for something a little different in the output. 
-
-Since the last release, I've seen some test screenshots from MAME 
-using a port of my original shader and have also seen another 
-port to get it working with the PCSX2 emulator. Having recently 
-seen some Kingdom Hearts II and Soul Calibur 3 YouTube videos with 
-my ported shader inspired me to revisit it and get it working in 
-RetroArch.
-
-As for this version (1.03), I've made a few small modifications 
-(such as to remove the OGL2Param references, which were specific 
-to Pete's plugin) and I added some RetroArch Parameter support, 
-so some values can now be changed in real time.
-
-Keep in mind, that this was originally developed for PS1, using
-various 3D games as a test. In general, it will look better in 
-games with less detailed textures, as "busy" textures will lead 
-to more outlining / messy appearance. Increasing "Outline 
-Brightness" can help mitigate this some by lessening the 
-"strength" of the outlines.
-
-Also (in regards to PS1 - I haven't really tested other systems 
-too much yet), 1x internal resolution will look terrible. 2x 
-will also probably be fairly blurry/messy-looking. For best 
-results, you should probably stick to 4x or higher internal 
-resolution with this shader.
-
-Parameters:
------------
-White Level Cutoff = Anything above this luminance value will be 
-    forced to pure white.
-
-Black Level Cutoff = Anything below this luminance value will be 
-    forced to pure black.
-
-Shading Levels = Determines how many color "slices" there should 
-    be (not counting black/white cutoffs, which are always 
-    applied).
-
-Saturation Modifier = Increase or decrease color saturation. 
-    Default value boosts saturation a little for a more 
-    cartoonish look. Set to 0.00 for grayscale.
-
-Outline Brightness = Adjusts darkness of the outlines. At a 
-    setting of 1, outlines should be disabled.
-
-Shader Strength = Adjusts the weight of the color banding 
-    portion of the shader from 0% (0.00) to 100% (1.00). At a 
-    setting of 0.00, you can turn off the color banding effect 
-    altogether, but still keep outlines enabled.
------------
-MMJuno
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float WhtCutoff;
-	float BlkCutoff;
-	float ShdLevels;
-	float SatModify;
-	float OtlModify;
-	float ShdWeight;
-} params;
-
-#pragma parameter WhtCutoff "White Level Cutoff" 0.97 0.50 1.00 0.01
-#pragma parameter BlkCutoff "Black Level Cutoff" 0.03 0.00 0.50 0.01
-#pragma parameter ShdLevels "Shading Levels" 9.0 1.0 16.0 1.0
-#pragma parameter SatModify "Saturation Modifier" 1.15 0.00 2.00 0.01
-#pragma parameter OtlModify "Outline Brightness" 0.20 0.00 1.00 0.01
-#pragma parameter ShdWeight "Shader Strength" 0.50 0.00 1.00 0.01
-
-#define WhtCutoff params.WhtCutoff
-#define BlkCutoff params.BlkCutoff
-#define ShdLevels params.ShdLevels
-#define SatModify params.SatModify
-#define OtlModify params.OtlModify
-#define ShdWeight params.ShdWeight
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 TEX0;
-layout(location = 2) out vec4 TEX1;
-layout(location = 3) out vec4 TEX2;
-layout(location = 4) out vec4 TEX3;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-   
-	TEX0 = vTexCoord.xyxy;
-    vec4 offset;
-    offset.xy = -(offset.zw = vec2(params.SourceSize.z, 0.0));
-    TEX1 = TEX0 + offset;
-    
-    offset.xy = -(offset.zw = vec2(0.0, params.SourceSize.w));
-    TEX2 = TEX0 + offset;
-    TEX3 = TEX1 + offset;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 TEX0;
-layout(location = 2) in vec4 TEX1;
-layout(location = 3) in vec4 TEX2;
-layout(location = 4) in vec4 TEX3;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec3 RGB2HSL(vec3 cRGB) 
-{
-    float cR = cRGB[0], cG = cRGB[1], cB = cRGB[2];
-    float vMin = min(min(cR, cG), cB), vMax = max(max(cR, cG), cB);
-    float dMax = vMax - vMin, vS = 0.0, vH = 0.0, vL = (vMax + vMin) / 2.0;
-
-    // gray, no chroma
-    if(dMax == 0.0) { 
-      vH = 0.0; vS = vH; 
-      
-    // chromatic data
-    } else {
-        if(vL < 0.5) { vS = dMax / (vMax + vMin); }
-        else         { vS = dMax / (2.0 - vMax - vMin); }
-
-        float dR = (((vMax - cR) * 0.1667) + (dMax * 0.5)) / dMax;
-        float dG = (((vMax - cG) * 0.1667) + (dMax * 0.5)) / dMax;
-        float dB = (((vMax - cB) * 0.1667) + (dMax * 0.5)) / dMax;
-
-        if     (cR >= vMax) { vH = dB - dG; }
-        else if(cG >= vMax) { vH = 0.3333 + dR - dB; }
-        else if(cB >= vMax) { vH = 0.6667 + dG - dR; }
-
-        if     (vH < 0.0) { vH += 1.0; }
-        else if(vH > 1.0) { vH -= 1.0; }
-    }
-    return vec3(vH, vS, vL);
-}
-
-float Hue2RGB(float v1, float v2, float vH) 
-{
-    float v3 = 0.0;
-
-    if     (vH < 0.0) { vH += 1.0; }
-    else if(vH > 1.0) { vH -= 1.0; }
-
-    if     ((6.0 * vH) < 1.0) { v3 = v1 + (v2 - v1) * 6.0 * vH; }
-    else if((2.0 * vH) < 1.0) { v3 = v2; }
-    else if((3.0 * vH) < 2.0) { v3 = v1 + (v2 - v1) * (0.6667 - vH) * 6.0; }
-    else                      { v3 = v1; }
-
-    return v3;
-}
-
-vec3 HSL2RGB(vec3 vHSL) 
-{
-    float cR = 0.0, cG = cR, cB = cR;
-
-    if(vHSL[1] == 0.0) {
-      cR = vHSL[2], cG = cR, cB = cR;
-
-    } else {
-        float v1 = 0.0, v2 = v1;
-
-        if(vHSL[2] < 0.5) { v2 = vHSL[2] * (1.0 + vHSL[1] ); }
-        else              { v2 = (vHSL[2] + vHSL[1] ) - (vHSL[1] * vHSL[2] ); }
-
-        v1 = 2.0 * vHSL[2] - v2;
-
-        cR = Hue2RGB(v1, v2, vHSL[0] + 0.3333);
-        cG = Hue2RGB(v1, v2, vHSL[0] );
-        cB = Hue2RGB(v1, v2, vHSL[0] - 0.3333);
-    }
-    return vec3(cR, cG, cB);
-}
-
-vec3 colorAdjust(vec3 cRGB) 
-{
-    vec3 cHSL = RGB2HSL(cRGB);
-
-    float cr = 1.0 / ShdLevels;
-
-    // brightness modifier
-    float BrtModify = mod(cHSL[2], cr); 
-
-    if     (cHSL[2] > WhtCutoff) { cHSL[1]  = 1.0; cHSL[2] = 1.0; }
-    else if(cHSL[2] > BlkCutoff) { cHSL[1] *= SatModify; cHSL[2] += (cHSL[2] * cr - BrtModify); }
-    else                         { cHSL[1]  = 0.0; cHSL[2] = 0.0; }
-    cRGB = 1.2 * HSL2RGB(cHSL);
-
-    return cRGB;
-}
-
-void main()
-{
-	vec3 c0 = texture(Source, TEX3.xy).rgb;
-	vec3 c1 = texture(Source, TEX2.xy).rgb;
-	vec3 c2 = texture(Source, TEX3.zy).rgb;
-	vec3 c3 = texture(Source, TEX1.xy).rgb;
-	vec3 c4 = texture(Source, TEX0.xy).rgb;
-	vec3 c5 = texture(Source, TEX1.zw).rgb;
-	vec3 c6 = texture(Source, TEX3.xw).rgb;
-	vec3 c7 = texture(Source, TEX2.zw).rgb;
-	vec3 c8 = texture(Source, TEX3.zw).rgb;
-
-	vec3 c9 = ((c0 + c2 + c6 + c8) * 0.15 + (c1 + c3 + c5 + c7) * 0.25 + c4) / 2.6;
-
-	vec3 o = vec3(1.0); vec3 h = vec3(0.05); vec3 hz = h; float k = 0.005; 
-	float kz = 0.007; float i = 0.0;
-
-	vec3 cz = (c9 + h) / (dot(o, c9) + k);
-
-	hz = (cz - ((c0 + h) / (dot(o, c0) + k))); i  = kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c1 + h) / (dot(o, c1) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c2 + h) / (dot(o, c2) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c3 + h) / (dot(o, c3) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c5 + h) / (dot(o, c5) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c6 + h) / (dot(o, c6) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c7 + h) / (dot(o, c7) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c8 + h) / (dot(o, c8) + k))); i += kz / (dot(hz, hz) + kz);
-
-	i /= 8.0; i = pow(i, 0.75);
-
-	if(i < OtlModify) { i = OtlModify; }
-	c9 = min(o, min(c9, c9 + dot(o, c9)));
-	FragColor.rgb = mix(c4 * i, colorAdjust(c9 * i), ShdWeight);
-}
\ No newline at end of file
diff --git a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_H.slang b/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_H.slang
deleted file mode 100644
index c6c1532e51..0000000000
--- a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_H.slang
+++ /dev/null
@@ -1,65 +0,0 @@
-#version 450
-
-#pragma name MMJ_BlurPass_H
-
-/*
-----------------------------------------------------------------
-MMJ's Cel Shader v2.0 - Multi-Pass 
-----------------------------------------------------------------
-Based on the original blur-gauss-h shader code.
-
-Used to blur the outlines, which is helpful at higher internal
-resolution settings to increase the line thickness.
-
-Parameters:
------------
-Blur Weight - Horizontal = Adjusts horizontal blur factor.
-----------------------------------------------------------------
-*/
-
-layout(push_constant) uniform Push
-{
-  vec4 SourceSize;
-  float BlurWeightH;
-} params;
-
-#pragma parameter BlurWeightH "Blur Weight - Horizontal" 0.0 0.0 16.0 1.0
-
-#define SourceSize params.SourceSize
-#define BlurWeightH params.BlurWeightH
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 PIXEL_SIZE = SourceSize.zw;
-  vec4 C = texture(Source, vTexCoord);
-  float L = 0.0, J = 0.0;
-  for(int i = 1; i <= BlurWeightH; ++i) {
-    L = 1.0 / i;
-    J = 0.5 * i * PIXEL_SIZE.x;
-    C = mix(C, mix(texture(Source, vTexCoord + vec2(J, 0.0)), texture(Source, vTexCoord - vec2(J, 0.0)), 0.5), L);
-  }
-  FragColor = C;
-}
\ No newline at end of file
diff --git a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_V.slang b/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_V.slang
deleted file mode 100644
index faa6cf4fca..0000000000
--- a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Blur_V.slang
+++ /dev/null
@@ -1,67 +0,0 @@
-#version 450
-
-#pragma name MMJ_BlurPass_V
-
-/*
-----------------------------------------------------------------
-MMJ's Cel Shader v2.0 - Multi-Pass 
-----------------------------------------------------------------
-Based on the original blur-gauss-v shader code.
-
-Used to blur the outlines, which is helpful at higher internal
-resolution settings to increase the line thickness.
-
-Parameters:
------------
-Blur Weight - Vertical = Adjusts vertical blur factor.
-----------------------------------------------------------------
-*/
-
-layout(push_constant) uniform Push
-{
-  vec4 MMJ_BlurPass_HSize;
-  vec4 OriginalSize;
-  float BlurWeightV;
-} params;
-
-#pragma parameter BlurWeightV "Blur Weight - Vertical" 0.0 0.0 16.0 1.0
-
-#define MMJ_BlurPass_HSize params.MMJ_BlurPass_HSize
-#define OriginalSize params.OriginalSize
-#define BlurWeightV params.BlurWeightV
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D MMJ_BlurPass_H;
-
-void main()
-{
-	vec2 PIXEL_SIZE = OriginalSize.zw;
-  vec4 C = texture(MMJ_BlurPass_H, vTexCoord);
-  float L = 0.0, J = 0.0;
-  for(int i = 1; i <= BlurWeightV; ++i) {
-    L = 1.0 / i;
-    J = 0.5 * i * PIXEL_SIZE.y;
-    C = mix(C, mix(texture(MMJ_BlurPass_H, vTexCoord + vec2(0.0, J)), texture(MMJ_BlurPass_H, vTexCoord - vec2(0.0, J)), 0.5), L);
-  }
-  FragColor = C;
-}
\ No newline at end of file
diff --git a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Color.slang b/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Color.slang
deleted file mode 100644
index 5c70c93afa..0000000000
--- a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Color.slang
+++ /dev/null
@@ -1,152 +0,0 @@
-#version 450
-
-#pragma name MMJ_ColorPass
-
-/*
-----------------------------------------------------------------
-MMJ's Cel Shader v2.0 - Multi-Pass 
-----------------------------------------------------------------
-Parameters:
------------
-Color Saturation = Increase or decrease color saturation. 
-
-Color Levels = Determines number of color "bands".
-
-Color Weight = Changes the strength of the color adjustments.
-----------------------------------------------------------------
-*/
-
-layout(push_constant) uniform Push
-{
-  vec4 MMJ_OutlineSize;
-  vec4 OriginalSize;
-  float ColorLevels;
-  float ColorSaturation;
-  float ColorWeight;
-} params;
-
-#pragma parameter ColorLevels "Color Levels" 12.0 1.0 32.0 1.0
-#pragma parameter ColorSaturation "Color Saturation" 1.15 0.00 2.00 0.05
-#pragma parameter ColorWeight "Color Weight" 0.50 0.00 1.00 0.05
-
-#define MMJ_OutlineSize params.MMJ_OutlineSize
-#define OriginalSize params.OriginalSize
-#define ColorLevels params.ColorLevels
-#define ColorSaturation params.ColorSaturation
-#define ColorWeight params.ColorWeight
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D MMJ_MP_refpass;
-layout(set = 0, binding = 3) uniform sampler2D MMJ_OutlinePass;
-
-vec3 RGB2HSL(vec3 cRGB) 
-{
-  float cR = cRGB[0], cG = cRGB[1], cB = cRGB[2];
-  float vMin = min(min(cR, cG), cB), vMax = max(max(cR, cG), cB);
-  float dMax = vMax - vMin, vS = 0.0, vH = 0.0, vL = (vMax + vMin) / 2.0;
-
-  // gray, no chroma
-  if(dMax == 0.0) { 
-    vH = 0.0; vS = vH; 
-
-  // chromatic data
-  } else {
-    if(vL < 0.5) { vS = dMax / (vMax + vMin); }
-    else         { vS = dMax / (2.0 - vMax - vMin); }
-
-    float dR = (((vMax - cR) * 0.1667) + (dMax * 0.5)) / dMax;
-    float dG = (((vMax - cG) * 0.1667) + (dMax * 0.5)) / dMax;
-    float dB = (((vMax - cB) * 0.1667) + (dMax * 0.5)) / dMax;
-
-    if     (cR >= vMax) { vH = dB - dG; }
-    else if(cG >= vMax) { vH = 0.3333 + dR - dB; }
-    else if(cB >= vMax) { vH = 0.6667 + dG - dR; }
-
-    if     (vH < 0.0) { vH += 1.0; }
-    else if(vH > 1.0) { vH -= 1.0; }
-  }
-  return vec3(vH, vS, vL);
-}
-
-float Hue2RGB(float v1, float v2, float vH) 
-{
-  float v3 = 0.0;
-
-  if     (vH < 0.0) { vH += 1.0; }
-  else if(vH > 1.0) { vH -= 1.0; }
-
-  if     ((6.0 * vH) < 1.0) { v3 = v1 + (v2 - v1) * 6.0 * vH; }
-  else if((2.0 * vH) < 1.0) { v3 = v2; }
-  else if((3.0 * vH) < 2.0) { v3 = v1 + (v2 - v1) * (0.6667 - vH) * 6.0; }
-  else                      { v3 = v1; }
-
-  return v3;
-}
-
-vec3 HSL2RGB(vec3 vHSL) 
-{
-    float cR = 0.0, cG = cR, cB = cR;
-
-  if(vHSL[1] == 0.0) { 
-    cR = vHSL[2], cG = cR, cB = cR; 
-    
-  } else {
-    float v1 = 0.0, v2 = v1;
-
-    if(vHSL[2] < 0.5) { v2 = vHSL[2] * (1.0 + vHSL[1] ); }
-    else              { v2 = (vHSL[2] + vHSL[1] ) - (vHSL[1] * vHSL[2] ); }
-
-    v1 = 2.0 * vHSL[2] - v2;
-
-    cR = Hue2RGB(v1, v2, vHSL[0] + 0.3333);
-    cG = Hue2RGB(v1, v2, vHSL[0] );
-    cB = Hue2RGB(v1, v2, vHSL[0] - 0.3333);
-  }
-  return vec3(cR, cG, cB);
-}
-
-vec3 colorAdjust(vec3 cRGB) 
-{
-  vec3 cHSL = RGB2HSL(cRGB);
-
-  float cr = 1.0 / ColorLevels;
-
-  // brightness modifier
-  float BrtModify = mod(cHSL[2], cr); 
-
-  cHSL[1] *= ColorSaturation; 
-  cHSL[2] += (cHSL[2] * cr - BrtModify);
-  cRGB = 1.2 * HSL2RGB(cHSL);
-
-  return cRGB;
-}
-
-void main()
-{
-  vec3 cOriginal = texture(MMJ_MP_refpass, vTexCoord).rgb;
-  vec3 cOutline = texture(MMJ_OutlinePass, vTexCoord).rgb;
-	
-	vec3 cNew = cOriginal;
-	cNew = min(vec3(1.0), min(cNew, cNew + dot(vec3(1.0), cNew)));
-	FragColor.rgb = mix(cOriginal * cOutline, colorAdjust(cNew * cOutline), ColorWeight);
-}
diff --git a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Outline.slang b/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Outline.slang
deleted file mode 100644
index c71b2fd58a..0000000000
--- a/cel/shaders/MMJ_Cel/MMJ_Cel_Shader_MP_Outline.slang
+++ /dev/null
@@ -1,120 +0,0 @@
-#version 450
-
-#pragma name MMJ_OutlinePass
-
-/*
-----------------------------------------------------------------
-MMJ's Cel Shader v2.0 - Multi-Pass 
-----------------------------------------------------------------
-Parameters:
------------
-Outline Weight = Adjusts darkness of the outlines.
-
-At lower internal resolutions, smaller values work better to
-reduce the appearance of lines around individual areas of some
-textures. At higher internal resolutions, setting both a higher 
-outline weight value plus increased blur factors will work 
-together to thicken the appearance of the lines.
-----------------------------------------------------------------
-*/
-
-layout(push_constant) uniform Push
-{
-  vec4 MMJ_BlurPass_VSize;
-  float OutlineWeight;
-} params;
-
-#pragma parameter OutlineWeight "Outline Weight" 1.0 0.0 10.0 0.1
-
-#define MMJ_BlurPass_VSize params.MMJ_BlurPass_VSize
-#define OutlineWeight params.OutlineWeight
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 TEX0;
-layout(location = 2) out vec4 TEX1;
-layout(location = 3) out vec4 TEX2;
-layout(location = 4) out vec4 TEX3;
-layout(location = 5) out vec4 TEX4;
-layout(location = 6) out vec4 TEX5;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-
-  TEX0 = vTexCoord.xyxy;
-	
-  vec4 offset;
-
-  offset.xy = -(offset.zw = vec2(MMJ_BlurPass_VSize.z, 0.0));
-  TEX1 = TEX0 + offset;
-  TEX5 = TEX1 + offset;
-
-  offset.xy = -(offset.zw = vec2(0.0, MMJ_BlurPass_VSize.w));
-  TEX2 = TEX0 + offset;
-  TEX3 = TEX1 + offset;
-  TEX4 = TEX2 + offset;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 TEX0;
-layout(location = 2) in vec4 TEX1;
-layout(location = 3) in vec4 TEX2;
-layout(location = 4) in vec4 TEX3;
-layout(location = 5) in vec4 TEX4;
-layout(location = 6) in vec4 TEX5;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D MMJ_BlurPass_V;
-
-void main()
-{
-	vec3 c00 = texture(MMJ_BlurPass_V, TEX3.xy).rgb;
-	vec3 c01 = texture(MMJ_BlurPass_V, TEX2.xy).rgb;
-	vec3 c02 = texture(MMJ_BlurPass_V, TEX3.zy).rgb;
-	vec3 c03 = texture(MMJ_BlurPass_V, TEX1.xy).rgb;
-	vec3 c04 = texture(MMJ_BlurPass_V, TEX0.xy).rgb;
-	vec3 c05 = texture(MMJ_BlurPass_V, TEX1.zw).rgb;
-	vec3 c06 = texture(MMJ_BlurPass_V, TEX3.xw).rgb;
-	vec3 c07 = texture(MMJ_BlurPass_V, TEX2.zw).rgb;
-	vec3 c08 = texture(MMJ_BlurPass_V, TEX3.zw).rgb;	
-  vec3 c09 = texture(MMJ_BlurPass_V, TEX4.xy).rgb;
-  vec3 c10 = texture(MMJ_BlurPass_V, TEX4.zw).rgb;
-  vec3 c11 = texture(MMJ_BlurPass_V, TEX5.xy).rgb;
-  vec3 c12 = texture(MMJ_BlurPass_V, TEX5.zw).rgb;
-
-  vec3 cNew = (c00 + c01 + c02 + c03 + c04 + c05 + c06 + c07 + c08 + c09 + c10 + c11 + c12) / 13.0;
-  
-	vec3 o = vec3(1.0), h = vec3(0.05), hz = h; 
-	float k = 0.005, kz = 0.007, i = 0.0;
-
-	vec3 cz = (cNew + h) / (dot(o, cNew) + k);
-
-	hz = (cz - ((c00 + h) / (dot(o, c00) + k))); i  = kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c01 + h) / (dot(o, c01) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c02 + h) / (dot(o, c02) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c03 + h) / (dot(o, c03) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c05 + h) / (dot(o, c05) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c06 + h) / (dot(o, c06) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c07 + h) / (dot(o, c07) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c08 + h) / (dot(o, c08) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c09 + h) / (dot(o, c09) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c10 + h) / (dot(o, c10) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c11 + h) / (dot(o, c11) + k))); i += kz / (dot(hz, hz) + kz);
-	hz = (cz - ((c12 + h) / (dot(o, c12) + k))); i += kz / (dot(hz, hz) + kz);
-
-	i /= 12.0; 
-	i = pow(i, OutlineWeight);
-
-	FragColor.rgb = vec3(i);
-}
\ No newline at end of file
diff --git a/crt/GritsScanlines.slangp b/crt/GritsScanlines.slangp
deleted file mode 100644
index 1658c240be..0000000000
--- a/crt/GritsScanlines.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-shaders = 2
-
-shader0 = shaders/GritsScanlines/GritsScanlines.slang
-filter_linear0 = true
-scale_type0 = source
-scale_x0 = 1.0
-scale_y0 = 4.0
-
-shader1 = ../stock.slang
-filter_linear1 = true
-scale_type1 = viewport
-
-textures = "scanlines_LUT;color_LUT;luminance_LUT"
-scanlines_LUT = shaders/GritsScanlines/Scanline-LUT-4px.png
-scanlines_LUT_linear = false
-color_LUT = shaders/GritsScanlines/trinitron_color.png
-color_LUT_linear = true
-luminance_LUT = shaders/GritsScanlines/Fake-Self-Illumination.png
-luminance_LUT_linear = true
diff --git a/crt/cathode-retro_no-signal.slangp b/crt/cathode-retro_no-signal.slangp
deleted file mode 100644
index b7c14ddca7..0000000000
--- a/crt/cathode-retro_no-signal.slangp
+++ /dev/null
@@ -1,47 +0,0 @@
-shaders = 11
-
-shader0 = shaders/cathode-retro/cathode-retro-util-copy.slang
-alias0 = g_sourceTexture
-filter_linear0 = true
-
-shader1 = shaders/cathode-retro/cathode-retro-util-downsample-2x-horz.slang
-filter_linear1 = true
-scale_x1 = 0.5
-
-shader2 = shaders/cathode-retro/cathode-retro-util-downsample-2x-vert.slang
-filter_linear2 = true
-scale_y2 = 0.5
-
-shader3 = ../stock.slang
-
-shader4 = shaders/cathode-retro/cathode-retro-util-tonemap-and-downsample-horz.slang
-filter_linear4 = true
-scale_x4 = 0.5
-
-shader5 = shaders/cathode-retro/cathode-retro-util-tonemap-and-downsample-vert.slang
-filter_linear5 = true
-scale_y5 = 0.5
-alias5 = g_sourceTex
-
-shader6 = shaders/cathode-retro/cathode-retro-util-gaussian-blur-horz.slang
-filter_linear6 = true
-
-shader7 = shaders/cathode-retro/cathode-retro-util-gaussian-blur-vert.slang
-filter_linear7 = true
-alias7 = g_diffusionTexture
-
-shader8 = shaders/cathode-retro/cathode-retro-crt-generate-masks.slang
-alias8 = g_maskTexture
-mipmap_input8 = true
-wrap_mode8 = repeat
-scale_type8 = viewport
-
-shader9 = shaders/cathode-retro/cathode-retro-crt-generate-screen-texture.slang
-alias9 = g_screenMaskTexture
-mipmap_input9 = true
-filter_linear9 = true
-wrap_mode9 = clamp
-
-shader10 = shaders/cathode-retro/cathode-retro-crt-rgb-to-crt_no-signal.slang
-mipmap_input10 = true
-filter_linear10 = true
diff --git a/crt/crt-1tap-bloom.slangp b/crt/crt-1tap-bloom.slangp
deleted file mode 100644
index 793bcf73b3..0000000000
--- a/crt/crt-1tap-bloom.slangp
+++ /dev/null
@@ -1,292 +0,0 @@
-shaders = "26"
-feedback_pass = "0"
-shader0 = "shaders/crt-1tap.slang"
-filter_linear0 = "true"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "true"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "viewport"
-scale_x0 = "1.000000"
-scale_type_y0 = "viewport"
-scale_y0 = "1.000000"
-shader1 = "../blurs/shaders/kawase/linearize.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "Input"
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear2 = "true"
-wrap_mode2 = "mirrored_repeat"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "0.700000"
-scale_type_y2 = "viewport"
-scale_y2 = "0.700000"
-shader3 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear3 = "true"
-wrap_mode3 = "mirrored_repeat"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "true"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear4 = "true"
-wrap_mode4 = "mirrored_repeat"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "true"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "0.500000"
-scale_type_y4 = "source"
-scale_y4 = "0.500000"
-shader5 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear5 = "true"
-wrap_mode5 = "mirrored_repeat"
-mipmap_input5 = "false"
-alias5 = "Scale1"
-float_framebuffer5 = "true"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "2.000000"
-scale_type_y5 = "source"
-scale_y5 = "2.000000"
-shader6 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear6 = "true"
-wrap_mode6 = "mirrored_repeat"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "true"
-srgb_framebuffer6 = "false"
-scale_type_x6 = "source"
-scale_x6 = "0.500000"
-scale_type_y6 = "source"
-scale_y6 = "0.500000"
-shader7 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear7 = "true"
-wrap_mode7 = "mirrored_repeat"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "0.500000"
-scale_type_y7 = "source"
-scale_y7 = "0.500000"
-shader8 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = "Scale2"
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "source"
-scale_x8 = "2.000000"
-scale_type_y8 = "source"
-scale_y8 = "2.000000"
-shader9 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "0.500000"
-scale_type_y9 = "source"
-scale_y9 = "0.500000"
-shader10 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale3"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale4"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale5"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale6"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "absolute"
-scale_x21 = "128"
-scale_type_y21 = "absolute"
-scale_y21 = "128"
-shader22 = "../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear22 = "true"
-wrap_mode22 = "clamp_to_border"
-mipmap_input22 = "true"
-alias22 = "MovingAverage"
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "absolute"
-scale_x22 = "2"
-scale_type_y22 = "absolute"
-scale_y22 = "2"
-shader23 = "../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear23 = "true"
-wrap_mode23 = "clamp_to_border"
-mipmap_input23 = "false"
-alias23 = ""
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "viewport"
-scale_x23 = "1.000000"
-scale_type_y23 = "viewport"
-scale_y23 = "1.000000"
-shader24 = "../blurs/shaders/kawase/delinearize.slang"
-filter_linear24 = "true"
-wrap_mode24 = "clamp_to_border"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "viewport"
-scale_x24 = "1.000000"
-scale_type_y24 = "viewport"
-scale_y24 = "1.000000"
-shader25 = "../sharpen/shaders/rcas.slang"
-filter_linear25 = "false"
-wrap_mode25 = "clamp_to_border"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "false"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "viewport"
-scale_x25 = "1.000000"
-scale_type_y25 = "viewport"
-scale_y25 = "1.000000"
-BLUR_RADIUS = "2.000000"
-MIN_EXP_INTENSITY = "0.500000"
-BLOOM_THRESHOLD = "2.500000"
-EYE_ADAPTION = "0.850000"
-RCAS_STRENGTH = "1.000000"
diff --git a/crt/crt-1tap-bloom_fast.slangp b/crt/crt-1tap-bloom_fast.slangp
deleted file mode 100644
index ce0f59699d..0000000000
--- a/crt/crt-1tap-bloom_fast.slangp
+++ /dev/null
@@ -1,224 +0,0 @@
-shaders = "20"
-feedback_pass = "0"
-shader0 = "shaders/crt-1tap.slang"
-filter_linear0 = "true"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "true"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "viewport"
-scale_x0 = "1.000000"
-scale_type_y0 = "viewport"
-scale_y0 = "1.000000"
-shader1 = "../blurs/shaders/kawase/linearize.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "Input"
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear2 = "true"
-wrap_mode2 = "mirrored_repeat"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "0.400000"
-scale_type_y2 = "viewport"
-scale_y2 = "0.400000"
-shader3 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear3 = "true"
-wrap_mode3 = "mirrored_repeat"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "true"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear4 = "true"
-wrap_mode4 = "mirrored_repeat"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "true"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "0.500000"
-scale_type_y4 = "source"
-scale_y4 = "0.500000"
-shader5 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear5 = "true"
-wrap_mode5 = "mirrored_repeat"
-mipmap_input5 = "false"
-alias5 = "Scale1"
-float_framebuffer5 = "true"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "2.000000"
-scale_type_y5 = "source"
-scale_y5 = "2.000000"
-shader6 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear6 = "true"
-wrap_mode6 = "mirrored_repeat"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "true"
-srgb_framebuffer6 = "false"
-scale_type_x6 = "source"
-scale_x6 = "0.500000"
-scale_type_y6 = "source"
-scale_y6 = "0.500000"
-shader7 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear7 = "true"
-wrap_mode7 = "mirrored_repeat"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "0.500000"
-scale_type_y7 = "source"
-scale_y7 = "0.500000"
-shader8 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = "Scale2"
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "source"
-scale_x8 = "2.000000"
-scale_type_y8 = "source"
-scale_y8 = "2.000000"
-shader9 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "0.500000"
-scale_type_y9 = "source"
-scale_y9 = "0.500000"
-shader10 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale3"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale4"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "absolute"
-scale_x15 = "64"
-scale_type_y15 = "absolute"
-scale_y15 = "64"
-shader16 = "../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear16 = "true"
-wrap_mode16 = "clamp_to_border"
-mipmap_input16 = "true"
-alias16 = "MovingAverage"
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "absolute"
-scale_x16 = "2"
-scale_type_y16 = "absolute"
-scale_y16 = "2"
-shader17 = "../blurs/shaders/dual_filter/bloom_blend_fast.slang"
-filter_linear17 = "true"
-wrap_mode17 = "clamp_to_border"
-mipmap_input17 = "false"
-alias17 = ""
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "viewport"
-scale_x17 = "1.000000"
-scale_type_y17 = "viewport"
-scale_y17 = "1.000000"
-shader18 = "../blurs/shaders/kawase/delinearize.slang"
-filter_linear18 = "true"
-wrap_mode18 = "clamp_to_border"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "viewport"
-scale_x18 = "1.000000"
-scale_type_y18 = "viewport"
-scale_y18 = "1.000000"
-shader19 = "../sharpen/shaders/rcas.slang"
-filter_linear19 = "false"
-wrap_mode19 = "clamp_to_border"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "false"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "viewport"
-scale_x19 = "1.000000"
-scale_type_y19 = "viewport"
-scale_y19 = "1.000000"
-MIN_EXP_INTENSITY = "0.650000"
-BLOOM_THRESHOLD = "2.500001"
-RCAS_STRENGTH = "1.000000"
diff --git a/crt/crt-1tap.slangp b/crt/crt-1tap.slangp
deleted file mode 100644
index 8a971c5453..0000000000
--- a/crt/crt-1tap.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-shaders = 1
-
-shader0 = shaders/crt-1tap.slang
-filter_linear0 = true
-scale_type0 = viewport
-scale_x0 = 1.0
-scale_y0 = 1.0
-float_framebuffer0 = true
diff --git a/crt/crt-frutbunn.slangp b/crt/crt-frutbunn.slangp
deleted file mode 100644
index a9b172d47f..0000000000
--- a/crt/crt-frutbunn.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/crt-frutbunn.slang
-scale_type0 = viewport
diff --git a/crt/crt-guest-advanced-fast.slangp b/crt/crt-guest-advanced-fast.slangp
deleted file mode 100644
index c38c79333b..0000000000
--- a/crt/crt-guest-advanced-fast.slangp
+++ /dev/null
@@ -1,74 +0,0 @@
-shaders = 9
-
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4"
-SamplerLUT1 = shaders/guest/advanced/lut/trinitron-lut.png
-SamplerLUT1_linear = true
-SamplerLUT2 = shaders/guest/advanced/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true
-SamplerLUT3 = shaders/guest/advanced/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = shaders/guest/advanced/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-shader0 = shaders/guest/fast/stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-
-shader1 = shaders/guest/fast/stock.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = StockPass
-
-shader2 = shaders/guest/fast/pre-shaders.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = PrePass
-
-shader3 = shaders/guest/fast/linearize.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 1.0
-float_framebuffer3 = true
-alias3 = LinearizePass
-
-shader4 = shaders/guest/fast/crt-guest-advanced-pass1.slang
-filter_linear4 = true
-scale_type_x4 = viewport
-scale_x4 = 1.0
-scale_type_y4 = source
-scale_y4 = 1.0
-float_framebuffer4 = true
-alias4 = Pass1
-
-shader5 = shaders/guest/fast/bloom_horizontal.slang
-filter_linear5 = true
-scale_type_x5 = absolute
-scale_x5 = 640.0
-scale_type_y5 = source
-scale_y5 = 1.0 
-float_framebuffer5 = true
-
-shader6 = shaders/guest/fast/bloom_vertical.slang
-filter_linear6 = true
-scale_type_x6 = source
-scale_x6 = 1.0
-scale_type_y6 = absolute
-scale_y6 = 480.0
-float_framebuffer6 = true
-alias6 = BloomPass
-
-shader7 = shaders/guest/fast/crt-guest-advanced-pass2.slang
-filter_linear7 = true
-float_framebuffer7 = true
-scale_type7 = viewport
-scale_x7 = 1.0
-scale_y7 = 1.0
-
-shader8 = shaders/guest/fast/deconvergence-f.slang
-filter_linear8 = true
-scale_type8 = viewport
-scale_x8 = 1.0
-scale_y8 = 1.0
diff --git a/crt/crt-guest-advanced-hd.slangp b/crt/crt-guest-advanced-hd.slangp
deleted file mode 100644
index 3f6e98baf7..0000000000
--- a/crt/crt-guest-advanced-hd.slangp
+++ /dev/null
@@ -1,98 +0,0 @@
-shaders = 12
-
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4"
-SamplerLUT1 = shaders/guest/advanced/lut/trinitron-lut.png
-SamplerLUT1_linear = true
-SamplerLUT2 = shaders/guest/advanced/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true
-SamplerLUT3 = shaders/guest/advanced/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = shaders/guest/advanced/lut/ntsc-lut.png
-SamplerLUT4_linear = true
-
-shader0 = shaders/guest/hd/stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-
-shader1 = shaders/guest/hd/stock.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = StockPass
-
-shader2 = shaders/guest/hd/afterglow0.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-alias2 = AfterglowPass
-
-shader3 = shaders/guest/hd/pre-shaders-afterglow.slang
-filter_linear3 = false
-scale_type3 = source
-mipmap_input3 = true
-scale3 = 1.0
-alias3 = PrePass
-
-shader4 = shaders/guest/hd/linearize-hd.slang
-filter_linear4 = true
-scale_type4 = source
-scale4 = 1.0
-float_framebuffer4 = true
-alias4 = LinearizePass
-
-shader5 = shaders/guest/hd/crt-guest-advanced-hd-pass1.slang
-filter_linear5 = true
-scale_type_x5 = viewport
-scale_x5 = 1.0
-scale_type_y5 = source
-scale_y5 = 1.0
-float_framebuffer5 = true
-alias5 = Pass1
-
-shader6 = shaders/guest/hd/gaussian_horizontal.slang
-filter_linear6 = true
-scale_type_x6 = absolute
-scale_x6 = 800.0
-scale_type_y6 = source
-scale_y6 = 1.0 
-float_framebuffer6 = true
-
-shader7 = shaders/guest/hd/gaussian_vertical.slang
-filter_linear7 = true
-scale_type_x7 = absolute
-scale_x7 = 800.0
-scale_type_y7 = absolute
-scale_y7 = 600.0
-float_framebuffer7 = true
-alias7 = GlowPass
-
-shader8 = shaders/guest/hd/bloom_horizontal.slang
-filter_linear8 = true
-scale_type_x8 = absolute
-scale_x8 = 800.0
-scale_type_y8 = source
-scale_y8 = 1.0 
-float_framebuffer8 = true
-
-shader9 = shaders/guest/hd/bloom_vertical.slang
-filter_linear9 = true
-scale_type_x9 = source
-scale_x9 = 1.0
-scale_type_y9 = absolute
-scale_y9 = 600.0
-float_framebuffer9 = true
-alias9 = BloomPass
-
-shader10 = shaders/guest/hd/crt-guest-advanced-hd-pass2.slang
-filter_linear10 = true
-float_framebuffer10 = true
-scale_type10 = viewport
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = shaders/guest/hd/deconvergence-hd.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale_x11 = 1.0
-scale_y11 = 1.0
diff --git a/crt/crt-guest-advanced-ntsc.slangp b/crt/crt-guest-advanced-ntsc.slangp
deleted file mode 100644
index a0ce1f8122..0000000000
--- a/crt/crt-guest-advanced-ntsc.slangp
+++ /dev/null
@@ -1,147 +0,0 @@
-shaders = 18
-
-
-shader0 = shaders/guest/advanced/stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-
-shader1 = shaders/guest/advanced/stock.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = StockPass
-
-shader2 = shaders/guest/advanced/afterglow0.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-alias2 = AfterglowPass
-
-shader3 = shaders/guest/advanced/pre-shaders-afterglow.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 1.0
-alias3 = PrePass0 
-
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4"
-SamplerLUT1 = shaders/guest/advanced/lut/trinitron-lut.png
-SamplerLUT1_linear = true
-SamplerLUT2 = shaders/guest/advanced/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true
-SamplerLUT3 = shaders/guest/advanced/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = shaders/guest/advanced/lut/ntsc-lut.png
-SamplerLUT4_linear = true 
-
-# custom ntsc shaders
-
-shader4 = shaders/guest/advanced/ntsc/ntsc-pass1.slang
-shader5 = shaders/guest/advanced/ntsc/ntsc-pass2.slang
-
-alias4 = NPass1
-
-filter_linear4 = false
-filter_linear5 = true
-
-scale_type_x4 = source
-scale_type_y4 = source
-scale_x4 = 4.0
-scale_y4 = 1.0
-float_framebuffer4 = true
-float_framebuffer5 = true
-
-scale_type5 = source
-scale_x5 = 0.50
-scale_y5 = 1.00
-
-shader6 = shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear6 = true
-scale_type6 = source
-scale_x6 = 1.0
-scale_y6 = 1.0
-
-shader7 = shaders/guest/advanced/custom-fast-sharpen.slang
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 1.0
-scale_y7 = 1.0
-alias7 = NtscPass
-
-shader8 = shaders/guest/advanced/stock.slang
-filter_linear8 = true
-scale_type8 = source
-scale_x8 = 1.0
-scale_y8 = 1.0
-alias8 = PrePass 
-mipmap_input8 = true
-
-shader9 = shaders/guest/advanced/avg-lum-ntsc.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-mipmap_input9 = true
-alias9 = AvgLumPass
-
-shader10 = shaders/guest/advanced/linearize-ntsc.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-alias10 = LinearizePass
-float_framebuffer10 = true
-
-shader11 = shaders/guest/advanced/crt-guest-advanced-ntsc-pass1.slang
-filter_linear11 = true
-scale_type_x11 = viewport
-scale_x11 = 1.0
-scale_type_y11 = source
-scale_y11 = 1.0
-float_framebuffer11 = true
-alias11 = Pass1
-
-shader12 = shaders/guest/hd/gaussian_horizontal.slang
-filter_linear12 = true
-scale_type_x12 = absolute
-scale_x12 = 800.0
-scale_type_y12 = source
-scale_y12 = 1.0 
-float_framebuffer12 = true
-
-shader13 = shaders/guest/advanced/gaussian_vertical.slang
-filter_linear13 = true
-scale_type_x13 = absolute
-scale_x13 = 800.0
-scale_type_y13 = absolute
-scale_y13 = 600.0
-float_framebuffer13 = true
-alias13 = GlowPass
-
-shader14 = shaders/guest/hd/bloom_horizontal.slang
-filter_linear14 = true
-scale_type_x14 = absolute
-scale_x14 = 800.0
-scale_type_y14 = absolute
-scale_y14 = 600.0 
-float_framebuffer14 = true
-
-shader15 = shaders/guest/advanced/bloom_vertical.slang
-filter_linear15 = true
-scale_type_x15 = absolute
-scale_x15 = 800.0
-scale_type_y15 = absolute
-scale_y15 = 600.0
-float_framebuffer15 = true
-alias15 = BloomPass 
-
-shader16 = shaders/guest/advanced/crt-guest-advanced-ntsc-pass2.slang
-filter_linear16 = true
-float_framebuffer16 = true
-scale_type16 = viewport
-scale_x16 = 1.0
-scale_y16 = 1.0
-
-shader17 = shaders/guest/advanced/deconvergence-ntsc.slang
-filter_linear17 = true
-scale_type17 = viewport
-scale_x17 = 1.0
-scale_y17 = 1.0
diff --git a/crt/crt-guest-advanced.slangp b/crt/crt-guest-advanced.slangp
deleted file mode 100644
index 551c1a8266..0000000000
--- a/crt/crt-guest-advanced.slangp
+++ /dev/null
@@ -1,96 +0,0 @@
-shaders = 12
-
-shader0 = shaders/guest/advanced/stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-
-shader1 = shaders/guest/advanced/stock.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = StockPass
-
-shader2 = shaders/guest/advanced/afterglow0.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-alias2 = AfterglowPass
-
-shader3 = shaders/guest/advanced/pre-shaders-afterglow.slang
-filter_linear3 = false
-scale_type3 = source
-mipmap_input3 = true
-scale3 = 1.0
-alias3 = PrePass
-
-textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4"
-SamplerLUT1 = shaders/guest/advanced/lut/trinitron-lut.png
-SamplerLUT1_linear = true
-SamplerLUT2 = shaders/guest/advanced/lut/inv-trinitron-lut.png
-SamplerLUT2_linear = true
-SamplerLUT3 = shaders/guest/advanced/lut/nec-lut.png
-SamplerLUT3_linear = true
-SamplerLUT4 = shaders/guest/advanced/lut/ntsc-lut.png
-SamplerLUT4_linear = true 
-
-shader4 = shaders/guest/advanced/avg-lum.slang
-filter_linear4 = true
-scale_type4 = source
-scale4 = 1.0
-mipmap_input4 = true
-alias4 = AvgLumPass
-
-shader5 = shaders/guest/advanced/linearize.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-alias5 = LinearizePass
-float_framebuffer5 = true
-
-shader6 = shaders/guest/advanced/gaussian_horizontal.slang
-filter_linear6 = true
-scale_type_x6 = absolute
-scale_x6 = 800.0
-scale_type_y6 = source
-scale_y6 = 1.0 
-float_framebuffer6 = true
-
-shader7 = shaders/guest/advanced/gaussian_vertical.slang
-filter_linear7 = true
-scale_type_x7 = absolute
-scale_x7 = 800.0
-scale_type_y7 = absolute
-scale_y7 = 600.0
-float_framebuffer7 = true
-alias7 = GlowPass
-
-shader8 = shaders/guest/advanced/bloom_horizontal.slang
-filter_linear8 = true
-scale_type_x8 = absolute
-scale_x8 = 800.0
-scale_type_y8 = absolute
-scale_y8 = 600.0 
-float_framebuffer8 = true
-
-shader9 = shaders/guest/advanced/bloom_vertical.slang
-filter_linear9 = true
-scale_type_x9 = source
-scale_x9 = 1.0
-scale_type_y9 = source
-scale_y9 = 1.0
-float_framebuffer9 = true
-alias9 = BloomPass
-
-shader10 = shaders/guest/advanced/crt-guest-advanced.slang
-filter_linear10 = true
-float_framebuffer10 = true
-scale_type10 = viewport
-scale_x10 = 1.0
-scale_y10 = 1.0
-
-shader11 = shaders/guest/advanced/deconvergence.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale_x11 = 1.0
-scale_y11 = 1.0
diff --git a/crt/crt-hyllian-ntsc-rainbow.slangp b/crt/crt-hyllian-ntsc-rainbow.slangp
deleted file mode 100644
index bde3e886ad..0000000000
--- a/crt/crt-hyllian-ntsc-rainbow.slangp
+++ /dev/null
@@ -1,72 +0,0 @@
-shaders = "5"
-feedback_pass = "0"
-shader0 = "shaders/hyllian/support/multiLUT-modified.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 =  "shaders/hyllian/support/ntsc/shaders/ntsc-adaptive-lite/ntsc-lite-pass1.slang"
-filter_linear1 =  "false"
-wrap_mode1 =  "clamp_to_edge"
-mipmap_input1 =  "false"
-alias1 =  ""
-float_framebuffer1 =  "true"
-srgb_framebuffer1 =  "false"
-scale_type_x1 =  "source"
-scale_x1 =  "4.000000"
-scale_type_y1 =  "source"
-scale_y1 =  "1.000000"
-shader2 =  "shaders/hyllian/support/ntsc/shaders/ntsc-adaptive-lite/ntsc-lite-pass2.slang"
-filter_linear2 =  "true"
-wrap_mode2 =  "clamp_to_edge"
-mipmap_input2 =  "false"
-alias2 =  ""
-float_framebuffer2 =  "false"
-srgb_framebuffer2 =  "false"
-scale_type_x2 =  "source"
-scale_x2 =  "1.000000"
-scale_type_y2 =  "source"
-scale_y2 =  "1.000000"
-shader3 = "shaders/hyllian/support/linearize.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_edge"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "viewport"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 =   "shaders/hyllian/crt-hyllian-pass1.slang"
-filter_linear4 =   "false"
-wrap_mode4 =   "clamp_to_edge"
-mipmap_input4 =   "false"
-alias4 =   ""
-float_framebuffer4 =   "false"
-srgb_framebuffer4 =   "false"
-scale_type_x4 =   "viewport"
-scale_x4 =   "1.000000"
-scale_type_y4 =   "viewport"
-scale_y4 =   "1.000000"
-LUT_selector_param = "2.000000"
-quality = "-1.000000"
-chroma_scale = "3.000000"
-cust_artifacting = "0.500000"
-ntsc_artifacting_rainbow = "1.000000"
-HFILTER_PROFILE = "0.000000"
-BEAM_MIN_WIDTH = "0.860000"
-BRIGHTBOOST = "1.600000"
-PHOSPHOR_LAYOUT = "2.000000"
-InputGamma = "2.400000"
-textures = "SamplerLUT1;SamplerLUT2"
-SamplerLUT1 = "shaders/guest/advanced/lut/ntsc-lut.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "shaders/hyllian/support/LUT/some-grade.png"
-SamplerLUT2_linear = true
-
diff --git a/crt/crt-hyllian-ntsc.slangp b/crt/crt-hyllian-ntsc.slangp
deleted file mode 100644
index 783bb20165..0000000000
--- a/crt/crt-hyllian-ntsc.slangp
+++ /dev/null
@@ -1,70 +0,0 @@
-shaders = "5"
-feedback_pass = "0"
-shader0 = "shaders/hyllian/support/multiLUT-modified.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 =  "shaders/hyllian/support/ntsc/shaders/ntsc-adaptive-lite/ntsc-lite-pass1.slang"
-filter_linear1 =  "false"
-wrap_mode1 =  "clamp_to_edge"
-mipmap_input1 =  "false"
-alias1 =  ""
-float_framebuffer1 =  "true"
-srgb_framebuffer1 =  "false"
-scale_type_x1 =  "source"
-scale_x1 =  "4.000000"
-scale_type_y1 =  "source"
-scale_y1 =  "1.000000"
-shader2 =  "shaders/hyllian/support/ntsc/shaders/ntsc-adaptive-lite/ntsc-lite-pass2.slang"
-filter_linear2 =  "true"
-wrap_mode2 =  "clamp_to_edge"
-mipmap_input2 =  "false"
-alias2 =  ""
-float_framebuffer2 =  "false"
-srgb_framebuffer2 =  "false"
-scale_type_x2 =  "source"
-scale_x2 =  "1.000000"
-scale_type_y2 =  "source"
-scale_y2 =  "1.000000"
-shader3 = "shaders/hyllian/support/linearize.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_edge"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "viewport"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 =   "shaders/hyllian/crt-hyllian-pass1.slang"
-filter_linear4 =   "false"
-wrap_mode4 =   "clamp_to_edge"
-mipmap_input4 =   "false"
-alias4 =   ""
-float_framebuffer4 =   "false"
-srgb_framebuffer4 =   "false"
-scale_type_x4 =   "viewport"
-scale_x4 =   "1.000000"
-scale_type_y4 =   "viewport"
-scale_y4 =   "1.000000"
-LUT_selector_param = "2.000000"
-quality = "-1.000000"
-chroma_scale = "4.000000"
-HFILTER_PROFILE = "0.000000"
-BEAM_MIN_WIDTH = "0.860000"
-BRIGHTBOOST = "1.600000"
-PHOSPHOR_LAYOUT = "2.000000"
-InputGamma = "2.400000"
-textures = "SamplerLUT1;SamplerLUT2"
-SamplerLUT1 = "shaders/guest/advanced/lut/ntsc-lut.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "shaders/hyllian/support/LUT/some-grade.png"
-SamplerLUT2_linear = true
-
diff --git a/crt/crt-hyllian-sinc-composite.slangp b/crt/crt-hyllian-sinc-composite.slangp
deleted file mode 100644
index 637488e3cf..0000000000
--- a/crt/crt-hyllian-sinc-composite.slangp
+++ /dev/null
@@ -1,43 +0,0 @@
-shaders = "3"
-feedback_pass = "0"
-shader0 = "shaders/hyllian/support/multiLUT-modified.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "shaders/hyllian/crt-hyllian-sinc-pass0.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "true"
-scale_type_x1 = "viewport"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "shaders/hyllian/crt-hyllian-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_edge"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "viewport"
-scale_y2 = "1.000000"
-LUT_selector_param = "2.000000"
-HFILTER_PROFILE = "2.000000"
-PHOSPHOR_LAYOUT = "2.000000"
-BRIGHTBOOST = "1.500000
-textures = "SamplerLUT1;SamplerLUT2"
-SamplerLUT1 = "shaders/guest/advanced/lut/ntsc-lut.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "shaders/hyllian/support/LUT/some-grade.png"
-SamplerLUT2_linear = true
diff --git a/crt/crt-hyllian.slangp b/crt/crt-hyllian.slangp
deleted file mode 100644
index ec1d22fc83..0000000000
--- a/crt/crt-hyllian.slangp
+++ /dev/null
@@ -1,43 +0,0 @@
-shaders = "5"
-
-shader0 = "shaders/hyllian/support/multiLUT-linear.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.000000"
-srgb_framebuffer0 = "true"
-
-
-shader1 = "shaders/hyllian/crt-hyllian-base.slang"
-filter_linear1 = "false"
-alias1 = "CRTPass"
-srgb_framebuffer1 = "true"
-scale_type1 = "viewport"
-scale1 = "1.000000"
-
-shader2 = "shaders/hyllian/support/glow/threshold.slang"
-filter_linear2 = "true"
-srgb_framebuffer2 = "true"
-
-shader3 = "shaders/hyllian/support/glow/blur_horiz.slang"
-filter_linear3 = "true"
-mipmap_input3 = "true"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "viewport"
-scale_x3 = "0.200000"
-scale_type_y3 = "viewport"
-scale_y3 = "1.000000"
-
-
-shader4 = "shaders/hyllian/support/glow/blur-glow-mask-geom.slang"
-filter_linear4 = "true"
-srgb_framebuffer4 = "true"
-scale_type4 = viewport
-wrap_mode4 = "clamp_to_border"
-
-textures = "SamplerLUT1;SamplerLUT2"
-SamplerLUT1 = "../reshade/shaders/LUT/grade-rgb.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "../reshade/shaders/LUT/grade-composite.png"
-SamplerLUT2_linear = true
-
-
diff --git a/crt/crt-interlaced-halation.slangp b/crt/crt-interlaced-halation.slangp
deleted file mode 100644
index 4fc52ca7f1..0000000000
--- a/crt/crt-interlaced-halation.slangp
+++ /dev/null
@@ -1,34 +0,0 @@
-shaders = "5"
-
-shader0 = ../stock.slang
-alias0 = crt_interlaced_halation_refpass
-
-shader1 = shaders/crt-interlaced-halation/crt-interlaced-halation-pass0.slang
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = shaders/crt-interlaced-halation/crt-interlaced-halation-pass1.slang
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = shaders/crt-interlaced-halation/crt-interlaced-halation-pass2.slang
-filter_linear3 = "false"
-float_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "3.000000"
-scale_type_y3 = "source"
-scale_y3 = "3.000000"
-
-shader4 = ../stock.slang
-filter_linear4 = "true"
-float_framebuffer4 = "false"
-scale_type4 = viewport
-
diff --git a/crt/crt-lottes-multipass-glow.slangp b/crt/crt-lottes-multipass-glow.slangp
deleted file mode 100644
index 9e4b58a484..0000000000
--- a/crt/crt-lottes-multipass-glow.slangp
+++ /dev/null
@@ -1,47 +0,0 @@
-shaders = "7"
-
-shader0 = ../stock.slang
-alias0 = glow_trails_refpass
-
-shader1 = "shaders/crt-easymode-halation/linearize.slang"
-filter_linear1 = "true"
-srgb_framebuffer1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-alias1 = ORIG_LINEARIZED
-
-shader2 = "shaders/crt-easymode-halation/blur_horiz.slang"
-filter_linear2 = "false"
-srgb_framebuffer2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/crt-easymode-halation/blur_vert.slang"
-filter_linear3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "shaders/crt-easymode-halation/threshold.slang"
-filter_linear4 = "false"
-srgb_framebuffer4 = "true"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-alias4 = GlowPass
-
-shader5 = "shaders/crt-lottes-multipass/bloompass.slang"
-filter_linear5 = "true"
-alias5 = BloomPass
-srgb_framebuffer5 = true
-
-shader6 = "shaders/crt-lottes-multipass/scanpass-glow.slang"
-filter_linear6 = "true"
-scale_type6 = viewport
diff --git a/crt/crt-lottes-multipass.slangp b/crt/crt-lottes-multipass.slangp
deleted file mode 100644
index 17be4ba3c5..0000000000
--- a/crt/crt-lottes-multipass.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-shaders = 3
-
-shader0 = ../stock.slang
-alias0 = Reference
-
-shader1 = shaders/crt-lottes-multipass/bloompass.slang
-alias1 = BloomPass
-filter_linear1 = true
-
-shader2 = shaders/crt-lottes-multipass/scanpass.slang
-filter_linear2 = true
-scale_type2 = viewport
diff --git a/crt/crt-lottes.slangp b/crt/crt-lottes.slangp
deleted file mode 100644
index 9896df3023..0000000000
--- a/crt/crt-lottes.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/crt-lottes.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/crt/crt-mattias.slangp b/crt/crt-mattias.slangp
deleted file mode 100644
index 8faa9f2d3f..0000000000
--- a/crt/crt-mattias.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/crt-mattias.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/crt/crt-maximus-royale-fast-mode.slangp b/crt/crt-maximus-royale-fast-mode.slangp
deleted file mode 100644
index ea07d9a00d..0000000000
--- a/crt/crt-maximus-royale-fast-mode.slangp
+++ /dev/null
@@ -1,222 +0,0 @@
-shaders = "22"
-
-shader0 = ../stock.slang
-alias0 = maximus_refpass
-
-shader1 = "shaders/crt-maximus-royale/src/H_blur.slang"
-filter_linear1 = "false"
-srgb_framebuffer1 = "true"
-scale_type1 = "source"
-scale1 = "1.0"
-
-shader2 = "shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-alias2 = "ORIG_LINEARIZED"
-srgb_framebuffer2 = "true"
-scale_type2 = "source"
-scale2 = "1.0"
-
-shader3 = "shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "source"
-scale_type_y3 = "source"
-scale_x3 = "1.0"
-scale_y3 = "3.0"
-
-shader4 = "shaders/crt-maximus-royale/src/resize.slang"
-filter_linear4 = "true"
-alias4 = "VERTICAL_SCANLINES"
-srgb_framebuffer4 = "true"
-scale_type_x4 = "source"
-scale_type_y4 = "viewport"
-scale_x4 = "1.0"
-scale_y4 = "1.95"
-
-shader5 = "shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-filter_linear5 = "true"
-wrap_mode5 = "clamp_to_border"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "absolute"
-scale_type_y5 = "absolute"
-scale_x5 = "320"
-scale_y5 = "240"
-
-shader6 = "shaders/crt-maximus-royale/src/resize.slang"
-filter_linear6 = "true"
-alias6 = "BLOOM_APPROX"
-srgb_framebuffer6 = "true"
-scale_type6 = "source"
-scale6 = "1.0"
-
-shader7 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear7 = "true"
-wrap_mode7 = "clamp_to_border"
-srgb_framebuffer7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-
-shader8 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_border"
-alias8 = "HALATION_BLUR"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.0"
-
-shader9 = "shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "absolute"
-scale_type_y9 = "viewport"
-scale_x9 = "128"
-scale_y9 = "0.975"
-
-shader10 = "shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-filter_linear10 = "false"
-wrap_mode10 = "clamp_to_border"
-alias10 = "MASK_RESIZE"
-srgb_framebuffer10 = "true"
-scale_type_x10 = "viewport"
-scale_type_y10 = "source"
-scale_x10 = "0.73125"
-scale_y10 = "1.0"
-
-shader11 = "shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-filter_linear11 = "true"
-wrap_mode11 = "clamp_to_edge"
-alias11 = "MASKED_SCANLINES"
-srgb_framebuffer11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-
-shader12 = "shaders/crt-royale/src/crt-royale-brightpass.slang"
-filter_linear12 = "true"
-wrap_mode12 = "clamp_to_border"
-alias12 = "BRIGHTPASS"
-srgb_framebuffer12 = "true"
-scale_type12 = "source"
-scale12 = "1.0"
-
-shader13 = "shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear13 = "true"
-wrap_mode13 = "clamp_to_border"
-srgb_framebuffer13 = "true"
-scale_type13 = "source"
-scale13 = "1.0"
-
-shader14 = "shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear14 = "true"
-wrap_mode14 = "clamp_to_border"
-srgb_framebuffer14 = "true"
-scale_type14 = "source"
-scale14 = "1.0"
-
-shader15 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear15 = "true"
-alias15 = "LAST_PASS"
-mipmap_input15 = "true"
-srgb_framebuffer15 = "true"
-scale_type15 = "source"
-scale15 = "1.0"
-
-shader16 = "shaders/crt-maximus-royale/src/crt_reflect.slang"
-filter_linear16 = "true"
-alias16 = "BORDER_REFLECTION"
-wrap_mode16 = "clamp_to_border"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "absolute"
-scale_type_y16 = "absolute"
-scale_x16 = "160"
-scale_y16 = "120"
-
-shader17 = "shaders/crt-maximus-royale/src/BGcolor_pass1.slang"
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-alias17 = "BGPASS1"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "absolute"
-scale_type_y17 = "absolute"
-scale_x17 = "1.0"
-scale_y17 = "100.0"
-
-shader18 = "shaders/crt-maximus-royale/src/BGcolor_pass2.slang"
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-alias18 = "BGPASS2"
-srgb_framebuffer18 = "false"
-scale_type18 = "absolute"
-scale18 = "1.0"
-
-shader19 = "shaders/crt-maximus-royale/src/imgborder.slang"
-filter_linear19 = "true"
-wrap_mode19 = "clamp_to_border"
-scale_type19 = "viewport"
-scale19 = "1.0"
-
-shader20 = "shaders/crt-maximus-royale/src/tv_reflection.slang"
-filter_linear20 = "true"
-wrap_mode20 = "clamp_to_border"
-scale_type20 = "source"
-scale20 = "1.0"
-
-shader21 = ../stock.slang
-scale_type21 = viewport
-
-crt_gamma = "1.7"
-lcd_gamma = "1.2"
-diffusion_weight = "0.3"
-beam_spot_power = "0.22"
-beam_min_sigma = "0.1"
-beam_max_shape = "2.0"
-mask_sample_mode_desired = "0.0"
-aa_cubic_c = "0.0"
-geom_mode_runtime = "1.0"
-border_size = "0.0"
-border_darkness = "0.0"
-
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;TVBORDER1;TVBORDER2;TVBORDER3;TVBORDER2BG;TVBORDER3BG;TVBORDER2LED;TVBORDER3LED;TVLIGHTS1;TVLIGHTS3;MONITORBORDER;MONITORLIGHTS;SHAPE1;SHAPE2"
-
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_mipmap = "false"
-mask_grille_texture_large_linear = "true"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_grille_texture_large_mipmap = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_mipmap = "false"
-mask_slot_texture_large_linear = "true"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_slot_texture_large_mipmap = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_mipmap = "false"
-mask_shadow_texture_large_linear = "true"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_large_mipmap = "true"
-
-TVBORDER1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1.png"
-TVBORDER2 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2.png"
-TVBORDER3 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3.png"
-TVBORDER2BG = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_bg.png"
-TVBORDER3BG = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_bg.png"
-TVBORDER2LED = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_led.png"
-TVBORDER3LED = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_led.png"
-TVLIGHTS1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1_lights_alpha.png"
-TVLIGHTS3 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_lights_alpha.png"
-MONITORBORDER = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png"
-MONITORLIGHTS = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png"
-SHAPE1 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png"
-SHAPE2 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png"
-#DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
-
-mask_grille_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128px.png"
-mask_grille_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512px.png"
-mask_slot_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128px.png"
-mask_slot_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512px.png"
-mask_shadow_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128px.png"
-mask_shadow_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512px.png"
diff --git a/crt/crt-maximus-royale-half-res-mode.slangp b/crt/crt-maximus-royale-half-res-mode.slangp
deleted file mode 100644
index 5292672ce8..0000000000
--- a/crt/crt-maximus-royale-half-res-mode.slangp
+++ /dev/null
@@ -1,222 +0,0 @@
-shaders = "22"
-
-shader0 = ../stock.slang
-alias0 = maximus_refpass
-
-shader1 = "shaders/crt-maximus-royale/src/H_blur.slang"
-filter_linear1 = "false"
-srgb_framebuffer1 = "true"
-scale_type1 = "source"
-scale1 = "0.5"
-
-shader2 = "shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-alias2 = "ORIG_LINEARIZED"
-srgb_framebuffer2 = "true"
-scale_type2 = "source"
-scale2 = "1.0"
-
-shader3 = "shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "source"
-scale_type_y3 = "source"
-scale_x3 = "1.0"
-scale_y3 = "3.0"
-
-shader4 = "shaders/crt-maximus-royale/src/resize.slang"
-filter_linear4 = "true"
-alias4 = "VERTICAL_SCANLINES"
-srgb_framebuffer4 = "true"
-scale_type_x4 = "source"
-scale_type_y4 = "viewport"
-scale_x4 = "1.0"
-scale_y4 = "1.95"
-
-shader5 = "shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-filter_linear5 = "true"
-wrap_mode5 = "clamp_to_border"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "absolute"
-scale_type_y5 = "absolute"
-scale_x5 = "320"
-scale_y5 = "240"
-
-shader6 = "shaders/crt-maximus-royale/src/resize.slang"
-filter_linear6 = "true"
-alias6 = "BLOOM_APPROX"
-srgb_framebuffer6 = "true"
-scale_type6 = "source"
-scale6 = "1.0"
-
-shader7 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear7 = "true"
-wrap_mode7 = "clamp_to_border"
-srgb_framebuffer7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-
-shader8 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_border"
-alias8 = "HALATION_BLUR"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.0"
-
-shader9 = "shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "absolute"
-scale_type_y9 = "viewport"
-scale_x9 = "128"
-scale_y9 = "0.975"
-
-shader10 = "shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-filter_linear10 = "false"
-wrap_mode10 = "clamp_to_border"
-alias10 = "MASK_RESIZE"
-srgb_framebuffer10 = "true"
-scale_type_x10 = "viewport"
-scale_type_y10 = "source"
-scale_x10 = "0.73125"
-scale_y10 = "1.0"
-
-shader11 = "shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-filter_linear11 = "true"
-wrap_mode11 = "clamp_to_edge"
-alias11 = "MASKED_SCANLINES"
-srgb_framebuffer11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-
-shader12 = "shaders/crt-royale/src/crt-royale-brightpass.slang"
-filter_linear12 = "true"
-wrap_mode12 = "clamp_to_border"
-alias12 = "BRIGHTPASS"
-srgb_framebuffer12 = "true"
-scale_type12 = "source"
-scale12 = "1.0"
-
-shader13 = "shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear13 = "true"
-wrap_mode13 = "clamp_to_border"
-srgb_framebuffer13 = "true"
-scale_type13 = "source"
-scale13 = "1.0"
-
-shader14 = "shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear14 = "true"
-wrap_mode14 = "clamp_to_border"
-srgb_framebuffer14 = "true"
-scale_type14 = "source"
-scale14 = "1.0"
-
-shader15 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear15 = "true"
-alias15 = "LAST_PASS"
-mipmap_input15 = "true"
-srgb_framebuffer15 = "true"
-scale_type15 = "source"
-scale15 = "1.0"
-
-shader16 = "shaders/crt-maximus-royale/src/crt_reflect.slang"
-filter_linear16 = "true"
-alias16 = "BORDER_REFLECTION"
-wrap_mode16 = "clamp_to_border"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "absolute"
-scale_type_y16 = "absolute"
-scale_x16 = "160"
-scale_y16 = "120"
-
-shader17 = "shaders/crt-maximus-royale/src/BGcolor_pass1.slang"
-filter_linear17 = "false"
-wrap_mode17 = "clamp_to_border"
-alias17 = "BGPASS1"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "absolute"
-scale_type_y17 = "absolute"
-scale_x17 = "1.0"
-scale_y17 = "100.0"
-
-shader18 = "shaders/crt-maximus-royale/src/BGcolor_pass2.slang"
-filter_linear18 = "false"
-wrap_mode18 = "clamp_to_border"
-alias18 = "BGPASS2"
-srgb_framebuffer18 = "false"
-scale_type18 = "absolute"
-scale18 = "1.0"
-
-shader19 = "shaders/crt-maximus-royale/src/imgborder.slang"
-filter_linear19 = "true"
-wrap_mode19 = "clamp_to_border"
-scale_type19 = "viewport"
-scale19 = "1.0"
-
-shader20 = "shaders/crt-maximus-royale/src/tv_reflection.slang"
-filter_linear20 = "true"
-wrap_mode20 = "clamp_to_border"
-scale_type20 = "source"
-scale20 = "1.0"
-
-shader21 = ../stock.slang
-scale_type21 = viewport
-
-crt_gamma = "1.7"
-lcd_gamma = "1.2"
-diffusion_weight = "0.3"
-beam_spot_power = "0.22"
-beam_min_sigma = "0.1"
-beam_max_shape = "2.0"
-mask_sample_mode_desired = "0.0"
-aa_cubic_c = "0.0"
-geom_mode_runtime = "1.0"
-border_size = "0.0"
-border_darkness = "0.0"
-
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;TVBORDER1;TVBORDER2;TVBORDER3;TVBORDER2BG;TVBORDER3BG;TVBORDER2LED;TVBORDER3LED;TVLIGHTS1;TVLIGHTS3;MONITORBORDER;MONITORLIGHTS;SHAPE1;SHAPE2"
-
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_mipmap = "false"
-mask_grille_texture_large_linear = "true"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_grille_texture_large_mipmap = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_mipmap = "false"
-mask_slot_texture_large_linear = "true"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_slot_texture_large_mipmap = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_mipmap = "false"
-mask_shadow_texture_large_linear = "true"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_large_mipmap = "true"
-
-TVBORDER1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1.png"
-TVBORDER2 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2.png"
-TVBORDER3 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3.png"
-TVBORDER2BG = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_bg.png"
-TVBORDER3BG = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_bg.png"
-TVBORDER2LED = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_led.png"
-TVBORDER3LED = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_led.png"
-TVLIGHTS1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1_lights_alpha.png"
-TVLIGHTS3 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_lights_alpha.png"
-MONITORBORDER = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png"
-MONITORLIGHTS = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png"
-SHAPE1 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png"
-SHAPE2 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png"
-#DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
-
-mask_grille_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128px.png"
-mask_grille_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512px.png"
-mask_slot_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128px.png"
-mask_slot_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512px.png"
-mask_shadow_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128px.png"
-mask_shadow_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512px.png"
diff --git a/crt/crt-maximus-royale.slangp b/crt/crt-maximus-royale.slangp
deleted file mode 100644
index 8bd7117b6a..0000000000
--- a/crt/crt-maximus-royale.slangp
+++ /dev/null
@@ -1,248 +0,0 @@
-shaders = "25"
-
-shader0 = ../stock.slang
-alias0 = maximus_refpass
-
-shader1 = "shaders/crt-maximus-royale/src/horizontal_ringing.slang"
-filter_linear1 = "false"
-srgb_framebuffer1 = "true"
-scale_type1 = "source"
-scale_x1 = "4.0"
-scale_y1 = "1.0"
-
-shader2 = "shaders/crt-maximus-royale/src/ntsc_pass1.slang"
-filter_linear2 = "false"
-frame_count_mod2 = "2"
-float_framebuffer2 = "true"
-scale_type_x2 = "source"
-scale_type_y2 = "source"
-scale_x2 = "4.0"
-scale_y2 = "1.0"
-
-shader3 = "shaders/crt-maximus-royale/src/ntsc_pass2.slang"
-filter_linear3 = "false"
-scale_type_x3 = "source"
-scale_type_y3 = "source"
-scale_x3 = "0.25"
-scale_y3 = "1.0"
-
-shader4 = "shaders/crt-maximus-royale/src/H_blur.slang"
-filter_linear4 = "false"
-srgb_framebuffer4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-
-shader5 = "shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-filter_linear5 = "true"
-wrap_mode5 = "clamp_to_border"
-alias5 = "ORIG_LINEARIZED"
-srgb_framebuffer5 = "true"
-scale_type5 = "source"
-scale5 = "1.0"
-
-shader6 = "shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-filter_linear6 = "true"
-wrap_mode6 = "clamp_to_border"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_type_y6 = "source"
-scale_x6 = "1.0"
-scale_y6 = "6.0"
-
-shader7 = "shaders/crt-maximus-royale/src/resize.slang"
-filter_linear7 = "true"
-alias7 = "VERTICAL_SCANLINES"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_type_y7 = "viewport"
-scale_x7 = "1.0"
-scale_y7 = "1.95"
-
-shader8 = "shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_border"
-srgb_framebuffer8 = "true"
-scale_type_x8 = "absolute"
-scale_type_y8 = "absolute"
-scale_x8 = "320"
-scale_y8 = "240"
-
-shader9 = "shaders/crt-maximus-royale/src/resize.slang"
-filter_linear9 = "true"
-alias9 = "BLOOM_APPROX"
-wrap_mode9 = "clamp_to_border"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.0"
-
-shader10 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear10 = "true"
-wrap_mode10 = "clamp_to_border"
-srgb_framebuffer10 = "true"
-scale_type10 = "source"
-scale10 = "1.0"
-
-shader11 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-filter_linear11 = "true"
-wrap_mode11 = "clamp_to_border"
-alias11 = "HALATION_BLUR"
-srgb_framebuffer11 = "false"
-scale_type11 = "source"
-scale11 = "1.0"
-
-shader12 = "shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear12 = "true"
-wrap_mode12 = "clamp_to_border"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "absolute"
-scale_type_y12 = "viewport"
-scale_x12 = "128"
-scale_y12 = "0.975"
-
-shader13 = "shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-filter_linear13 = "false"
-wrap_mode13 = "clamp_to_border"
-alias13 = "MASK_RESIZE"
-srgb_framebuffer13 = "true"
-scale_type_x13 = "viewport"
-scale_type_y13 = "source"
-scale_x13 = "0.73125"
-scale_y13 = "2.0"
-
-shader14 = "shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-filter_linear14 = "true"
-wrap_mode14 = "clamp_to_edge"
-alias14 = "MASKED_SCANLINES"
-srgb_framebuffer14 = "true"
-scale_type14 = "source"
-scale14 = "1.0"
-
-shader15 = "shaders/crt-royale/src/crt-royale-brightpass.slang"
-filter_linear15 = "true"
-wrap_mode15 = "clamp_to_border"
-alias15 = "BRIGHTPASS"
-srgb_framebuffer15 = "true"
-scale_type15 = "source"
-scale15 = "1.0"
-
-shader16 = "shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear16 = "true"
-wrap_mode16 = "clamp_to_border"
-srgb_framebuffer16 = "true"
-scale_type16 = "source"
-scale16 = "1.0"
-
-shader17 = "shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear17 = "true"
-wrap_mode17 = "clamp_to_border"
-srgb_framebuffer17 = "true"
-scale_type17 = "source"
-scale17 = "1.0"
-
-shader18 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear18 = "true"
-alias18 = "LAST_PASS"
-mipmap_input18 = "false"
-srgb_framebuffer18 = "true"
-scale_type_x18 = "source"
-scale_type_y18 = "source"
-scale_x18 = "1.0"
-scale_y18 = "0.5"
-
-shader19 = "shaders/crt-maximus-royale/src/crt_reflect.slang"
-filter_linear19 = "true"
-alias19 = "BORDER_REFLECTION"
-wrap_mode19 = "clamp_to_border"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "absolute"
-scale_type_y19 = "absolute"
-scale_x19 = "160"
-scale_y19 = "120"
-
-shader20 = "shaders/crt-maximus-royale/src/BGcolor_pass1.slang"
-filter_linear20 = "false"
-wrap_mode20 = "clamp_to_border"
-alias20 = "BGPASS1"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "absolute"
-scale_type_y20 = "absolute"
-scale_x20 = "1.0"
-scale_y20 = "100.0"
-
-shader21 = "shaders/crt-maximus-royale/src/BGcolor_pass2.slang"
-filter_linear21 = "false"
-wrap_mode21 = "clamp_to_border"
-alias21 = "BGPASS2"
-srgb_framebuffer21 = "false"
-scale_type21 = "absolute"
-scale21 = "1.0"
-
-shader22 = "shaders/crt-maximus-royale/src/imgborder.slang"
-filter_linear22 = "true"
-wrap_mode22 = "clamp_to_border"
-scale_type22 = "viewport"
-scale22 = "1.0"
-
-shader23 = "shaders/crt-maximus-royale/src/tv_reflection.slang"
-filter_linear23 = "true"
-wrap_mode23 = "clamp_to_border"
-scale_type23 = "source"
-scale23 = "1.0"
-
-shader24 = ../stock.slang
-scale_type24 = viewport
-
-crt_gamma = "1.7"
-lcd_gamma = "1.2"
-diffusion_weight = "0.3"
-beam_spot_power = "0.22"
-beam_min_sigma = "0.1"
-beam_max_shape = "2.0"
-mask_sample_mode_desired = "0.0"
-aa_cubic_c = "0.0"
-geom_mode_runtime = "1.0"
-border_size = "0.0"
-border_darkness = "0.0"
-
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;TVBORDER1;TVBORDER2;TVBORDER3;TVBORDER2BG;TVBORDER3BG;TVBORDER2LED;TVBORDER3LED;TVLIGHTS1;TVLIGHTS3;MONITORBORDER;MONITORLIGHTS;SHAPE1;SHAPE2"
-
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_mipmap = "false"
-mask_grille_texture_large_linear = "true"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_grille_texture_large_mipmap = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_mipmap = "false"
-mask_slot_texture_large_linear = "true"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_slot_texture_large_mipmap = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_mipmap = "false"
-mask_shadow_texture_large_linear = "true"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_large_mipmap = "true"
-
-TVBORDER1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1.png"
-TVBORDER2 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2.png"
-TVBORDER3 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3.png"
-TVBORDER2BG = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_bg.png"
-TVBORDER3BG = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_bg.png"
-TVBORDER2LED = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_led.png"
-TVBORDER3LED = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_led.png"
-TVLIGHTS1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1_lights_alpha.png"
-TVLIGHTS3 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_lights_alpha.png"
-MONITORBORDER = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png"
-MONITORLIGHTS = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png"
-SHAPE1 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png"
-SHAPE2 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png"
-#DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
-
-mask_grille_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128pxH.png"
-mask_grille_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512pxH.png"
-mask_slot_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128pxH.png"
-mask_slot_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512pxH.png"
-mask_shadow_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128pxH.png"
-mask_shadow_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512pxH.png"
diff --git a/crt/crt-nes-mini.slangp b/crt/crt-nes-mini.slangp
deleted file mode 100644
index 05c8e72919..0000000000
--- a/crt/crt-nes-mini.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/crt-nes-mini.slang
-scale_type0 = viewport
diff --git a/crt/crt-royale-fake-bloom-intel.slangp b/crt/crt-royale-fake-bloom-intel.slangp
deleted file mode 100644
index d3323e4ff1..0000000000
--- a/crt/crt-royale-fake-bloom-intel.slangp
+++ /dev/null
@@ -1,134 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x_for_fake = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "7"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-# Pass1: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-#float_framebuffer1 = "true"
-srgb_framebuffer1 = "true"
-
-# Pass2: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader2 = "shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.slang"
-alias2 = "BLOOM_APPROX"
-filter_linear2 = "true"
-scale_type2 = "absolute"
-scale_x2 = "400"
-scale_y2 = "300"
-srgb_framebuffer2 = "true"
-
-# Pass3: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader3 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-# Pass4: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader4 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias4 = "HALATION_BLUR"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask, then fake a phosphor bloom, all in one pass.
-shader5 = "shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.slang"
-alias5 = "MASKED_SCANLINES"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-#float_framebuffer5 = "true"
-srgb_framebuffer5 = "true"
-
-# Pass 6: Compute curvature/AA:
-shader6 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.slang"
-filter_linear6 = "true"
-scale_type6 = "viewport"
-mipmap_input6 = "true"
-wrap_mode6 = "clamp_to_edge"
-
-
-
diff --git a/crt/crt-royale-fake-bloom.slangp b/crt/crt-royale-fake-bloom.slangp
deleted file mode 100644
index 7a662ac437..0000000000
--- a/crt/crt-royale-fake-bloom.slangp
+++ /dev/null
@@ -1,183 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x_for_fake = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "9"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-# Pass1: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-#float_framebuffer1 = "true"
-srgb_framebuffer1 = "true"
-
-# Pass2: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader2 = "shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.slang"
-alias2 = "BLOOM_APPROX"
-filter_linear2 = "true"
-scale_type2 = "absolute"
-scale_x2 = "400"
-scale_y2 = "300"
-srgb_framebuffer2 = "true"
-
-# Pass3: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader3 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-# Pass4: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader4 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias4 = "HALATION_BLUR"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x5 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.5 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y5 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y5 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x6 = scale_y5
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y5 = 4.0/3.0 * 2.0/(341.33333 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-cgp-constants.h!
-shader5 = "shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear5 = "true"
-scale_type_x5 = "absolute"
-scale_x5 = "64"
-scale_type_y5 = "viewport"
-scale_y5 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer5 = "false" # mask_texture is already assumed linear
-
-# Pass6: Lanczos-resize the phosphor mask horizontally.  scale_x6 = scale_y5.
-# TODO: Check again if the shaders actually require equal scales.
-shader6 = "shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias6 = "MASK_RESIZE"
-filter_linear6 = "false"
-scale_type_x6 = "viewport"
-scale_x6 = "0.0625"
-scale_type_y6 = "source"
-scale_y6 = "1.0"
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Pass7: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask, then fake a phosphor bloom, all in one pass.
-shader7 = "shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.slang"
-alias7 = "MASKED_SCANLINES"
-filter_linear7 = "true" # This could just as easily be nearest neighbor.
-scale_type7 = "viewport"
-scale7 = "1.0"
-#float_framebuffer7 = "true"
-srgb_framebuffer7 = "true"
-
-# Pass 8: Compute curvature/AA:
-shader8 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear8 = "true"
-scale_type8 = "viewport"
-mipmap_input8 = "true"
-wrap_mode8 = "clamp_to_edge"
diff --git a/crt/crt-royale-fast.slangp b/crt/crt-royale-fast.slangp
deleted file mode 100644
index 8c9bc75c71..0000000000
--- a/crt/crt-royale-fast.slangp
+++ /dev/null
@@ -1,93 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
diff --git a/crt/crt-royale-intel.slangp b/crt/crt-royale-intel.slangp
deleted file mode 100644
index 8cae15f547..0000000000
--- a/crt/crt-royale-intel.slangp
+++ /dev/null
@@ -1,154 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "10"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-# Pass1: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-#float_framebuffer1 = "true"
-srgb_framebuffer1 = "true"
-
-# Pass2: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader2 = "shaders/crt-royale/src/crt-royale-bloom-approx-intel.slang"
-alias2 = "BLOOM_APPROX"
-filter_linear2 = "true"
-scale_type2 = "absolute"
-scale_x2 = "320"
-scale_y2 = "240"
-srgb_framebuffer2 = "true"
-
-# Pass3: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader3 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-# Pass4: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader4 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias4 = "HALATION_BLUR"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader5 = "shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-intel.slang"
-alias5 = "MASKED_SCANLINES"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-#float_framebuffer5 = "true"
-srgb_framebuffer5 = "true"
-
-# Pass 6: Compute a brightpass.  This will require reading the final mask.
-shader6 = "shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias6 = "BRIGHTPASS"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "viewport"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass 7: Blur the brightpass vertically
-shader7 = "shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear7 = "true" # This could just as easily be nearest neighbor.
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-
-# Pass 8: Blur the brightpass horizontally and combine it with the dimpass:
-shader8 = "shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear8 = "true"
-scale_type8 = "source"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Compute curvature/AA:
-shader9 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.slang"
-filter_linear9 = "true"
-scale_type9 = "viewport"
-mipmap_input9 = "true"
-wrap_mode9 = "clamp_to_edge"
-
diff --git a/crt/crt-royale.slangp b/crt/crt-royale.slangp
deleted file mode 100644
index 15a30dfc11..0000000000
--- a/crt/crt-royale.slangp
+++ /dev/null
@@ -1,203 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-preset-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this preset, but their
-# compilation model doesn't currently allow the preset file to tell them.  Make
-# sure to set the following constants in user-preset-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = vec2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "12"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-# Pass1: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader2 = "shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias2 = "BLOOM_APPROX"
-filter_linear2 = "true"
-scale_type2 = "absolute"
-scale_x2 = "320"
-scale_y2 = "240"
-srgb_framebuffer2 = "true"
-
-# Pass3: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader3 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-# Pass4: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader4 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias4 = "HALATION_BLUR"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x5 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.5 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y5 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y5 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x6 = scale_y5
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y5 = 4.0/3.0 * 2.0/(341.33333 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-preset-constants.h!
-shader5 = "shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear5 = "true"
-scale_type_x5 = "absolute"
-scale_x5 = "64"
-scale_type_y5 = "viewport"
-scale_y5 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer5 = "false" # mask_texture is already assumed linear
-
-# Pass6: Lanczos-resize the phosphor mask horizontally.  scale_x6 = scale_y5.
-# TODO: Check again if the shaders actually require equal scales.
-shader6 = "shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias6 = "MASK_RESIZE"
-filter_linear6 = "false"
-scale_type_x6 = "viewport"
-scale_x6 = "0.0625"
-scale_type_y6 = "source"
-scale_y6 = "1.0"
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Pass7: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader7 = "shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias7 = "MASKED_SCANLINES"
-filter_linear7 = "true" # This could just as easily be nearest neighbor.
-scale_type7 = "viewport"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-
-# Pass 8: Compute a brightpass.  This will require reading the final mask.
-shader8 = "shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias8 = "BRIGHTPASS"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Blur the brightpass vertically
-shader9 = "shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "source"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Pass 10: Blur the brightpass horizontally and combine it with the dimpass:
-shader10 = "shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear10 = "true"
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Pass 11: Compute curvature/AA:
-shader11 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear11 = "true"
-scale_type11 = "viewport"
-mipmap_input11 = "true"
-wrap_mode11 = "clamp_to_edge"
diff --git a/crt/crt-sines.slangp b/crt/crt-sines.slangp
deleted file mode 100644
index 8e594f51e7..0000000000
--- a/crt/crt-sines.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/crt-sines.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/crt/crt-slangtest-cubic.slangp b/crt/crt-slangtest-cubic.slangp
deleted file mode 100644
index e0cbb159f3..0000000000
--- a/crt/crt-slangtest-cubic.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-shaders = 3
-shader0 = shaders/crt-slangtest/linearize.slang
-shader1 = shaders/crt-slangtest/cubic.slang
-shader2 = shaders/crt-slangtest/scanline.slang
-
-filter_linear0 = false 
-scale_type0 = source
-scale0 = 1.0
-srgb_framebuffer0 = true
-
-filter_linear1 = false 
-scale_type_x1 = viewport
-scale_x1 = 1.0
-scale_type_y1 = source
-scale_y1 = 1.0
-srgb_framebuffer1 = true
-
-filter_linear2 = false 
-scale_type0 = viewport
diff --git a/crt/crt-slangtest-lanczos.slangp b/crt/crt-slangtest-lanczos.slangp
deleted file mode 100644
index 89cb33a94a..0000000000
--- a/crt/crt-slangtest-lanczos.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-shaders = 3
-shader0 = shaders/crt-slangtest/linearize.slang
-shader1 = shaders/crt-slangtest/sinc.slang
-shader2 = shaders/crt-slangtest/scanline.slang
-
-filter_linear0 = false 
-scale_type0 = source
-scale0 = 1.0
-srgb_framebuffer0 = true
-
-filter_linear1 = false 
-scale_type_x1 = viewport
-scale_x1 = 1.0
-scale_type_y1 = source
-scale_y1 = 1.0
-srgb_framebuffer1 = true
-
-filter_linear2 = false 
-scale_type2 = viewport
diff --git a/crt/crt-torridgristle.slangp b/crt/crt-torridgristle.slangp
deleted file mode 100644
index e6a70f1e7c..0000000000
--- a/crt/crt-torridgristle.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = 7
-
-shader0 = shaders/torridgristle/Scanline-Interpolation.slang
-filter_linear0 = true
-scale_type0 = source
-
-shader1 = shaders/torridgristle/ScanlineSimple.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 3.0
-
-shader2 = ../reshade/shaders/blendoverlay/blendoverlay.slang
-filter_linear2 = true
-scale_type2 = viewport
-
-shader3 = shaders/torridgristle/Brighten.slang
-filter_linear3 = true
-alias3 = candy_ref
-
-shader4 = shaders/torridgristle/sunset-gaussian-vert.slang
-filter_linear4 = true
-scale_type4 = source
-
-shader5 = shaders/torridgristle/sunset-gaussian-horiz.slang
-filter_linear5 = true
-scale_type5 = source
-
-shader6 = shaders/torridgristle/Candy-Bloom.slang
-filter_linear6 = true
-scale_type6 = viewport
-
-textures = "overlay"
-overlay = ../reshade/shaders/blendoverlay/shadowmask-4x4.png
-overlay_linear = true
-
-parameters = "ScanlineSize;YIQAmount;BrightenLevel;BrightenAmount;GlowLevel;GlowTightness;LUTHeight;LUTWidth;OverlayMix"
-ScanlineSize = 3.0
-YIQAmount = 0.35
-BrightenLevel = 2.0
-BrightenAmount = 0.1
-GlowLevel = 1.0
-GlowTightness = 0.8
-LUTWidth = 4.0
-LUTHeight = 4.0
-OverlayMix = 0.5
diff --git a/crt/crt-yo6-KV-21CL10B.slangp b/crt/crt-yo6-KV-21CL10B.slangp
deleted file mode 100644
index 45e250ae55..0000000000
--- a/crt/crt-yo6-KV-21CL10B.slangp
+++ /dev/null
@@ -1,15 +0,0 @@
-shaders = 1
-
-shader0 = "shaders/crt-yo6/crt-yo6-flat-trinitron-tv.slang"
-filter_linear0 = true
-wrap_mode0 = "clamp_to_edge"
-scale_type0 = viewport
-
-textures = "TEX"
-TEX = "shaders/crt-yo6/phosphor-flat-trinitron-tv.png"
-TEX_linear = false
-
-parameters = "TVL;VSIZE;GAMMA"
-TVL = 487.0
-VSIZE = 240.0
-GAMMA = 2.2
diff --git a/crt/crt-yo6-KV-M1420B-sharp.slangp b/crt/crt-yo6-KV-M1420B-sharp.slangp
deleted file mode 100644
index 94aafdc672..0000000000
--- a/crt/crt-yo6-KV-M1420B-sharp.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = 3
-
-shader0 = "shaders/crt-yo6/crt-yo6-native-resolution.slang"
-filter_linear0 = true
-wrap_mode0 = "clamp_to_edge"
-scale_type0 = "absolute"
-scale_x0 = 439
-scale_y0 = 233
-
-shader1 = "shaders/crt-yo6/crt-yo6-warp.slang"
-filter_linear1 = true
-wrap_mode1 = "clamp_to_edge"
-scale_type1 = "absolute"
-scale_x1 = 1684
-scale_y1 = 1329
-
-shader2 = "../interpolation/shaders/jinc2.slang"
-filter_linear2 = false
-scale_type2 = viewport
-
-textures = TEX_CRT
-TEX_CRT = "shaders/crt-yo6/KV-M1420B.png"
-TEX_CRT_linear = false
-
-parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH"
-JINC2_WINDOW_SINC = 0.44
-JINC2_SINC = 0.82
-JINC2_AR_STRENGTH = 0.5
diff --git a/crt/crt-yo6-KV-M1420B.slangp b/crt/crt-yo6-KV-M1420B.slangp
deleted file mode 100644
index 16676b56ff..0000000000
--- a/crt/crt-yo6-KV-M1420B.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = 3
-
-shader0 = "shaders/crt-yo6/crt-yo6-native-resolution.slang"
-filter_linear0 = true
-wrap_mode0 = "clamp_to_edge"
-scale_type0 = "absolute"
-scale_x0 = 439
-scale_y0 = 233
-
-shader1 = "shaders/crt-yo6/crt-yo6-warp.slang"
-filter_linear1 = true
-wrap_mode1 = "clamp_to_edge"
-scale_type1 = "absolute"
-scale_x1 = 1684
-scale_y1 = 1329
-
-shader2 = "../interpolation/shaders/jinc2.slang"
-filter_linear2 = false
-scale_type2 = viewport
-
-textures = TEX_CRT
-TEX_CRT = "shaders/crt-yo6/KV-M1420B.png"
-TEX_CRT_linear = false
-
-parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH"
-JINC2_WINDOW_SINC = 0.44
-JINC2_SINC = 0.40
-JINC2_AR_STRENGTH = 0.0
diff --git a/crt/crt-yo6-flat-trinitron-tv.slangp b/crt/crt-yo6-flat-trinitron-tv.slangp
deleted file mode 100644
index d0d141a438..0000000000
--- a/crt/crt-yo6-flat-trinitron-tv.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 1
-
-shader0 = "shaders/crt-yo6/crt-yo6-flat-trinitron-tv.slang"
-filter_linear0 = true
-wrap_mode0 = "clamp_to_edge"
-scale_type0 = viewport
-
-textures = "TEX"
-TEX = "shaders/crt-yo6/phosphor-flat-trinitron-tv.png"
-TEX_linear = false
diff --git a/crt/crtglow_gauss.slangp b/crt/crtglow_gauss.slangp
deleted file mode 100644
index bb766a5161..0000000000
--- a/crt/crtglow_gauss.slangp
+++ /dev/null
@@ -1,40 +0,0 @@
-shaders = 7
-
-shader0 = shaders/glow/linearize.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-
-shader1 = shaders/glow/gauss_horiz.slang
-filter_linear1 = false
-scale_type_x1 = viewport
-scale_type_y1 = source
-scale_x0 = 1.0
-scale_y0 = 1.0
-srgb_framebuffer1 = true
-
-shader2 = shaders/glow/gauss_vert.slang
-filter_linear2 = false
-scale_type2 = viewport
-scale2 = 1.0
-srgb_framebuffer2 = true
-alias2 = "CRTPass"
-
-shader3 = shaders/glow/threshold.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-
-shader4 = shaders/glow/blur_horiz.slang
-mipmap_input4 = true
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.25
-srgb_framebuffer4 = true
-
-shader5 = shaders/glow/blur_vert.slang
-filter_linear5 = true
-srgb_framebuffer5 = true
-
-shader6 = shaders/glow/resolve.slang
-filter_linear6 = true
-scale_type6 = viewport
-
diff --git a/crt/crtglow_lanczos.slangp b/crt/crtglow_lanczos.slangp
deleted file mode 100644
index 5a7dc14af5..0000000000
--- a/crt/crtglow_lanczos.slangp
+++ /dev/null
@@ -1,40 +0,0 @@
-shaders = 7
-
-shader0 = shaders/glow/linearize.slang
-filter_linear0 = false
-srgb_framebuffer0 = true
-
-shader1 = shaders/glow/lanczos_horiz.slang
-filter_linear1 = false
-scale_type_x1 = viewport
-scale_type_y1 = source
-scale_x1 = 1.0
-scale_y1 = 1.0
-srgb_framebuffer1 = true
-
-shader2 = shaders/glow/gauss_vert.slang
-filter_linear2 = false
-scale_type2 = viewport
-scale2 = 1.0
-srgb_framebuffer2 = true
-alias2 = "CRTPass"
-
-shader3 = shaders/glow/threshold.slang
-filter_linear3 = false
-srgb_framebuffer3 = true
-
-shader4 = shaders/glow/blur_horiz.slang
-mipmap_input4 = true
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.25
-srgb_framebuffer4 = true
-
-shader5 = shaders/glow/blur_vert.slang
-filter_linear5 = true
-srgb_framebuffer5 = true
-
-shader6 = shaders/glow/resolve.slang
-filter_linear6 = true
-scale_type6 = viewport
-
diff --git a/crt/fake-crt-geom-potato.slangp b/crt/fake-crt-geom-potato.slangp
deleted file mode 100644
index d0077c8b32..0000000000
--- a/crt/fake-crt-geom-potato.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/fake-crt-geom-potato.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/crt/fake-crt-geom.slangp b/crt/fake-crt-geom.slangp
deleted file mode 100644
index 72ea6702fc..0000000000
--- a/crt/fake-crt-geom.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/fake-crt-geom.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/crt/fakelottes.slangp b/crt/fakelottes.slangp
deleted file mode 100644
index 4a41e279ee..0000000000
--- a/crt/fakelottes.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/fakelottes.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/crt/glow_trails.slangp b/crt/glow_trails.slangp
deleted file mode 100644
index 1193f7cf58..0000000000
--- a/crt/glow_trails.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-alias0 = "glow_trails_refpass"
-
-shader1 = ../crt/shaders/glow-trails/glow-trails0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = Trails0
-
-# replace the blur passes with stock for sharp trails
-shader2 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear2 = "true"
-scale_type2 = "source"
-scale2 = "1.0"
-srgb_framebuffer2 = "true"
-
-shader3 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias3 = "TRAIL_BLUR"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-shader4 = ../crt/shaders/glow-trails/glow-trails1.slang
diff --git a/crt/metacrt.slangp b/crt/metacrt.slangp
deleted file mode 100644
index 69f2a61c77..0000000000
--- a/crt/metacrt.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 4
-
-shader0 = shaders/metacrt/bufC.slang
-scale_type0 = viewport
-filter_linear0 = true
-float_framebuffer0 = true
-
-shader1 = shaders/metacrt/bufD.slang
-scale_type1 = viewport
-filter_linear1 = true
-float_framebuffer1 = true
-
-shader2 = shaders/metacrt/Image.slang
-scale_type2 = viewport
-filter_linear2 = true
-float_framebuffer2 = true
-
-shader3 = ../anti-aliasing/shaders/fxaa.slang
-filter_linear3 = true
-scale_type3 = viewport
-
-textures = "cubeMap;table"
-cubeMap = shaders/metacrt/basilica.png
-cubeMap_wrap_mode = repeat
-table = shaders/metacrt/woodgrain.png
-table_wrap_mode = repeat
diff --git a/crt/phosphorlut.slangp b/crt/phosphorlut.slangp
deleted file mode 100644
index 419a259bc0..0000000000
--- a/crt/phosphorlut.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = 5
-
-shader0 = shaders/phosphorlut/scanlines-interlace-linearize.slang
-alias0 = firstPass
-scale0 = 2.0
-scale_type0 = source
-srgb_framebuffer0 = true
-filter_linear0 = false
-
-shader1 = ../blurs/shaders/royale/blur5fast-vertical.slang
-scale_type1 = source
-scale1 = 1.0
-srgb_framebuffer1 = true
-filter_linear1 = true
-alias1 = blurPassV
-
-shader2 = ../blurs/shaders/royale/blur5fast-horizontal.slang
-alias2 = blurPass
-filter_linear2 = true
-scale2 = 1.0
-scale_type2 = source
-srgb_framebuffer2 = true
-
-shader3 = shaders/phosphorlut/phosphorlut-pass0.slang
-alias3 = phosphorPass
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 4.0
-scale_y3 = 2.0
-srgb_framebuffer3 = true
-
-shader4 = shaders/phosphorlut/phosphorlut-pass1.slang
-filter_linear4 = true
-scale_type4 = viewport
-
-textures = "shadow;aperture;slot"
-shadow = shaders/phosphorlut/luts/shadowmask.png
-shadow_linear = true
-shadow_wrap_mode = "repeat"
-aperture = shaders/phosphorlut/luts/aperture-grille.png
-aperture_linear = true
-aperture_wrap_mode = "repeat"
-slot = shaders/phosphorlut/luts/slotmask.png
-slot_linear = true
-slot_wrap_mode = "repeat"
diff --git a/crt/ray_traced_curvature.slangp b/crt/ray_traced_curvature.slangp
deleted file mode 100644
index 99059b03d9..0000000000
--- a/crt/ray_traced_curvature.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = ../stock.slang
-filter_linear0 = false
-scale_type0 = source
-
-shader1 = shaders/rt_curvature/rt_curvature.slang
-filter_linear1 = true
-scale_type1 = viewport
-mipmap_input1 = true
diff --git a/crt/shaders/cathode-retro/signal_test.slangp b/crt/shaders/cathode-retro/signal_test.slangp
deleted file mode 100644
index e6999a0c54..0000000000
--- a/crt/shaders/cathode-retro/signal_test.slangp
+++ /dev/null
@@ -1,103 +0,0 @@
-shaders = 18
-
-#mipmap_input1 = true
-#mipmap_input2 = true
-#mipmap_input3 = true
-#mipmap_input4 = true
-#mipmap_input5 = true
-#mipmap_input6 = true
-#mipmap_input7 = true
-#mipmap_input8 = true
-#mipmap_input9 = true
-#mipmap_input10 = true
-#mipmap_input11 = true
-#mipmap_input12 = true
-#mipmap_input13 = true
-#mipmap_input14 = true
-#mipmap_input15 = true
-#mipmap_input16 = true
-#mipmap_input17 = true
-
-shader0 = cathode-retro-util-copy.slang
-alias0 = g_sourceTexture
-filter_linear0 = true
-
-shader1 = cathode-retro-util-downsample-2x-horz.slang
-filter_linear1 = true
-scale_x1 = 0.5
-
-shader2 = cathode-retro-util-downsample-2x-vert.slang
-filter_linear2 = true
-scale_y2 = 0.5
-
-shader3 = cathode-retro-util-tonemap-and-downsample-horz.slang
-filter_linear3 = true
-scale_x3 = 0.5
-
-shader4 = cathode-retro-util-tonemap-and-downsample-vert.slang
-filter_linear4 = true
-scale_y4 = 0.5
-alias4 = g_sourceTex
-
-shader5 = cathode-retro-util-gaussian-blur-horz.slang
-filter_linear5 = true
-
-shader6 = cathode-retro-util-gaussian-blur-vert.slang
-filter_linear6 = true
-alias6 = g_diffusionTexture
-
-shader7 = cathode-retro-generator-gen-phase.slang
-float_framebuffer7 = true
-alias7 = g_scanlinePhases
-scale_type7 = absolute
-scale_y7 = 1.0
-scale_x7 = 224.0
-filter_linear7 = true
-
-shader8 = ../../../stock.slang
-scale_type_y8 = absolute
-scale_y8 = 224.0
-
-shader9 = cathode-retro-generator-rgb-to-svideo-or-composite.slang
-float_framebuffer9 = true
-alias9 = rgb2yiq
-
-shader10 = cathode-retro-generator-apply-artifacts.slang
-filter_linear10 = true
-float_framebuffer10 = true
-alias10 = YIQ_tex
-
-shader11 = cathode-retro-decoder-composite-to-svideo.slang
-filter_linear11 = true
-float_framebuffer11 = true
-alias11 = IQ_separate
-
-shader12 = cathode-retro-decoder-svideo-to-modulated-chroma.slang
-float_framebuffer12 = true
-alias12 = g_modulatedChromaTexture
-
-shader13 = cathode-retro-decoder-svideo-to-rgb.slang
-float_framebuffer13 = true
-alias13 = yiq2rgb
-
-shader14 = cathode-retro-decoder-filter-rgb.slang
-float_framebuffer14 = true
-alias14 = g_currentFrameTexture
-
-shader15 = cathode-retro-crt-generate-masks.slang
-alias15 = g_maskTexture
-#mipmap_input15 = false
-wrap_mode15 = repeat
-scale_type15 = viewport
-float_framebuffer15 = true
-
-shader16 = cathode-retro-crt-generate-screen-texture.slang
-alias16 = g_screenMaskTexture
-#mipmap_input16 = false
-filter_linear16 = true
-wrap_mode16 = clamp_to_edge
-float_framebuffer16 = true
-
-shader17 = cathode-retro-crt-rgb-to-crt.slang
-#mipmap_input17 = false
-filter_linear17 = true
diff --git a/crt/shaders/crt-frutbunn.slang b/crt/shaders/crt-frutbunn.slang
deleted file mode 100644
index f1cbe89c32..0000000000
--- a/crt/shaders/crt-frutbunn.slang
+++ /dev/null
@@ -1,135 +0,0 @@
-#version 450
-
-/*
-Adapted for RetroArch from frutbunn's "Another CRT shader" from shadertoy:
-https://www.shadertoy.com/view/XdyGzR
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float CURVATURE;
-	float SCANLINES;
-	float CURVED_SCANLINES;
-	float LIGHT;
-	float light;
-	float blur;
-} params;
-
-#pragma parameter CURVATURE "Curvature Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter SCANLINES "Scanlines Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter CURVED_SCANLINES "Scanline Curve Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter LIGHT "Vignetting Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter light "Vignetting Strength" 9.0 0.0 20.0 1.0'
-#pragma parameter blur "Blur Strength" 1.0 0.0 8.0 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-//#define CURVATURE 1. //moved to parameter
-//#define SCANLINES 1. //moved to parameter
-//#define CURVED_SCANLINES 1. //moved to parameter
-#define BLURRED 1.
-//#define LIGHT 1. //moved to parameter
-
-const float gamma = 1.;
-const float contrast = 1.;
-const float saturation = 1.;
-const float brightness = 1.;
-
-//const float light = 9.; //moved to parameter
-//const float blur = 1.0; //moved to parameter
-
-// Sigma 1. Size 3
-vec3 gaussian(in vec2 uv, in sampler2D tex, in vec2 iResolution) {
-    float b = params.blur / (iResolution.x / iResolution.y);
-
-    vec3 col = texture(tex, vec2(uv.x - b/iResolution.x, uv.y - b/iResolution.y) ).rgb * 0.077847;
-    col += texture(tex, vec2(uv.x - b/iResolution.x, uv.y) ).rgb * 0.123317;
-    col += texture(tex, vec2(uv.x - b/iResolution.x, uv.y + b/iResolution.y) ).rgb * 0.077847;
-
-    col += texture(tex, vec2(uv.x, uv.y - b/iResolution.y) ).rgb * 0.123317;
-    col += texture(tex, vec2(uv.x, uv.y) ).rgb * 0.195346;
-    col += texture(tex, vec2(uv.x, uv.y + b/iResolution.y) ).rgb * 0.123317;
-
-    col += texture(tex, vec2(uv.x + b/iResolution.x, uv.y - b/iResolution.y) ).rgb * 0.077847;
-    col += texture(tex, vec2(uv.x + b/iResolution.x, uv.y) ).rgb * 0.123317;
-    col += texture(tex, vec2(uv.x + b/iResolution.x, uv.y + b/iResolution.y) ).rgb * 0.077847;
-
-    return col;
-}
-
-void main()
-{
-    vec2 st = vTexCoord - vec2(0.5);
-    
-    // Curvature/light
-    float d = length(st*.5 * st*.5);
-	vec2 uv;
-if (params.CURVATURE > 0.5){
-    uv = st*d + st*.935;
-}else{
-    uv = st;
-}
-    
-    // CRT color blur
-#ifdef BLURRED
-    vec3 color = gaussian(uv+.5, Source, params.SourceSize.xy * 2.0);
-#else
-    vec3 color = texture(Source, uv+.5).rgb;
-#endif
-
-    // Light
-if (params.LIGHT > 0.5){
-    float l = 1. - min(1., d*params.light);
-    color *= l;
-}
-
-    // Scanlines
-	float y;
-if (params.CURVED_SCANLINES > 0.5){
-    y = uv.y;
-}else{
-    y = st.y;
-}
-
-    float showScanlines = 1.;
-//    if (params.SourceSize.y<360.) showScanlines = 0.;
-    
-if (params.SCANLINES > 0.5){
-    float s = 2.5 + params.OutputSize.y * params.SourceSize.w;//1. - smoothstep(params.SourceSize.x, params.OutputSize.x, params.SourceSize.y) + 4.;//1. - smoothstep(320., 1440., params.SourceSize.y) + 4.;
-    float j = cos(y*params.SourceSize.y*s)*.25; // values between .01 to .25 are ok.
-    color = abs(showScanlines-1.)*color + showScanlines*(color - color*j);
-//    color *= 1. - ( .01 + ceil(mod( (st.x+.5)*params.SourceSize.x, 3.) ) * (.995-1.01) )*showScanlines;
-}
-
-    // Border mask
-if (params.CURVATURE > 0.5){
-        float m = max(0.0, 1. - 2.*max(abs(uv.x), abs(uv.y) ) );
-        m = min(m*200., 1.);
-        color *= m;
-}
-
-	FragColor = vec4(color, 1.0);//vec4(max(vec3(.0), min(vec3(1.), color)), 1.);
-}
\ No newline at end of file
diff --git a/crt/shaders/crt-mattias.slang b/crt/shaders/crt-mattias.slang
deleted file mode 100644
index 1552ee940a..0000000000
--- a/crt/shaders/crt-mattias.slang
+++ /dev/null
@@ -1,167 +0,0 @@
-#version 450
-
-// CRT Emulation
-// by Mattias
-// https://www.shadertoy.com/view/lsB3DV
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float CURVATURE;
-   float SCANSPEED;
-} params;
-
-#pragma parameter CURVATURE "Curvature" 0.5 0.0 1.0 0.05
-#pragma parameter SCANSPEED "Scanline Crawl Speed" 1.0 0.0 10.0 0.5
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define iChannel0 Source
-#define iTime (float(params.FrameCount) / 60.0)
-#define iResolution params.OutputSize.xy
-#define fragCoord (vTexCoord.xy * params.OutputSize.xy)
-
-vec3 sample_( sampler2D tex, vec2 tc )
-{
-	vec3 s = pow(texture(tex,tc).rgb, vec3(2.2));
-	return s;
-}
-
-vec3 blur(sampler2D tex, vec2 tc, float offs)
-{
-	vec4 xoffs = offs * vec4(-2.0, -1.0, 1.0, 2.0) / iResolution.x;
-	vec4 yoffs = offs * vec4(-2.0, -1.0, 1.0, 2.0) / iResolution.y;
-	
-	vec3 color = vec3(0.0, 0.0, 0.0);
-	color += sample_(tex,tc + vec2(xoffs.x, yoffs.x)) * 0.00366;
-	color += sample_(tex,tc + vec2(xoffs.y, yoffs.x)) * 0.01465;
-	color += sample_(tex,tc + vec2(    0.0, yoffs.x)) * 0.02564;
-	color += sample_(tex,tc + vec2(xoffs.z, yoffs.x)) * 0.01465;
-	color += sample_(tex,tc + vec2(xoffs.w, yoffs.x)) * 0.00366;
-	
-	color += sample_(tex,tc + vec2(xoffs.x, yoffs.y)) * 0.01465;
-	color += sample_(tex,tc + vec2(xoffs.y, yoffs.y)) * 0.05861;
-	color += sample_(tex,tc + vec2(    0.0, yoffs.y)) * 0.09524;
-	color += sample_(tex,tc + vec2(xoffs.z, yoffs.y)) * 0.05861;
-	color += sample_(tex,tc + vec2(xoffs.w, yoffs.y)) * 0.01465;
-	
-	color += sample_(tex,tc + vec2(xoffs.x, 0.0)) * 0.02564;
-	color += sample_(tex,tc + vec2(xoffs.y, 0.0)) * 0.09524;
-	color += sample_(tex,tc + vec2(    0.0, 0.0)) * 0.15018;
-	color += sample_(tex,tc + vec2(xoffs.z, 0.0)) * 0.09524;
-	color += sample_(tex,tc + vec2(xoffs.w, 0.0)) * 0.02564;
-	
-	color += sample_(tex,tc + vec2(xoffs.x, yoffs.z)) * 0.01465;
-	color += sample_(tex,tc + vec2(xoffs.y, yoffs.z)) * 0.05861;
-	color += sample_(tex,tc + vec2(    0.0, yoffs.z)) * 0.09524;
-	color += sample_(tex,tc + vec2(xoffs.z, yoffs.z)) * 0.05861;
-	color += sample_(tex,tc + vec2(xoffs.w, yoffs.z)) * 0.01465;
-	
-	color += sample_(tex,tc + vec2(xoffs.x, yoffs.w)) * 0.00366;
-	color += sample_(tex,tc + vec2(xoffs.y, yoffs.w)) * 0.01465;
-	color += sample_(tex,tc + vec2(    0.0, yoffs.w)) * 0.02564;
-	color += sample_(tex,tc + vec2(xoffs.z, yoffs.w)) * 0.01465;
-	color += sample_(tex,tc + vec2(xoffs.w, yoffs.w)) * 0.00366;
-
-	return color;
-}
-
-//Canonical noise function; replaced to prevent precision errors
-//float rand(vec2 co){
-//    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-//}
-
-float rand(vec2 co)
-{
-    float a = 12.9898;
-    float b = 78.233;
-    float c = 43758.5453;
-    float dt= dot(co.xy ,vec2(a,b));
-    float sn= mod(dt,3.14);
-    return fract(sin(sn) * c);
-}
-
-vec2 curve(vec2 uv)
-{
-	uv = (uv - 0.5) * 2.0;
-	uv *= 1.1;	
-	uv.x *= 1.0 + pow((abs(uv.y) / 5.0), 2.0);
-	uv.y *= 1.0 + pow((abs(uv.x) / 4.0), 2.0);
-	uv  = (uv / 2.0) + 0.5;
-	uv =  uv *0.92 + 0.04;
-	return uv;
-}
-
-void main()
-{
-    vec2 q = fragCoord.xy / iResolution.xy;
-    vec2 uv = q;
-    uv = mix( uv, curve( uv ), params.CURVATURE );
-    vec3 oricol = texture( iChannel0, vec2(q.x,q.y) ).xyz;
-    vec3 col;
-	float x =  sin(0.1*iTime+uv.y*21.0)*sin(0.23*iTime+uv.y*29.0)*sin(0.3+0.11*iTime+uv.y*31.0)*0.0017;
-	float o =2.0*mod(fragCoord.y,2.0)/iResolution.x;
-	x+=o;
-    col.r = 1.0*blur(iChannel0,vec2(uv.x+0.0009,uv.y+0.0009),1.2).x+0.005;
-    col.g = 1.0*blur(iChannel0,vec2(uv.x+0.000,uv.y-0.0015),1.2).y+0.005;
-    col.b = 1.0*blur(iChannel0,vec2(uv.x-0.0015,uv.y+0.000),1.2).z+0.005;
-    col.r += 0.2*blur(iChannel0,vec2(uv.x+0.0009,uv.y+0.0009),2.25).x-0.005;
-    col.g += 0.2*blur(iChannel0,vec2(uv.x+0.000,uv.y-0.0015),1.75).y-0.005;
-    col.b += 0.2*blur(iChannel0,vec2(uv.x-0.0015,uv.y+0.000),1.25).z-0.005;
-    float ghs = 0.05;
-	col.r += ghs*(1.0-0.299)*blur(iChannel0,0.75*vec2(0.01, -0.027)+vec2(uv.x+0.001,uv.y+0.001),7.0).x;
-    col.g += ghs*(1.0-0.587)*blur(iChannel0,0.75*vec2(-0.022, -0.02)+vec2(uv.x+0.000,uv.y-0.002),5.0).y;
-    col.b += ghs*(1.0-0.114)*blur(iChannel0,0.75*vec2(-0.02, -0.0)+vec2(uv.x-0.002,uv.y+0.000),3.0).z;
-
-    col = clamp(col*0.4+0.6*col*col*1.0,0.0,1.0);
-
-    float vig = (0.0 + 1.0*16.0*uv.x*uv.y*(1.0-uv.x)*(1.0-uv.y));
-	vig = pow(vig,0.3);
-	col *= vec3(vig);
-
-    col *= vec3(0.95,1.05,0.95);
-	col = mix( col, col * col, 0.3) * 3.8;
-
-	float scans = clamp( 0.35+0.15*sin(3.5*(iTime * params.SCANSPEED)+uv.y*iResolution.y*1.5), 0.0, 1.0);
-	
-	float s = pow(scans,0.9);
-	col = col*vec3( s) ;
-
-    col *= 1.0+0.0015*sin(300.0*iTime);
-	
-	col*=1.0-0.15*vec3(clamp((mod(fragCoord.x+o, 2.0)-1.0)*2.0,0.0,1.0));
-	col *= vec3( 1.0 ) - 0.25*vec3( rand( uv+0.0001*iTime),  rand( uv+0.0001*iTime + 0.3 ),  rand( uv+0.0001*iTime+ 0.5 )  );
-	col = pow(col, vec3(0.45));
-
-	if (uv.x < 0.0 || uv.x > 1.0)
-		col *= 0.0;
-	if (uv.y < 0.0 || uv.y > 1.0)
-		col *= 0.0;
-	
-
-    float comp = smoothstep( 0.1, 0.9, sin(iTime) );
-
-    FragColor = vec4(col,1.0);
-}
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png
deleted file mode 100644
index ffbaa7c523..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png
deleted file mode 100644
index b24985a85e..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1.png
deleted file mode 100644
index 26dd45fdc6..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1_lights_alpha.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1_lights_alpha.png
deleted file mode 100644
index 83ba0fceb0..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_1_lights_alpha.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2.png
deleted file mode 100644
index 0b727e04ef..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_bg.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_bg.png
deleted file mode 100644
index f3b2f16037..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_bg.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_led.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_led.png
deleted file mode 100644
index 627163a3c1..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_2_led.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3.png
deleted file mode 100644
index 8c464de4d8..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_bg.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_bg.png
deleted file mode 100644
index 552c128d13..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_bg.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_led.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_led.png
deleted file mode 100644
index d7e56ab92a..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_led.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_lights_alpha.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_lights_alpha.png
deleted file mode 100644
index cf09a5c8eb..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/TV_frame_3_lights_alpha.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png
deleted file mode 100644
index 5087da90ce..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png b/crt/shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png
deleted file mode 100644
index 6535901dff..0000000000
Binary files a/crt/shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128px.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128px.png
deleted file mode 100644
index 63f6fbf525..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128px.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128pxH.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128pxH.png
deleted file mode 100644
index 3d665eddbe..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128pxH.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512px.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512px.png
deleted file mode 100644
index 2836ccc8d4..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512px.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512pxH.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512pxH.png
deleted file mode 100644
index 6d7b914f1b..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512pxH.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128px.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128px.png
deleted file mode 100644
index 6520c23181..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128px.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128pxH.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128pxH.png
deleted file mode 100644
index 3253c4d068..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots128pxH.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512px.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512px.png
deleted file mode 100644
index 3da2deae99..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512px.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512pxH.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512pxH.png
deleted file mode 100644
index 1459191a77..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorDots512pxH.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128px.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128px.png
deleted file mode 100644
index 0f35a9bcc0..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128px.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128pxH.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128pxH.png
deleted file mode 100644
index 033e9965e2..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix128pxH.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512px.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512px.png
deleted file mode 100644
index 1beb36ad00..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512px.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512pxH.png b/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512pxH.png
deleted file mode 100644
index e0d79e5bc0..0000000000
Binary files a/crt/shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphorMatrix512pxH.png and /dev/null differ
diff --git a/crt/shaders/crt-maximus-royale/src/BGcolor_pass1.slang b/crt/shaders/crt-maximus-royale/src/BGcolor_pass1.slang
deleted file mode 100644
index c122b6006c..0000000000
--- a/crt/shaders/crt-maximus-royale/src/BGcolor_pass1.slang
+++ /dev/null
@@ -1,58 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float bgMode;
-   float ledMode;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter bgMode "BG Mode" 0.0 0.0 3.0 1.0
-#pragma parameter ledMode "Rear TV LED Mode" 0.0 0.0 3.0 1.0
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D maximus_refpass;
-
-void main()
-{
-   vec3 BColor = vec3(0.0).rgb;
-   if ((params.bgMode > 1.0) || (params.ledMode == 3.0)) for (float i = 0.02; i <= 1.0; i += 0.02) BColor += texture(maximus_refpass, vec2(i,vTexCoord.y)).rgb;
-   FragColor = vec4(BColor/50, 1.0).rgba;
-}
diff --git a/crt/shaders/crt-maximus-royale/src/BGcolor_pass2.slang b/crt/shaders/crt-maximus-royale/src/BGcolor_pass2.slang
deleted file mode 100644
index f384ba328c..0000000000
--- a/crt/shaders/crt-maximus-royale/src/BGcolor_pass2.slang
+++ /dev/null
@@ -1,58 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float bgMode;
-   float ledMode;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter bgMode "BG Mode" 0.0 0.0 3.0 1.0
-#pragma parameter ledMode "Rear TV LED Mode" 0.0 0.0 3.0 1.0
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D BGPASS1;
-
-void main()
-{
-   vec3 BColor = vec3(0.0).rgb;
-   if ((params.bgMode > 1.0) || (params.ledMode == 3.0)) for (float i = 0.02; i <= 1.0; i += 0.02) BColor += texture(BGPASS1, vec2(0.0,i)).rgb;
-   FragColor = vec4(BColor/50, 1.0).rgba;
-}
diff --git a/crt/shaders/crt-maximus-royale/src/H_blur.slang b/crt/shaders/crt-maximus-royale/src/H_blur.slang
deleted file mode 100644
index 8b860b4af2..0000000000
--- a/crt/shaders/crt-maximus-royale/src/H_blur.slang
+++ /dev/null
@@ -1,74 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float Hsharpness;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter Hsharpness "Horizontal Sharpness" 10.0 1.0 20.0 0.5
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec3 Color = vec3(0.0);
-
-   float count = -0.005 / params.Hsharpness;
-   float limit = 0.005 / params.Hsharpness;
-   float countAdd = 0.001 / params.Hsharpness;
-
-   if (params.Hsharpness < 20.0)
-   {
-      for (float i = count; i < limit ; i += countAdd)
-      {
-         Color += texture(Source, vec2(vTexCoord.x + i,vTexCoord.y)).rgb;
-      }
-
-      Color /= 10.0;
-   }
-   else
-   {
-      Color = texture(Source, vTexCoord).rgb;
-   }
-
-   FragColor = vec4( Color , 1.0 );
-}
diff --git a/crt/shaders/crt-maximus-royale/src/crt_reflect.slang b/crt/shaders/crt-maximus-royale/src/crt_reflect.slang
deleted file mode 100644
index c9089e042a..0000000000
--- a/crt/shaders/crt-maximus-royale/src/crt_reflect.slang
+++ /dev/null
@@ -1,132 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float crtFrame;
-   float Xscale;
-   float Yscale;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter Xscale "Horizontal Scale %" 100.0 75.0 150.0 0.1
-#pragma parameter Yscale "Vertical Scale %" 100.0 75.0 150.0 0.1
-#pragma parameter crtFrame "CRT Frame" 1.0 1.0 4.0 1.0
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 screen_coord;
-layout(location = 2) out vec2 resize_coord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vec2 center =  TexCoord.xy - 0.5;
-   screen_coord = center / vec2(0.955,0.98);
-   resize_coord = vec2(params.Xscale,params.Yscale) * 0.01;
-   vTexCoord = TexCoord.xy;
-   if (params.crtFrame == 4.0) screen_coord /= vec2(1.0,0.985);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 screen_coord;
-layout(location = 2) in vec2 resize_coord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D maximus_refpass;
-
-void main()
-{
-
-////CALCULATE REFLEXION COORDS 1st pass////
-
-float curveFactor = 0.14;
-float scaleFactor = 1.0;
-float borderAdjustment = 0.99;
-
-if (params.crtFrame == 3.0) scaleFactor = 0.835;
-if (params.crtFrame == 4.0)
-{
-   curveFactor = 0.1;
-   scaleFactor = 0.92;
-   borderAdjustment = 1.035;
-}
-
-vec2 LightsCoordPre = screen_coord/cos(screen_coord.yx * vec2(3.0,4.0) * curveFactor) / scaleFactor;
-
-vec2 LightsCoord = 0.5 + LightsCoordPre / borderAdjustment;
-vec2 LightsCoordScale = 0.5 + LightsCoordPre / resize_coord;
-
-vec2 LightsCoordInv = 1.0 - LightsCoord;
-vec2 LightsCoordHalf = LightsCoord / 2.0;
-vec2 LightsCoordHalfInv = LightsCoordHalf - 0.5;
-
-vec2 rezCoords = 0.5 / resize_coord * borderAdjustment - 0.5;
-
-////CALCULATE REFLEXION COORDS 2nd pass////
-
-vec2 newLightsCoord = LightsCoord;
-
-if (LightsCoordScale.x > -0.05 && LightsCoordScale.x < 1.05 && LightsCoordScale.y > -0.05 && LightsCoordScale.y < 1.05)
-{
-   if (LightsCoord.x < 0.0 && -LightsCoordHalf.x < LightsCoord.y && -LightsCoordHalf.x < LightsCoordInv.y)
-   {
-      newLightsCoord.x = -LightsCoord.x - rezCoords.x;
-      newLightsCoord.y *= 1.0 - LightsCoord.x + rezCoords.y * 2.0;
-      newLightsCoord.y += LightsCoord.x / 2.0 - rezCoords.y;
-   }
-
-   if (LightsCoord.x > 1.0 && LightsCoordHalfInv.x < LightsCoord.y && LightsCoordHalfInv.x < LightsCoordInv.y)
-   {
-      newLightsCoord.x = 2.0 - LightsCoord.x + rezCoords.x;
-      newLightsCoord.y *= 1.0 - LightsCoordInv.x + rezCoords.y * 2.0;
-      newLightsCoord.y += LightsCoordInv.x / 2.0 - rezCoords.y;
-   }
-
-   if (LightsCoord.y < 0.0 && -LightsCoordHalf.y < LightsCoord.x && -LightsCoordHalf.y < LightsCoordInv.x)
-   {
-      newLightsCoord.y = -LightsCoord.y - rezCoords.y;
-      newLightsCoord.x *= 1.0 - LightsCoord.y + rezCoords.x * 2.0;
-      newLightsCoord.x += LightsCoord.y / 2.0 - rezCoords.x;
-   }
-
-   if (LightsCoord.y > 1.0 && LightsCoordHalfInv.y < LightsCoord.x && LightsCoordHalfInv.y < LightsCoordInv.x)
-   {
-      newLightsCoord.y = 2.0 - LightsCoord.y + rezCoords.y;
-      newLightsCoord.x *= 1.0 - LightsCoordInv.y + rezCoords.x * 2.0;
-      newLightsCoord.x += LightsCoordInv.y / 2.0 - rezCoords.x;
-   }
-}
-
-if (LightsCoord.x > 0.0  && LightsCoord.x < 1.0 && LightsCoord.y > 0.0  && LightsCoord.y < 1.0) { newLightsCoord = LightsCoordScale; }
-
-vec4 lightSource = texture(maximus_refpass, newLightsCoord).rgba;
-
-FragColor = lightSource; //final output
-}
diff --git a/crt/shaders/crt-maximus-royale/src/horizontal_ringing.slang b/crt/shaders/crt-maximus-royale/src/horizontal_ringing.slang
deleted file mode 100644
index 3f67c8cb09..0000000000
--- a/crt/shaders/crt-maximus-royale/src/horizontal_ringing.slang
+++ /dev/null
@@ -1,81 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float ringAct;
-   float ringDsp;
-   float ringInt;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter ringAct "Ringing On" 0.0 0.0 1.0 1.0
-#pragma parameter ringDsp "Ringing Displace" 3.0 0.0 3.0 0.1
-#pragma parameter ringInt "Ringing Intensity" 5.0 0.0 10.0 0.5
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-vec3 screen = vec3(0.0);
-float rDisp = params.ringDsp * 0.001;
-float Disp;
-bool rAct = bool(params.ringAct);
-
-   if (rAct)
-   {
-      for (int i; i < 10 ; i++)
-      {
-         Disp = float(i) * rDisp;
-         screen += (texture(Source, vec2(vTexCoord.x + Disp, vTexCoord.y)).xyz - texture(Source, vec2(vTexCoord.x + Disp + rDisp, vTexCoord.y)).xyz) * pow((10.0 - float(i))/10.0,5)/4.0;
-      }
-
-      for (int j; j < 10 ; j++)
-      {
-         Disp = float(j) * rDisp;
-         screen -= (texture(Source, vec2(vTexCoord.x - Disp, vTexCoord.y)).xyz - texture(Source, vec2(vTexCoord.x - Disp - rDisp, vTexCoord.y)).xyz) * pow((10.0 - float(j))/10.0,5);
-      }
-
-       screen /= 10;
-       screen *= params.ringInt;
-   }
-
-FragColor = texture(Source,vTexCoord) + vec4(screen,1.0);
-}
\ No newline at end of file
diff --git a/crt/shaders/crt-maximus-royale/src/imgborder.slang b/crt/shaders/crt-maximus-royale/src/imgborder.slang
deleted file mode 100644
index b5d34510e1..0000000000
--- a/crt/shaders/crt-maximus-royale/src/imgborder.slang
+++ /dev/null
@@ -1,203 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float crtFrame;
-   float bgMode;
-   float bgR;
-   float bgG;
-   float bgB;
-   float ledMode;
-   float ledR;
-   float ledG;
-   float ledB;
-   float ledSpeed;
-   float ledBrightness;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   uint FrameCount;
-} global;
-
-#pragma parameter crtFrame "CRT Frame" 1.0 1.0 4.0 1.0
-#pragma parameter bgMode "BG Mode" 0.0 0.0 3.0 1.0
-#pragma parameter bgR "BG Red" 0.0 0.0 100.0 1.0
-#pragma parameter bgG "BG Green" 25.0 0.0 100.0 1.0
-#pragma parameter bgB "BG Blue" 50.0 0.0 100.0 1.0
-#pragma parameter ledMode "Rear TV LED Mode" 0.0 0.0 3.0 1.0
-#pragma parameter ledR "LED Red" 50.0 0.0 100.0 1.0
-#pragma parameter ledG "LED Green" 50.0 0.0 100.0 1.0
-#pragma parameter ledB "LED Blue" 50.0 0.0 100.0 1.0
-#pragma parameter ledSpeed "LED Speed" 1.0 1.0 20.0 1.0
-#pragma parameter ledBrightness "LED Brightness" 50.0 1.0 100.0 1.0
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 screen_coord;
-layout(location = 2) out vec2 screen_coord_fix;
-layout(location = 3) out vec2 frame_coord;
-layout(location = 4) out float screen_ratio;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-
-   vec2 middle = vec2(0.5);
-   vec2 center =  TexCoord.xy - middle;
-
-   float s4_3_ratio = (global.OutputSize.y/3.0 * 4.0) / global.OutputSize.x;
-   float s16_9_ratio = (global.OutputSize.y/9.0 * 16.0) / global.OutputSize.x;
-
-   vec2 screen_coord_pre = center / vec2(s4_3_ratio , 1.0);
-
-   screen_coord = middle + screen_coord_pre;
-   screen_coord_fix = middle + screen_coord_pre / 0.975;
-
-   frame_coord = middle + center / vec2(s16_9_ratio , 1.0);
-
-   screen_ratio = global.OutputSize.x / global.OutputSize.y;
-   vTexCoord = TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 screen_coord;
-layout(location = 2) in vec2 screen_coord_fix;
-layout(location = 3) in vec2 frame_coord;
-layout(location = 4) in float screen_ratio;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D BGPASS2;
-layout(set = 0, binding = 3) uniform sampler2D TVBORDER1;
-layout(set = 0, binding = 4) uniform sampler2D TVBORDER2;
-layout(set = 0, binding = 5) uniform sampler2D TVBORDER3;
-layout(set = 0, binding = 6) uniform sampler2D TVBORDER2BG;
-layout(set = 0, binding = 7) uniform sampler2D TVBORDER3BG;
-layout(set = 0, binding = 8) uniform sampler2D TVBORDER2LED;
-layout(set = 0, binding = 9) uniform sampler2D TVBORDER3LED;
-layout(set = 0, binding = 10) uniform sampler2D MONITORBORDER;
-layout(set = 0, binding = 11) uniform sampler2D SHAPE1;
-layout(set = 0, binding = 12) uniform sampler2D SHAPE2;
-layout(set = 0, binding = 13) uniform sampler2D LAST_PASS;
-
-void main()
-{
-
-////DRAWING////
-
-vec3 screen = texture(LAST_PASS, screen_coord_fix).rgb;
-vec3 shape;
-vec4 background;
-vec4 backgroundBG = vec4(0.0).rgba;
-vec3 backgroundLED = vec3(0.0).rgb;
-vec3 BGcolor = vec3(0.0).rgb;
-vec3 LEDcolor = vec3(0.0).rgb;
-vec4 borders = vec4(0.0).rgba;
-
-if (params.crtFrame == 1.0)
-{
-   background = texture(TVBORDER1, frame_coord);
-
-   float Sratio = screen_ratio / (16.0/9.0);
-   
-   if (vTexCoord.x < 0.3)
-   {
-      borders = vec4(texture(TVBORDER1, vec2(vTexCoord.x * Sratio , frame_coord.y)).rgb , 0.0);
-   }
-   if (vTexCoord.x > 0.7)
-   {
-      borders = vec4(texture(TVBORDER1, vec2(1.0 + (vTexCoord.x - 1.0) * Sratio , frame_coord.y)).rgb , 0.0);
-   }
-
-   vec2 sidebar = vec2((vTexCoord.x * global.OutputSize.x - 25.0) / 5.0 , ((1.0 - vTexCoord.x) * global.OutputSize.x - 25.0) / 5.0);
-
-   if (screen_ratio < (16.0/9.0) && screen_ratio > (4.205556/3.0))
-   {
-      if (sidebar.x < 0.0) { borders.a = 1.0; }
-      else if (sidebar.x < 1.0) { borders.a += -sidebar.x; }
-
-      if (sidebar.y < 0.0) { borders.a = 1.0; }
-      else if (sidebar.y < 1.0) { borders.a += -sidebar.y; }
-   }
-}
-
-if ((params.crtFrame == 2.0) || (params.crtFrame == 3.0))
-{
-   float BG_R = params.bgR / 100;
-   float BG_G = params.bgG / 100;
-   float BG_B = params.bgB / 100;
-   float LED_R = params.ledR / 100;
-   float LED_G = params.ledG / 100;
-   float LED_B = params.ledB / 100;
-
-   if ((params.bgMode > 0.0) && (params.bgMode < 3.0)) BGcolor = vec3(BG_R, BG_G, BG_B).rgb;
-   if (params.bgMode > 1.0) BGcolor += texture(BGPASS2, vec2(0.0)).rgb;
-
-   if (params.ledMode == 1.0) LEDcolor = vec3(LED_R, LED_G, LED_B).rgb;
-   if (params.ledMode == 2.0)
-   {
-      float LED_Speed = global.FrameCount * params.ledSpeed / 1000;
-      LEDcolor = vec3(sin(LED_Speed), sin(LED_Speed - 2.094395), sin(LED_Speed - 4.18879)).rgb + 1.0;
-   }
-
-   if (params.ledMode == 3.0) LEDcolor += texture(BGPASS2, vec2(0.0)).rgb * 5.0;
-   if (params.ledMode >= 2.0)
-   {
-      float LED_Brightness = params.ledBrightness / 100;
-      LEDcolor *= LED_Brightness;
-   }
-}
-
-if (params.crtFrame == 2.0)
-{
-   background = texture(TVBORDER2, frame_coord);
-   backgroundBG = texture(TVBORDER2BG, frame_coord);
-   backgroundLED = texture(TVBORDER2LED, frame_coord).rgb;
-}
-
-if (params.crtFrame == 3.0)
-{
-   background = texture(TVBORDER3, frame_coord);
-   backgroundBG = texture(TVBORDER3BG, frame_coord);
-   backgroundLED = texture(TVBORDER3LED, frame_coord).rgb;
-   shape = texture(SHAPE2, frame_coord).rgb;
-}
-else shape = texture(SHAPE1, frame_coord).rgb;
-
-if (params.crtFrame == 4.0) background = texture(MONITORBORDER, frame_coord);
-
-///NOISE///
-
-vec3 grain;
-
-float x = (vTexCoord.x + 1.0) * (vTexCoord.y + 1.0) * (mod(global.FrameCount, 1000.0) + 10.0) * 10;
-grain = vec3(mod((mod(x, 10.0) + 1.0) * (mod(x, 100.0) + 1.0), 0.01) - 0.005);
-
-////OUTPUT////
-
-FragColor = vec4(mix(mix(mix(screen + shape + grain, background.rgb, background.a), backgroundBG.rgb * BGcolor.rgb + backgroundLED.rgb * LEDcolor.rgb, backgroundBG.a), borders.rgb, borders.a),1.0); //final output
-}
\ No newline at end of file
diff --git a/crt/shaders/crt-maximus-royale/src/ntsc_pass1.slang b/crt/shaders/crt-maximus-royale/src/ntsc_pass1.slang
deleted file mode 100644
index 856c14e211..0000000000
--- a/crt/shaders/crt-maximus-royale/src/ntsc_pass1.slang
+++ /dev/null
@@ -1,138 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float h2x;
-   float CVBS_SVIDEO_RGB;
-   float CVBS_RES;
-   float CVBS_PHASE;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma parameter h2x "Horizontal Scale" 2.0 0.0 2.0 1.0
-#pragma parameter CVBS_SVIDEO_RGB "CVBS - SVIDEO - RGB" 0.0 0.0 2.0 1.0
-#pragma parameter CVBS_RES "CVBS Intensity" 0.0 0.0 1.0 1.0
-#pragma parameter CVBS_PHASE "CVBS Phase" 3.0 2.0 4.0 1.0
-
-#define PI 3.14159265
-#define CMF_TWO_PHASE (4.0 * PI / 15.0)
-#define CMF_THREE_PHASE (PI / 3.0)
-
-#define FRGART (params.h2x + params.CVBS_RES)
-
-mat3 mix_matCVBS = mat3(
-	1.0, FRGART, FRGART,
-	FRGART, 2.0, 0.0,
-	FRGART, 0.0, 2.0
-);
-
-mat3 mix_matSVIDEO = mat3(
-	1.0, 0.0, 0.0,
-	0.0, 2.0, 0.0,
-	0.0, 0.0, 2.0
-);
-
-#include "ntsc_rgbyuv.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 pix_no;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-
-   if (params.CVBS_SVIDEO_RGB < 2)
-   {
-      vec2 cutH = vec2(1.0);
-      vec2 doubleY = vec2(1.0);
-      vec2 Src_Size = global.SourceSize.xy * vec2(0.25, 1.0);
-      vec2 Out_Size = global.OutputSize.xy * vec2(0.5, 1.0);
-
-      if (params.h2x == 0.0) { cutH.x = 4.0; }
-      if (params.h2x == 1.0) { cutH.x = 2.0; }
-      if (global.OriginalSize.y > 400) { doubleY.y = 0.5; }
-
-      vec2 SrcSize = Src_Size / cutH;
-      vec2 OutSize = Out_Size / cutH;
-      pix_no = TexCoord * SrcSize * (OutSize / SrcSize) * doubleY;
-   }
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-vec3 col = texture(Source, vTexCoord).rgb;
-
-vec3 yiq;
-vec3 yiqsum;
-float chroma_phase;
-float mod_phase;
-float i_mod;
-float q_mod;
-float CHROMA_MOD_FREQ;
-float PHASE_MOD_FREQ;
-
-if (params.CVBS_SVIDEO_RGB < 2)
-{
-   yiq = rgb2yiq(col);
-
-   if (params.CVBS_PHASE == 2) CHROMA_MOD_FREQ = CMF_TWO_PHASE;
-   if (params.CVBS_PHASE >= 3) CHROMA_MOD_FREQ = CMF_THREE_PHASE;
-   if (params.CVBS_PHASE == 4) PHASE_MOD_FREQ = 2.0;
-   else PHASE_MOD_FREQ = 3.0;
-
-   chroma_phase = 0.6667 * PI * (mod(pix_no.y, PHASE_MOD_FREQ) + global.FrameCount);
-   mod_phase = chroma_phase + (pix_no.x) * CHROMA_MOD_FREQ;
-
-   i_mod = cos(mod_phase);
-   q_mod = sin(mod_phase);
-
-   yiq.yz *= vec2(i_mod, q_mod); // Modulate.
-
-   if (params.CVBS_SVIDEO_RGB == 0) { yiq *= mix_matCVBS; } // Cross-talk. 
-   if (params.CVBS_SVIDEO_RGB == 1) { yiq *= mix_matSVIDEO; } // Cross-talk. 
-   
-   yiq.yz *= vec2(i_mod, q_mod); // Demodulate.
-
-   col = yiq;
-}
-
-FragColor = vec4(col, 1.0);
-}
diff --git a/crt/shaders/crt-maximus-royale/src/ntsc_pass2.slang b/crt/shaders/crt-maximus-royale/src/ntsc_pass2.slang
deleted file mode 100644
index 6f48279d99..0000000000
--- a/crt/shaders/crt-maximus-royale/src/ntsc_pass2.slang
+++ /dev/null
@@ -1,153 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float CVBS_SVIDEO_RGB;
-   float h2x;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#pragma parameter h2x "Horizontal Scale" 2.0 0.0 2.0 1.0
-#pragma parameter CVBS_SVIDEO_RGB "CVBS - SVIDEO - RGB" 0.0 0.0 2.0 1.0
-
-#include "ntsc_rgbyuv.inc"
-
-#define TAPS 24
-const float luma_filter[TAPS + 1] = float[TAPS + 1](
-   -0.000012020,
-   -0.000022146,
-   -0.000013155,
-   -0.000012020,
-   -0.000049979,
-   -0.000113940,
-   -0.000122150,
-   -0.000005612,
-   0.000170516,
-   0.000237199,
-   0.000169640,
-   0.000285688,
-   0.000984574,
-   0.002018683,
-   0.002002275,
-   -0.000909882,
-   -0.007049081,
-   -0.013222860,
-   -0.012606931,
-   0.002460860,
-   0.035868225,
-   0.084016453,
-   0.135563500,
-   0.175261268,
-   0.190176552);
-
-const float chroma_filter[TAPS + 1] = float[TAPS + 1](
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
-
-#define fetch_offset(offset, one_x) \
-   texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out float cutH;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   cutH = global.SourceSize.x / 2.0;
-
-   if (params.CVBS_SVIDEO_RGB < 2)
-   {
-      if (params.h2x == 0.0) { cutH /= 4.0; }
-      else if (params.h2x == 1.0) { cutH /= 2.0; }
-      else if (global.OriginalSize.x > 500) { cutH /= 2.0; }
-
-      vTexCoord -= vec2(0.5 / cutH, 0.0); // Compensate for decimate-by-2.
-   }
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in float cutH;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-vec3 rgb;
-
-if (params.CVBS_SVIDEO_RGB < 2)
-{
-   float one_x = 1.0 / cutH;
-   vec3 signal = vec3(0.0);
-
-   for (int i = 0; i < TAPS; i++)
-   {
-      float offset = float(i);
-      vec3 sums = fetch_offset(offset - float(TAPS), one_x) + fetch_offset(float(TAPS) - offset, one_x);
-      signal += sums * vec3(luma_filter[i], chroma_filter[i], chroma_filter[i]);
-   }
-
-   signal += texture(Source, vTexCoord).xyz * vec3(luma_filter[TAPS], chroma_filter[TAPS], chroma_filter[TAPS]);
-
-   rgb = yiq2rgb(signal);
-}
-else
-{
-   rgb = texture(Source, vTexCoord).xyz;
-}
-
-FragColor = vec4(rgb, 1.0);
-}
diff --git a/crt/shaders/crt-maximus-royale/src/ntsc_rgbyuv.inc b/crt/shaders/crt-maximus-royale/src/ntsc_rgbyuv.inc
deleted file mode 100644
index 27fb136c22..0000000000
--- a/crt/shaders/crt-maximus-royale/src/ntsc_rgbyuv.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
diff --git a/crt/shaders/crt-maximus-royale/src/resize.slang b/crt/shaders/crt-maximus-royale/src/resize.slang
deleted file mode 100644
index 2a7a9c5525..0000000000
--- a/crt/shaders/crt-maximus-royale/src/resize.slang
+++ /dev/null
@@ -1,69 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float Xscale;
-   float Yscale;
-   float crtFrame;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter Xscale "Horizontal Scale %" 100.0 75.0 150.0 0.1
-#pragma parameter Yscale "Vertical Scale %" 100.0 75.0 150.0 0.1
-#pragma parameter crtFrame "CRT Frame" 1.0 1.0 4.0 1.0
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vec2 center =  TexCoord.xy - 0.5;
-   vec2 resizeCoord = vec2(params.Xscale,params.Yscale) * 0.01;
-
-   float resizeFactor = 1.0;
-   if (params.crtFrame == 3.0) resizeFactor = 0.835;
-   if (params.crtFrame == 4.0)
-   {
-      resizeCoord *= vec2(1.0,0.985);
-      resizeFactor = 0.92;
-   }
-
-   vTexCoord = 0.5 + center / resizeCoord / resizeFactor;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = texture(Source, vTexCoord).rgba;
-}
diff --git a/crt/shaders/crt-maximus-royale/src/tv_reflection.slang b/crt/shaders/crt-maximus-royale/src/tv_reflection.slang
deleted file mode 100644
index 818a355dcb..0000000000
--- a/crt/shaders/crt-maximus-royale/src/tv_reflection.slang
+++ /dev/null
@@ -1,114 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-maximus-royale: A fully customizable extension for crt-royale shader,
-//  inside a TV / MONITOR BOX with backlight and some other cool stuff.
-//  Copyright (C) 2022 DigiDwrf
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-layout(push_constant) uniform Push
-{
-   float crtFrame;
-   float crtReflection;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   vec4 OutputSize;
-   mat4 MVP;
-} global;
-
-#pragma parameter crtFrame "CRT Frame" 1.0 1.0 4.0 1.0
-#pragma parameter crtReflection "CRT Reflection" 1.0 0.0 1.0 1.0
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 light_coord;
-layout(location = 2) out vec2 frame_coord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-
-   vec2 middle = vec2(0.5);
-   vec2 center =  TexCoord.xy - middle;
-
-   float s4_3_ratio = (global.OutputSize.y/3.0 * 4.0) / global.OutputSize.x;
-   float s16_9_ratio = (global.OutputSize.y/9.0 * 16.0) / global.OutputSize.x;
-
-   light_coord = middle + center / vec2(s4_3_ratio / 0.986 , 1.0);
-   frame_coord = middle + center / vec2(s16_9_ratio , 1.0);
-
-   vTexCoord = TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 light_coord;
-layout(location = 2) in vec2 frame_coord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D TVLIGHTS1;
-layout(set = 0, binding = 5) uniform sampler2D TVLIGHTS3;
-layout(set = 0, binding = 6) uniform sampler2D MONITORLIGHTS;
-layout(set = 0, binding = 7) uniform sampler2D BORDER_REFLECTION;
-
-void main()
-{
-
-vec3 color = texture(Source, vTexCoord).rgb;
-
-if (params.crtReflection == 1.0)
-{
-
-   ////DRAWING////
-
-   vec3 lights;
-
-   if (params.crtFrame <= 2.0) lights = texture(TVLIGHTS1, frame_coord).rgb;
-   else if (params.crtFrame == 3.0) lights = texture(TVLIGHTS3, frame_coord).rgb;
-   else lights = texture(MONITORLIGHTS, frame_coord).rgb;
-
-   ////GAUSSIAN BLUR////
-
-   const float PI = 3.14159265f;
-   const float PI2 = PI*2;
-   vec2 Radius;
-   vec3 lightSource = vec3(0.0);
-
-   if (lights.r > 0.01 && lights.g > 0.01 && lights.b > 0.01)
-   {
-      for(float d = 0.0 ; d < PI2 ; d += PI2/14)
-      {
-         Radius = vec2(cos(d),sin(d)); //Calculate Radius
-
-         for(float e = 0.005 ; e < 0.03 ; e += 0.005)
-            lightSource += texture(BORDER_REFLECTION, light_coord + Radius * e).rgb;
-      }
-   }
-
-   lightSource /= 220;
-   color += lightSource * lights;
-}
-
-////OUTPUT////
-
-FragColor = vec4(color,1.0); //final output
-}
\ No newline at end of file
diff --git a/crt/shaders/crt-nes-mini.slang b/crt/shaders/crt-nes-mini.slang
deleted file mode 100644
index d73a3fd090..0000000000
--- a/crt/shaders/crt-nes-mini.slang
+++ /dev/null
@@ -1,50 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float BRIGHTBOOST;
-	float INTENSITY;
-	float SCANTHICK;
-} params;
-
-#pragma parameter SCANTHICK "Scanline Thickness" 2.0 2.0 4.0 2.0
-#pragma parameter INTENSITY "Scanline Intensity" 0.15 0.0 1.0 0.01
-#pragma parameter BRIGHTBOOST "Luminance Boost" 0.15 0.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 texel = texture(Source, vTexCoord.xy).rgb;
-    vec3 pixelHigh = ((1.0 + params.BRIGHTBOOST) - (0.2 * texel)) * texel;
-    vec3 pixelLow  = ((1.0 - params.INTENSITY) + (0.1 * texel)) * texel;
-    float selectY = mod(vTexCoord.y * params.SCANTHICK * params.SourceSize.y, 2.0);
-    float selectHigh = step(1.0, selectY);
-    float selectLow = 1.0 - selectHigh;
-    vec3 pixelColor = (selectLow * pixelLow) + (selectHigh * pixelHigh);
-
-    FragColor = vec4(pixelColor, 1.0);
-}
diff --git a/crt/shaders/crt-royale/LICENSE.TXT b/crt/shaders/crt-royale/LICENSE.TXT
deleted file mode 100644
index d8cf7d463e..0000000000
--- a/crt/shaders/crt-royale/LICENSE.TXT
+++ /dev/null
@@ -1,280 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
diff --git a/crt/shaders/crt-royale/README.TXT b/crt/shaders/crt-royale/README.TXT
deleted file mode 100644
index 84ab870a3a..0000000000
--- a/crt/shaders/crt-royale/README.TXT
+++ /dev/null
@@ -1,493 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-////          crt-royale, by TroggleMonkey <trogglemonkey@gmx.com>          ////
-////                     Last Updated: August 16, 2014                      ////
-////////////////////////////////////////////////////////////////////////////////
-
-REQUIREMENTS:
-The earliest official Retroarch version fully supporting crt-royale is 1.0.0.3
-(currently unreleased).  Earlier versions lack shader parameters and proper
-mipmapping and sRGB support, but the shader may still run at reduced quality.
-
-The earliest development version fully supporting this shader is:
-    commit ba40be909913c9ccc34dab5d452fba4fe61af9d0
-    Author: Themaister <maister@archlinux.us>
-    Date:   Thu Jun 5 17:41:10 2014 +0200
-A few earlier revisions support the required features, but they may be buggier.
-
-
-BASICS:
-crt-royale is a highly customizable CRT shader for Retroarch and other programs
-supporting the libretro Cg shader standard.  It uses a number of nonstandardized
-extensions like sRGB FBO's, mipmapping, and runtime shader parameters, but
-hopefully it will run without much of a fuss on new implementations of the
-standard as well.
-
-There are a huge number of parameters.  Among the things you can customize:
-* Phosphor mask type: An aperture grille, slot mask, and shadow mask are each
-  included, although the latter won't be seeing much usage until 1440p displays
-  and better become more common (4k UHD and 8k UHD are increasingly optimal).
-* Phosphor mask dot pitch
-* Phosphor mask resampling method: Choose between Lanczos sinc resizing,
-  mipmapped hardware resizing, and no resizing of the input LUT.
-* Phosphor bloom softness and type (real or fake ;))
-* Gaussian and generalized Gaussian scanline beam properties/distribution,
-  including convergence offsets
-* Screen geometry, including curvature (spherical, alternative spherical, or
-  cylindrical like Trinitrons), tilt, and borders
-* Antialiasing level, resampling filter, and sharpness parameters for gracefully
-  combining screen curvature with high-frequency phosphor details, including
-  optionally resampling based on RGB subpixel positions.
-* Halation (electrons bouncing under the glass and lighting random phosphors)
-  random phosphors)
-* Refractive diffusion (light spreading from the imperfect CRT glass face)
-* Interlacing options
-* etc.
-
-There are two major ways to customize the shader:
-* Runtime shader parameters allow convenient experimentation with real-time
-  feedback, but they are much slower, because they prevent static evaluation of
-  a lot of math.  Disabling them drastically speeds up the shader.
-* If runtime shader parameters are disabled (partially or totally), those same
-  settings can be freely altered in the text of the user-settings.h file.  There
-  are also a number of other static-only settings, including the #define macros
-  which indicate where and when to allow runtime shader parameters.  To disable
-  them entirely, comment out the "#define RUNTIME_SHADER_PARAMS_ENABLE" line by
-  putting a double-slash ("//") at the beginning...your FPS will skyrocket.
-
-You may also note that there are two major versions of the shader preset:
-* crt-royale.cgh is the "full" version of the shader, which blooms the light
-  from the brighter phosphors to maintain brightness and avoid clipping.
-* crt-royale-fake-bloom.cgh is the "cheater's" version of the shader, which
-  only fakes the bloom based on carefully blending in a [potentially blurred]
-  version of the original input.  This version is MUCH faster, and you have to
-  strain to see the difference, so people with slower GPU's will prefer it.
-
-There's a lot to play around with, and I encourage everyone using this shader to
-read through the user-settings.h file to learn about the parameters.  Before
-loading the shader, be sure to read the next section, entitled...
-
-
-////////////////////////////////////////////////////////////////////////////////
-////                    FREQUENTLY EXPECTED QUESTIONS:                      ////
-////////////////////////////////////////////////////////////////////////////////
-
-1.) WHY IS THE SHADER CRASHING WHEN I LOAD IT?!?
-Do you get C6001 or C6002 errors with integrated graphics, like Intel HD 4000?
-If so, please try one of the following .cgp presets:
-* crt-royale-intel.cgp
-* crt-royale-fake-bloom-intel.cgp
-These load .cg wrappers that #define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-(also available in user-settings.h) before loading the main .cg shader files.
-
-Integrated graphics compatibility mode will disable these three features, which
-currently require more registers or instructions than Intel GPU's allow:
-* PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-  (This may be reenabled in a later release.)
-* RUNTIME_GEOMETRY_MODE: You must change the screen geometry/curvature using
-  the geom_mode_static setting in user-settings.h.
-* The high-quality 4x4 Gaussian resize for the bloom approximation
-
-Using Intel-specific .cgp files is equivalent to #defining
-INTEGRATED_GRAPHICS_COMPATIBILITY_MODE in your user-settings.h.  Out of the box,
-user-settings.h is configured for maximum configurability and compatibility with
-dedicated nVidia and AMD/ATI GPU's.  Compatibility mode is disabled by default
-to avoid silently degrading quality for AMD/ATI and nVidia users, so Intel-
-specific .cgp's are a convenient way for Intel users to play with the shader
-without editing text files.
-
-I've tested this solution on Intel HD 4000 graphics, and it should work for that
-GPU at least, but please let me know if you're still having problems!
-
---------------------------------------------------------------------------------
-
-2.) WHY IS EVERYTHING SO SLOW?!?:
-Out of the box, this will be a problem for all but monster GPU's.  The default
-user-settings.h file disables any features and optimizations which might cause
-compilation failure on AMD/ATI GPU's.  Despite the name of the options, this is
-not a problem with your card or drivers; it's a shortcoming in the Cg shader
-compiler's nVidia-centric profile setups.
-
-Uncommenting the following #define macros at the top of user-settings.h will
-help performance a good deal on compatible nVidia cards:
-    #define DRIVERS_ALLOW_DERIVATIVES
-    #define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-    #define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-    #define DRIVERS_ALLOW_TEX2DLOD
-    #define DRIVERS_ALLOW_TEX2DBIAS
-A few of these warrant some elaboration.  First, derivatives:
-
-Derivatives allow the shader to cheaply calculate a tangent-space matrix for
-correct antialiasing when curvature or overscan are used.  Without them, there
-are two options:
-    a.) Cheat, and there will be artifacts with strong cylindrical curvature
-    b.) Compute the correct tangent-space matrix analytically.  This is used
-        by default, and it's controlled by this option near the bottom:
-            geom_force_correct_tangent_matrix = true
-
-Dynamic branches:
-Dynamic branches allow the shader to avoid performing computations that it
-doesn't need (but might have, given different runtime options).  Without them,
-the shader has to either let the GPU evaluate every possible codepath and select
-a result, or make a "best guess" ahead of time.  The full phosphor bloom suffers
-most from not having dynamic branches, because the shader doesn't know how big
-of a blur to use until it knows your phosphor mask dot pitch...which you set at
-runtime if shader parameters are enabled.
-
-If RUNTIME_PHOSPHOR_BLOOM_SIGMA is commented out (faster), this won't matter:
-The shader will just select the blur size and standard deviation suitable for
-the mask_triad_size_desired_static setting in user-settings.cgp.  It will be
-fast, but larger triads won't blur enough, and smaller triads will blur more
-than they need to.  However, if RUNTIME_PHOSPHOR_BLOOM_SIGMA is enabled, the
-shader will calculate an optimal standard deviation and *try* to use the right
-blur size for it...but using an "if standard deviation is such and such"
-condition would be prohibitively slow without dynamic branches.  Instead, the
-shader uses the largest and slowest blur the user lets it use (to cover the
-widest range of triad sizes and standard deviations), according to these macros:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-The more you have uncommented, the larger the triads you can blur, but the
-slower runtime sigmas will be if your GPU can't use dynamic branches.  By
-default, triads up to 6 pixels wide will be bloomed perfectly, and a little
-beyond that (8 should be fine), but going too far beyond that will create
-blocking artifacts in the blur due to an insufficient support size.
-
-tex2Dlod:
-The tex2Dlod function allows the shader to disables anisotropic filtering, which
-can get confused when we're manually tiling the texture coordinates for a small
-resized phosphor mask tile (it creates nasty seam artifacts).  There are several
-ways the shader can deal with this: The cheapest is to use tex2Dlod to tile the
-output of MASK_RESIZE across the screen...and the slower alternatives either
-require derivatives or force the shader to draw 2 tiles to MASK_RESIZE in each
-direction, thereby reducing your maximum allowed dot pitch by half.
-
-tex2Dbias:
-According to nVidia's Cg language standard library page, tex2Dbias requires the
-fp30 profile, which doesn't work on ATI/AMD cards...but you might actually have
-mixed results.  This can be used as a substitute for tex2Dlod at times, so it's
-worth trying even on ATI.
-
---------------------------------------------------------------------------------
-
-3.) WHY IS EVERYTHING STILL SO SLOW?!?:
-For maximum quality and configurability out of the box, almost all shader
-parameters are enabled by default (except for the disproportionately expensive
-runtime subpixel offsets).  Some are more expensive than others.  Commenting
-the following macro disables all shader parameters:
-    #define RUNTIME_SHADER_PARAMS_ENABLE
-Commenting these macros disables selective shader parameters:
-    #define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-    #define RUNTIME_ANTIALIAS_WEIGHTS
-    //#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-    #define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-    #define RUNTIME_GEOMETRY_TILT
-    #define RUNTIME_GEOMETRY_MODE
-    #define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-Note that all shader parameters will still show up in your GUI list, and the
-disabled ones simply won't work.
-
-Finally, there are a lot of other options enabled by default that carry serious
-performance penalties.  For instance, the default antialiasing filter is a
-cubic filter, because it's the most configurable, but it's also quite slow if
-RUNTIME_ANTIALIAS_WEIGHTS is #defined.  A lot of the static true/false options
-have a significant influence, and the shader is faster if the red subpixel
-offset (from which the blue one is calculated as well) is zero...even if it's
-a static value, because RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS is commented out.
-To avoid any confusion, I should also clarify now that subpixel offsets are
-separate from scanline beam convergence offsets.
-
-To quickly see how much performance you can get from other settings, you can
-temporarily replace your user-settings.h with one of:
-a.) crt-royale-settings-files/user-settings-fast-static-ati.h
-b.) crt-royale-settings-files/user-settings-fast-static-nvidia.h
-Then load crt-royale-fake-bloom.cgp.  It should be far more playable.
-
---------------------------------------------------------------------------------
-
-4.) WHY WON'T MY SHADER BLOOM MY PHOSPHORS ENOUGH?
-First, see the discussion about dynamic branching above, in 1.
-If you don't have dynamic branches, you can either uncomment the lines that
-let the shader pessimistically use larger blurs than it's guaranteed to need
-(which is slow), or...you can just use crt-royale-fake-bloom.cgp, which
-doesn't have this problem. :)
-
---------------------------------------------------------------------------------
-
-5.) WHY CAN'T I MAKE MY PHOSPHORS ANY BIGGER?
-By default, the phosphor mask is Lanczos-resized in earlier passes to your
-specified dot pitch (mask_sample_mode = 0).  This gives a much sharper result
-than mipmapped hardware sampling (mask_sample_mode = 1), but it can be much
-slower without taking proper care: If the input mask tile (containing 8
-phosphor triads by default) is large, like 512x512, and you try to resize it
-to 24x24 for 3x3 pixel triads, the resizer has to take 128 samples in each
-pass/direction (the max allowed) for a 3-lobe Lanczos filter.  This can be
-very slow, so I made the output of MASK_RESIZE very small by default: Just
-1/16th of the viewport size in each direction.  The exact limit scales with
-your viewport size, and it *should* be reasonable, but the restrictions can
-get tighter if we can't use tex2Dlod and have to fit two whole tiles (16
-phosphor triads with default 8-triad tiles) into the MASK_RESIZE pass for
-compatibility with anisotropic filtering (long story).
-
-If you want bigger phosphor triads, you have two options:
-a.) Set mask_sample_mode to 1 in your shader params (if enabled) or set
-    mask_sample_mode_static to 1 in your user-settings.h file.  This will use
-    hardware sampling, which is softer but has no limitations.
-b.) To increase the limit with manual mask-resizing (best quality), you need to
-    do five things:
-    1.) Go into your .cgp file and find the MASK_RESIZE pass (the horizontal
-        mask resizing pass) and the one before it (the vertical mask resizing
-        pass).  Find the viewport-relative scales, which should say 0.0625, and
-        change them to 0.125 or even 0.25.
-    2.) Still in your .cgp file, also make sure your mask_*_texture_small
-        filenames point to LUT textures that are larger than your final desired
-        onscreen size (upsizing is not currently permitted).
-    3.) Go into user-cgp-constants.h and change mask_resize_viewport_scale from
-        0.0625 to the new value you changed it to in step 1.  This is necessary,
-        because we can't pass that value from the .cgp file to the shader, and
-        the shader can't compute the viewport size (necessary) without it.
-    4.) Still in user-cgp-constants.h, update mask_texture_small_size and
-        mask_triads_per_tile appropriately if you changed your LUT texture in
-        step 2.
-    5.) Reload your .cgp file.
-I REALLY wish there was an easier way to do that, but my hands are tied until
-.cgp files are allowed to pass more information to .cg shaders (which would
-require major updates to the cg2glsl script).
-
---------------------------------------------------------------------------------
-
-6.) WHY CAN'T I MAKE MY PHOSPHORS ANY SMALLER THAN 2 PIXELS PER TRIAD?
-This is controlled by mask_min_allowed_triad_size in your user-settings.h file.
-Set it to 1.0 instead of 2.0 (anything lower than 1 is pointless), and you're
-set.  It defaults to 2.0 to make mask resizing twice as fast when dynamic
-branches aren't allowed.  Some people may want to be able to fade the phosphors
-away entirely to get a more PVM-like scanlined image though, so change it to 1.0
-for that (or get a higher-resolution display ;)).
-
-Note: This setting should be obsolete soon.  I have some ideas for more
-sophisticated mask resampling that I just don't have a spare few hours to
-implement yet.
-
---------------------------------------------------------------------------------
-
-7.) I AM NOT RUNNING INTEGRATED GRAPHICS.  WHY AM I GETTING ERRORS?
-First recheck the top of your user-settings.h to make sure incompatible driver
-options are commented out (disabled).  If they're all disabled and you're still
-having problems, you've probably found a bug.  There are bound to be a number of
-them with certain setting combinations, and there might even be a few individual
-settings I broke more recently than I tested them.  My contact information is up
-top, so let me know!
-
---------------------------------------------------------------------------------
-
-8.) WHY AM I GETTING BANDING IN DARK COLORS?  OR, WHY WON'T MIPMAPPING WORK?
-crt-royale uses features like sRGB and mipmapping, which are not available in
-the latest Retroarch release (1.0.0.2) at the time of this writing.
-
-You may get banding in dark colors if your platform or Retroarch version doesn't
-support sRGB FBO's, and mask_sample_mode 1 will look awful without mipmapping.
-I expect most platforms capable of running this shader at full speed will
-support sRGB FBO's, but if yours doesn't, please let me know, and I'll include
-a note about it.
-
-Alternately, setting levels_autodim_temp too low will cause precision loss and
-banding.
-
---------------------------------------------------------------------------------
-
-9.) HOW DO I SET GEOMETRY/CURVATURE/ETC.?
-If RUNTIME_SHADER_PARAMS_ENABLE and RUNTIME_GEOMETRY_MODE are both #defined (not
-commented out) in user-settings.cgp, you can find these options in your shader
-parameters (in Retroarch's RGUI for instance) under e.g. geom_mode.  Otherwise,
-you can set the corresponding e.g. geom_mode_static options in user-settings.h.
-
---------------------------------------------------------------------------------
-
-10.) WHY DON'T MY SHADER PARAMETERS STICK?
-This is a bit confusing, at least in the version of Retroarch I'm using.
-In the Shader Options menu, Parameters (Current) controls what's on your screen
-right now, whereas Parameters (RGUI) seems to control what gets saved to a
-shader preset (in your base shaders directory) with Save As Shader Preset.
-
---------------------------------------------------------------------------------
-
-11.) WHY DID YOU SLOW THE SHADER DOWN WITH ALL OF THESE FEATURES I DON'T WANT?
-     WHY DIDN'T YOU MAKE THE DEFAULTS MORE TO MY LIKING?
-
-The default settings tend to best match flat ~13" slot mask TV's with sharp
-scanlines.  Real CRT's however vary a lot in their characteristics (and many are
-softer in more ways than one), so it's impossible to make the default settings
-look like everyone's favorite CRT.  Moreover, it's impossible to decide which
-of the slower features and options are superfluous:
-
-Some people love curvature, and some people hate it.  Some people love
-scanlines, and some people hate them.  Some people love phosphors, and some
-people hate them.  Some people love interlacing support, and some people hate
-it.  Some people love sharpness, and some people hate it.  Some people love
-convergence error, and some people hate it.  The one thing you hate the most is
-probably someone else's most critical feature.  This is why there are so many
-options, why the shader is so complicated, and why it's impossible to please
-everyone out of the box...unfortunately.
-
-That said, if you spend some time tweaking the settings, you're bound to get a
-picture you like.  Once you've made up your mind, you can save the settings to
-a user-settings.h file and disable shader parameters and other slow options to
-get the kind of performance you want.
-
---------------------------------------------------------------------------------
-
-12.) WHY DIDN'T YOU INCLUDE A SHADER PRESET WITH NTSC SUPPORT?  WHY DIDN'T YOU
-     INCLUDE MORE CANNED PRESETS WITH DIFFERENT OPTIONS?  WHY CAN'T I SELECT
-     FROM ONE OF SEVERAL USER SETTINGS FILES WITHOUT MANUAL FILE RENAMING?
-
-I do plan on adding a version that uses the NTSC shader for the first two
-passes, but it will take a bit of work, because there are several NTSC shader
-versions as it is.  It's easy enough to combine the HALATION_BLUR passes into a
-one-pass blur from blurs/shaders/royale/blur9x9fast.cg, but I'm not sure yet just how much
-modification the NTSC shader passes themselves might need for best results.
-
-I originally wanted NTSC support to be included out-of-the-box, but I'd also
-like to release the shader ASAP, so it'll have to wait.
-
-As for other canned presets, that's a little more complicated: I DO intend on
-creating more canned presets, but the combinatorial explosion of major codepath
-options in this shader is too overwhelming to be as exhaustive as I'd like.
-When I get the time, I'll add what I can to make this more user-friendly.
-In the meantime, I'll start adding a few different default versions of the
-user settings file and put them in a subdirectory for people to manually
-place in the main directory and rename to "user-settings.h."
-
-However, the libretro Cg shader specification (and the Cg to GLSL compiler) does
-not currently allow .cgp files to pass any static settings to the source files.
-This presents a huge problem, because it means that in order to create a new
-preset with different options, I also have to create duplicate files for EVERY
-single .cg pass for every permutation, not just the .cgp.  I plan on creating
-a number of skeleton wrapper .cg files in a subdirectory (which set a few
-options and then include the main .cg file for the pass), but it'll be a while
-yet.  In the meantime, I'd rather let people play with what's already done than
-keep it hidden on my hard drive.
-
---------------------------------------------------------------------------------
-
-13.) WHY DO SO MANY VALUES IN USER_SETTINGS.H HAVE A _STATIC SUFFIX?
-
-The "_static" suffix is there to prevent naming conflicts with runtime shader
-parameters: The shader usually uses a version without the suffix, which is
-assigned either the value of the "_static" version or the runtime shader
-parameter version.  If a value in uset-settings.h doesn't have a "_static"
-suffix, it's usually because it's a static compile-time option only, with no
-corresponding runtime version.  Basically, you can ignore the suffix. :)
-
---------------------------------------------------------------------------------
-
-14.) ARE THERE ANY BROKEN SETTINGS I SHOULD BE AWARE OF?
-     WHAT IF I WANT TO CHANGE SETTINGS IN THE .CGP FILE?
-
-As far as I know, all of the options in user-settings.h and the runtime shader
-parameters are pretty robust, with a few caveats:
-* As noted above, there are some tradeoffs between runtime and compile-time
-  options.  If runtime blur sigmas are disabled for instance, the phosphor
-  bloom (and to a lesser extent, the fake bloom) may not blur the right amount.
-* If you set your aspect ratio incorrectly, and mask_specify_num_triads == 1.0
-  (i.e. true, as opposed to 0.0, which is false), the shader will misinterpret
-  the number of triads you want by the same proportion.
-* Disabled shader parameters will do nothing, including either:
-    a.) mask_triad_size_desired
-    b.) mask_num_triads_desired,
-  depending on the value of mask_specify_num_triads.
-
-There is a broken and unimplemented option in derived-settings-and-constants.h,
-but users shouldn't need to mess around in there anyway.  (It's related to the
-more efficient phosphor mask resampling I want to implement.)
-
-However, the .cgp files are another story: They are pretty brittle, especially
-when it comes to their interaction with user-cgp-constants.h.  Be aware that the
-shader passes rely on scale types and sizes in your .cgp file being exactly what
-they expect.  Do not change any scale types from the defaults, or you'll get
-artifacts under certain conditions.  You can change the BLOOM_APPROX and
-MASK_RESIZE scale values (not scale types), but you must update the associated
-constant in user-cgp-constants.h to let the .cg shader files know about it, and
-the implications may reach farther than you expect.  Similarly, if you plan on
-changing an LUT texture, make sure you update the associated constants in
-user-cgp-constants.h.  In short, if you plan on changing anything in a .cgp
-file, you'll want to read it thoroughly first, especially the "IMPORTANT"
-section at the top.
-
---------------------------------------------------------------------------------
-
-15.) WHAT ARE THE MOST COMMON DOT PITCHES FOR CRT TELEVISIONS?
-     WHAT KIND OF RESOLUTION WOULD I NEED FOR A REAL SHADOW MASK?
-
-The most demanding CRT we're ever likely to emulate is a Sony PVM-20M4U:
-    Width: 450mm
-    Aperture Grille Pitch: 0.31mm
-    Triads in 4:3 frame: 1451, assuming little to no overscan
-For 3-pixel triads, we would need about 6k UHD resolution.  A BVM-20F1U has
-similar requirements.
-
-However, common slot masks are far more similar to the kind of image this shader
-will produce at 900p, 1080p, 1200p, and 1440p:
-1.) A typical 13" diagonal CRT might have a 0.60mm slot pitch, for a total of
-    440.26666666666665 or so phosphor triads horizontally.
-2.) A typical 19" diagonal CRT might have a 0.75mm slot pitch, for a total of
-    514.7733333333333 or so phosphor triads horizontally.
-3.) According to http://repairfaq.ece.drexel.edu/REPAIR/F_crtfaq.html, a
-    typical 25" diagonal CRT might have a 0.9mm slot pitch, for a total of
-    564.4444444444445 or so phosphor triads horizontally.
-4.) A 21" Samsung SMC210N CCTV monitor (450 TV lines) has a 0.7mm stripe
-    pitch, for a total of 609.6 or so phosphor triads horizontally.
-
-The included EDP shadow mask starts looking very good with ~6-pixel triads, so
-it may take nearly 4k resolution to make it a particularly compelling option.
-However, it's possible to make smaller shadow masks on a pixel-by-pixel basis
-and tile them at a 1:1 ratio (mask_sample_mode = 2).  I may include a mask like
-this in a future update.
-
---------------------------------------------------------------------------------
-
-16.) IS THIS PHOSPHOR BLOOM REALISTIC?
-
-Probably not:
-
-Realistically, the "phosphor bloom" blurs bright phosphors significantly more
-than your eyes would bloom the brighter phosphors on a real CRT.  This extra
-blurring however is necessary to distribute enough brightness to nearby pixels
-that we can amplify the overall brightness to that of the original source after
-applying the phosphor mask.  If you're interested, there are more comments on
-the subject at the top of the fragment shader in crt-royale-bloom-approx.cg.
-
-On the subject of the phosphor bloom: I intended to include some exposition
-about the math behind the brightpass calculation (and the much more complex
-and thorough calculation I originally used to blur the minimal amount necessary,
-which turned out to be inferior in practice), but that document isn't release-
-ready at the moment.  Sorry Hyllian. ;)
-
---------------------------------------------------------------------------------
-
-17.) SO WHAT DO YOU PLAN ON ADDING IN THE FUTURE?
-
-I'd like to add these relatively soon:
-1.) A combined ntsc-crt-royale.cgp and ntsc-crt-royale-fake-bloom.cgp.
-2.) More presets, especially if maister or squarepusher find a way to make the
-Cg to GLSL compiler process .cgp files (which will allows .cgp's to pass
-arbitrary #defines to the .cg shader passes).
-3.) More efficient and flexible phosphor mask resampling.  Hopefully, this will
-    make it possible to manually resize the mask on Intel HD Graphics as well.
-4.) Make it more easy and convenient to use and experiment with mask_sample_mode
-    2 (direct 1:1 tiling of an input texture) by using a separate LUT texture
-    with its own parameters in user-cgp-constants.h, etc.  I haven't done this
-    yet because it requires yet another texture sample that could hurt other
-    codepaths, and I'm waiting until I have time to optimize it.
-5.) Refine the runtime shader parameters: Some of them are probably too fine-
-    grained and slow to change.
-
-Maybe's:
-1.) I've had trouble getting LUT's from subdirectories to work consistently
-    across platforms, but I'd like to get around that and include more mask
-    textures I've made.
-2.) If you're using spherical curvature with a small radius, the edges of the
-    sphere are blocky due to the pixel discards being done in 2x2 fragment
-    blocks.  I'd like to fix this if it can be done without a performance hit.
-3.) I have some ideas for procedural mask generation with a fast, closed-form
-    low-pass filter, but I don't know if I'll ever get around to it.
-
diff --git a/crt/shaders/crt-royale/THANKS.TXT b/crt/shaders/crt-royale/THANKS.TXT
deleted file mode 100644
index 4966f0e7c9..0000000000
--- a/crt/shaders/crt-royale/THANKS.TXT
+++ /dev/null
@@ -1,43 +0,0 @@
-Thank you squarepusher and maister, for hammering out the shader framework that
-made this possible and being so receptive to my feedback for Retroarch and the
-libretro Cg shader spec.  Thank you especially maister, for designing the sRGB
-support with me and implementing all the code for both sRGB FBO's and mipmapped
-FBO's in less time than it took me to add mipmapped LUT's alone!
-
-I want to thank xythen and DOLLS for inspiring me with their early efforts:
-    http://board.byuu.org/viewtopic.php?f=10&t=147
-    http://board.byuu.org/viewtopic.php?p=3820#p3834
-I've never spoken with them, but I never would have thought to make this shader
-if xythen hadn't gotten the ball rolling, or if DOLLS hadn't made his point
-about just how far CRT emulation could go with his phosphor mask prototypes,
-convergence error images, and barrel distortion code.
-
-I also want to thank hunterk for his excellent blog, especially this post:
-    http://filthypants.blogspot.com/2011/05/
-        more-emulator-pixel-shaders-crt-updated.html
-Along with caligari's work, his PhosphorLUT shader provoked me to experiment
-with game-style bloom as a way to reconcile shadow masks with full brightness.
-Along with Pulp Fiction, he also gets credit for helping me name this shader. :D
-
-Thank you Hyllian for your enthusiasm: It kept me focused on actually releasing
-this shader instead of refining it in perpetuity!
-
-Finally, I want to thank cgwg for everything he has done for CRT emulation:
-He was the first to consider the effects of halation, and (in addition to
-caligari?) he did the most research on the Gaussian properties of scanline
-electron beams.  His forum posts and links to academic research were very
-helpful, and so were the few PM's we exchanged many months ago: I originally
-meant to wet my feet by extending his shader with cylindrical curvature before
-writing my own.  I never managed to understand his curvature code (due to all of
-the different algebraic/trigonometric stages being rolled into one), and I gave
-up and started from scratch, but talking with him helped me piece together how
-his spherical uv<=>xyz mapping worked mathematically.  My own is subtly
-different, but not on purpose. ;)  A lot of the user parameters for geometry
-were inspired by his own (including Euler angle tilt and a "view distance" for
-controlling the field of view with a simplified near-plane).  Last but not
-least, my border dimming code was based more directly off of his: I did what I
-could to write a fresh implementation of his algorithm with new features, but
-the line between code and algorithm is pretty thin in that function, and it's
-a testament to him coming up with such an elegant solution.
-
-TroggleMonkey
diff --git a/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png b/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png
deleted file mode 100644
index 8e2d58ef5e..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png b/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png
deleted file mode 100644
index a92bc54aff..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png b/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png
deleted file mode 100644
index 1782226fd0..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearShadowMask.png b/crt/shaders/crt-royale/TileableLinearShadowMask.png
deleted file mode 100644
index 71555cf3b9..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearShadowMask.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png b/crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png
deleted file mode 100644
index 0c938e740b..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png b/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png
deleted file mode 100644
index 8ac37b6367..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png b/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png
deleted file mode 100644
index 2beaec718b..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png b/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png
deleted file mode 100644
index c04c8b8cda..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png b/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png
deleted file mode 100644
index 40c8112e77..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png b/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png
deleted file mode 100644
index 71baedb23e..0000000000
Binary files a/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png and /dev/null differ
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/README.TXT b/crt/shaders/crt-royale/crt-royale-settings-files/README.TXT
deleted file mode 100644
index 38270a7a24..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/README.TXT
+++ /dev/null
@@ -1,12 +0,0 @@
-These files aren't nearly as good as canned .cgp presets with all of your
-favorite settings, and there aren't nearly enough, but they're a start.
-
-The nVidia settings files will only work on nVidia cards.
-The ATI settings files will work on both AMD/ATI and nVidia cards.
-The Intel settings files should additionally work on Intel HD 4000 Graphics, but
-they disable manual phosphor mask resizing, so the phosphor mask will be softer.
-
-For compatibility with Intel integrated graphics, you can either use the Intel-
-specific .cgp files or use the Intel settings files.  These are the same as the
-ATI settings, except the following line is also uncommented:
-    #define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-ati-clean.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-ati-clean.h
deleted file mode 100644
index e16002f6b3..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-ati-clean.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-    //#define DRIVERS_ALLOW_DERIVATIVES
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-    //#define DRIVERS_ALLOW_TEX2DLOD
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-#define RUNTIME_SHADER_PARAMS_ENABLE
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-#define RUNTIME_GEOMETRY_TILT
-#define RUNTIME_GEOMETRY_MODE
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    static const float bloom_approx_filter_static = 2.0;
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    static const bool beam_generalized_gaussian = true;
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    static const float beam_spot_shape_function = 0.0;
-    static const float beam_spot_power_static = 1.0/3.0;        //  range (0, 16]
-    static const float beam_min_shape_static = 2.0;             //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;             //  range [2, 32]
-    static const float beam_shape_power_static = 1.0/4.0;       //  range (0, 16]
-    static const float beam_horiz_filter_static = 0.0;
-    static const float beam_horiz_sigma_static = 0.35;          //  range (0, 2/3]
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    static const bool beam_misconvergence = true;
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    static const bool interlace_detect_static = true;
-    static const bool interlace_1080i_static = false;
-    static const bool interlace_bff_static = false;
-    static const float aa_level = 12.0;                         //  range [0, 24]
-    static const float aa_filter = 6.0;                         //  range [0, 9]
-    static const bool aa_temporal = false;
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    static const float aa_cubic_c_static = 0.5;                 //  range [0, 4]
-    static const float aa_gauss_sigma_static = 0.5;             //  range [0.0625, 1.0]
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    static const float mask_num_triads_desired_static = 480.0;
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    static const float mask_min_allowed_triad_size = 2.0;
-    static const float geom_mode_static = 0.0;                  //  range [0, 3]
-    static const float geom_radius_static = 2.0;                //  range [1/(2*pi), 1024]
-    static const float geom_view_dist_static = 2.0;             //  range [0.5, 1024]
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    static const float geom_aspect_ratio_static = 1.313069909;
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    static const bool geom_force_correct_tangent_matrix = true;
-    static const float border_size_static = 0.015;               //  range [0, 0.5]
-    static const float border_darkness_static = 2.0;            //  range [0, inf)
-    static const float border_compress_static = 2.5;            //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-ati.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-ati.h
deleted file mode 100644
index e43cee77a4..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-ati.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 2.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = true;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 6.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-intel-clean.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-intel-clean.h
deleted file mode 100644
index 99d2a9537c..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-intel-clean.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-    //#define DRIVERS_ALLOW_DERIVATIVES
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-    //#define DRIVERS_ALLOW_TEX2DLOD
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-    #define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-#define RUNTIME_SHADER_PARAMS_ENABLE
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-#define RUNTIME_GEOMETRY_TILT
-#define RUNTIME_GEOMETRY_MODE
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    static const float bloom_approx_filter_static = 0.0;
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    static const bool beam_generalized_gaussian = true;
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    static const float beam_spot_shape_function = 0.0;
-    static const float beam_spot_power_static = 1.0/3.0;        //  range (0, 16]
-    static const float beam_min_shape_static = 2.0;             //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;             //  range [2, 32]
-    static const float beam_shape_power_static = 1.0/4.0;       //  range (0, 16]
-    static const float beam_horiz_filter_static = 0.0;
-    static const float beam_horiz_sigma_static = 0.35;          //  range (0, 2/3]
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    static const bool beam_misconvergence = true;
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    static const bool interlace_detect_static = true;
-    static const bool interlace_1080i_static = false;
-    static const bool interlace_bff_static = false;
-    static const float aa_level = 12.0;                         //  range [0, 24]
-    static const float aa_filter = 6.0;                         //  range [0, 9]
-    static const bool aa_temporal = false;
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    static const float aa_cubic_c_static = 0.5;                 //  range [0, 4]
-    static const float aa_gauss_sigma_static = 0.5;             //  range [0.0625, 1.0]
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    static const float mask_num_triads_desired_static = 480.0;
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    static const float mask_min_allowed_triad_size = 2.0;
-    static const float geom_mode_static = 0.0;                  //  range [0, 3]
-    static const float geom_radius_static = 2.0;                //  range [1/(2*pi), 1024]
-    static const float geom_view_dist_static = 2.0;             //  range [0.5, 1024]
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    static const float geom_aspect_ratio_static = 1.313069909;
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    static const bool geom_force_correct_tangent_matrix = true;
-    static const float border_size_static = 0.015;               //  range [0, 0.5]
-    static const float border_darkness_static = 2.0;            //  range [0, inf)
-    static const float border_compress_static = 2.5;            //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-intel.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-intel.h
deleted file mode 100644
index 8d1c972c7a..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-intel.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    #define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 0.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = true;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 6.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-nvidia-clean.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-nvidia-clean.h
deleted file mode 100644
index ee5e05b740..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-nvidia-clean.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-    #define DRIVERS_ALLOW_DERIVATIVES
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-    #define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-    #define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-    #define DRIVERS_ALLOW_TEX2DLOD
-    #define DRIVERS_ALLOW_TEX2DBIAS
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-#define RUNTIME_SHADER_PARAMS_ENABLE
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-#define RUNTIME_GEOMETRY_TILT
-#define RUNTIME_GEOMETRY_MODE
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    static const float bloom_approx_filter_static = 2.0;
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    static const bool beam_generalized_gaussian = true;
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    static const float beam_spot_shape_function = 0.0;
-    static const float beam_spot_power_static = 1.0/3.0;        //  range (0, 16]
-    static const float beam_min_shape_static = 2.0;             //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;             //  range [2, 32]
-    static const float beam_shape_power_static = 1.0/4.0;       //  range (0, 16]
-    static const float beam_horiz_filter_static = 0.0;
-    static const float beam_horiz_sigma_static = 0.35;          //  range (0, 2/3]
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    static const bool beam_misconvergence = true;
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    static const bool interlace_detect_static = true;
-    static const bool interlace_1080i_static = false;
-    static const bool interlace_bff_static = false;
-    static const float aa_level = 12.0;                         //  range [0, 24]
-    static const float aa_filter = 6.0;                         //  range [0, 9]
-    static const bool aa_temporal = false;
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    static const float aa_cubic_c_static = 0.5;                 //  range [0, 4]
-    static const float aa_gauss_sigma_static = 0.5;             //  range [0.0625, 1.0]
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    static const float mask_num_triads_desired_static = 480.0;
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    static const float mask_min_allowed_triad_size = 2.0;
-    static const float geom_mode_static = 0.0;                  //  range [0, 3]
-    static const float geom_radius_static = 2.0;                //  range [1/(2*pi), 1024]
-    static const float geom_view_dist_static = 2.0;             //  range [0.5, 1024]
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    static const float geom_aspect_ratio_static = 1.313069909;
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    static const bool geom_force_correct_tangent_matrix = true;
-    static const float border_size_static = 0.015;               //  range [0, 0.5]
-    static const float border_darkness_static = 2.0;            //  range [0, inf)
-    static const float border_compress_static = 2.5;            //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-nvidia.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-nvidia.h
deleted file mode 100644
index 69d858b484..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-default-nvidia.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    #define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    #define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    #define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    #define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    #define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 2.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = true;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 6.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-ati.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-ati.h
deleted file mode 100644
index 2d4e237d9a..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-ati.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-//#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-//#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-//#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 2.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = false;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 8.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(0.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = false;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-intel.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-intel.h
deleted file mode 100644
index 14b2c56d52..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-intel.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    #define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-//#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-//#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-//#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 0.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = false;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 8.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(0.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = false;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-nvidia.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-nvidia.h
deleted file mode 100644
index 0ae4b7f01c..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-nvidia.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    #define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    #define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    #define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    #define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    #define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-//#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-//#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-//#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 2.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = false;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 8.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(0.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = false;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-ati.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-ati.h
deleted file mode 100644
index 73f049c644..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-ati.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-//#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-//#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-//#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-//#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-//#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-//#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-//#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 0.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 2.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = false;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = false;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 8.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(0.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = mask_specify_num_triads_static;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = false;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-intel.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-intel.h
deleted file mode 100644
index b8a9bf603e..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-intel.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    #define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-//#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-//#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-//#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-//#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-//#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-//#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-//#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 0.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 2.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = false;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = false;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 8.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(0.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = mask_specify_num_triads_static;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = false;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-nvidia.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-nvidia.h
deleted file mode 100644
index 8751126146..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-fast-static-nvidia.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    #define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    #define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    #define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    #define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    #define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-//#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-//#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-//#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-//#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-//#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-//#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-//#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 0.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 2.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = false;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = false;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 8.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(0.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = mask_specify_num_triads_static;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = false;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-royale-with-cheese-ati.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-royale-with-cheese-ati.h
deleted file mode 100644
index 0586732238..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-royale-with-cheese-ati.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 2.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 4.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = true;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 6.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-royale-with-cheese-nvidia.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-royale-with-cheese-nvidia.h
deleted file mode 100644
index 4aebad3a54..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings-royale-with-cheese-nvidia.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    #define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    #define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    #define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    #define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    #define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 2.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 4.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = true;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 6.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings.h b/crt/shaders/crt-royale/crt-royale-settings-files/user-settings.h
deleted file mode 100644
index e43cee77a4..0000000000
--- a/crt/shaders/crt-royale/crt-royale-settings-files/user-settings.h
+++ /dev/null
@@ -1,359 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-    static const float bloom_approx_filter_static = 2.0;
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = true;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 6.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/src-fast/bind-shader-params.h b/crt/shaders/crt-royale/src-fast/bind-shader-params.h
deleted file mode 100644
index 6af2b6712c..0000000000
--- a/crt/shaders/crt-royale/src-fast/bind-shader-params.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef BIND_SHADER_PARAMS_H
-#define BIND_SHADER_PARAMS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	float crt_gamma;
-	float lcd_gamma;
-	float levels_contrast;
-	float bloom_underestimate_levels;
-	float bloom_excess;
-	float beam_min_sigma;
-	float beam_max_sigma;
-	float beam_spot_power;
-	float beam_min_shape;
-	float beam_max_shape;
-	float beam_shape_power;
-	float beam_horiz_filter;
-	float beam_horiz_sigma;
-	float beam_horiz_linear_rgb_weight;
-	float convergence_offset_x_r;
-	float convergence_offset_x_g;
-	float convergence_offset_x_b;
-	float convergence_offset_y_r;
-	float convergence_offset_y_g;
-	float convergence_offset_y_b;
-	float mask_type;
-//	float mask_sample_mode_desired;
-	float mask_num_triads_desired;
-	float mask_triad_size_desired;
-	float mask_specify_num_triads;
-	float aa_subpixel_r_offset_x_runtime;
-	float aa_subpixel_r_offset_y_runtime;
-	float aa_cubic_c;
-	float aa_gauss_sigma;
-	float interlace_bff;
-	float interlace_1080i;
-	float interlace_detect_toggle;
-} global;
-
-#include "user-settings.h"
-#include "derived-settings-and-constants.h"
-
-//  Override some parameters for gamma-management.h and tex2Dantialias.h:
-#define OVERRIDE_DEVICE_GAMMA
-float gba_gamma = 3.5; //  Irrelevant but necessary to define.
-#define ANTIALIAS_OVERRIDE_BASICS
-#define ANTIALIAS_OVERRIDE_PARAMETERS
-
-#pragma parameter crt_gamma "Simulated CRT Gamma" 2.4 1.0 5.0 0.025
-#define crt_gamma global.crt_gamma
-#pragma parameter lcd_gamma "Your Display Gamma" 2.4 1.0 5.0 0.025
-#define lcd_gamma global.lcd_gamma
-#pragma parameter levels_contrast "Contrast" 0.671875 0.0 4.0 0.015625
-#define levels_contrast global.levels_contrast
-#pragma parameter bloom_underestimate_levels "Bloom - Underestimate Levels" 1.0 0.0 5.0 0.01
-#define bloom_underestimate_levels global.bloom_underestimate_levels
-#pragma parameter bloom_excess "Bloom - Excess" 0.0 0.0 1.0 0.005
-#pragma parameter beam_min_sigma "Beam - Min Sigma" 0.055 0.005 1.0 0.005
-#define beam_min_sigma global.beam_min_sigma
-#pragma parameter beam_max_sigma "Beam - Max Sigma" 0.2 0.005 1.0 0.005
-#define beam_max_sigma global.beam_max_sigma
-#pragma parameter beam_spot_power "Beam - Spot Power" 0.38 0.01 16.0 0.01
-#define beam_spot_power global.beam_spot_power
-#pragma parameter beam_min_shape "Beam - Min Shape" 2.0 2.0 32.0 0.1
-#define beam_min_shape global.beam_min_shape
-#pragma parameter beam_max_shape "Beam - Max Shape" 2.0 2.0 32.0 0.1
-#define beam_max_shape global.beam_max_shape
-#pragma parameter beam_shape_power "Beam - Shape Power" 0.25 0.01 16.0 0.01
-#define beam_shape_power global.beam_shape_power
-#pragma parameter beam_horiz_filter "Beam - Horiz Filter" 0.0 0.0 3.0 1.0
-#define beam_horiz_filter global.beam_horiz_filter
-#pragma parameter beam_horiz_sigma "Beam - Horiz Sigma" 0.35 0.0 0.67 0.005
-#define beam_horiz_sigma global.beam_horiz_sigma
-#pragma parameter beam_horiz_linear_rgb_weight "Beam - Horiz Linear RGB Weight" 1.0 0.0 1.0 0.01
-#pragma parameter convergence_offset_x_r "Convergence - Offset X Red" 0.0 -4.0 4.0 0.05
-#define convergence_offset_x_r global.convergence_offset_x_r
-#pragma parameter convergence_offset_x_g "Convergence - Offset X Green" 0.0 -4.0 4.0 0.05
-#define convergence_offset_x_g global.convergence_offset_x_g
-#pragma parameter convergence_offset_x_b "Convergence - Offset X Blue" 0.0 -4.0 4.0 0.05
-#define convergence_offset_x_b global.convergence_offset_x_b
-#pragma parameter convergence_offset_y_r "Convergence - Offset Y Red" 0.05 -2.0 2.0 0.05
-#define convergence_offset_y_r global.convergence_offset_y_r
-#pragma parameter convergence_offset_y_g "Convergence - Offset Y Green" -0.05 -2.0 2.0 0.05
-#define convergence_offset_y_g global.convergence_offset_y_g
-#pragma parameter convergence_offset_y_b "Convergence - Offset Y Blue" 0.05 -2.0 2.0 0.05
-#define convergence_offset_y_b global.convergence_offset_y_b
-#pragma parameter mask_type "Mask - Type" 0.0 0.0 2.0 1.0
-#define mask_type global.mask_type
-//#pragma parameter mask_sample_mode_desired "Mask - Sample Mode" 0.0 0.0 2.0 1.0   //  Consider blocking mode 2.
-//#define mask_sample_mode_desired global.mask_sample_mode_desired
-#pragma parameter mask_specify_num_triads "Mask - Specify Number of Triads" 0.0 0.0 1.0 1.0
-#pragma parameter mask_triad_size_desired "Mask - Triad Size Desired" 3.0 1.0 18.0 0.125
-#pragma parameter mask_num_triads_desired "Mask - Number of Triads Desired" 480.0 342.0 1920.0 1.0
-#pragma parameter aa_subpixel_r_offset_x_runtime "AA - Subpixel R Offset X" -0.333333333 -0.333333333 0.333333333 0.333333333
-#define aa_subpixel_r_offset_x_runtime global.aa_subpixel_r_offset_x_runtime
-#pragma parameter aa_subpixel_r_offset_y_runtime "AA - Subpixel R Offset Y" 0.0 -0.333333333 0.333333333 0.333333333
-#define aa_subpixel_r_offset_y_runtime global.aa_subpixel_r_offset_y_runtime
-#pragma parameter aa_cubic_c "AA - Cubic Sharpness" 0.5 0.0 4.0 0.015625
-#define aa_cubic_c global.aa_cubic_c
-#pragma parameter aa_gauss_sigma "AA - Gaussian Sigma" 0.5 0.0625 1.0 0.015625
-#define aa_gauss_sigma global.aa_gauss_sigma
-#pragma parameter interlace_detect_toggle "Interlacing - Toggle" 1.0 0.0 1.0 1.0
-bool interlace_detect = bool(global.interlace_detect_toggle);
-#pragma parameter interlace_bff "Interlacing - Bottom Field First" 0.0 0.0 1.0 1.0
-//#define interlace_bff global.interlace_bff
-#pragma parameter interlace_1080i "Interlace - Detect 1080i" 0.0 0.0 1.0 1.0
-#define interlace_1080i global.interlace_1080i
-
-//  Provide accessors for vector constants that pack scalar uniforms:
-vec2 get_aspect_vector(const float geom_aspect_ratio)
-{
-    //  Get an aspect ratio vector.  Enforce geom_max_aspect_ratio, and prevent
-    //  the absolute scale from affecting the uv-mapping for curvature:
-    const float geom_clamped_aspect_ratio =
-        min(geom_aspect_ratio, geom_max_aspect_ratio);
-    const vec2 geom_aspect =
-        normalize(vec2(geom_clamped_aspect_ratio, 1.0));
-    return geom_aspect;
-}
-
-
-vec3 get_convergence_offsets_x_vector()
-{
-    return vec3(convergence_offset_x_r, convergence_offset_x_g,
-        convergence_offset_x_b);
-}
-
-vec3 get_convergence_offsets_y_vector()
-{
-    return vec3(convergence_offset_y_r, convergence_offset_y_g,
-        convergence_offset_y_b);
-}
-
-vec2 get_convergence_offsets_r_vector()
-{
-    return vec2(convergence_offset_x_r, convergence_offset_y_r);
-}
-
-vec2 get_convergence_offsets_g_vector()
-{
-    return vec2(convergence_offset_x_g, convergence_offset_y_g);
-}
-
-vec2 get_convergence_offsets_b_vector()
-{
-    return vec2(convergence_offset_x_b, convergence_offset_y_b);
-}
-
-vec2 get_aa_subpixel_r_offset()
-{
-    return aa_subpixel_r_offset_static;
-}
-
-//  Provide accessors settings which still need "cooking:"
-float get_mask_amplify()
-{
-    float mask_grille_amplify = 1.0/mask_grille_avg_color;
-    float mask_slot_amplify = 1.0/mask_slot_avg_color;
-    float mask_shadow_amplify = 1.0/mask_shadow_avg_color;
-    return mask_type < 0.5 ? mask_grille_amplify :
-        mask_type < 1.5 ? mask_slot_amplify :
-        mask_shadow_amplify;
-}
-
-//float get_mask_sample_mode()
-//{
-//    return mask_sample_mode_desired;
-//}
-
-#endif  //  BIND_SHADER_PARAMS_H
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang b/crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang
deleted file mode 100644
index f2d7e62e3d..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang
+++ /dev/null
@@ -1,245 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	vec4 MASKED_SCANLINESSize;
-	vec4 BRIGHTPASSSize;
-} params;
-
-#define MASKED_SCANLINEStexture MASKED_SCANLINES
-#define MASKED_SCANLINEStexture_size params.MASKED_SCANLINESSize.xy
-#define MASKED_SCANLINESvideo_size params.MASKED_SCANLINESSize.xy
-#define BRIGHTPASStexture BRIGHTPASS
-#define BRIGHTPASStexture_size params.BRIGHTPASSSize.xy
-#define BRIGHTPASSvideo_size params.BRIGHTPASSSize.xy
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "bind-shader-params.h"
-
-///////////////////////////////  VERTEX INCLUDES  //////////////////////////////
-
-#include "scanline-functions.h"
-
-#define GAMMA_OUT(color)    pow(color, vec3(1.0 / lcd_gamma))
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-float max_viewport_size_x  = 1080.0*1024.0*(4.0/3.0);
-float bloom_diff_thresh_   = 1.0/256.0;
-float mask_min_allowed_tile_size  = ceil(mask_min_allowed_triad_size * mask_triads_per_tile);
-
-struct st_gauss{
-    vec4 w1_8;
-    vec4 w1_8_ratio;
-};
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 video_uv;
-layout(location = 1) out vec2 bloom_dxdy;
-layout(location = 2) out float bloom_sigma_runtime;
-layout(location = 3) out vec4 w1_8;
-layout(location = 4) out vec4 w1_8_ratio;
-layout(location = 5) out float weight_sum_inv;
-layout(location = 6) out float undim_mask_contrast_factors;
-
-// copied from bloom-functions.h
-float get_min_sigma_to_blur_triad(float triad_size,
-    float thresh)
-{
-    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
-    //              2.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum sigma that will fully blur a phosphor
-    //              triad on the screen to an even color, within thresh.
-    //              This closed-form function was found by curve-fitting data.
-    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
-    return -0.05168 + 0.6113*triad_size -
-        1.122*triad_size*sqrt(0.000416 + thresh);
-    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
-    //return 0.5985*triad_size - triad_size*sqrt(thresh)
-}
-
-float get_fast_gaussian_weight_sum_inv(float sigma)
-{
-    //  We can use the Gaussian integral to calculate the asymptotic weight for
-    //  the center pixel.  Since the unnormalized center pixel weight is 1.0,
-    //  the normalized weight is the same as the weight sum inverse.  Given a
-    //  large enough blur (9+), the asymptotic weight sum is close and faster:
-    //      center_weight = 0.5 *
-    //          (erf(0.5/(sigma*sqrt(2.0))) - erf(-0.5/(sigma*sqrt(2.0))))
-    //      erf(-x) == -erf(x), so we get 0.5 * (2.0 * erf(blah blah)):
-    //  However, we can get even faster results with curve-fitting.  These are
-    //  also closer than the asymptotic results, because they were constructed
-    //  from 64 blurs sizes from [3, 131) and 255 equally-spaced sigmas from
-    //  (0, blurN_std_dev), so the results for smaller sigmas are biased toward
-    //  smaller blurs.  The max error is 0.0031793913.
-    //  Relative FPS: 134.3 with erf, 135.8 with curve-fitting.
-    //float temp = 0.5/sqrt(2.0);
-    //return erf(temp/sigma);
-    return min(exp(exp(0.348348412457428/
-        (sigma - 0.0860587260734721))), 0.399334576340352/sigma);
-}
-
-st_gauss get_blur_fastest_w1_8(float sigma)
-{
-    float denom_inv = 0.5/(sigma*sigma);
-    float w0 = 1.0;
-    float w1 = exp(-1.0 * denom_inv);
-    float w2 = exp(-4.0 * denom_inv);
-    float w3 = exp(-9.0 * denom_inv);
-    float w4 = exp(-16.0 * denom_inv);
-    float w5 = exp(-25.0 * denom_inv);
-    float w6 = exp(-36.0 * denom_inv);
-    float w7 = exp(-49.0 * denom_inv);
-    float w8 = exp(-64.0 * denom_inv);
-
-    st_gauss blur_weights;
-
-    blur_weights.w1_8.x = w1 + w2;
-    blur_weights.w1_8.y = w3 + w4;
-    blur_weights.w1_8.z = w5 + w6;
-    blur_weights.w1_8.w = w7 + w8;
-    blur_weights.w1_8_ratio.x = w2/(blur_weights.w1_8.x);
-    blur_weights.w1_8_ratio.y = w4/(blur_weights.w1_8.y);
-    blur_weights.w1_8_ratio.z = w6/(blur_weights.w1_8.z);
-    blur_weights.w1_8_ratio.w = w8/(blur_weights.w1_8.w);
-
-    return blur_weights;
-}
-
-vec2 get_resized_mask_tile_size(vec2 estimated_viewport_size, vec2 estimated_mask_resize_output_size, bool solemnly_swear_same_inputs_for_every_pass)
-{
-    //  Stated tile properties must be correct:
-    float tile_aspect_ratio_inv = mask_resize_src_lut_size.y/mask_resize_src_lut_size.x;
-    float tile_aspect_ratio     = 1.0/tile_aspect_ratio_inv;
-    vec2  tile_aspect           = vec2(1.0, tile_aspect_ratio_inv);
-
-    //  If mask_specify_num_triads is 1.0/true and estimated_viewport_size.x is
-    //  wrong, the user preference will be misinterpreted:
-    float desired_tile_size_x = mask_triads_per_tile * mix(global.mask_triad_size_desired, estimated_viewport_size.x / global.mask_num_triads_desired, global.mask_specify_num_triads);
-
-    //  Make sure we're not upsizing:
-    float temp_tile_size_x = min(desired_tile_size_x, mask_resize_src_lut_size.x);
-
-    //  Enforce min_tile_size and max_tile_size in both dimensions:
-    vec2 temp_tile_size    = temp_tile_size_x * tile_aspect;
-    vec2 min_tile_size     = mask_min_allowed_tile_size * tile_aspect;
-    vec2 max_tile_size     = estimated_mask_resize_output_size / mask_resize_num_tiles;
-    vec2 clamped_tile_size = clamp(temp_tile_size, min_tile_size, max_tile_size);
-
-    float x_tile_size_from_y = clamped_tile_size.y * tile_aspect_ratio;
-    float y_tile_size_from_x = mix(clamped_tile_size.y, clamped_tile_size.x * tile_aspect_ratio_inv, float(solemnly_swear_same_inputs_for_every_pass));
-    vec2 reclamped_tile_size = vec2(min(clamped_tile_size.x, x_tile_size_from_y), min(clamped_tile_size.y, y_tile_size_from_x));
-
-    //  We need integer tile sizes in both directions for tiled sampling to
-    //  work correctly.  Use floor (to make sure we don't round up), but be
-    //  careful to avoid a rounding bug where floor decreases whole numbers:
-    vec2 final_resized_tile_size = floor(reclamped_tile_size + vec2(FIX_ZERO(0.0)));
-
-    return final_resized_tile_size;
-}
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    video_uv = TexCoord;
-
-    //  We're horizontally blurring the bloom input (vertically blurred
-    //  brightpass).  Get the uv distance between output pixels / input texels
-    //  in the horizontal direction (this pass must NOT resize):
-    bloom_dxdy = vec2(1.0/params.SourceSize.x, 0.0);
-
-    //  Calculate a runtime bloom_sigma in case it's needed:
-    float mask_tile_size_x = get_resized_mask_tile_size(params.OutputSize.xy, params.OutputSize.xy * mask_resize_viewport_scale, false).x;
-
-    bloom_sigma_runtime = get_min_sigma_to_blur_triad(mask_tile_size_x / mask_triads_per_tile, bloom_diff_thresh_);
-
-    st_gauss blur_weights = get_blur_fastest_w1_8(bloom_sigma_runtime);
-
-    w1_8       = blur_weights.w1_8;
-    w1_8_ratio = blur_weights.w1_8_ratio;
-
-    weight_sum_inv = get_fast_gaussian_weight_sum_inv(bloom_sigma_runtime);
-
-    float undim_factor = 1.0/levels_autodim_temp;
-
-    undim_mask_contrast_factors = undim_factor * get_mask_amplify() * levels_contrast;
-//    undim_mask_contrast_factors = 2.0 * (255.0/46.0) * 1.0;
-}
-
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 video_uv;
-layout(location = 1) in vec2 bloom_dxdy;
-layout(location = 2) in float bloom_sigma_runtime;
-layout(location = 3) in vec4 w1_8;
-layout(location = 4) in vec4 w1_8_ratio;
-layout(location = 5) in float weight_sum_inv;
-layout(location = 6) in float undim_mask_contrast_factors;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D BRIGHTPASS;
-layout(set = 0, binding = 4) uniform sampler2D MASKED_SCANLINES;
-#define bloom_texture Source
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-vec3 tex2Dblur17fastest(sampler2D tex, vec2 tex_uv, vec2 dxdy, float weight_sum_inv, vec4 w1_8, vec4 w1_8_ratio)
-{
-
-    float w0 = 1.0;
-
-    vec3 sum = vec3(0.0,0.0,0.0);
-
-    sum += (w1_8.w * texture(tex, tex_uv - (7.0 + w1_8_ratio.w) * dxdy).rgb);
-    sum += (w1_8.z * texture(tex, tex_uv - (5.0 + w1_8_ratio.z) * dxdy).rgb);
-    sum += (w1_8.y * texture(tex, tex_uv - (3.0 + w1_8_ratio.y) * dxdy).rgb);
-    sum += (w1_8.x * texture(tex, tex_uv - (1.0 + w1_8_ratio.x) * dxdy).rgb);
-    sum += (w0 * texture(tex, tex_uv).rgb);
-    sum += (w1_8.x * texture(tex, tex_uv + (1.0 + w1_8_ratio.x) * dxdy).rgb);
-    sum += (w1_8.y * texture(tex, tex_uv + (3.0 + w1_8_ratio.y) * dxdy).rgb);
-    sum += (w1_8.z * texture(tex, tex_uv + (5.0 + w1_8_ratio.z) * dxdy).rgb);
-    sum += (w1_8.w * texture(tex, tex_uv + (7.0 + w1_8_ratio.w) * dxdy).rgb);
-
-    return sum * weight_sum_inv;
-}
-
-void main()
-{
-    vec3 blurred_brightpass = tex2Dblur17fastest(bloom_texture, video_uv, bloom_dxdy, weight_sum_inv, w1_8, w1_8_ratio);
-
-    //  Sample the masked scanlines.  Alpha contains the auto-dim factor:
-    vec3 intensity_dim  = texture(MASKED_SCANLINEStexture, video_uv).rgb;
-
-    //  Calculate the mask dimpass, add it to the blurred brightpass, and
-    //  undim (from scanline auto-dim) and amplify (from mask dim) the result:
-    vec3 brightpass     = texture(BRIGHTPASStexture, video_uv).rgb;
-    vec3 phosphor_bloom = (intensity_dim - brightpass + blurred_brightpass) * undim_mask_contrast_factors;
-
-    //  Encode and output the bloomed image:
-    FragColor = vec4(GAMMA_OUT(phosphor_bloom), 1.0);
-}
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang b/crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang
deleted file mode 100644
index e458dc31b7..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang
+++ /dev/null
@@ -1,214 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 MASKED_SCANLINESSize;
-	vec4 BLOOM_APPROXSize;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "bind-shader-params.h"
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-float max_viewport_size_x  = 1080.0*1024.0*(4.0/3.0);
-float bloom_diff_thresh_   = 1.0/256.0;
-float mask_min_allowed_tile_size  = ceil(mask_min_allowed_triad_size * mask_triads_per_tile);
-
-struct st_gauss{
-    vec4 w1_8;
-    vec4 w1_8_ratio;
-};
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 bloom_dxdy;
-layout(location = 2) out float bloom_sigma_runtime;
-layout(location = 3) out vec4 w1_8;
-layout(location = 4) out vec4 w1_8_ratio;
-layout(location = 5) out float weight_sum_inv;
-
-// copied from bloom-functions.h
-float get_min_sigma_to_blur_triad(float triad_size,
-    float thresh)
-{
-    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
-    //              2.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum sigma that will fully blur a phosphor
-    //              triad on the screen to an even color, within thresh.
-    //              This closed-form function was found by curve-fitting data.
-    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
-    return -0.05168 + 0.6113*triad_size - 1.122*triad_size*sqrt(0.000416 + thresh);
-    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
-    //return 0.5985*triad_size - triad_size*sqrt(thresh)
-}
-
-float get_fast_gaussian_weight_sum_inv(float sigma)
-{
-    //  We can use the Gaussian integral to calculate the asymptotic weight for
-    //  the center pixel.  Since the unnormalized center pixel weight is 1.0,
-    //  the normalized weight is the same as the weight sum inverse.  Given a
-    //  large enough blur (9+), the asymptotic weight sum is close and faster:
-    //      center_weight = 0.5 *
-    //          (erf(0.5/(sigma*sqrt(2.0))) - erf(-0.5/(sigma*sqrt(2.0))))
-    //      erf(-x) == -erf(x), so we get 0.5 * (2.0 * erf(blah blah)):
-    //  However, we can get even faster results with curve-fitting.  These are
-    //  also closer than the asymptotic results, because they were constructed
-    //  from 64 blurs sizes from [3, 131) and 255 equally-spaced sigmas from
-    //  (0, blurN_std_dev), so the results for smaller sigmas are biased toward
-    //  smaller blurs.  The max error is 0.0031793913.
-    //  Relative FPS: 134.3 with erf, 135.8 with curve-fitting.
-    //float temp = 0.5/sqrt(2.0);
-    //return erf(temp/sigma);
-    return min(exp(exp(0.348348412457428/(sigma - 0.0860587260734721))), 0.399334576340352/sigma);
-}
-
-st_gauss get_blur_fastest_w1_8(float sigma)
-{
-    float denom_inv = 0.5/(sigma*sigma);
-    float w0 = 1.0;
-    float w1 = exp(-1.0 * denom_inv);
-    float w2 = exp(-4.0 * denom_inv);
-    float w3 = exp(-9.0 * denom_inv);
-    float w4 = exp(-16.0 * denom_inv);
-    float w5 = exp(-25.0 * denom_inv);
-    float w6 = exp(-36.0 * denom_inv);
-    float w7 = exp(-49.0 * denom_inv);
-    float w8 = exp(-64.0 * denom_inv);
-
-    st_gauss blur_weights;
-
-    blur_weights.w1_8.x = w1 + w2;
-    blur_weights.w1_8.y = w3 + w4;
-    blur_weights.w1_8.z = w5 + w6;
-    blur_weights.w1_8.w = w7 + w8;
-    blur_weights.w1_8_ratio.x = w2/(blur_weights.w1_8.x);
-    blur_weights.w1_8_ratio.y = w4/(blur_weights.w1_8.y);
-    blur_weights.w1_8_ratio.z = w6/(blur_weights.w1_8.z);
-    blur_weights.w1_8_ratio.w = w8/(blur_weights.w1_8.w);
-
-    return blur_weights;
-}
-
-vec2 get_resized_mask_tile_size(vec2 estimated_viewport_size, vec2 estimated_mask_resize_output_size, bool solemnly_swear_same_inputs_for_every_pass)
-{
-    //  Stated tile properties must be correct:
-    float tile_aspect_ratio_inv = mask_resize_src_lut_size.y/mask_resize_src_lut_size.x;
-    float tile_aspect_ratio     = 1.0/tile_aspect_ratio_inv;
-    vec2  tile_aspect           = vec2(1.0, tile_aspect_ratio_inv);
-
-    //  If mask_specify_num_triads is 1.0/true and estimated_viewport_size.x is
-    //  wrong, the user preference will be misinterpreted:
-    float desired_tile_size_x = mask_triads_per_tile * mix(global.mask_triad_size_desired, estimated_viewport_size.x / global.mask_num_triads_desired, global.mask_specify_num_triads);
-
-    //  Make sure we're not upsizing:
-    float temp_tile_size_x = min(desired_tile_size_x, mask_resize_src_lut_size.x);
-
-    //  Enforce min_tile_size and max_tile_size in both dimensions:
-    vec2 temp_tile_size    = temp_tile_size_x * tile_aspect;
-    vec2 min_tile_size     = mask_min_allowed_tile_size * tile_aspect;
-    vec2 max_tile_size     = estimated_mask_resize_output_size / mask_resize_num_tiles;
-    vec2 clamped_tile_size = clamp(temp_tile_size, min_tile_size, max_tile_size);
-
-    float x_tile_size_from_y = clamped_tile_size.y * tile_aspect_ratio;
-    float y_tile_size_from_x = mix(clamped_tile_size.y, clamped_tile_size.x * tile_aspect_ratio_inv, float(solemnly_swear_same_inputs_for_every_pass));
-    vec2 reclamped_tile_size = vec2(min(clamped_tile_size.x, x_tile_size_from_y), min(clamped_tile_size.y, y_tile_size_from_x));
-
-    //  We need integer tile sizes in both directions for tiled sampling to
-    //  work correctly.  Use floor (to make sure we don't round up), but be
-    //  careful to avoid a rounding bug where floor decreases whole numbers:
-    vec2 final_resized_tile_size = floor(reclamped_tile_size + vec2(FIX_ZERO(0.0)));
-
-    return final_resized_tile_size;
-}
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    tex_uv = TexCoord * 1.0001;
-   
-    //  Get the uv sample distance between output pixels.  Calculate dxdy like
-    //  blurs/shaders/vertex-shader-blur-fast-vertical.h.
-    vec2 dxdy_scale = params.SourceSize.xy/params.OutputSize.xy;
-    vec2 dxdy       = dxdy_scale/params.SourceSize.xy;
-
-    //  This blur is vertical-only, so zero out the vertical offset:
-    bloom_dxdy = vec2(0.0, dxdy.y);
-
-    //  Calculate a runtime bloom_sigma in case it's needed:
-    float mask_tile_size_x = get_resized_mask_tile_size(params.OutputSize.xy, params.OutputSize.xy * mask_resize_viewport_scale, false).x;
-    bloom_sigma_runtime    = get_min_sigma_to_blur_triad(mask_tile_size_x / mask_triads_per_tile, bloom_diff_thresh_);
-
-    st_gauss blur_weights  = get_blur_fastest_w1_8(bloom_sigma_runtime);
-
-    w1_8       = blur_weights.w1_8;
-    w1_8_ratio = blur_weights.w1_8_ratio;
-
-    weight_sum_inv = get_fast_gaussian_weight_sum_inv(bloom_sigma_runtime);
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 bloom_dxdy;
-layout(location = 2) in float bloom_sigma_runtime;
-layout(location = 3) in vec4 w1_8;
-layout(location = 4) in vec4 w1_8_ratio;
-layout(location = 5) in float weight_sum_inv;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-vec3 tex2Dblur17fastest(sampler2D tex, vec2 tex_uv, vec2 dxdy, float weight_sum_inv, vec4 w1_8, vec4 w1_8_ratio)
-{
-
-    float w0 = 1.0;
-
-    vec3 sum = vec3(0.0,0.0,0.0);
-
-    sum += (w1_8.w * texture(tex, tex_uv - (7.0 + w1_8_ratio.w) * dxdy).rgb);
-    sum += (w1_8.z * texture(tex, tex_uv - (5.0 + w1_8_ratio.z) * dxdy).rgb);
-    sum += (w1_8.y * texture(tex, tex_uv - (3.0 + w1_8_ratio.y) * dxdy).rgb);
-    sum += (w1_8.x * texture(tex, tex_uv - (1.0 + w1_8_ratio.x) * dxdy).rgb);
-    sum += (w0 * texture(tex, tex_uv).rgb);
-    sum += (w1_8.x * texture(tex, tex_uv + (1.0 + w1_8_ratio.x) * dxdy).rgb);
-    sum += (w1_8.y * texture(tex, tex_uv + (3.0 + w1_8_ratio.y) * dxdy).rgb);
-    sum += (w1_8.z * texture(tex, tex_uv + (5.0 + w1_8_ratio.z) * dxdy).rgb);
-    sum += (w1_8.w * texture(tex, tex_uv + (7.0 + w1_8_ratio.w) * dxdy).rgb);
-
-    return sum * weight_sum_inv;
-}
-
-void main()
-{
-    FragColor = vec4(tex2Dblur17fastest(Source, tex_uv, bloom_dxdy, weight_sum_inv, w1_8, w1_8_ratio), 1.0);
-}
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang b/crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang
deleted file mode 100644
index ad75a13500..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang
+++ /dev/null
@@ -1,179 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 MASKED_SCANLINESSize;
-} params;
-
-#define MASKED_SCANLINEStexture MASKED_SCANLINES
-#define MASKED_SCANLINEStexture_size params.MASKED_SCANLINESSize.xy
-#define MASKED_SCANLINESvideo_size params.MASKED_SCANLINESSize.xy
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "bind-shader-params.h"
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-float bloom_diff_thresh_ = 1.0/256.0;
-float mask_min_allowed_tile_size  = ceil(mask_min_allowed_triad_size * mask_triads_per_tile);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out float center_weight;
-layout(location = 2) out float undim_mask_contrast_factors;
-
-// copied from bloom-functions.h
-float get_min_sigma_to_blur_triad(float triad_size,
-    float thresh)
-{
-    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
-    //              2.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum sigma that will fully blur a phosphor
-    //              triad on the screen to an even color, within thresh.
-    //              This closed-form function was found by curve-fitting data.
-    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
-    return -0.05168 + 0.6113*triad_size - 1.122*triad_size*sqrt(0.000416 + thresh);
-    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
-    //return 0.5985*triad_size - triad_size*sqrt(thresh)
-}
-
-float get_fast_gaussian_weight_sum_inv(float sigma)
-{
-    //  We can use the Gaussian integral to calculate the asymptotic weight for
-    //  the center pixel.  Since the unnormalized center pixel weight is 1.0,
-    //  the normalized weight is the same as the weight sum inverse.  Given a
-    //  large enough blur (9+), the asymptotic weight sum is close and faster:
-    //      center_weight = 0.5 *
-    //          (erf(0.5/(sigma*sqrt(2.0))) - erf(-0.5/(sigma*sqrt(2.0))))
-    //      erf(-x) == -erf(x), so we get 0.5 * (2.0 * erf(blah blah)):
-    //  However, we can get even faster results with curve-fitting.  These are
-    //  also closer than the asymptotic results, because they were constructed
-    //  from 64 blurs sizes from [3, 131) and 255 equally-spaced sigmas from
-    //  (0, blurN_std_dev), so the results for smaller sigmas are biased toward
-    //  smaller blurs.  The max error is 0.0031793913.
-    //  Relative FPS: 134.3 with erf, 135.8 with curve-fitting.
-    //float temp = 0.5/sqrt(2.0);
-    //return erf(temp/sigma);
-    return min(exp(exp(0.348348412457428/(sigma - 0.0860587260734721))), 0.399334576340352/sigma);
-}
-
-vec2 get_resized_mask_tile_size(vec2 estimated_viewport_size, vec2 estimated_mask_resize_output_size, bool solemnly_swear_same_inputs_for_every_pass)
-{
-    //  Stated tile properties must be correct:
-    float tile_aspect_ratio_inv = mask_resize_src_lut_size.y/mask_resize_src_lut_size.x;
-    float tile_aspect_ratio     = 1.0/tile_aspect_ratio_inv;
-    vec2  tile_aspect           = vec2(1.0, tile_aspect_ratio_inv);
-
-    //  If mask_specify_num_triads is 1.0/true and estimated_viewport_size.x is
-    //  wrong, the user preference will be misinterpreted:
-    float desired_tile_size_x = mask_triads_per_tile * mix(global.mask_triad_size_desired, estimated_viewport_size.x / global.mask_num_triads_desired, global.mask_specify_num_triads);
-
-    //  Make sure we're not upsizing:
-    float temp_tile_size_x = min(desired_tile_size_x, mask_resize_src_lut_size.x);
-
-    //  Enforce min_tile_size and max_tile_size in both dimensions:
-    vec2 temp_tile_size    = temp_tile_size_x * tile_aspect;
-    vec2 min_tile_size     = mask_min_allowed_tile_size * tile_aspect;
-    vec2 max_tile_size     = estimated_mask_resize_output_size / mask_resize_num_tiles;
-    vec2 clamped_tile_size = clamp(temp_tile_size, min_tile_size, max_tile_size);
-
-    float x_tile_size_from_y = clamped_tile_size.y * tile_aspect_ratio;
-    float y_tile_size_from_x = mix(clamped_tile_size.y, clamped_tile_size.x * tile_aspect_ratio_inv, float(solemnly_swear_same_inputs_for_every_pass));
-    vec2 reclamped_tile_size = vec2(min(clamped_tile_size.x, x_tile_size_from_y), min(clamped_tile_size.y, y_tile_size_from_x));
-
-    //  We need integer tile sizes in both directions for tiled sampling to
-    //  work correctly.  Use floor (to make sure we don't round up), but be
-    //  careful to avoid a rounding bug where floor decreases whole numbers:
-    vec2 final_resized_tile_size = floor(reclamped_tile_size + vec2(FIX_ZERO(0.0)));
-
-    return final_resized_tile_size;
-}
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-
-    tex_uv = TexCoord;
-
-    //  Calculate a runtime bloom_sigma in case it's needed:
-    float mask_tile_size_x    = get_resized_mask_tile_size(params.OutputSize.xy, params.OutputSize.xy * mask_resize_viewport_scale, false).x;
-    float bloom_sigma_runtime = get_min_sigma_to_blur_triad(mask_tile_size_x / mask_triads_per_tile, bloom_diff_thresh_);
-
-    center_weight = get_fast_gaussian_weight_sum_inv(bloom_sigma_runtime);
-
-    float undim_factor = 1.0/levels_autodim_temp;
-
-    undim_mask_contrast_factors = undim_factor * get_mask_amplify() * levels_contrast;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in float center_weight;
-layout(location = 2) in float undim_mask_contrast_factors;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D MASKED_SCANLINES;
-layout(set = 0, binding = 3) uniform sampler2D ORIG_LINEARIZED;
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-void main()
-{
-    //  Sample the masked scanlines:
-    vec3 intensity_dim = texture(MASKED_SCANLINEStexture, tex_uv).rgb;
-
-    //  Get the full intensity, including auto-undimming, and mask compensation:
-    vec3  intensity = intensity_dim * undim_mask_contrast_factors;
-
-    //  Sample BLOOM_APPROX to estimate what a straight blur of masked scanlines
-    //  would look like, so we can estimate how much energy we'll receive from
-    //  blooming neighbors:
-    vec3 phosphor_blur_approx = levels_contrast * texture(ORIG_LINEARIZED, tex_uv).rgb;
-
-    //  Compute the blur weight for the center texel and the maximum energy we
-    //  expect to receive from neighbors:
-    vec3  max_area_contribution_approx = max(vec3(0.0, 0.0, 0.0), phosphor_blur_approx - center_weight * intensity);
-
-    //  Assume neighbors will blur 100% of their intensity (blur_ratio = 1.0),
-    //  because it actually gets better results (on top of being very simple),
-    //  but adjust all intensities for the user's desired underestimate factor:
-    vec3 area_contrib_underestimate = bloom_underestimate_levels * max_area_contribution_approx;
-    vec3 intensity_underestimate    = bloom_underestimate_levels * intensity;
-
-    //  Calculate the blur_ratio, the ratio of intensity we want to blur:
-    vec3 blur_ratio_temp = ((vec3(1.0, 1.0, 1.0) - area_contrib_underestimate) / intensity_underestimate - vec3(1.0, 1.0, 1.0)) / (center_weight - 1.0);
-    vec3 blur_ratio      = clamp(blur_ratio_temp, 0.0, 1.0);
-
-    //  Calculate the brightpass based on the auto-dimmed, unamplified, masked
-    //  scanlines, encode if necessary, and return!
-    vec3 brightpass = intensity_dim * mix(blur_ratio, vec3(1.0, 1.0, 1.0), global.bloom_excess);
-
-    FragColor = vec4(brightpass, 1.0);
-}
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang b/crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang
deleted file mode 100644
index 258a539c2c..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang
+++ /dev/null
@@ -1,97 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "bind-shader-params.h"
-#include "scanline-functions.h"
-
-#define GAMMA_IN(color)    pow(color, vec3(crt_gamma))
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 uv_step;
-layout(location = 2) out float interlaced;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv      = TexCoord * 1.00001;
-   uv_step     = vec2(1.0)/params.SourceSize.xy;
-   
-    //  Detect interlacing: 1.0 = true, 0.0 = false.
-    vec2 _video_size = params.SourceSize.xy;
-    interlaced       = float(is_interlaced(_video_size.y));
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 uv_step;
-layout(location = 2) in float interlaced;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-void main()
-{
-    //  Linearize the input based on CRT gamma and bob interlaced fields.
-    //  Bobbing ensures we can immediately blur without getting artifacts.
-    //  Note: TFF/BFF won't matter for sources that double-weave or similar.
-    if(bool(interlace_detect))
-    {
-        //  Sample the current line and an average of the previous/next line;
-        //  tex2D_linearize will decode CRT gamma.  Don't bother branching:
-        vec2 v_step = vec2(0.0, uv_step.y);
-
-        vec3 curr_line = GAMMA_IN(texture(input_texture, tex_uv         ).rgb);
-        vec3 last_line = GAMMA_IN(texture(input_texture, tex_uv - v_step).rgb);
-        vec3 next_line = GAMMA_IN(texture(input_texture, tex_uv + v_step).rgb);
-
-        vec3 interpolated_line = 0.5 * (last_line + next_line);
-
-        //  If we're interlacing, determine which field curr_line is in:
-        float modulus         = interlaced + 1.0;
-        float field_offset    = mod(params.FrameCount + global.interlace_bff, modulus);
-        float curr_line_texel = tex_uv.y * params.SourceSize.y;
-
-        //  Use under_half to fix a rounding bug around exact texel locations.
-        float line_num_last = floor(curr_line_texel - under_half);
-        float wrong_field   = mod(line_num_last + field_offset, modulus);
-
-        //  Select the correct color, and output the result:
-        vec3 color = mix(curr_line, interpolated_line, wrong_field);
-        FragColor  = vec4(color, 1.0);
-    }
-    else
-    {
-        FragColor = vec4(GAMMA_IN(texture(input_texture, tex_uv).rgb), 1.0);
-    }
-}
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang b/crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang
deleted file mode 100644
index e46e3c826f..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang
+++ /dev/null
@@ -1,122 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "bind-shader-params.h"
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "phosphor-mask-resizing.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 src_tex_uv_wrap;
-layout(location = 1) out vec2 tile_uv_wrap;
-layout(location = 2) out vec2 resize_magnification_scale;
-layout(location = 3) out vec2 src_dxdy;
-layout(location = 4) out vec2 tile_size_uv;
-layout(location = 5) out vec2 input_tiles_per_texture;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vec2 tex_uv = TexCoord.xy;
-
-    //  First estimate the viewport size (the user will get the wrong number of
-    //  triads if it's wrong and mask_specify_num_triads is 1.0/true).
-    vec2 estimated_viewport_size = params.OutputSize.xy / mask_resize_viewport_scale;
-
-    //  Find the final size of our resized phosphor mask tiles.  We probably
-    //  estimated the viewport size and MASK_RESIZE output size differently last
-    //  pass, so do not swear they were the same. ;)
-    vec2 mask_resize_tile_size = get_resized_mask_tile_size(estimated_viewport_size, params.OutputSize.xy, false);
-
-    //  We'll render resized tiles until filling the output FBO or meeting a
-    //  limit, so compute [wrapped] tile uv coords based on the output uv coords
-    //  and the number of tiles that will fit in the FBO.
-    vec2 output_tiles_this_pass = params.OutputSize.xy / mask_resize_tile_size;
-    vec2 output_video_uv        = tex_uv;
-    tile_uv_wrap                = output_video_uv * output_tiles_this_pass;
-
-    //  Get the texel size of an input tile and related values:
-    vec2 input_tile_size    = vec2(min(mask_resize_src_lut_size.x, params.SourceSize.x), mask_resize_tile_size.y);
-    tile_size_uv            = input_tile_size / params.SourceSize.xy;
-    input_tiles_per_texture = params.SourceSize.xy / input_tile_size;
-
-    //  Derive [wrapped] texture uv coords from [wrapped] tile uv coords and
-    //  the tile size in uv coords, and save frac() for the fragment shader.
-    src_tex_uv_wrap = tile_uv_wrap * tile_size_uv;
-
-    //  Output the values we need, including the magnification scale and step:
-    resize_magnification_scale = mask_resize_tile_size / input_tile_size;
-    src_dxdy                   = vec2(1.0/params.SourceSize.x, 0.0);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 src_tex_uv_wrap;
-layout(location = 1) in vec2 tile_uv_wrap;
-layout(location = 2) in vec2 resize_magnification_scale;
-layout(location = 3) in vec2 src_dxdy;
-layout(location = 4) in vec2 tile_size_uv;
-layout(location = 5) in vec2 input_tiles_per_texture;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-void main()
-{
-    //  The input contains one mask tile horizontally and a number vertically.
-    //  Resize the tile horizontally to its final screen size and repeat it
-    //  until drawing at least mask_resize_num_tiles, leaving it unchanged
-    //  vertically.  Lanczos-resizing the phosphor mask achieves much sharper
-    //  results than mipmapping, outputting >= mask_resize_num_tiles makes for
-    //  easier tiled sampling later.
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        //  Discard unneeded fragments in case our profile allows real branches.
-        vec2 tile_uv_wrap = tile_uv_wrap;
-
-        if(max(tile_uv_wrap.x, tile_uv_wrap.y) <= mask_resize_num_tiles)
-        {
-            float src_dx = src_dxdy.x;
-            vec2 src_tex_uv = fract(src_tex_uv_wrap);
-            vec3 pixel_color = downsample_horizontal_sinc_tiled(input_texture, src_tex_uv, params.SourceSize.xy, src_dxdy.x, resize_magnification_scale.x, tile_size_uv.x);
-
-            //  The input LUT was linear RGB, and so is our output:
-            FragColor = vec4(pixel_color, 1.0);
-        }
-        else
-        {
-            discard;
-        }
-    #else
-        discard;
-        FragColor = vec4(1.0);
-    #endif
-}
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang b/crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang
deleted file mode 100644
index 2b14aa383d..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang
+++ /dev/null
@@ -1,141 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "bind-shader-params.h"
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "phosphor-mask-resizing.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 src_tex_uv_wrap;
-layout(location = 1) out vec2 resize_magnification_scale;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vec2 tex_uv = TexCoord;
-
-    //  First estimate the viewport size (the user will get the wrong number of
-    //  triads if it's wrong and mask_specify_num_triads is 1.0/true).
-//    float viewport_y              = params.OutputSize.y / mask_resize_viewport_scale.y;
-//    float aspect_ratio            = geom_aspect_ratio_x / geom_aspect_ratio_y;
-//    vec2  estimated_viewport_size = vec2(viewport_y * aspect_ratio, viewport_y);
-
-    //  Estimate the output size of MASK_RESIZE (the next pass).  The estimated
-    //  x component shouldn't matter, because we're not using the x result, and
-    //  we're not swearing it's correct (if we did, the x result would influence
-    //  the y result to maintain the tile aspect ratio).
-//    vec2 estimated_mask_resize_output_size = vec2(params.OutputSize.y * aspect_ratio, params.OutputSize.y);
-
-    //  First estimate the viewport size (the user will get the wrong number of
-    //  triads if it's wrong and mask_specify_num_triads is 1.0/true).
-    vec2  estimated_viewport_size = params.OutputSize.xy / mask_resize_viewport_scale.yy;
-
-    //  Estimate the output size of MASK_RESIZE (the next pass).  The estimated
-    //  x component shouldn't matter, because we're not using the x result, and
-    //  we're not swearing it's correct (if we did, the x result would influence
-    //  the y result to maintain the tile aspect ratio).
-    vec2 estimated_mask_resize_output_size = params.OutputSize.xy;
-
-    //  Find the final intended [y] size of our resized phosphor mask tiles,
-    //  then the tile size for the current pass (resize y only):
-    vec2 mask_resize_tile_size = get_resized_mask_tile_size(estimated_viewport_size, estimated_mask_resize_output_size, false);
-    vec2 pass_output_tile_size = vec2(min(mask_resize_src_lut_size.x, params.OutputSize.x), mask_resize_tile_size.y);
-
-    //  We'll render resized tiles until filling the output FBO or meeting a
-    //  limit, so compute [wrapped] tile uv coords based on the output uv coords
-    //  and the number of tiles that will fit in the FBO.
-    vec2 output_tiles_this_pass = params.OutputSize.xy / pass_output_tile_size;
-    vec2 output_video_uv        = tex_uv;
-    vec2 tile_uv_wrap           = output_video_uv * output_tiles_this_pass;
-
-    //  The input LUT is just a single mask tile, so texture uv coords are the
-    //  same as tile uv coords (save fract() for the fragment shader).  The
-    //  magnification scale is also straightforward:
-    src_tex_uv_wrap            = tile_uv_wrap;
-    resize_magnification_scale = pass_output_tile_size / mask_resize_src_lut_size;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 src_tex_uv_wrap;
-layout(location = 1) in vec2 resize_magnification_scale;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D mask_grille_texture_small;
-layout(set = 0, binding = 4) uniform sampler2D mask_slot_texture_small;
-layout(set = 0, binding = 5) uniform sampler2D mask_shadow_texture_small;
-
-void main()
-{
-    //  Resize the input phosphor mask tile to the final vertical size it will
-    //  appear on screen.  Keep 1x horizontal size if possible (IN.output_size
-    //  >= mask_resize_src_lut_size), and otherwise linearly sample horizontally
-    //  to fit exactly one tile.  Lanczos-resizing the phosphor mask achieves
-    //  much sharper results than mipmapping, and vertically resizing first
-    //  minimizes the total number of taps required.  We output a number of
-    //  resized tiles >= mask_resize_num_tiles for easier tiled sampling later.
-    //vec2 src_tex_uv_wrap = src_tex_uv_wrap;
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-    //  Discard unneeded fragments in case our profile allows real branches.
-    vec2 tile_uv_wrap = src_tex_uv_wrap;
-
-    if(tile_uv_wrap.y <= mask_resize_num_tiles)
-    {
-        float src_dy     = 1.0/mask_resize_src_lut_size.y;
-        vec2  src_tex_uv = fract(src_tex_uv_wrap);
-        vec3  pixel_color;
-
-        if(mask_type < 0.5)
-        {
-            pixel_color = downsample_vertical_sinc_tiled(mask_grille_texture_small, src_tex_uv, mask_resize_src_lut_size, src_dy, resize_magnification_scale.y, 1.0);
-        }
-        else if(mask_type < 1.5)
-        {
-            pixel_color = downsample_vertical_sinc_tiled(mask_slot_texture_small, src_tex_uv, mask_resize_src_lut_size, src_dy, resize_magnification_scale.y, 1.0);
-        }
-        else
-        {
-            pixel_color = downsample_vertical_sinc_tiled(mask_shadow_texture_small, src_tex_uv, mask_resize_src_lut_size, src_dy, resize_magnification_scale.y, 1.0);
-        }
-            //  The input LUT was linear RGB, and so is our output:
-            FragColor = vec4(pixel_color, 1.0);
-        }
-        else
-        {
-            discard;
-        }
-    #else
-        discard;
-        FragColor = vec4(1.0);
-	#endif
-}
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang b/crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang
deleted file mode 100644
index 293688dd70..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang
+++ /dev/null
@@ -1,316 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	vec4 VERTICAL_SCANLINESSize;
-	vec4 MASK_RESIZESize;
-    float geom_d;
-    float geom_R;
-    float geom_cornersize;
-    float geom_cornersmooth;
-    float geom_x_tilt;
-    float geom_y_tilt;
-    float geom_overscanx;
-    float geom_overscany;
-    float geom_center_x;
-    float geom_center_y;
-    float geom_curvature;
-    float geom_invert_aspect;
-} params;
-
-
-/*
-    Geom code - a modified Geom code without CRT features made to provide
-    curvature/warping/oversampling features.
-
-    Adapted by Hyllian (2024).
-*/
-
-/*
-    Copyright (C) 2010-2012 cgwg, Themaister and DOLLS
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation; either version 2 of the License, or (at your option)
-    any later version.
-
-    (cgwg gave their consent to have the original version of this shader
-    distributed under the GPL in this message:
-
-    http://board.byuu.org/viewtopic.php?p=26075#p26075
-
-    "Feel free to distribute my shaders under the GPL. After all, the
-    barrel distortion code was taken from the Curvature shader, which is
-    under the GPL."
-    )
-    This shader variant is pre-configured with screen curvature
-*/
-
-
-
-#pragma parameter geom_curvature "Geom Curvature Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter geom_R "Geom Curvature Radius" 4.0 0.3 10.0 0.1
-#pragma parameter geom_d "Geom Distance" 1.5 0.1 3.0 0.1
-#pragma parameter geom_invert_aspect "Geom Curvature Aspect Inversion" 0.0 0.0 1.0 1.0
-#pragma parameter geom_cornersize "Geom Corner Size" 0.006 0.001 1.0 0.005
-#pragma parameter geom_cornersmooth "Geom Corner Smoothness" 400.0 80.0 2000.0 100.0
-#pragma parameter geom_x_tilt "Geom Horizontal Tilt" 0.0 -0.5 0.5 0.01
-#pragma parameter geom_y_tilt "Geom Vertical Tilt" 0.0 -0.5 0.5 0.01
-#pragma parameter geom_center_x "Geom Center X" 0.0 -1.0 1.0 0.001
-#pragma parameter geom_center_y "Geom Center Y" 0.0 -1.0 1.0 0.001
-#pragma parameter geom_overscanx "Geom Horiz. Overscan %" 100.0 -125.0 125.0 0.5
-#pragma parameter geom_overscany "Geom Vert. Overscan %" 100.0 -125.0 125.0 0.5
-
-#define VERTICAL_SCANLINEStexture VERTICAL_SCANLINES
-#define VERTICAL_SCANLINEStexture_size params.VERTICAL_SCANLINESSize.xy
-#define VERTICAL_SCANLINESvideo_size params.VERTICAL_SCANLINESSize.xy
-#ifdef INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-	#define MASK_RESIZEtexture Source
-#else
-	#define MASK_RESIZEtexture MASK_RESIZE
-#endif
-#define MASK_RESIZEtexture_size params.MASK_RESIZESize.xy
-#define MASK_RESIZEvideo_size params.MASK_RESIZESize.xy
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "bind-shader-params.h"
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "scanline-functions.h"
-#include "phosphor-mask-resizing.h"
-
-///////////////////////////////////  HELPERS  //////////////////////////////////
-
-// Macros.
-#define FIX(c) max(abs(c), 1e-5);
-#define PI 3.141592653589
-
-
-// aspect ratio
-vec2 aspect     = vec2(params.geom_invert_aspect > 0.5 ? (0.75, 1.0) : (1.0, 0.75));
-vec2 overscan   = vec2(1.01, 1.01);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 video_uv;
-layout(location = 1) out vec2 scanline_texture_size_inv;
-layout(location = 2) out vec4 mask_tile_start_uv_and_size;
-layout(location = 3) out vec2 mask_tiles_per_screen;
-layout(location = 4) out vec2 sinangle;
-layout(location = 5) out vec2 cosangle;
-layout(location = 6) out vec3 stretch;
-layout(location = 7) out float R_d_cx_cy;
-layout(location = 8) out float d2;
-
-float intersect(vec2 xy)
-{
-    float A = dot(xy,xy) + params.geom_d*params.geom_d;
-    float B = 2.0*(params.geom_R*(dot(xy,sinangle)-params.geom_d*cosangle.x*cosangle.y)-params.geom_d*params.geom_d);
-    float C = params.geom_d*params.geom_d + 2.0*params.geom_R*params.geom_d*cosangle.x*cosangle.y;
-    
-    return (-B-sqrt(B*B-4.0*A*C))/(2.0*A);
-}
-
-vec2 bkwtrans(vec2 xy)
-{
-    float c     = intersect(xy);
-    vec2 point  = (vec2(c, c)*xy - vec2(-params.geom_R, -params.geom_R)*sinangle) / vec2(params.geom_R, params.geom_R);
-    vec2 poc    = point/cosangle;
-    
-    vec2 tang   = sinangle/cosangle;
-    float A     = dot(tang, tang) + 1.0;
-    float B     = -2.0*dot(poc, tang);
-    float C     = dot(poc, poc) - 1.0;
-    
-    float a     = (-B + sqrt(B*B - 4.0*A*C))/(2.0*A);
-    vec2 uv     = (point - a*sinangle)/cosangle;
-    float r     = FIX(params.geom_R*acos(a));
-    
-    return uv*r/sin(r/params.geom_R);
-}
-
-vec2 fwtrans(vec2 uv)
-{
-    float r = FIX(sqrt(dot(uv,uv)));
-    uv *= sin(r/params.geom_R)/r;
-    float x = 1.0-cos(r/params.geom_R);
-    float D = params.geom_d/params.geom_R + x*cosangle.x*cosangle.y+dot(uv,sinangle);
-    
-    return params.geom_d*(uv*cosangle-x*sinangle)/D;
-}
-
-vec3 maxscale()
-{
-    vec2 c  = bkwtrans(-params.geom_R * sinangle / (1.0 + params.geom_R/params.geom_d*cosangle.x*cosangle.y));
-    vec2 a  = vec2(0.5,0.5)*aspect;
-    
-    vec2 lo = vec2(fwtrans(vec2(-a.x,  c.y)).x,
-                   fwtrans(vec2( c.x, -a.y)).y)/aspect;
-
-    vec2 hi = vec2(fwtrans(vec2(+a.x,  c.y)).x,
-                   fwtrans(vec2( c.x, +a.y)).y)/aspect;
-    
-    return vec3((hi+lo)*aspect*0.5,max(hi.x-lo.x,hi.y-lo.y));
-}
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-
-    video_uv = TexCoord * vec2(1.0001) - vec2(params.geom_center_x, params.geom_center_y);
-
-
-    // Precalculate a bunch of useful values we'll need in the fragment
-    // shader.
-    sinangle    = sin(vec2(params.geom_x_tilt, params.geom_y_tilt));
-    cosangle    = cos(vec2(params.geom_x_tilt, params.geom_y_tilt));
-    stretch     = maxscale();
-
-    d2        = params.geom_d * params.geom_d;
-    R_d_cx_cy = params.geom_R * params.geom_d * cosangle.x * cosangle.y;
-
-    scanline_texture_size_inv = vec2(1.0, 1.0)/VERTICAL_SCANLINEStexture_size;
-
-    //  Get a consistent name for the final mask texture size.  Sample mode 0
-    //  uses the manually resized mask, but ignore it if we never resized.
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        vec2 mask_resize_texture_size = MASK_RESIZEtexture_size;
-        vec2 mask_resize_video_size = MASK_RESIZEvideo_size;
-    #endif
-    //  Compute mask tile dimensions, starting points, etc.:
-    mask_tile_start_uv_and_size = get_mask_sampling_parameters(mask_resize_texture_size, mask_resize_video_size, params.OutputSize.xy, mask_tiles_per_screen);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 video_uv;
-layout(location = 1) in vec2 scanline_texture_size_inv;
-layout(location = 2) in vec4 mask_tile_start_uv_and_size;
-layout(location = 3) in vec2 mask_tiles_per_screen;
-layout(location = 4) in vec2 sinangle;
-layout(location = 5) in vec2 cosangle;
-layout(location = 6) in vec3 stretch;
-layout(location = 7) in float R_d_cx_cy;
-layout(location = 8) in float d2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D VERTICAL_SCANLINES;
-#ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-layout(set = 0, binding = 4) uniform sampler2D MASK_RESIZE;
-#endif
-
-
-float intersect(vec2 xy, float d2, float R_d_cx_cy)
-{
-    float A = dot(xy,xy) + d2;
-    float B = 2.0 * ( params.geom_R * dot(xy, sinangle) - R_d_cx_cy - d2);
-    float C = d2 + 2.0 * R_d_cx_cy;
-    
-    return (-B-sqrt(B*B-4.0*A*C))/(2.0*A);
-}
-
-vec2 bkwtrans(vec2 xy, float d2, float R_d_cx_cy)
-{
-    float c     = intersect(xy, d2, R_d_cx_cy);
-    vec2 point  = (vec2(c, c)*xy - vec2(-params.geom_R, -params.geom_R)*sinangle) / vec2(params.geom_R, params.geom_R);
-    vec2 poc    = point/cosangle;
-    
-    vec2 tang   = sinangle/cosangle;
-    float A     = dot(tang, tang) + 1.0;
-    float B     = -2.0*dot(poc, tang);
-    float C     = dot(poc, poc) - 1.0;
-    
-    float a     = (-B + sqrt(B*B - 4.0*A*C))/(2.0*A);
-    vec2 uv     = (point - a*sinangle)/cosangle;
-    float r     = FIX(params.geom_R*acos(a));
-    
-    return uv*r/sin(r/params.geom_R);
-}
-
-vec2 transform(vec2 coord, float d2, float R_d_cx_cy)
-{
-    coord = (coord - vec2(0.5, 0.5))*aspect*stretch.z + stretch.xy;
-    
-    return (bkwtrans(coord, d2, R_d_cx_cy) /
-        vec2(params.geom_overscanx / 100.0, params.geom_overscany / 100.0)/aspect + vec2(0.5, 0.5));
-}
-
-float corner(vec2 coord)
-{
-    coord = (coord - vec2(0.5)) * vec2(params.geom_overscanx / 100.0, params.geom_overscany / 100.0) + vec2(0.5, 0.5);
-    coord = min(coord, vec2(1.0) - coord) * aspect;
-    vec2 cdist = vec2(params.geom_cornersize);
-    coord = (cdist - min(coord, cdist));
-    float dist = sqrt(dot(coord, coord));
-    
-      return clamp((cdist.x - dist)*params.geom_cornersmooth, 0.0, 1.0);
-}
-
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-void main()
-{
-    // Texture coordinates of the texel containing the active pixel.
-    vec2  uv   = video_uv;
-    float cval = 1.0;
-
-    if (params.geom_curvature > 0.5)
-    {
-        uv   = transform(video_uv, d2, R_d_cx_cy);
-        cval = corner(uv);
-    }
-
-
-    //  This pass: Sample (misconverged?) scanlines to the final horizontal
-    //  resolution, apply halation (bouncing electrons), and apply the phosphor
-    //  mask.  Fake a bloom if requested.  Unless we fake a bloom, the output
-    //  will be dim from the scanline auto-dim, mask dimming, and low gamma.
-
-    //  Horizontally sample the current row (a vertically interpolated scanline)
-    //  and account for horizontal convergence offsets, given in units of texels.
-    vec3 scanline_color_dim = sample_rgb_scanline_horizontal(VERTICAL_SCANLINEStexture, uv, VERTICAL_SCANLINEStexture_size, scanline_texture_size_inv);
-
-    //  Sample the phosphor mask:
-    vec2 tile_uv_wrap = video_uv * mask_tiles_per_screen;
-
-    vec2 mask_tex_uv = convert_phosphor_tile_uv_wrap_to_tex_uv(tile_uv_wrap, mask_tile_start_uv_and_size);
-
-    vec3 phosphor_mask_sample;
-
-    //  Sample the resized mask, and avoid tiling artifacts:
-    phosphor_mask_sample = texture(MASK_RESIZEtexture, mask_tex_uv).rgb;
-
-    //  Apply the phosphor mask:
-    vec3 phosphor_emission_dim = scanline_color_dim * phosphor_mask_sample * vec3(cval);
-
-    phosphor_emission_dim *= step(0.0, fract(uv.y)); // Discard off limit pixels
-
-    FragColor = vec4(phosphor_emission_dim, 1.0);
-}
diff --git a/crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang b/crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang
deleted file mode 100644
index 468907b8f3..0000000000
--- a/crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang
+++ /dev/null
@@ -1,135 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "bind-shader-params.h"
-#include "scanline-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 uv_step;                     //  uv size of a texel (x) and scanline (y)
-layout(location = 2) out vec2 il_step_multiple;            //  (1, 1) = progressive, (1, 2) = interlaced
-layout(location = 3) out float pixel_height_in_scanlines;  //  Height of an output pixel in scanlines
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv      = TexCoord * 1.00001;
-   
-    //  Detect interlacing: il_step_multiple indicates the step multiple between
-    //  lines: 1 is for progressive sources, and 2 is for interlaced sources.
-    vec2  video_size_ = params.SourceSize.xy;
-    float y_step      = 1.0 + float(is_interlaced(video_size_.y));
-    il_step_multiple  = vec2(1.0, y_step);
-
-    //  Get the uv tex coords step between one texel (x) and scanline (y):
-    uv_step = il_step_multiple / params.SourceSize.xy;
-
-    //  We need the pixel height in scanlines for antialiased/integral sampling:
-    float ph = (video_size_.y / params.OutputSize.y) / il_step_multiple.y;
-    pixel_height_in_scanlines = ph;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 uv_step;                      //  uv size of a texel (x) and scanline (y)
-layout(location = 2) in vec2 il_step_multiple;             //  (1, 1) = progressive, (1, 2) = interlaced
-layout(location = 3) in float pixel_height_in_scanlines;   //  Height of an output pixel in scanlines
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-void main()
-{
-    //  This pass: Sample multiple (misconverged?) scanlines to the final
-    //  vertical resolution.  Temporarily auto-dim the output to avoid clipping.
-
-    //  Read some attributes into local variables:
-    vec2 texture_size_    = params.SourceSize.xy;
-    vec2 texture_size_inv = params.SourceSize.zw;
-
-    float frame_count = float(params.FrameCount);
-    float ph = pixel_height_in_scanlines;
-
-    //  Get the uv coords of the previous scanline (in this field), and the
-    //  scanline's distance from this sample, in scanlines.
-    float dist;
-    vec2  scanline_uv = get_last_scanline_uv(tex_uv, texture_size_, texture_size_inv, il_step_multiple, frame_count, dist);
- 
-    //  NOTE: Anisotropic filtering creates interlacing artifacts, which is why
-    //  ORIG_LINEARIZED bobbed any interlaced input before this pass.
-    vec2 v_step          = vec2(0.0, uv_step.y);
-    vec3 scanline2_color = texture(input_texture, scanline_uv         ).rgb;
-    vec3 scanline3_color = texture(input_texture, scanline_uv + v_step).rgb;
-
-    vec3 scanline0_color, scanline1_color, scanline4_color, scanline5_color, scanline_outside_color;
-    float dist_round;
-
-    //  dist is in [0, 1]
-    dist_round              = round(dist);
-    vec2 sample_1or4_uv_off = mix(-v_step, 2.0 * v_step, dist_round);
-    scanline_outside_color  = texture(input_texture, scanline_uv + sample_1or4_uv_off).rgb;
-    
-    //  Compute scanline contributions, accounting for vertical convergence.
-    //  Vertical convergence offsets are in units of current-field scanlines.
-    //  dist2 means "positive sample distance from scanline 2, in scanlines:"
-    vec3 dist2 = vec3(dist);
-
-    if(beam_misconvergence)
-    {
-        vec3 convergence_offsets_vert_rgb = get_convergence_offsets_y_vector();
-        dist2 = vec3(dist) - convergence_offsets_vert_rgb;
-    }
-
-    //  Calculate {sigma, shape}_range outside of scanline_contrib so it's only
-    //  done once per pixel (not 6 times) with runtime params.  Don't reuse the
-    //  vertex shader calculations, so static versions can be constant-folded.
-	float sigma_range = max(beam_max_sigma, beam_min_sigma) - beam_min_sigma;
-	float shape_range = max(beam_max_shape, beam_min_shape) - beam_min_shape;
-
-    //  Calculate and sum final scanline contributions, starting with lines 2/3.
-    //  There is no normalization step, because we're not interpolating a
-    //  continuous signal.  Instead, each scanline is an additive light source.
-    vec3 scanline2_contrib  = scanline_contrib(dist2, scanline2_color, ph, sigma_range, shape_range);
-    vec3 scanline3_contrib  = scanline_contrib(abs(vec3(1.0,1.0,1.0) - dist2), scanline3_color, ph, sigma_range, shape_range);
-    vec3 scanline_intensity = scanline2_contrib + scanline3_contrib;
-
-    vec3 dist1or4 = mix(dist2 + vec3(1.0,1.0,1.0), vec3(2.0,2.0,2.0) - dist2, dist_round);
-    vec3 scanline1or4_contrib = scanline_contrib(dist1or4, scanline_outside_color, ph, sigma_range, shape_range);
-    scanline_intensity += scanline1or4_contrib;
-
-    //  Auto-dim the image to avoid clipping, encode if necessary, and output.
-    //  My original idea was to compute a minimal auto-dim factor and put it in
-    //  the alpha channel, but it wasn't working, at least not reliably.  This
-    //  is faster anyway, levels_autodim_temp = 0.5 isn't causing banding.
-    FragColor = vec4(scanline_intensity * levels_autodim_temp, 1.0);
-}
diff --git a/crt/shaders/crt-royale/src-fast/derived-settings-and-constants.h b/crt/shaders/crt-royale/src-fast/derived-settings-and-constants.h
deleted file mode 100644
index e11a71649e..0000000000
--- a/crt/shaders/crt-royale/src-fast/derived-settings-and-constants.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef DERIVED_SETTINGS_AND_CONSTANTS_H
-#define DERIVED_SETTINGS_AND_CONSTANTS_H
-
-#include "user-cgp-constants.h"
-
-#define FIX_ZERO(c) (max(abs(c), 0.0000152587890625))   //  2^-16
-
-
-    float bloom_approx_filter = bloom_approx_filter_static;
-    vec2 mask_resize_src_lut_size = mask_texture_small_size;
-
-
-    #ifdef FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-        #define RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-    #endif
-
-    float max_aa_base_pixel_border = 0.0;
-
-    float max_aniso_pixel_border = max_aa_base_pixel_border + 0.5;
-
-    float max_tiled_pixel_border = max_aniso_pixel_border;
-
-    float max_mask_texel_border = ceil(max_tiled_pixel_border);
-
-    float max_mask_tile_border = max_mask_texel_border/
-        (mask_min_allowed_triad_size * mask_triads_per_tile);
-
-        float mask_resize_num_tiles = 1.0 +
-            2.0 * max_mask_tile_border;
-        float mask_start_texels = max_mask_texel_border;
-
-float mask_resize_num_triads = mask_resize_num_tiles * mask_triads_per_tile;
-vec2 min_allowed_viewport_triads = vec2(mask_resize_num_triads) / mask_resize_viewport_scale;
-
-
-////////////////////////  COMMON MATHEMATICAL CONSTANTS  ///////////////////////
-
-float pi = 3.141592653589;
-float under_half = 0.4995;
-
-
-#endif  //  DERIVED_SETTINGS_AND_CONSTANTS_H
-
diff --git a/crt/shaders/crt-royale/src-fast/phosphor-mask-resizing.h b/crt/shaders/crt-royale/src-fast/phosphor-mask-resizing.h
deleted file mode 100644
index a1f5957663..0000000000
--- a/crt/shaders/crt-royale/src-fast/phosphor-mask-resizing.h
+++ /dev/null
@@ -1,284 +0,0 @@
-#ifndef PHOSPHOR_MASK_RESIZING_H
-#define PHOSPHOR_MASK_RESIZING_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-
-/////////////////////////////  CODEPATH SELECTION  /////////////////////////////
-
-        #define USE_SINGLE_STATIC_LOOP
-
-//////////////////////////////////  CONSTANTS  /////////////////////////////////
-
-//  The larger the resized tile, the fewer samples we'll need for downsizing.
-//  See if we can get a static min tile size > mask_min_allowed_tile_size:
-float mask_min_allowed_tile_size  = ceil(mask_min_allowed_triad_size * mask_triads_per_tile);
-float mask_min_expected_tile_size = mask_min_allowed_tile_size;
-
-//  Limit the number of sinc resize taps by the maximum minification factor:
-float pi_over_lobes = pi/mask_sinc_lobes;
-float max_sinc_resize_samples_float = 2.0 * mask_sinc_lobes * mask_resize_src_lut_size.x/mask_min_expected_tile_size;
-
-//  Vectorized loops sample in multiples of 4.  Round up to be safe:
-float max_sinc_resize_samples_m4 = ceil(max_sinc_resize_samples_float * 0.25) * 4.0;
-
-
-/////////////////////////  RESAMPLING FUNCTION HELPERS  ////////////////////////
-
-float get_dynamic_loop_size(float magnification_scale)
-{
-
-    float min_samples_float = 2.0 * mask_sinc_lobes / magnification_scale;
-    float min_samples_m4 = ceil(min_samples_float * 0.25) * 4.0;
-
-    //  Simulating loops with branches imposes a 128-sample limit.
-    float max_samples_m4 = min(128.0, max_sinc_resize_samples_m4);
-
-    return min(min_samples_m4, max_samples_m4);
-}
-
-vec2 get_first_texel_tile_uv_and_dist(vec2 tex_uv, vec2 tex_size, float dr, float input_tiles_per_texture_r, float samples, bool vertical)
-{
-
-    vec2 curr_texel  = tex_uv * tex_size;
-    vec2 prev_texel  = floor(curr_texel - vec2(under_half)) + vec2(0.5);
-    vec2 first_texel = prev_texel - vec2(samples/2.0 - 1.0);
-    vec2 first_texel_uv_wrap_2D = first_texel * dr;
-    vec2 first_texel_dist_2D    = curr_texel - first_texel;
-
-    //  Convert from tex_uv to tile_uv coords so we can sub fracts for fmods.
-    vec2 first_texel_tile_uv_wrap_2D = first_texel_uv_wrap_2D * input_tiles_per_texture_r;
-
-    //  Project wrapped coordinates to the [0, 1] range.  We'll do this with all
-    //  samples,but the first texel is special, since it might be negative.
-    vec2 coord_negative = vec2((first_texel_tile_uv_wrap_2D.x < 0.),(first_texel_tile_uv_wrap_2D.y < 0.));
-    vec2 first_texel_tile_uv_2D = fract(first_texel_tile_uv_wrap_2D) + coord_negative;
-
-    //  Pack the first texel's tile_uv coord and texel distance in 1D:
-    vec2 tile_u_and_dist = vec2(first_texel_tile_uv_2D.x, first_texel_dist_2D.x);
-    vec2 tile_v_and_dist = vec2(first_texel_tile_uv_2D.y, first_texel_dist_2D.y);
-
-    return vertical ? tile_v_and_dist : tile_u_and_dist;
-}
-
-vec4 tex2Dlod0try(sampler2D tex, vec2 tex_uv)
-{
-    //  Mipmapping and anisotropic filtering get confused by sinc-resampling.
-    //  One [slow] workaround is to select the lowest mip level:
-    return texture(tex, tex_uv);
-}
-
-
-//////////////////////////////  LOOP BODY MACROS  //////////////////////////////
-
-
-    #define CALCULATE_R_COORD_FOR_4_SAMPLES                                    \
-        vec4 true_i = vec4(i_base + i) + vec4(0.0, 1.0, 2.0, 3.0); \
-        vec4 tile_uv_r = fract(                                         \
-            first_texel_tile_uv_rrrr + true_i * tile_dr);                      \
-        vec4 tex_uv_r = tile_uv_r * tile_size_uv_r;
-
-    #ifdef PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-        #define CALCULATE_SINC_RESAMPLE_WEIGHTS                                \
-            vec4 pi_dist_over_lobes = pi_over_lobes * dist;            \
-            vec4 weights = min(sin(pi_dist) * sin(pi_dist_over_lobes) /\
-                (pi_dist*pi_dist_over_lobes), vec4(1.0));
-    #else
-        #define CALCULATE_SINC_RESAMPLE_WEIGHTS                                \
-            vec4 weights = min(sin(pi_dist)/pi_dist, vec4(1.0));
-    #endif
-
-    #define UPDATE_COLOR_AND_WEIGHT_SUMS                                       \
-        vec4 dist = magnification_scale *                              \
-            abs(first_dist_unscaled - true_i);                                 \
-        vec4 pi_dist = pi * dist;                                      \
-        CALCULATE_SINC_RESAMPLE_WEIGHTS;                                       \
-        pixel_color += new_sample0 * weights.xxx;                              \
-        pixel_color += new_sample1 * weights.yyy;                              \
-        pixel_color += new_sample2 * weights.zzz;                              \
-        pixel_color += new_sample3 * weights.www;                              \
-        weight_sum += weights;
-
-    #define VERTICAL_SINC_RESAMPLE_LOOP_BODY                                   \
-        CALCULATE_R_COORD_FOR_4_SAMPLES;                                       \
-        vec3 new_sample0 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv.x, tex_uv_r.x)).rgb;                                 \
-        vec3 new_sample1 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv.x, tex_uv_r.y)).rgb;                                 \
-        vec3 new_sample2 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv.x, tex_uv_r.z)).rgb;                                 \
-        vec3 new_sample3 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv.x, tex_uv_r.w)).rgb;                                 \
-        UPDATE_COLOR_AND_WEIGHT_SUMS;
-
-    #define HORIZONTAL_SINC_RESAMPLE_LOOP_BODY                                 \
-        CALCULATE_R_COORD_FOR_4_SAMPLES;                                       \
-        vec3 new_sample0 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv_r.x, tex_uv.y)).rgb;                                 \
-        vec3 new_sample1 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv_r.y, tex_uv.y)).rgb;                                 \
-        vec3 new_sample2 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv_r.z, tex_uv.y)).rgb;                                 \
-        vec3 new_sample3 = tex2Dlod0try(tex,                       \
-            vec2(tex_uv_r.w, tex_uv.y)).rgb;                                 \
-        UPDATE_COLOR_AND_WEIGHT_SUMS;
-
-
-////////////////////////////  RESAMPLING FUNCTIONS  ////////////////////////////
-
-vec3 downsample_vertical_sinc_tiled(sampler2D tex, vec2 tex_uv, vec2 tex_size, float dr, float magnification_scale, float tile_size_uv_r)
-{
-    int samples = int(max_sinc_resize_samples_m4);
-
-    //  Get the first sample location (scalar tile uv coord along the resized
-    //  dimension) and distance from the output location (in texels):
-    float input_tiles_per_texture_r = 1.0/tile_size_uv_r;
-
-    //  true = vertical resize:
-    vec2 first_texel_tile_r_and_dist = get_first_texel_tile_uv_and_dist(tex_uv, tex_size, dr, input_tiles_per_texture_r, samples, true);
-    vec4 first_texel_tile_uv_rrrr    = first_texel_tile_r_and_dist.xxxx;
-    vec4 first_dist_unscaled         = first_texel_tile_r_and_dist.yyyy;
-
-    //  Get the tile sample offset:
-    float tile_dr = dr * input_tiles_per_texture_r;
-
-    //  Sum up each weight and weighted sample color, varying the looping
-    //  strategy based on our expected dynamic loop capabilities.  See the
-    //  loop body macros above.
-    int i_base = 0;
-    int i_step = 4;
-    vec4 weight_sum  = vec4(0.0);
-    vec3 pixel_color = vec3(0.0);
- 
-    for(int i = 0; i < samples; i += i_step)
-    {
-        VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-    }
- 
-    //  Normalize so the weight_sum == 1.0, and return:
-    vec2 weight_sum_reduce = weight_sum.xy + weight_sum.zw;
-    vec3 scalar_weight_sum = vec3(weight_sum_reduce.x + weight_sum_reduce.y);
-
-    return (pixel_color/scalar_weight_sum);
-}
-
-vec3 downsample_horizontal_sinc_tiled(sampler2D tex, vec2 tex_uv, vec2 tex_size, float dr, float magnification_scale, float tile_size_uv_r)
-{
-    int samples = int(max_sinc_resize_samples_m4);
-
-    //  Get the first sample location (scalar tile uv coord along resized
-    //  dimension) and distance from the output location (in texels):
-    float input_tiles_per_texture_r = 1.0/tile_size_uv_r;
-
-    //  false = horizontal resize:
-    vec2 first_texel_tile_r_and_dist = get_first_texel_tile_uv_and_dist(tex_uv, tex_size, dr, input_tiles_per_texture_r, samples, false);
-    vec4 first_texel_tile_uv_rrrr    = first_texel_tile_r_and_dist.xxxx;
-    vec4 first_dist_unscaled         = first_texel_tile_r_and_dist.yyyy;
-
-    //  Get the tile sample offset:
-    float tile_dr = dr * input_tiles_per_texture_r;
-
-    //  Sum up each weight and weighted sample color, varying the looping
-    //  strategy based on our expected dynamic loop capabilities.  See the
-    //  loop body macros above.
-    int i_base = 0;
-    int i_step = 4;
-    vec4 weight_sum  = vec4(0.0);
-    vec3 pixel_color = vec3(0.0);
-
-    for(int i = 0; i < samples; i += i_step)
-    {
-        HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-    }
-
-    //  Normalize so the weight_sum == 1.0, and return:
-    vec2 weight_sum_reduce = weight_sum.xy + weight_sum.zw;
-    vec3 scalar_weight_sum = vec3(weight_sum_reduce.x + weight_sum_reduce.y);
-
-    return (pixel_color/scalar_weight_sum);
-}
-
-
-////////////////////////////  TILE SIZE CALCULATION  ///////////////////////////
-
-vec2 get_resized_mask_tile_size(vec2 estimated_viewport_size, vec2 estimated_mask_resize_output_size, bool solemnly_swear_same_inputs_for_every_pass)
-{
-    //  Stated tile properties must be correct:
-    float tile_aspect_ratio_inv = mask_resize_src_lut_size.y/mask_resize_src_lut_size.x;
-    float tile_aspect_ratio     = 1.0/tile_aspect_ratio_inv;
-    vec2  tile_aspect           = vec2(1.0, tile_aspect_ratio_inv);
-
-    //  If mask_specify_num_triads is 1.0/true and estimated_viewport_size.x is
-    //  wrong, the user preference will be misinterpreted:
-    float desired_tile_size_x = mask_triads_per_tile * mix(global.mask_triad_size_desired, estimated_viewport_size.x / global.mask_num_triads_desired, global.mask_specify_num_triads);
-
-    //  Make sure we're not upsizing:
-    float temp_tile_size_x = min(desired_tile_size_x, mask_resize_src_lut_size.x);
-
-    //  Enforce min_tile_size and max_tile_size in both dimensions:
-    vec2 temp_tile_size    = temp_tile_size_x * tile_aspect;
-    vec2 min_tile_size     = mask_min_allowed_tile_size * tile_aspect;
-    vec2 max_tile_size     = estimated_mask_resize_output_size / mask_resize_num_tiles;
-    vec2 clamped_tile_size = clamp(temp_tile_size, min_tile_size, max_tile_size);
-
-    float x_tile_size_from_y = clamped_tile_size.y * tile_aspect_ratio;
-    float y_tile_size_from_x = mix(clamped_tile_size.y, clamped_tile_size.x * tile_aspect_ratio_inv, float(solemnly_swear_same_inputs_for_every_pass));
-    vec2 reclamped_tile_size = vec2(min(clamped_tile_size.x, x_tile_size_from_y), min(clamped_tile_size.y, y_tile_size_from_x));
-
-    //  We need integer tile sizes in both directions for tiled sampling to
-    //  work correctly.  Use floor (to make sure we don't round up), but be
-    //  careful to avoid a rounding bug where floor decreases whole numbers:
-    vec2 final_resized_tile_size = floor(reclamped_tile_size + vec2(FIX_ZERO(0.0)));
-
-    return final_resized_tile_size;
-}
-
-
-/////////////////////////  FINAL MASK SAMPLING HELPERS  ////////////////////////
-
-vec4 get_mask_sampling_parameters(vec2 mask_resize_texture_size, vec2 mask_resize_video_size, vec2 true_viewport_size, out vec2 mask_tiles_per_screen)
-{
-    vec2 mask_resize_tile_size = get_resized_mask_tile_size(true_viewport_size, mask_resize_video_size, false);
-
-    //  Sample MASK_RESIZE: The resized tile is a fracttion of the texture
-    //  size and starts at a nonzero offset to allow for border texels:
-    vec2 mask_tile_uv_size  = mask_resize_tile_size / mask_resize_texture_size;
-    vec2 skipped_tiles      = mask_start_texels/mask_resize_tile_size;
-    vec2 mask_tile_start_uv = skipped_tiles * mask_tile_uv_size;
-    
-    //  mask_tiles_per_screen must be based on the *true* viewport size:
-    mask_tiles_per_screen = true_viewport_size / mask_resize_tile_size;
-    
-    return vec4(mask_tile_start_uv, mask_tile_uv_size);
-}
-
-vec2 convert_phosphor_tile_uv_wrap_to_tex_uv(vec2 tile_uv_wrap, vec4 mask_tile_start_uv_and_size)
-{
-    vec2 tile_uv = fract(tile_uv_wrap);
-    vec2 mask_tex_uv = mask_tile_start_uv_and_size.xy + tile_uv * mask_tile_start_uv_and_size.zw;
-
-    return mask_tex_uv;
-}
-
-
-#endif  //  PHOSPHOR_MASK_RESIZING_H
-
diff --git a/crt/shaders/crt-royale/src-fast/scanline-functions.h b/crt/shaders/crt-royale/src-fast/scanline-functions.h
deleted file mode 100644
index d71763b6f4..0000000000
--- a/crt/shaders/crt-royale/src-fast/scanline-functions.h
+++ /dev/null
@@ -1,334 +0,0 @@
-#ifndef SCANLINE_FUNCTIONS_H
-#define SCANLINE_FUNCTIONS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "special-functions.h"
-
-/////////////////////////////  SCANLINE FUNCTIONS  /////////////////////////////
-
-vec3 get_gaussian_sigma(vec3 color, float sigma_range)
-{
-    if(beam_spot_shape_function < 0.5)
-    {
-        //  Use a power function:
-        return vec3(beam_min_sigma) + sigma_range * pow(color, vec3(beam_spot_power));
-    }
-    else
-    {
-        //  Use a spherical function:
-        vec3 color_minus_1 = color - vec3(1.0);
-
-	return vec3(beam_min_sigma) + sigma_range * sqrt(vec3(1.0) - color_minus_1*color_minus_1);
-    }
-}
-
-vec3 get_generalized_gaussian_beta(vec3 color, float shape_range)
-{
-    return beam_min_shape + shape_range * pow(color, vec3(beam_shape_power));
-}
-
-vec3 scanline_gaussian_integral_contrib(vec3 dist, vec3 color, float pixel_height, float sigma_range)
-{
-    vec3 sigma         = get_gaussian_sigma(color, sigma_range);
-    vec3 ph_offset     = vec3(pixel_height * 0.5);
-    vec3 denom_inv     = 1.0/(sigma*sqrt(2.0));
-    vec3 integral_high = erf((dist + ph_offset)*denom_inv);
-    vec3 integral_low  = erf((dist - ph_offset)*denom_inv);
-
-    return color * 0.5*(integral_high - integral_low)/pixel_height;
-}
-
-vec3 scanline_generalized_gaussian_integral_contrib(vec3 dist, vec3 color, float pixel_height, float sigma_range, float shape_range)
-{
-    vec3 alpha     = sqrt(2.0) * get_gaussian_sigma(color, sigma_range);
-    vec3 beta      = get_generalized_gaussian_beta(color, shape_range);
-    vec3 alpha_inv = vec3(1.0)/alpha;
-    vec3 s         = vec3(1.0)/beta;
-    vec3 ph_offset = vec3(pixel_height * 0.5);
-
-    vec3 gamma_s_inv   = vec3(1.0)/gamma_impl(s, beta);
-    vec3 dist1         = dist + ph_offset;
-    vec3 dist0         = dist - ph_offset;
-    vec3 integral_high = sign(dist1) * normalized_ligamma_impl(s, pow(abs(dist1)*alpha_inv, beta), beta, gamma_s_inv);
-    vec3 integral_low  = sign(dist0) * normalized_ligamma_impl(s, pow(abs(dist0)*alpha_inv, beta), beta, gamma_s_inv);
-
-    return color * 0.5*(integral_high - integral_low)/pixel_height;
-}
-
-vec3 scanline_gaussian_sampled_contrib(vec3 dist, vec3 color, float pixel_height, float sigma_range)
-{
-    vec3 sigma     = get_gaussian_sigma(color, sigma_range);
-    vec3 sigma_inv = vec3(1.0)/sigma;
-
-    vec3 inner_denom_inv = 0.5 * sigma_inv * sigma_inv;
-    vec3 outer_denom_inv = sigma_inv/sqrt(2.0*pi);
-
-    if(beam_antialias_level > 0.5)
-    {
-        //  Sample 1/3 pixel away in each direction as well:
-        vec3 sample_offset = vec3(pixel_height/3.0);
-        vec3 dist2         = dist + sample_offset;
-        vec3 dist3         = abs(dist - sample_offset);
-
-	//  Average three pure Gaussian samples:
-        vec3 scale   = color/3.0  * outer_denom_inv;
-        vec3 weight1 = exp(-( dist* dist)*inner_denom_inv);
-        vec3 weight2 = exp(-(dist2*dist2)*inner_denom_inv);
-        vec3 weight3 = exp(-(dist3*dist3)*inner_denom_inv);
-
-	return scale * (weight1 + weight2 + weight3);
-    }
-    else
-    {
-        return color*exp(-(dist*dist)*inner_denom_inv)*outer_denom_inv;
-    }
-}
-
-vec3 scanline_generalized_gaussian_sampled_contrib(vec3 dist, vec3 color, float pixel_height, float sigma_range, float shape_range)
-{
-    vec3 alpha = sqrt(2.0) * get_gaussian_sigma(color, sigma_range);
-    vec3 beta  = get_generalized_gaussian_beta(color, shape_range);
-
-    //  Avoid repeated divides:
-    vec3 alpha_inv = vec3(1.0)/alpha;
-    vec3 beta_inv  = vec3(1.0)/beta;
-    vec3 scale     = color * beta * 0.5 * alpha_inv / gamma_impl(beta_inv, beta);
-
-    if(beam_antialias_level > 0.5)
-    {
-        //  Sample 1/3 pixel closer to and farther from the scanline too.
-        vec3 sample_offset = vec3(pixel_height/3.0);
-        vec3 dist2         = dist + sample_offset;
-        vec3 dist3         = abs(dist - sample_offset);
-
-	//  Average three generalized Gaussian samples:
-        vec3 weight1 = exp(-pow(abs( dist*alpha_inv), beta));
-        vec3 weight2 = exp(-pow(abs(dist2*alpha_inv), beta));
-        vec3 weight3 = exp(-pow(abs(dist3*alpha_inv), beta));
-
-	return scale/3.0 * (weight1 + weight2 + weight3);
-    }
-    else
-    {
-        return scale * exp(-pow(abs(dist*alpha_inv), beta));
-    }
-}
-
-vec3 scanline_contrib(vec3 dist, vec3 color, float pixel_height, float sigma_range, float shape_range)
-{
-    if(beam_generalized_gaussian)
-    {
-        if(beam_antialias_level > 1.5)
-        {
-            return scanline_generalized_gaussian_integral_contrib(dist, color, pixel_height, sigma_range, shape_range);
-        }
-        else
-        {
-            return scanline_generalized_gaussian_sampled_contrib(dist, color, pixel_height, sigma_range, shape_range);
-        }
-    }
-    else
-    {
-        if(beam_antialias_level > 1.5)
-        {
-            return scanline_gaussian_integral_contrib(dist, color, pixel_height, sigma_range);
-        }
-        else
-        {
-            return scanline_gaussian_sampled_contrib(dist, color, pixel_height, sigma_range);
-        }
-    }
-}
-
-
-// 2 - Apply mask only.
-vec3 get_raw_interpolated_color(vec3 color0, vec3 color1, vec3 color2, vec3 color3, vec4 weights)
-{
-    //  Use max to avoid bizarre artifacts from negative colors:
-    return max((mat4x3(color0, color1, color2, color3) * weights), 0.0);
-}
-
-vec3 get_interpolated_linear_color(vec3 color0, vec3 color1, vec3 color2, vec3 color3, vec4 weights)
-{
-    float intermediate_gamma = lcd_gamma;
-
-    //  Inputs: color0-3 are colors in linear RGB.
-            vec3 linear_mixed_color = get_raw_interpolated_color(color0, color1, color2, color3, weights);
-
-	    vec3 gamma_mixed_color = get_raw_interpolated_color(
-                    pow(color0, vec3(1.0/intermediate_gamma)),
-                    pow(color1, vec3(1.0/intermediate_gamma)),
-                    pow(color2, vec3(1.0/intermediate_gamma)),
-                    pow(color3, vec3(1.0/intermediate_gamma)),
-                    weights);
-			// wtf fixme
-//			float beam_horiz_linear_rgb_weight1 = 1.0;
-            return mix(gamma_mixed_color, linear_mixed_color, global.beam_horiz_linear_rgb_weight);
-}
-
-vec3 get_scanline_color(sampler2D tex, vec2 scanline_uv, vec2 uv_step_x, vec4 weights)
-{
-    vec3 color1 = texture(tex, scanline_uv).rgb;
-    vec3 color2 = texture(tex, scanline_uv + uv_step_x).rgb;
-    vec3 color0 = vec3(0.0);
-    vec3 color3 = vec3(0.0);
-
-    if(beam_horiz_filter > 0.5)
-    {
-        color0 = texture(tex, scanline_uv - uv_step_x).rgb;
-        color3 = texture(tex, scanline_uv + 2.0 * uv_step_x).rgb;
-    }
-
-    return get_interpolated_linear_color(color0, color1, color2, color3, weights);
-}
-
-vec3 sample_single_scanline_horizontal(sampler2D tex, vec2 tex_uv, vec2 tex_size, vec2 texture_size_inv)
-{
-    vec2 curr_texel = tex_uv * tex_size;
-
-    //  Use under_half to fix a rounding bug right around exact texel locations.
-    vec2 prev_texel        = floor(curr_texel - vec2(under_half)) + vec2(0.5);
-    vec2 prev_texel_hor    = vec2(prev_texel.x, curr_texel.y);
-    vec2 prev_texel_hor_uv = prev_texel_hor * texture_size_inv;
-
-    float prev_dist   = curr_texel.x - prev_texel_hor.x;
-    vec4 sample_dists = vec4(1.0 + prev_dist, prev_dist, 1.0 - prev_dist, 2.0 - prev_dist);
-
-    //  Get Quilez, Lanczos2, or Gaussian resize weights for 2/4 nearby texels:
-    vec4 weights;
-
-    if(beam_horiz_filter < 0.5)
-    {
-        //  Quilez:
-        float x  = sample_dists.y;
-        float w2 = x*x*x*(x*(x*6.0 - 15.0) + 10.0);
-        weights  = vec4(0.0, 1.0 - w2, w2, 0.0);
-    }
-    else if(beam_horiz_filter < 1.5)
-    {
-        //  Gaussian:
-        float inner_denom_inv = 1.0/(2.0*beam_horiz_sigma*beam_horiz_sigma);
-        weights               = exp(-(sample_dists*sample_dists)*inner_denom_inv);
-    }
-    else if(beam_horiz_filter < 2.5)
-    {
-        //  Lanczos2:
-        vec4 pi_dists = FIX_ZERO(sample_dists * pi);
-        weights       = 2.0 * sin(pi_dists) * sin(pi_dists * 0.5)/(pi_dists * pi_dists);
-    }
-    else
-    {
-        //  Linear:
-        float x  = sample_dists.y;
-        weights  = vec4(0.0, 1.0 - x, x, 0.0);
-    }
-
-    //  Ensure the weight sum == 1.0:
-    vec4 final_weights = weights/dot(weights, vec4(1.0));
-
-    //  Get the interpolated horizontal scanline color:
-    vec2 uv_step_x = vec2(texture_size_inv.x, 0.0);
-
-    return get_scanline_color(tex, prev_texel_hor_uv, uv_step_x, final_weights);
-}
-
-vec3 sample_rgb_scanline_horizontal(sampler2D tex, vec2 tex_uv, vec2 tex_size, vec2 texture_size_inv)
-{
-    //  TODO: Add function requirements.
-    //  Rely on a helper to make convergence easier.
-    if(beam_misconvergence)
-    {
-        vec3 convergence_offsets_rgb = get_convergence_offsets_x_vector();
-        vec3 offset_u_rgb = convergence_offsets_rgb * texture_size_inv.xxx;
-
-	vec2 scanline_uv_r = tex_uv - vec2(offset_u_rgb.r, 0.0);
-        vec2 scanline_uv_g = tex_uv - vec2(offset_u_rgb.g, 0.0);
-        vec2 scanline_uv_b = tex_uv - vec2(offset_u_rgb.b, 0.0);
-
-	vec3 sample_r = sample_single_scanline_horizontal(tex, scanline_uv_r, tex_size, texture_size_inv);
-        vec3 sample_g = sample_single_scanline_horizontal(tex, scanline_uv_g, tex_size, texture_size_inv);
-        vec3 sample_b = sample_single_scanline_horizontal(tex, scanline_uv_b, tex_size, texture_size_inv);
-
-	return vec3(sample_r.r, sample_g.g, sample_b.b);
-    }
-    else
-    {
-        return sample_single_scanline_horizontal(tex, tex_uv, tex_size, texture_size_inv);
-    }
-}
-
-// Monolythic
-vec2 get_last_scanline_uv( vec2 tex_uv,
-		           vec2 tex_size, vec2 texture_size_inv, 
-		           vec2 il_step_multiple,
-                           float frame_count, out float dist)
-{
-    float field_offset = floor(il_step_multiple.y * 0.75)*mod(frame_count + float(global.interlace_bff), 2.0);
-    vec2  curr_texel   = tex_uv * tex_size;
-
-    //  Use under_half to fix a rounding bug right around exact texel locations.
-    vec2  prev_texel_num     = floor(curr_texel - vec2(under_half));
-    float wrong_field        = mod(prev_texel_num.y + field_offset, il_step_multiple.y);
-    vec2  scanline_texel_num = prev_texel_num - vec2(0.0, wrong_field);
-
-    //  Snap to the center of the previous scanline in the current field:
-    vec2  scanline_texel = scanline_texel_num + vec2(0.5);
-    vec2  scanline_uv    = scanline_texel * texture_size_inv;
-
-    //  Save the sample's distance from the scanline, in units of scanlines:
-    dist = (curr_texel.y - scanline_texel.y)/il_step_multiple.y;
-
-    return scanline_uv;
-}
-
-bool is_interlaced(float num_lines)
-{
-    //  Detect interlacing based on the number of lines in the source.
-    if(interlace_detect)
-    {
-        //  NTSC: 525 lines, 262.5/field; 486 active (2 half-lines), 243/field
-        //  NTSC Emulators: Typically 224 or 240 lines
-        //  PAL: 625 lines, 312.5/field; 576 active (typical), 288/field
-        //  PAL Emulators: ?
-        //  ATSC: 720p, 1080i, 1080p
-        //  Where do we place our cutoffs?  Assumptions:
-        //  1.) We only need to care about active lines.
-        //  2.) Anything > 288 and <= 576 lines is probably interlaced.
-        //  3.) Anything > 576 lines is probably not interlaced...
-        //  4.) ...except 1080 lines, which is a crapshoot (user decision).
-        //  5.) Just in case the main program uses calculated video sizes,
-        //      we should nudge the float thresholds a bit.
-        bool sd_interlace = ((num_lines > 288.5) && (num_lines < 576.5));
-        bool hd_interlace = bool(interlace_1080i) ? ((num_lines > 1079.5) && (num_lines < 1080.5)) : false;
-
-	return (sd_interlace || hd_interlace);
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-#endif  //  SCANLINE_FUNCTIONS_H
-
diff --git a/crt/shaders/crt-royale/src-fast/special-functions.h b/crt/shaders/crt-royale/src-fast/special-functions.h
deleted file mode 100644
index 3857178c00..0000000000
--- a/crt/shaders/crt-royale/src-fast/special-functions.h
+++ /dev/null
@@ -1,489 +0,0 @@
-#ifndef SPECIAL_FUNCTIONS_H
-#define SPECIAL_FUNCTIONS_H
-
-/////////////////////////////////  MIT LICENSE  ////////////////////////////////
-
-//  Copyright (C) 2014 TroggleMonkey
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to
-//  deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-//  sell copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-//  IN THE SOFTWARE.
-
-
-///////////////////////////  GAUSSIAN ERROR FUNCTION  //////////////////////////
-
-vec4 erf6(vec4 x)
-{
-    //  Requires:   x is the standard parameter to erf().
-    //  Returns:    Return an Abramowitz/Stegun approximation of erf(), where:
-    //                  erf(x) = 2/sqrt(pi) * integral(e**(-x**2))
-    //              This approximation has a max absolute error of 2.5*10**-5
-    //              with solid numerical robustness and efficiency.  See:
-	//                  https://en.wikipedia.org/wiki/Error_function#Approximation_with_elementary_functions
-	vec4 one = vec4(1.0);
-	vec4 sign_x = sign(x);
-	vec4 t = one/(one + 0.47047*abs(x));
-	vec4 result = one - t*(0.3480242 + t*(-0.0958798 + t*0.7478556))*
-		exp(-(x*x));
-	return result * sign_x;
-}
-
-vec3 erf6(vec3 x)
-{
-    //  Float3 version:
-	vec3 one = vec3(1.0);
-	vec3 sign_x = sign(x);
-	vec3 t = one/(one + 0.47047*abs(x));
-	vec3 result = one - t*(0.3480242 + t*(-0.0958798 + t*0.7478556))*
-		exp(-(x*x));
-	return result * sign_x;
-}
-
-vec2 erf6(vec2 x)
-{
-    //  Float2 version:
-	vec2 one = vec2(1.0);
-	vec2 sign_x = sign(x);
-	vec2 t = one/(one + 0.47047*abs(x));
-	vec2 result = one - t*(0.3480242 + t*(-0.0958798 + t*0.7478556))*
-		exp(-(x*x));
-	return result * sign_x;
-}
-
-float erf6(float x)
-{
-    //  Float version:
-	float sign_x = sign(x);
-	float t = 1.0/(1.0 + 0.47047*abs(x));
-	float result = 1.0 - t*(0.3480242 + t*(-0.0958798 + t*0.7478556))*
-		exp(-(x*x));
-	return result * sign_x;
-}
-
-vec4 erft(vec4 x)
-{
-    //  Requires:   x is the standard parameter to erf().
-    //  Returns:    Approximate erf() with the hyperbolic tangent.  The error is
-    //              visually noticeable, but it's blazing fast and perceptually
-    //              close...at least on ATI hardware.  See:
-    //                  http://www.maplesoft.com/applications/view.aspx?SID=5525&view=html
-    //  Warning:    Only use this if your hardware drivers correctly implement
-    //              tanh(): My nVidia 8800GTS returns garbage output.
-	return tanh(1.202760580 * x);
-}
-
-vec3 erft(vec3 x)
-{
-    //  Float3 version:
-	return tanh(1.202760580 * x);
-}
-
-vec2 erft(vec2 x)
-{
-    //  Float2 version:
-	return tanh(1.202760580 * x);
-}
-
-float erft(float x)
-{
-    //  Float version:
-	return tanh(1.202760580 * x);
-}
-
-vec4 erf(vec4 x)
-{
-    //  Requires:   x is the standard parameter to erf().
-    //  Returns:    Some approximation of erf(x), depending on user settings.
-	#ifdef ERF_FAST_APPROXIMATION
-		return erft(x);
-	#else
-		return erf6(x);
-	#endif
-}
-
-vec3 erf(vec3 x)
-{
-    //  Float3 version:
-	#ifdef ERF_FAST_APPROXIMATION
-		return erft(x);
-	#else
-		return erf6(x);
-	#endif
-}
-
-vec2 erf(vec2 x)
-{
-    //  Float2 version:
-	#ifdef ERF_FAST_APPROXIMATION
-		return erft(x);
-	#else
-		return erf6(x);
-	#endif
-}
-
-float erf(float x)
-{
-    //  Float version:
-	#ifdef ERF_FAST_APPROXIMATION
-		return erft(x);
-	#else
-		return erf6(x);
-	#endif
-}
-
-
-///////////////////////////  COMPLETE GAMMA FUNCTION  //////////////////////////
-
-vec4 gamma_impl(vec4 s, vec4 s_inv)
-{
-    //  Requires:   1.) s is the standard parameter to the gamma function, and
-    //                  it should lie in the [0, 36] range.
-    //              2.) s_inv = 1.0/s.  This implementation function requires
-    //                  the caller to precompute this value, giving users the
-    //                  opportunity to reuse it.
-    //  Returns:    Return approximate gamma function (real-numbered factorial)
-    //              output using the Lanczos approximation with two coefficients
-    //              calculated using Paul Godfrey's method here:
-    //                  http://my.fit.edu/~gabdo/gamma.txt
-    //              An optimal g value for s in [0, 36] is ~1.12906830989, with
-    //              a maximum relative error of 0.000463 for 2**16 equally
-    //              evals.  We could use three coeffs (0.0000346 error) without
-    //              hurting latency, but this allows more parallelism with
-    //              outside instructions.
-	vec4 g = vec4(1.12906830989);
-	vec4 c0 = vec4(0.8109119309638332633713423362694399653724431);
-	vec4 c1 = vec4(0.4808354605142681877121661197951496120000040);
-	vec4 e = vec4(2.71828182845904523536028747135266249775724709);
-	vec4 sph = s + vec4(0.5);
-	vec4 lanczos_sum = c0 + c1/(s + vec4(1.0));
-	vec4 base = (sph + g)/e;  //  or (s + g + vec4(0.5))/e
-	//  gamma(s + 1) = base**sph * lanczos_sum; divide by s for gamma(s).
-	//  This has less error for small s's than (s -= 1.0) at the beginning.
-	return (pow(base, sph) * lanczos_sum) * s_inv;
-}
-
-vec3 gamma_impl(vec3 s, vec3 s_inv)
-{
-    //  Float3 version:
-	vec3 g = vec3(1.12906830989);
-	vec3 c0 = vec3(0.8109119309638332633713423362694399653724431);
-	vec3 c1 = vec3(0.4808354605142681877121661197951496120000040);
-	vec3 e = vec3(2.71828182845904523536028747135266249775724709);
-	vec3 sph = s + vec3(0.5);
-	vec3 lanczos_sum = c0 + c1/(s + vec3(1.0));
-	vec3 base = (sph + g)/e;
-	return (pow(base, sph) * lanczos_sum) * s_inv;
-}
-
-vec2 gamma_impl(vec2 s, vec2 s_inv)
-{
-    //  Float2 version:
-	vec2 g = vec2(1.12906830989);
-	vec2 c0 = vec2(0.8109119309638332633713423362694399653724431);
-	vec2 c1 = vec2(0.4808354605142681877121661197951496120000040);
-	vec2 e = vec2(2.71828182845904523536028747135266249775724709);
-	vec2 sph = s + vec2(0.5);
-	vec2 lanczos_sum = c0 + c1/(s + vec2(1.0));
-	vec2 base = (sph + g)/e;
-	return (pow(base, sph) * lanczos_sum) * s_inv;
-}
-
-float gamma_impl(float s, float s_inv)
-{
-    //  Float version:
-	float g = 1.12906830989;
-	float c0 = 0.8109119309638332633713423362694399653724431;
-	float c1 = 0.4808354605142681877121661197951496120000040;
-	float e = 2.71828182845904523536028747135266249775724709;
-	float sph = s + 0.5;
-	float lanczos_sum = c0 + c1/(s + 1.0);
-	float base = (sph + g)/e;
-	return (pow(base, sph) * lanczos_sum) * s_inv;
-}
-
-vec4 gamma(vec4 s)
-{
-    //  Requires:   s is the standard parameter to the gamma function, and it
-    //              should lie in the [0, 36] range.
-    //  Returns:    Return approximate gamma function output with a maximum
-    //              relative error of 0.000463.  See gamma_impl for details.
-	return gamma_impl(s, vec4(1.0)/s);
-}
-
-vec3 gamma(vec3 s)
-{
-    //  Float3 version:
-	return gamma_impl(s, vec3(1.0)/s);
-}
-
-vec2 gamma(vec2 s)
-{
-    //  Float2 version:
-	return gamma_impl(s, vec2(1.0)/s);
-}
-
-float gamma(float s)
-{
-    //  Float version:
-	return gamma_impl(s, 1.0/s);
-}
-
-
-////////////////  INCOMPLETE GAMMA FUNCTIONS (RESTRICTED INPUT)  ///////////////
-
-//  Lower incomplete gamma function for small s and z (implementation):
-vec4 ligamma_small_z_impl(vec4 s, vec4 z, vec4 s_inv)
-{
-    //  Requires:   1.) s < ~0.5
-    //              2.) z <= ~0.775075
-    //              3.) s_inv = 1.0/s (precomputed for outside reuse)
-    //  Returns:    A series representation for the lower incomplete gamma
-    //              function for small s and small z (4 terms).
-    //  The actual "rolled up" summation looks like:
-	//      last_sign = 1.0; last_pow = 1.0; last_factorial = 1.0;
-	//      sum = last_sign * last_pow / ((s + k) * last_factorial)
-	//      for(int i = 0; i < 4; ++i)
-	//      {
-	//          last_sign *= -1.0; last_pow *= z; last_factorial *= i;
-	//          sum += last_sign * last_pow / ((s + k) * last_factorial);
-	//      }
-	//  Unrolled, constant-unfolded and arranged for madds and parallelism:
-	vec4 scale = pow(z, s);
-	vec4 sum = s_inv;  //  Summation iteration 0 result
-	//  Summation iterations 1, 2, and 3:
-	vec4 z_sq = z*z;
-	vec4 denom1 = s + vec4(1.0);
-	vec4 denom2 = 2.0*s + vec4(4.0);
-	vec4 denom3 = 6.0*s + vec4(18.0);
-	//vec4 denom4 = 24.0*s + vec4(96.0);
-	sum -= z/denom1;
-	sum += z_sq/denom2;
-	sum -= z * z_sq/denom3;
-	//sum += z_sq * z_sq / denom4;
-	//  Scale and return:
-	return scale * sum;
-}
-
-vec3 ligamma_small_z_impl(vec3 s, vec3 z, vec3 s_inv)
-{
-    //  Float3 version:
-	vec3 scale = pow(z, s);
-	vec3 sum = s_inv;
-	vec3 z_sq = z*z;
-	vec3 denom1 = s + vec3(1.0);
-	vec3 denom2 = 2.0*s + vec3(4.0);
-	vec3 denom3 = 6.0*s + vec3(18.0);
-	sum -= z/denom1;
-	sum += z_sq/denom2;
-	sum -= z * z_sq/denom3;
-	return scale * sum;
-}
-
-vec2 ligamma_small_z_impl(vec2 s, vec2 z, vec2 s_inv)
-{
-    //  Float2 version:
-	vec2 scale = pow(z, s);
-	vec2 sum = s_inv;
-	vec2 z_sq = z*z;
-	vec2 denom1 = s + vec2(1.0);
-	vec2 denom2 = 2.0*s + vec2(4.0);
-	vec2 denom3 = 6.0*s + vec2(18.0);
-	sum -= z/denom1;
-	sum += z_sq/denom2;
-	sum -= z * z_sq/denom3;
-	return scale * sum;
-}
-
-float ligamma_small_z_impl(float s, float z, float s_inv)
-{
-    //  Float version:
-	float scale = pow(z, s);
-	float sum = s_inv;
-	float z_sq = z*z;
-	float denom1 = s + 1.0;
-	float denom2 = 2.0*s + 4.0;
-	float denom3 = 6.0*s + 18.0;
-	sum -= z/denom1;
-	sum += z_sq/denom2;
-	sum -= z * z_sq/denom3;
-	return scale * sum;
-}
-
-//  Upper incomplete gamma function for small s and large z (implementation):
-vec4 uigamma_large_z_impl(vec4 s, vec4 z)
-{
-    //  Requires:   1.) s < ~0.5
-    //              2.) z > ~0.775075
-    //  Returns:    Gauss's continued fraction representation for the upper
-    //              incomplete gamma function (4 terms).
-	//  The "rolled up" continued fraction looks like this.  The denominator
-    //  is truncated, and it's calculated "from the bottom up:"
-	//      denom = vec4('inf');
-	//      vec4 one = vec4(1.0);
-	//      for(int i = 4; i > 0; --i)
-	//      {
-	//          denom = ((i * 2.0) - one) + z - s + (i * (s - i))/denom;
-	//      }
-	//  Unrolled and constant-unfolded for madds and parallelism:
-	vec4 numerator = pow(z, s) * exp(-z);
-	vec4 denom = vec4(7.0) + z - s;
-	denom = vec4(5.0) + z - s + (3.0*s - vec4(9.0))/denom;
-	denom = vec4(3.0) + z - s + (2.0*s - vec4(4.0))/denom;
-	denom = vec4(1.0) + z - s + (s - vec4(1.0))/denom;
-	return numerator / denom;
-}
-
-vec3 uigamma_large_z_impl(vec3 s, vec3 z)
-{
-    //  Float3 version:
-	vec3 numerator = pow(z, s) * exp(-z);
-	vec3 denom = vec3(7.0) + z - s;
-	denom = vec3(5.0) + z - s + (3.0*s - vec3(9.0))/denom;
-	denom = vec3(3.0) + z - s + (2.0*s - vec3(4.0))/denom;
-	denom = vec3(1.0) + z - s + (s - vec3(1.0))/denom;
-	return numerator / denom;
-}
-
-vec2 uigamma_large_z_impl(vec2 s, vec2 z)
-{
-    //  Float2 version:
-	vec2 numerator = pow(z, s) * exp(-z);
-	vec2 denom = vec2(7.0) + z - s;
-	denom = vec2(5.0) + z - s + (3.0*s - vec2(9.0))/denom;
-	denom = vec2(3.0) + z - s + (2.0*s - vec2(4.0))/denom;
-	denom = vec2(1.0) + z - s + (s - vec2(1.0))/denom;
-	return numerator / denom;
-}
-
-float uigamma_large_z_impl(float s, float z)
-{
-    //  Float version:
-	float numerator = pow(z, s) * exp(-z);
-	float denom = 7.0 + z - s;
-	denom = 5.0 + z - s + (3.0*s - 9.0)/denom;
-	denom = 3.0 + z - s + (2.0*s - 4.0)/denom;
-	denom = 1.0 + z - s + (s - 1.0)/denom;
-	return numerator / denom;
-}
-
-//  Normalized lower incomplete gamma function for small s (implementation):
-vec4 normalized_ligamma_impl(vec4 s, vec4 z,
-    vec4 s_inv, vec4 gamma_s_inv)
-{
-    //  Requires:   1.) s < ~0.5
-    //              2.) s_inv = 1/s (precomputed for outside reuse)
-    //              3.) gamma_s_inv = 1/gamma(s) (precomputed for outside reuse)
-    //  Returns:    Approximate the normalized lower incomplete gamma function
-    //              for s < 0.5.  Since we only care about s < 0.5, we only need
-    //              to evaluate two branches (not four) based on z.  Each branch
-    //              uses four terms, with a max relative error of ~0.00182.  The
-    //              branch threshold and specifics were adapted for fewer terms
-    //              from Gil/Segura/Temme's paper here:
-    //                  http://oai.cwi.nl/oai/asset/20433/20433B.pdf
-	//  Evaluate both branches: Real branches test slower even when available.
-	vec4 thresh = vec4(0.775075);
-	bvec4 z_is_large;
-	z_is_large.x = z.x > thresh.x;
-	z_is_large.y = z.y > thresh.y;
-	z_is_large.z = z.z > thresh.z;
-	z_is_large.w = z.w > thresh.w;
-	vec4 large_z = vec4(1.0) - uigamma_large_z_impl(s, z) * gamma_s_inv;
-	vec4 small_z = ligamma_small_z_impl(s, z, s_inv) * gamma_s_inv;
-	//  Combine the results from both branches:
-	bvec4 inverse_z_is_large = not(z_is_large);
-	return large_z * vec4(z_is_large) + small_z * vec4(inverse_z_is_large);
-}
-
-vec3 normalized_ligamma_impl(vec3 s, vec3 z,
-    vec3 s_inv, vec3 gamma_s_inv)
-{
-    //  Float3 version:
-	vec3 thresh = vec3(0.775075);
-	bvec3 z_is_large;
-	z_is_large.x = z.x > thresh.x;
-	z_is_large.y = z.y > thresh.y;
-	z_is_large.z = z.z > thresh.z;
-	vec3 large_z = vec3(1.0) - uigamma_large_z_impl(s, z) * gamma_s_inv;
-	vec3 small_z = ligamma_small_z_impl(s, z, s_inv) * gamma_s_inv;
-	bvec3 inverse_z_is_large = not(z_is_large);
-	return large_z * vec3(z_is_large) + small_z * vec3(inverse_z_is_large);
-}
-
-vec2 normalized_ligamma_impl(vec2 s, vec2 z,
-    vec2 s_inv, vec2 gamma_s_inv)
-{
-    //  Float2 version:
-	vec2 thresh = vec2(0.775075);
-	bvec2 z_is_large;
-	z_is_large.x = z.x > thresh.x;
-	z_is_large.y = z.y > thresh.y;
-	vec2 large_z = vec2(1.0) - uigamma_large_z_impl(s, z) * gamma_s_inv;
-	vec2 small_z = ligamma_small_z_impl(s, z, s_inv) * gamma_s_inv;
-	bvec2 inverse_z_is_large = not(z_is_large);
-	return large_z * vec2(z_is_large) + small_z * vec2(inverse_z_is_large);
-}
-
-float normalized_ligamma_impl(float s, float z,
-    float s_inv, float gamma_s_inv)
-{
-    //  Float version:
-	float thresh = 0.775075;
-	bool z_is_large = z > thresh;
-	float large_z = 1.0 - uigamma_large_z_impl(s, z) * gamma_s_inv;
-	float small_z = ligamma_small_z_impl(s, z, s_inv) * gamma_s_inv;
-	return large_z * float(z_is_large) + small_z * float(!z_is_large);
-}
-
-//  Normalized lower incomplete gamma function for small s:
-vec4 normalized_ligamma(vec4 s, vec4 z)
-{
-    //  Requires:   s < ~0.5
-    //  Returns:    Approximate the normalized lower incomplete gamma function
-    //              for s < 0.5.  See normalized_ligamma_impl() for details.
-	vec4 s_inv = vec4(1.0)/s;
-	vec4 gamma_s_inv = vec4(1.0)/gamma_impl(s, s_inv);
-	return normalized_ligamma_impl(s, z, s_inv, gamma_s_inv);
-}
-
-vec3 normalized_ligamma(vec3 s, vec3 z)
-{
-    //  Float3 version:
-	vec3 s_inv = vec3(1.0)/s;
-	vec3 gamma_s_inv = vec3(1.0)/gamma_impl(s, s_inv);
-	return normalized_ligamma_impl(s, z, s_inv, gamma_s_inv);
-}
-
-vec2 normalized_ligamma(vec2 s, vec2 z)
-{
-    //  Float2 version:
-	vec2 s_inv = vec2(1.0)/s;
-	vec2 gamma_s_inv = vec2(1.0)/gamma_impl(s, s_inv);
-	return normalized_ligamma_impl(s, z, s_inv, gamma_s_inv);
-}
-
-float normalized_ligamma(float s, float z)
-{
-    //  Float version:
-	float s_inv = 1.0/s;
-	float gamma_s_inv = 1.0/gamma_impl(s, s_inv);
-	return normalized_ligamma_impl(s, z, s_inv, gamma_s_inv);
-}
-
-
-#endif  //  SPECIAL_FUNCTIONS_H
-
-
diff --git a/crt/shaders/crt-royale/src-fast/user-cgp-constants.h b/crt/shaders/crt-royale/src-fast/user-cgp-constants.h
deleted file mode 100644
index 0bdcfda1e5..0000000000
--- a/crt/shaders/crt-royale/src-fast/user-cgp-constants.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef USER_CGP_CONSTANTS_H
-#define USER_CGP_CONSTANTS_H
-
-//  PASS SCALES AND RELATED CONSTANTS:
-float bloom_approx_size_x = 320.0;
-float bloom_approx_size_x_for_fake = 400.0;
-vec2 mask_resize_viewport_scale = vec2(0.0625, 0.0625);
-float geom_max_aspect_ratio = 4.0/3.0;
-
-//  PHOSPHOR MASK TEXTURE CONSTANTS:
-vec2 mask_texture_small_size = vec2(64.0, 64.0);
-//vec2 mask_texture_large_size = vec2(512.0, 512.0);
-float mask_triads_per_tile = 8.0;
-//#define PHOSPHOR_MASK_GRILLE14
-//float mask_grille14_avg_color = 50.6666666/255.0;
-float mask_grille15_avg_color = 53.0/255.0;
-float mask_slot_avg_color     = 46.0/255.0;
-float mask_shadow_avg_color   = 41.0/255.0;
-
-    float mask_grille_avg_color = mask_grille15_avg_color;
-
-
-#endif  //  USER_CGP_CONSTANTS_H
-
diff --git a/crt/shaders/crt-royale/src-fast/user-settings.h b/crt/shaders/crt-royale/src-fast/user-settings.h
deleted file mode 100644
index 6b1713a863..0000000000
--- a/crt/shaders/crt-royale/src-fast/user-settings.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-//    #ifdef DRIVERS_ALLOW_DERIVATIVES
-//        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-//    #endif
-
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-#define RUNTIME_SHADER_PARAMS_ENABLE
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-#define RUNTIME_GEOMETRY_TILT
-#define RUNTIME_GEOMETRY_MODE
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-
-//  GAMMA:
-    float crt_gamma_static = 2.5;                  //  range [1, 5]
-    float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    float levels_contrast_static = 1.0;            //  range [0, 4)
-    float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    float halation_weight_static = 0.0;            //  range [0, 1]
-    float diffusion_weight_static = 0.075;         //  range [0, 1]
-    float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    float bloom_excess_static = 0.0;               //  range [0, 1]
-
-    float bloom_approx_filter_static = 0.0;
-
-    float beam_num_scanlines = 3.0;                //  range [2, 6]
-    bool beam_generalized_gaussian = true;
-    float beam_antialias_level = 1.0;              //  range [0, 2]
-    float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    float beam_spot_shape_function = 0.0;
-    float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    float beam_min_shape_static = 2.0;         //  range [2, 32]
-    float beam_max_shape_static = 4.0;         //  range [2, 32]
-    float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    float beam_horiz_filter_static = 0.0;
-    float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    bool beam_misconvergence = true;
-    vec2  convergence_offsets_r_static = vec2 (0.1, 0.2);
-    vec2  convergence_offsets_g_static = vec2 (0.3, 0.4);
-    vec2  convergence_offsets_b_static = vec2 (0.5, 0.6);
-    bool interlace_detect_static = true;
-    bool interlace_1080i_static = false;
-    bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    float aa_level = 12.0;                     //  range [0, 24]
-    float aa_filter = 6.0;                     //  range [0, 9]
-    bool aa_temporal = false;
-    vec2  aa_subpixel_r_offset_static = vec2 (-1.0/3.0, 0.0);//vec2 (0.0);
-    float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    float mask_type_static = 1.0;                  //  range [0, 2]
-    float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    float mask_triad_size_desired_static = 24.0 / 8.0;
-    float mask_num_triads_desired_static = 480.0;
-    float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    float geom_mode_static = 0.0;      //  range [0, 3]
-    float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    vec2  geom_tilt_angle_static = vec2 (0.0, 0.0);  //  range [-pi, pi]
-    float geom_aspect_ratio_static = 1.313069909;
-    vec2  geom_overscan_static = vec2 (1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    float border_size_static = 0.015;           //  range [0, 0.5]
-    float border_darkness_static = 2.0;        //  range [0, inf)
-    float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-royale/src/bind-shader-params.h b/crt/shaders/crt-royale/src/bind-shader-params.h
deleted file mode 100644
index 58230634a0..0000000000
--- a/crt/shaders/crt-royale/src/bind-shader-params.h
+++ /dev/null
@@ -1,333 +0,0 @@
-#ifndef BIND_SHADER_PARAMS_H
-#define BIND_SHADER_PARAMS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	float crt_gamma;
-	float lcd_gamma;
-	float levels_contrast;
-	float halation_weight;
-	float diffusion_weight;
-	float bloom_underestimate_levels;
-	float bloom_excess;
-	float beam_min_sigma;
-	float beam_max_sigma;
-	float beam_spot_power;
-	float beam_min_shape;
-	float beam_max_shape;
-	float beam_shape_power;
-	float beam_horiz_filter;
-	float beam_horiz_sigma;
-	float beam_horiz_linear_rgb_weight;
-	float convergence_offset_x_r;
-	float convergence_offset_x_g;
-	float convergence_offset_x_b;
-	float convergence_offset_y_r;
-	float convergence_offset_y_g;
-	float convergence_offset_y_b;
-	float mask_type;
-	float mask_sample_mode_desired;
-	float mask_num_triads_desired;
-	float mask_triad_size_desired;
-	float mask_specify_num_triads;
-	float aa_subpixel_r_offset_x_runtime;
-	float aa_subpixel_r_offset_y_runtime;
-	float aa_cubic_c;
-	float aa_gauss_sigma;
-	float geom_mode_runtime;
-	float geom_radius;
-	float geom_view_dist;
-	float geom_tilt_angle_x;
-	float geom_tilt_angle_y;
-	float geom_aspect_ratio_x;
-	float geom_aspect_ratio_y;
-	float geom_overscan_x;
-	float geom_overscan_y;
-	float border_size;
-	float border_darkness;
-	float border_compress;
-	float interlace_bff;
-	float interlace_1080i;
-	float interlace_detect_toggle;
-} global;
-
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-
-//  Override some parameters for gamma-management.h and tex2Dantialias.h:
-#define OVERRIDE_DEVICE_GAMMA
-static const float gba_gamma = 3.5; //  Irrelevant but necessary to define.
-#define ANTIALIAS_OVERRIDE_BASICS
-#define ANTIALIAS_OVERRIDE_PARAMETERS
-
-//  Disable runtime shader params if the user doesn't explicitly want them.
-//  Static constants will be defined in place of uniforms of the same name.
-#ifdef RUNTIME_SHADER_PARAMS_ENABLE    
-    #ifndef RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-        static const float beam_horiz_filter = clamp(beam_horiz_filter_static, 0.0, 2.0);
-        static const float beam_horiz_linear_rgb_weight = clamp(beam_horiz_linear_rgb_weight_static, 0.0, 1.0);
-    #endif
-    #ifndef RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-        static const float mask_type = clamp(mask_type_static, 0.0, 2.0);
-    #endif
-    #ifndef RUNTIME_ANTIALIAS_WEIGHTS
-        static const float aa_cubic_c = aa_cubic_c_static;                              //  Clamp to [0, 4]?
-        static const float aa_gauss_sigma = max(FIX_ZERO(0.0), aa_gauss_sigma_static);  //  Clamp to [FIXZERO(0), 1]?
-    #endif
-#else
-	#define HARDCODE_SETTINGS
-#endif
-
-//  Bind option names to shader parameter uniforms or static constants.
-#ifdef HARDCODE_SETTINGS
-    //  Use constants from user-settings.h, and limit ranges appropriately:
-    static const float crt_gamma = max(0.0, crt_gamma_static);
-    static const float lcd_gamma = max(0.0, lcd_gamma_static);
-    static const float levels_contrast = clamp(levels_contrast_static, 0.0, 4.0);
-    static const float halation_weight = clamp(halation_weight_static, 0.0, 1.0);
-    static const float diffusion_weight = clamp(diffusion_weight_static, 0.0, 1.0);
-    static const float bloom_underestimate_levels = max(FIX_ZERO(0.0), bloom_underestimate_levels_static);
-    static const float bloom_excess = clamp(bloom_excess_static, 0.0, 1.0);
-    static const float beam_min_sigma = max(FIX_ZERO(0.0), beam_min_sigma_static);
-    static const float beam_max_sigma = max(beam_min_sigma, beam_max_sigma_static);
-    static const float beam_spot_power = max(beam_spot_power_static, 0.0);
-    static const float beam_min_shape = max(2.0, beam_min_shape_static);
-    static const float beam_max_shape = max(beam_min_shape, beam_max_shape_static);
-    static const float beam_shape_power = max(0.0, beam_shape_power_static);
-    static const float beam_horiz_filter = clamp(beam_horiz_filter_static, 0.0, 2.0);
-    static const float beam_horiz_sigma = max(FIX_ZERO(0.0), beam_horiz_sigma_static);
-    static const float beam_horiz_linear_rgb_weight = clamp(beam_horiz_linear_rgb_weight_static, 0.0, 1.0);
-    //  Unpack static vector elements to match scalar uniforms:
-    static const float convergence_offset_x_r = clamp(convergence_offsets_r_static.x, -4.0, 4.0);
-    static const float convergence_offset_x_g = clamp(convergence_offsets_g_static.x, -4.0, 4.0);
-    static const float convergence_offset_x_b = clamp(convergence_offsets_b_static.x, -4.0, 4.0);
-    static const float convergence_offset_y_r = clamp(convergence_offsets_r_static.y, -4.0, 4.0);
-    static const float convergence_offset_y_g = clamp(convergence_offsets_g_static.y, -4.0, 4.0);
-    static const float convergence_offset_y_b = clamp(convergence_offsets_b_static.y, -4.0, 4.0);
-    static const float mask_type = clamp(mask_type_static, 0.0, 2.0);
-    static const float mask_sample_mode_desired = clamp(mask_sample_mode_static, 0.0, 2.0);
-    static const float mask_specify_num_triads = clamp(mask_specify_num_triads_static, 0.0, 1.0);
-    static const float mask_triad_size_desired = clamp(mask_triad_size_desired_static, 1.0, 18.0);
-    static const float mask_num_triads_desired = clamp(mask_num_triads_desired_static, 342.0, 1920.0);
-    static const float aa_subpixel_r_offset_x_runtime = clamp(aa_subpixel_r_offset_static.x, -0.5, 0.5);
-    static const float aa_subpixel_r_offset_y_runtime = clamp(aa_subpixel_r_offset_static.y, -0.5, 0.5);
-    static const float aa_cubic_c = aa_cubic_c_static;                              //  Clamp to [0, 4]?
-    static const float aa_gauss_sigma = max(FIX_ZERO(0.0), aa_gauss_sigma_static);  //  Clamp to [FIXZERO(0), 1]?
-    static const float geom_mode_runtime = clamp(geom_mode_static, 0.0, 3.0);
-    static const float geom_radius = max(1.0/(2.0*pi), geom_radius_static);         //  Clamp to [1/(2*pi), 1024]?
-    static const float geom_view_dist = max(0.5, geom_view_dist_static);            //  Clamp to [0.5, 1024]?
-    static const float geom_tilt_angle_x = clamp(geom_tilt_angle_static.x, -pi, pi);
-    static const float geom_tilt_angle_y = clamp(geom_tilt_angle_static.y, -pi, pi);
-    static const float geom_aspect_ratio_x = geom_aspect_ratio_static;              //  Force >= 1?
-    static const float geom_aspect_ratio_y = 1.0;
-    static const float geom_overscan_x = max(FIX_ZERO(0.0), geom_overscan_static.x);
-    static const float geom_overscan_y = max(FIX_ZERO(0.0), geom_overscan_static.y);
-    static const float border_size = clamp(border_size_static, 0.0, 0.5);           //  0.5 reaches to image center
-    static const float border_darkness = max(0.0, border_darkness_static);
-    static const float border_compress = max(1.0, border_compress_static);          //  < 1.0 darkens whole image
-    static const bool  interlace_detect = bool(interlace_detect_static);
-    static const bool  interlace_bff = bool(interlace_bff_static);
-    static const bool  interlace_1080i = bool(interlace_1080i_static);
-#else
-#pragma parameter crt_gamma "Simulated CRT Gamma" 2.5 1.0 5.0 0.025
-#define crt_gamma global.crt_gamma
-#pragma parameter lcd_gamma "Your Display Gamma" 2.2 1.0 5.0 0.025
-#define lcd_gamma global.lcd_gamma
-#pragma parameter levels_contrast "Contrast" 1.0 0.0 4.0 0.015625
-#define levels_contrast global.levels_contrast
-#pragma parameter halation_weight "Halation Weight" 0.0 0.0 1.0 0.005
-#pragma parameter diffusion_weight "Diffusion Weight" 0.075 0.0 1.0 0.005
-#pragma parameter bloom_underestimate_levels "Bloom - Underestimate Levels" 0.8 0.0 5.0 0.01
-#define bloom_underestimate_levels global.bloom_underestimate_levels
-#pragma parameter bloom_excess "Bloom - Excess" 0.0 0.0 1.0 0.005
-#pragma parameter beam_min_sigma "Beam - Min Sigma" 0.02 0.005 1.0 0.005
-#define beam_min_sigma global.beam_min_sigma
-#pragma parameter beam_max_sigma "Beam - Max Sigma" 0.3 0.005 1.0 0.005
-#define beam_max_sigma global.beam_max_sigma
-#pragma parameter beam_spot_power "Beam - Spot Power" 0.33 0.01 16.0 0.01
-#define beam_spot_power global.beam_spot_power
-#pragma parameter beam_min_shape "Beam - Min Shape" 2.0 2.0 32.0 0.1
-#define beam_min_shape global.beam_min_shape
-#pragma parameter beam_max_shape "Beam - Max Shape" 4.0 2.0 32.0 0.1
-#define beam_max_shape global.beam_max_shape
-#pragma parameter beam_shape_power "Beam - Shape Power" 0.25 0.01 16.0 0.01
-#define beam_shape_power global.beam_shape_power
-#pragma parameter beam_horiz_filter "Beam - Horiz Filter" 0.0 0.0 2.0 1.0
-#define beam_horiz_filter global.beam_horiz_filter
-#pragma parameter beam_horiz_sigma "Beam - Horiz Sigma" 0.35 0.0 0.67 0.005
-#define beam_horiz_sigma global.beam_horiz_sigma
-#pragma parameter beam_horiz_linear_rgb_weight "Beam - Horiz Linear RGB Weight" 1.0 0.0 1.0 0.01
-#pragma parameter convergence_offset_x_r "Convergence - Offset X Red" 0.0 -4.0 4.0 0.05
-#define convergence_offset_x_r global.convergence_offset_x_r
-#pragma parameter convergence_offset_x_g "Convergence - Offset X Green" 0.0 -4.0 4.0 0.05
-#define convergence_offset_x_g global.convergence_offset_x_g
-#pragma parameter convergence_offset_x_b "Convergence - Offset X Blue" 0.0 -4.0 4.0 0.05
-#define convergence_offset_x_b global.convergence_offset_x_b
-#pragma parameter convergence_offset_y_r "Convergence - Offset Y Red" 0.0 -2.0 2.0 0.05
-#define convergence_offset_y_r global.convergence_offset_y_r
-#pragma parameter convergence_offset_y_g "Convergence - Offset Y Green" 0.0 -2.0 2.0 0.05
-#define convergence_offset_y_g global.convergence_offset_y_g
-#pragma parameter convergence_offset_y_b "Convergence - Offset Y Blue" 0.0 -2.0 2.0 0.05
-#define convergence_offset_y_b global.convergence_offset_y_b
-#pragma parameter mask_type "Mask - Type" 1.0 0.0 2.0 1.0
-#define mask_type global.mask_type
-#pragma parameter mask_sample_mode_desired "Mask - Sample Mode" 0.0 0.0 2.0 1.0   //  Consider blocking mode 2.
-#define mask_sample_mode_desired global.mask_sample_mode_desired
-#pragma parameter mask_specify_num_triads "Mask - Specify Number of Triads" 0.0 0.0 1.0 1.0
-#pragma parameter mask_triad_size_desired "Mask - Triad Size Desired" 3.0 1.0 18.0 0.125
-#pragma parameter mask_num_triads_desired "Mask - Number of Triads Desired" 480.0 342.0 1920.0 1.0
-#pragma parameter aa_subpixel_r_offset_x_runtime "AA - Subpixel R Offset X" -0.333333333 -0.333333333 0.333333333 0.333333333
-#define aa_subpixel_r_offset_x_runtime global.aa_subpixel_r_offset_x_runtime
-#pragma parameter aa_subpixel_r_offset_y_runtime "AA - Subpixel R Offset Y" 0.0 -0.333333333 0.333333333 0.333333333
-#define aa_subpixel_r_offset_y_runtime global.aa_subpixel_r_offset_y_runtime
-#pragma parameter aa_cubic_c "AA - Cubic Sharpness" 0.5 0.0 4.0 0.015625
-#define aa_cubic_c global.aa_cubic_c
-#pragma parameter aa_gauss_sigma "AA - Gaussian Sigma" 0.5 0.0625 1.0 0.015625
-#define aa_gauss_sigma global.aa_gauss_sigma
-#pragma parameter geom_mode_runtime "Geometry - Mode" 0.0 0.0 3.0 1.0
-#define geom_mode_runtime global.geom_mode_runtime
-#pragma parameter geom_radius "Geometry - Radius" 2.0 0.16 1024.0 0.1
-#define geom_radius global.geom_radius
-#pragma parameter geom_view_dist "Geometry - View Distance" 2.0 0.5 1024.0 0.25
-#define geom_view_dist global.geom_view_dist
-#pragma parameter geom_tilt_angle_x "Geometry - Tilt Angle X" 0.0 -3.14159265 3.14159265 0.017453292519943295
-#define geom_tilt_angle_x global.geom_tilt_angle_x
-#pragma parameter geom_tilt_angle_y "Geometry - Tilt Angle Y" 0.0 -3.14159265 3.14159265 0.017453292519943295
-#define geom_tilt_angle_y global.geom_tilt_angle_y
-#pragma parameter geom_aspect_ratio_x "Geometry - Aspect Ratio X" 432.0 1.0 512.0 1.0
-#define geom_aspect_ratio_x global.geom_aspect_ratio_x
-#pragma parameter geom_aspect_ratio_y "Geometry - Aspect Ratio Y" 329.0 1.0 512.0 1.0
-#define geom_aspect_ratio_y global.geom_aspect_ratio_y
-#pragma parameter geom_overscan_x "Geometry - Overscan X" 1.0 0.00390625 4.0 0.00390625
-#define geom_overscan_x global.geom_overscan_x
-#pragma parameter geom_overscan_y "Geometry - Overscan Y" 1.0 0.00390625 4.0 0.00390625
-#define geom_overscan_y global.geom_overscan_y
-#pragma parameter border_size "Border - Size" 0.015 0.0000001 0.5 0.005
-#define border_size global.border_size
-#pragma parameter border_darkness "Border - Darkness" 2.0 0.0 16.0 0.0625
-#define border_darkness global.border_darkness
-#pragma parameter border_compress "Border - Compression" 2.5 1.0 64.0 0.0625
-#define border_compress global.border_compress
-#pragma parameter interlace_detect_toggle "Interlacing - Toggle" 1.0 0.0 1.0 1.0
-bool interlace_detect = bool(global.interlace_detect_toggle);
-#pragma parameter interlace_bff "Interlacing - Bottom Field First" 0.0 0.0 1.0 1.0
-//#define interlace_bff global.interlace_bff
-#pragma parameter interlace_1080i "Interlace - Detect 1080i" 0.0 0.0 1.0 1.0
-#define interlace_1080i global.interlace_1080i
-#endif
-
-//  Provide accessors for vector constants that pack scalar uniforms:
-inline float2 get_aspect_vector(const float geom_aspect_ratio)
-{
-    //  Get an aspect ratio vector.  Enforce geom_max_aspect_ratio, and prevent
-    //  the absolute scale from affecting the uv-mapping for curvature:
-    const float geom_clamped_aspect_ratio =
-        min(geom_aspect_ratio, geom_max_aspect_ratio);
-    const float2 geom_aspect =
-        normalize(float2(geom_clamped_aspect_ratio, 1.0));
-    return geom_aspect;
-}
-
-inline float2 get_geom_overscan_vector()
-{
-    return float2(geom_overscan_x, geom_overscan_y);
-}
-
-inline float2 get_geom_tilt_angle_vector()
-{
-    return float2(geom_tilt_angle_x, geom_tilt_angle_y);
-}
-
-inline float3 get_convergence_offsets_x_vector()
-{
-    return float3(convergence_offset_x_r, convergence_offset_x_g,
-        convergence_offset_x_b);
-}
-
-inline float3 get_convergence_offsets_y_vector()
-{
-    return float3(convergence_offset_y_r, convergence_offset_y_g,
-        convergence_offset_y_b);
-}
-
-inline float2 get_convergence_offsets_r_vector()
-{
-    return float2(convergence_offset_x_r, convergence_offset_y_r);
-}
-
-inline float2 get_convergence_offsets_g_vector()
-{
-    return float2(convergence_offset_x_g, convergence_offset_y_g);
-}
-
-inline float2 get_convergence_offsets_b_vector()
-{
-    return float2(convergence_offset_x_b, convergence_offset_y_b);
-}
-
-inline float2 get_aa_subpixel_r_offset()
-{
-    #ifdef RUNTIME_ANTIALIAS_WEIGHTS
-        #ifdef RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-            //  WARNING: THIS IS EXTREMELY EXPENSIVE.
-            return float2(aa_subpixel_r_offset_x_runtime,
-                aa_subpixel_r_offset_y_runtime);
-        #else
-            return aa_subpixel_r_offset_static;
-        #endif
-    #else
-        return aa_subpixel_r_offset_static;
-    #endif
-}
-
-//  Provide accessors settings which still need "cooking:"
-inline float get_mask_amplify()
-{
-    static const float mask_grille_amplify = 1.0/mask_grille_avg_color;
-    static const float mask_slot_amplify = 1.0/mask_slot_avg_color;
-    static const float mask_shadow_amplify = 1.0/mask_shadow_avg_color;
-    return mask_type < 0.5 ? mask_grille_amplify :
-        mask_type < 1.5 ? mask_slot_amplify :
-        mask_shadow_amplify;
-}
-
-inline float get_mask_sample_mode()
-{
-    #ifdef RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-        #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-            return mask_sample_mode_desired;
-        #else
-            return clamp(mask_sample_mode_desired, 1.0, 2.0);
-        #endif
-    #else
-        #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-            return mask_sample_mode_static;
-        #else
-            return clamp(mask_sample_mode_static, 1.0, 2.0);
-        #endif
-    #endif
-}
-
-#endif  //  BIND_SHADER_PARAMS_H
diff --git a/crt/shaders/crt-royale/src/bloom-functions.h b/crt/shaders/crt-royale/src/bloom-functions.h
deleted file mode 100644
index 8ce2d0e77f..0000000000
--- a/crt/shaders/crt-royale/src/bloom-functions.h
+++ /dev/null
@@ -1,317 +0,0 @@
-#ifndef BLOOM_FUNCTIONS_H
-#define BLOOM_FUNCTIONS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-/////////////////////////////////  DESCRIPTION  ////////////////////////////////
-
-//  These utility functions and constants help several passes determine the
-//  size and center texel weight of the phosphor bloom in a uniform manner.
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-//  We need to calculate the correct blur sigma using some .cgp constants:
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "../../../../include/blur-functions.h"
-
-
-///////////////////////////////  BLOOM CONSTANTS  //////////////////////////////
-
-//  Compute constants with manual inlines of the functions below:
-static const float bloom_diff_thresh = 1.0/256.0;
-
-
-
-///////////////////////////////////  HELPERS  //////////////////////////////////
-
-inline float get_min_sigma_to_blur_triad(const float triad_size,
-    const float thresh)
-{
-    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
-    //              2.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum sigma that will fully blur a phosphor
-    //              triad on the screen to an even color, within thresh.
-    //              This closed-form function was found by curve-fitting data.
-    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
-    return -0.05168 + 0.6113*triad_size -
-        1.122*triad_size*sqrt(0.000416 + thresh);
-    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
-    //return 0.5985*triad_size - triad_size*sqrt(thresh)
-}
-
-inline float get_absolute_scale_blur_sigma(const float thresh)
-{
-    //  Requires:   1.) min_expected_triads must be a global float.  The number
-    //                  of horizontal phosphor triads in the final image must be
-    //                  >= min_allowed_viewport_triads.x for realistic results.
-    //              2.) bloom_approx_scale_x must be a global float equal to the
-    //                  absolute horizontal scale of BLOOM_APPROX.
-    //              3.) bloom_approx_scale_x/min_allowed_viewport_triads.x
-    //                  should be <= 1.1658025090 to keep the final result <
-    //                  0.62666015625 (the largest sigma ensuring the largest
-    //                  unused texel weight stays < 1.0/256.0 for a 3x3 blur).
-    //              4.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum Gaussian sigma that will blur the pass
-    //              output as much as it would have taken to blur away
-    //              bloom_approx_scale_x horizontal phosphor triads.
-    //  Description:
-    //  BLOOM_APPROX should look like a downscaled phosphor blur.  Ideally, we'd
-    //  use the same blur sigma as the actual phosphor bloom and scale it down
-    //  to the current resolution with (bloom_approx_scale_x/viewport_size_x), but
-    //  we don't know the viewport size in this pass.  Instead, we'll blur as
-    //  much as it would take to blur away min_allowed_viewport_triads.x.  This
-    //  will blur "more than necessary" if the user actually uses more triads,
-    //  but that's not terrible either, because blurring a constant fraction of
-    //  the viewport may better resemble a true optical bloom anyway (since the
-    //  viewport will generally be about the same fraction of each player's
-    //  field of view, regardless of screen size and resolution).
-    //  Assume an extremely large viewport size for asymptotic results.
-    return bloom_approx_scale_x/max_viewport_size_x *
-        get_min_sigma_to_blur_triad(
-            max_viewport_size_x/min_allowed_viewport_triads.x, thresh);
-}
-
-inline float get_center_weight(const float sigma)
-{
-    //  Given a Gaussian blur sigma, get the blur weight for the center texel.
-    #ifdef RUNTIME_PHOSPHOR_BLOOM_SIGMA
-        return get_fast_gaussian_weight_sum_inv(sigma);
-    #else
-        const float denom_inv = 0.5/(sigma*sigma);
-        const float w0 = 1.0;
-        const float w1 = exp(-1.0 * denom_inv);
-        const float w2 = exp(-4.0 * denom_inv);
-        const float w3 = exp(-9.0 * denom_inv);
-        const float w4 = exp(-16.0 * denom_inv);
-        const float w5 = exp(-25.0 * denom_inv);
-        const float w6 = exp(-36.0 * denom_inv);
-        const float w7 = exp(-49.0 * denom_inv);
-        const float w8 = exp(-64.0 * denom_inv);
-        const float w9 = exp(-81.0 * denom_inv);
-        const float w10 = exp(-100.0 * denom_inv);
-        const float w11 = exp(-121.0 * denom_inv);
-        const float w12 = exp(-144.0 * denom_inv);
-        const float w13 = exp(-169.0 * denom_inv);
-        const float w14 = exp(-196.0 * denom_inv);
-        const float w15 = exp(-225.0 * denom_inv);
-        const float w16 = exp(-256.0 * denom_inv);
-        const float w17 = exp(-289.0 * denom_inv);
-        const float w18 = exp(-324.0 * denom_inv);
-        const float w19 = exp(-361.0 * denom_inv);
-        const float w20 = exp(-400.0 * denom_inv);
-        const float w21 = exp(-441.0 * denom_inv);
-        //  Note: If the implementation uses a smaller blur than the max allowed,
-        //  the worst case scenario is that the center weight will be overestimated,
-        //  so we'll put a bit more energy into the brightpass...no huge deal.
-        //  Then again, if the implementation uses a larger blur than the max
-        //  "allowed" because of dynamic branching, the center weight could be
-        //  underestimated, which is more of a problem...consider always using
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-            //  43x blur:
-            const float weight_sum_inv = 1.0 /
-                (w0 + 2.0 * (w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 + w9 + w10 +
-                w11 + w12 + w13 + w14 + w15 + w16 + w17 + w18 + w19 + w20 + w21));
-        #else
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-            //  31x blur:
-            const float weight_sum_inv = 1.0 /
-                (w0 + 2.0 * (w1 + w2 + w3 + w4 + w5 + w6 + w7 +
-                w8 + w9 + w10 + w11 + w12 + w13 + w14 + w15));
-        #else
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-            //  25x blur:
-            const float weight_sum_inv = 1.0 / (w0 + 2.0 * (
-                w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 + w9 + w10 + w11 + w12));
-        #else
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-            //  17x blur:
-            const float weight_sum_inv = 1.0 / (w0 + 2.0 * (
-                w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8));
-        #else
-            //  9x blur:
-            const float weight_sum_inv = 1.0 / (w0 + 2.0 * (w1 + w2 + w3 + w4));
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-        const float center_weight = weight_sum_inv * weight_sum_inv;
-        return center_weight;
-    #endif
-}
-
-inline float3 tex2DblurNfast(const sampler2D texture, const float2 tex_uv,
-    const float2 dxdy, const float sigma)
-{
-    //  If sigma is static, we can safely branch and use the smallest blur
-    //  that's big enough.  Ignore #define hints, because we'll only use a
-    //  large blur if we actually need it, and the branches cost nothing.
-    #ifndef RUNTIME_PHOSPHOR_BLOOM_SIGMA
-        #define PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
-    #else
-        //  It's still worth branching if the profile supports dynamic branches:
-        //  It's much faster than using a hugely excessive blur, but each branch
-        //  eats ~1% FPS.
-        #ifdef DRIVERS_ALLOW_DYNAMIC_BRANCHES
-            #define PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
-        #endif
-    #endif
-    //  Failed optimization notes:
-    //  I originally created a same-size mipmapped 5-tap separable blur10 that
-    //  could handle any sigma by reaching into lower mip levels.  It was
-    //  as fast as blur25fast for runtime sigmas and a tad faster than
-    //  blur31fast for static sigmas, but mipmapping two viewport-size passes
-    //  ate 10% of FPS across all codepaths, so it wasn't worth it.
-    #ifdef PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
-        if(sigma <= blur9_std_dev)
-        {
-            return tex2Dblur9fast(texture, tex_uv, dxdy, sigma);
-        }
-        else if(sigma <= blur17_std_dev)
-        {
-            return tex2Dblur17fast(texture, tex_uv, dxdy, sigma);
-        }
-        else if(sigma <= blur25_std_dev)
-        {
-            return tex2Dblur25fast(texture, tex_uv, dxdy, sigma);
-        }
-        else if(sigma <= blur31_std_dev)
-        {
-            return tex2Dblur31fast(texture, tex_uv, dxdy, sigma);
-        }
-        else
-        {
-            return tex2Dblur43fast(texture, tex_uv, dxdy, sigma);
-        }
-    #else
-        //  If we can't afford to branch, we can only guess at what blur
-        //  size we need.  Therefore, use the largest blur allowed.
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-            return tex2Dblur43fast(texture, tex_uv, dxdy, sigma);
-        #else
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-            return tex2Dblur31fast(texture, tex_uv, dxdy, sigma);
-        #else
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-            return tex2Dblur25fast(texture, tex_uv, dxdy, sigma);
-        #else
-        #ifdef PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-            return tex2Dblur17fast(texture, tex_uv, dxdy, sigma);
-        #else
-            return tex2Dblur9fast(texture, tex_uv, dxdy, sigma);
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-        #endif  //  PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    #endif  //  PHOSPHOR_BLOOM_BRANCH_FOR_BLUR_SIZE
-}
-
-inline float get_bloom_approx_sigma(const float output_size_x_runtime,
-    const float estimated_viewport_size_x)
-{
-    //  Requires:   1.) output_size_x_runtime == BLOOM_APPROX.output_size.x.
-    //                  This is included for dynamic codepaths just in case the
-    //                  following two globals are incorrect:
-    //              2.) bloom_approx_size_x_for_skip should == the same
-    //                  if PHOSPHOR_BLOOM_FAKE is #defined
-    //              3.) bloom_approx_size_x should == the same otherwise
-    //  Returns:    For gaussian4x4, return a dynamic small bloom sigma that's
-    //              as close to optimal as possible given available information.
-    //              For blur3x3, return the a static small bloom sigma that
-    //              works well for typical cases.  Otherwise, we're using simple
-    //              bilinear filtering, so use static calculations.
-    //  Assume the default static value.  This is a compromise that ensures
-    //  typical triads are blurred, even if unusually large ones aren't.
-    static const float mask_num_triads_static =
-        max(min_allowed_viewport_triads.x, mask_num_triads_desired_static);
-    const float mask_num_triads_from_size =
-        estimated_viewport_size_x/global.mask_triad_size_desired;
-    const float mask_num_triads_runtime = max(min_allowed_viewport_triads.x,
-        lerp(mask_num_triads_from_size, global.mask_num_triads_desired,
-            global.mask_specify_num_triads));
-    //  Assume an extremely large viewport size for asymptotic results:
-    static const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-    if(bloom_approx_filter > 1.5)   //  4x4 true Gaussian resize
-    {
-        //  Use the runtime num triads and output size:
-        const float asymptotic_triad_size =
-            max_viewport_size_x/mask_num_triads_runtime;
-        const float asymptotic_sigma = get_min_sigma_to_blur_triad(
-            asymptotic_triad_size, bloom_diff_thresh);
-        const float bloom_approx_sigma =
-            asymptotic_sigma * output_size_x_runtime/max_viewport_size_x;
-        //  The BLOOM_APPROX input has to be ORIG_LINEARIZED to avoid moire, but
-        //  account for the Gaussian scanline sigma from the last pass too.
-        //  The bloom will be too wide horizontally but tall enough vertically.
-        return length(float2(bloom_approx_sigma, beam_max_sigma));
-    }
-    else    //  3x3 blur resize (the bilinear resize doesn't need a sigma)
-    {
-        //  We're either using blur3x3 or bilinear filtering.  The biggest
-        //  reason to choose blur3x3 is to avoid dynamic weights, so use a
-        //  static calculation.
-        #ifdef PHOSPHOR_BLOOM_FAKE
-            static const float output_size_x_static =
-                bloom_approx_size_x_for_fake;
-        #else
-            static const float output_size_x_static = bloom_approx_size_x;
-        #endif
-        static const float asymptotic_triad_size =
-            max_viewport_size_x/mask_num_triads_static;
-        const float asymptotic_sigma = get_min_sigma_to_blur_triad(
-            asymptotic_triad_size, bloom_diff_thresh);
-        const float bloom_approx_sigma =
-            asymptotic_sigma * output_size_x_static/max_viewport_size_x;
-        //  The BLOOM_APPROX input has to be ORIG_LINEARIZED to avoid moire, but
-        //  try accounting for the Gaussian scanline sigma from the last pass
-        //  too; use the static default value:
-        return length(float2(bloom_approx_sigma, beam_max_sigma_static));
-    }
-}
-
-inline float get_final_bloom_sigma(const float bloom_sigma_runtime)
-{
-    //  Requires:   1.) bloom_sigma_runtime is a precalculated sigma that's
-    //                  optimal for the [known] triad size.
-    //              2.) Call this from a fragment shader (not a vertex shader),
-    //                  or blurring with static sigmas won't be constant-folded.
-    //  Returns:    Return the optimistic static sigma if the triad size is
-    //              known at compile time.  Otherwise return the optimal runtime
-    //              sigma (10% slower) or an implementation-specific compromise
-    //              between an optimistic or pessimistic static sigma.
-    //  Notes:      Call this from the fragment shader, NOT the vertex shader,
-    //              so static sigmas can be constant-folded!
-    const float bloom_sigma_optimistic = get_min_sigma_to_blur_triad(
-        mask_triad_size_desired_static, bloom_diff_thresh);
-    #ifdef RUNTIME_PHOSPHOR_BLOOM_SIGMA
-        return bloom_sigma_runtime;
-    #else
-        //  Overblurring looks as bad as underblurring, so assume average-size
-        //  triads, not worst-case huge triads:
-        return bloom_sigma_optimistic;
-    #endif
-}
-
-
-#endif  //  BLOOM_FUNCTIONS_H
-
diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.slang
deleted file mode 100644
index 2ea796b807..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-#define PHOSPHOR_BLOOM_FAKE
-#include "crt-royale-bloom-approx.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.slang
deleted file mode 100644
index 4ddc78efa1..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.slang
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 450
-
-//  crt-royale-bloom-approx.slang #includes "bloom-functions.h", which checks
-//  whether PHOSPHOR_BLOOM_FAKE is defined to decide whether to use:
-//  a.) bloom_approx_size_x (default 320.0), or
-//  b.) bloom_approx_size_x_for_skip (default 400.0)
-//  from "user-cgp-constants.h."  This is used to calculate a blur sigma (which
-//  incidentally is only used by some codepaths).  These values often differ:
-//  a.) 400x300 is better for the fake-bloom shader.
-//  b.) 320x240 can be a better choice for the real bloom shader.
-//  The only purpose of this file is to tell bloom-functions.h which to assume.
-
-#define PHOSPHOR_BLOOM_FAKE
-#include "crt-royale-bloom-approx.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-approx-intel.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-approx-intel.slang
deleted file mode 100644
index 420f527d55..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-bloom-approx-intel.slang
+++ /dev/null
@@ -1,3 +0,0 @@
-#version 450
-#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-#include "crt-royale-bloom-approx.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-approx.h b/crt/shaders/crt-royale/src/crt-royale-bloom-approx.h
deleted file mode 100644
index 92af7e73d2..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-bloom-approx.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 ORIG_LINEARIZEDSize;
-} params;
-
-#define ORIG_LINEARIZEDvideo_size params.SourceSize.xy
-#define ORIG_LINEARIZEDtexture_size params.SourceSize.xy
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "bind-shader-params.h"
-#include "../../../../include/gamma-management.h"
-#include "derived-settings-and-constants.h"
-#include "scanline-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 blur_dxdy;
-layout(location = 2) out vec2 uv_scanline_step;
-layout(location = 3) out float estimated_viewport_size_x;
-layout(location = 4) out vec2 texture_size_inv;
-layout(location = 5) out vec2 tex_uv_to_pixel_scale;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   float2 vTexCoord = TexCoord;
-    const float2 video_uv = vTexCoord * IN.texture_size/IN.video_size;
-    tex_uv = video_uv * ORIG_LINEARIZEDvideo_size /
-        ORIG_LINEARIZEDtexture_size;
-    //  The last pass (vertical scanlines) had a viewport y scale, so we can
-    //  use it to calculate a better runtime sigma:
-    estimated_viewport_size_x =
-        IN.video_size.y * geom_aspect_ratio_x/geom_aspect_ratio_y;
-
-    //  Get the uv sample distance between output pixels.  We're using a resize
-    //  blur, so arbitrary upsizing will be acceptable if filter_linearN =
-    //  "true," and arbitrary downsizing will be acceptable if mipmap_inputN =
-    //  "true" too.  The blur will be much more accurate if a true 4x4 Gaussian
-    //  resize is used instead of tex2Dblur3x3_resize (which samples between
-    //  texels even for upsizing).
-    const float2 dxdy_min_scale = ORIG_LINEARIZEDvideo_size/IN.output_size;
-    texture_size_inv = float2(1.0)/ORIG_LINEARIZEDtexture_size;
-    if(bloom_approx_filter > 1.5)   //  4x4 true Gaussian resize
-    {
-        //  For upsizing, we'll snap to texels and sample the nearest 4.
-        const float2 dxdy_scale = max(dxdy_min_scale, float2(1.0));
-        blur_dxdy = dxdy_scale * texture_size_inv;
-    }
-    else
-    {
-        const float2 dxdy_scale = dxdy_min_scale;
-        blur_dxdy = dxdy_scale * texture_size_inv;
-    }
-    //  tex2Dresize_gaussian4x4 needs to know a bit more than the other filters:
-    tex_uv_to_pixel_scale = IN.output_size *
-        ORIG_LINEARIZEDtexture_size / ORIG_LINEARIZEDvideo_size;
-    //texture_size_inv = texture_size_inv;
-
-    //  Detecting interlacing again here lets us apply convergence offsets in
-    //  this pass.  il_step_multiple contains the (texel, scanline) step
-    //  multiple: 1 for progressive, 2 for interlaced.
-    const float2 orig_video_size = ORIG_LINEARIZEDvideo_size;
-    const float y_step = 1.0 + float(is_interlaced(orig_video_size.y));
-    const float2 il_step_multiple = float2(1.0, y_step);
-    //  Get the uv distance between (texels, same-field scanlines):
-    uv_scanline_step = il_step_multiple / ORIG_LINEARIZEDtexture_size;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 blur_dxdy;
-layout(location = 2) in vec2 uv_scanline_step;
-layout(location = 3) in float estimated_viewport_size_x;
-layout(location = 4) in vec2 texture_size_inv;
-layout(location = 5) in vec2 tex_uv_to_pixel_scale;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D ORIG_LINEARIZED;
-layout(set = 0, binding = 4) uniform sampler2D Original;
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-#include "../../../../include/blur-functions.h"
-#include "bloom-functions.h"
-#include "../../../../include/gamma-management.h"
-
-
-///////////////////////////////////  HELPERS  //////////////////////////////////
-
-float3 tex2Dresize_gaussian4x4(sampler2D tex, float2 tex_uv, float2 dxdy, float2 tex_size, float2 texture_size_inv, float2 tex_uv_to_pixel_scale, float sigma)
-{
-    //  Requires:   1.) All requirements of gamma-management.h must be satisfied!
-    //              2.) filter_linearN must == "true" in your .cgp preset.
-    //              3.) mipmap_inputN must == "true" in your .cgp preset if
-    //                  IN.output_size << SRC.video_size.
-    //              4.) dxdy should contain the uv pixel spacing:
-    //                      dxdy = max(float2(1.0),
-    //                          SRC.video_size/IN.output_size)/SRC.texture_size;
-    //              5.) texture_size == SRC.texture_size
-    //              6.) texture_size_inv == float2(1.0)/SRC.texture_size
-    //              7.) tex_uv_to_pixel_scale == IN.output_size *
-    //                      SRC.texture_size / SRC.video_size;
-    //              8.) sigma is the desired Gaussian standard deviation, in
-    //                  terms of output pixels.  It should be < ~0.66171875 to
-    //                  ensure the first unused sample (outside the 4x4 box) has
-    //                  a weight < 1.0/256.0.
-    //  Returns:    A true 4x4 Gaussian resize of the input.
-    //  Description:
-    //  Given correct inputs, this Gaussian resizer samples 4 pixel locations
-    //  along each downsized dimension and/or 4 texel locations along each
-    //  upsized dimension.  It computes dynamic weights based on the pixel-space
-    //  distance of each sample from the destination pixel.  It is arbitrarily
-    //  resizable and higher quality than tex2Dblur3x3_resize, but it's slower.
-    //  TODO: Move this to a more suitable file once there are others like it.
-    const float denom_inv = 0.5/(sigma*sigma);
-    //  We're taking 4x4 samples, and we're snapping to texels for upsizing.
-    //  Find texture coords for sample 5 (second row, second column):
-    const float2 curr_texel = tex_uv * tex_size;
-    const float2 prev_texel =
-        floor(curr_texel - float2(under_half)) + float2(0.5);
-    const float2 prev_texel_uv = prev_texel * texture_size_inv;
-    const float2 snap = float2((dxdy.x <= texture_size_inv.x), (dxdy.y <= texture_size_inv.y));
-    const float2 sample5_downsize_uv = tex_uv - 0.5 * dxdy;
-    const float2 sample5_uv = lerp(sample5_downsize_uv, prev_texel_uv, snap);
-    //  Compute texture coords for other samples:
-    const float2 dx = float2(dxdy.x, 0.0);
-    const float2 sample0_uv = sample5_uv - dxdy;
-    const float2 sample10_uv = sample5_uv + dxdy;
-    const float2 sample15_uv = sample5_uv + 2.0 * dxdy;
-    const float2 sample1_uv = sample0_uv + dx;
-    const float2 sample2_uv = sample0_uv + 2.0 * dx;
-    const float2 sample3_uv = sample0_uv + 3.0 * dx;
-    const float2 sample4_uv = sample5_uv - dx;
-    const float2 sample6_uv = sample5_uv + dx;
-    const float2 sample7_uv = sample5_uv + 2.0 * dx;
-    const float2 sample8_uv = sample10_uv - 2.0 * dx;
-    const float2 sample9_uv = sample10_uv - dx;
-    const float2 sample11_uv = sample10_uv + dx;
-    const float2 sample12_uv = sample15_uv - 3.0 * dx;
-    const float2 sample13_uv = sample15_uv - 2.0 * dx;
-    const float2 sample14_uv = sample15_uv - dx;
-    //  Load each sample:
-    float3 sample0 = tex2D_linearize(tex, sample0_uv).rgb;
-    float3 sample1 = tex2D_linearize(tex, sample1_uv).rgb;
-    float3 sample2 = tex2D_linearize(tex, dx).rgb;
-    float3 sample3 = tex2D_linearize(tex, sample3_uv).rgb;
-    float3 sample4 = tex2D_linearize(tex, sample4_uv).rgb;
-    float3 sample5 = tex2D_linearize(tex, sample5_uv).rgb;
-    float3 sample6 = tex2D_linearize(tex, sample6_uv).rgb;
-    float3 sample7 = tex2D_linearize(tex, sample7_uv).rgb;
-    float3 sample8 = tex2D_linearize(tex, sample8_uv).rgb;
-    float3 sample9 = tex2D_linearize(tex, sample9_uv).rgb;
-    float3 sample10 = tex2D_linearize(tex, sample10_uv).rgb;
-    float3 sample11 = tex2D_linearize(tex, sample11_uv).rgb;
-    float3 sample12 = tex2D_linearize(tex, sample12_uv).rgb;
-    float3 sample13 = tex2D_linearize(tex, sample13_uv).rgb;
-    float3 sample14 = tex2D_linearize(tex, sample14_uv).rgb;
-    float3 sample15 = tex2D_linearize(tex, sample15_uv).rgb;
-    //  Compute destination pixel offsets for each sample:
-    const float2 dest_pixel = tex_uv * tex_uv_to_pixel_scale;
-    const float2 sample0_offset = sample0_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample1_offset = sample1_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample2_offset = sample2_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample3_offset = sample3_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample4_offset = sample4_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample5_offset = sample5_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample6_offset = sample6_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample7_offset = sample7_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample8_offset = sample8_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample9_offset = sample9_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample10_offset = sample10_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample11_offset = sample11_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample12_offset = sample12_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample13_offset = sample13_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample14_offset = sample14_uv * tex_uv_to_pixel_scale - dest_pixel;
-    const float2 sample15_offset = sample15_uv * tex_uv_to_pixel_scale - dest_pixel;
-    //  Compute Gaussian sample weights:
-    const float w0 = exp(-LENGTH_SQ(sample0_offset) * denom_inv);
-    const float w1 = exp(-LENGTH_SQ(sample1_offset) * denom_inv);
-    const float w2 = exp(-LENGTH_SQ(sample2_offset) * denom_inv);
-    const float w3 = exp(-LENGTH_SQ(sample3_offset) * denom_inv);
-    const float w4 = exp(-LENGTH_SQ(sample4_offset) * denom_inv);
-    const float w5 = exp(-LENGTH_SQ(sample5_offset) * denom_inv);
-    const float w6 = exp(-LENGTH_SQ(sample6_offset) * denom_inv);
-    const float w7 = exp(-LENGTH_SQ(sample7_offset) * denom_inv);
-    const float w8 = exp(-LENGTH_SQ(sample8_offset) * denom_inv);
-    const float w9 = exp(-LENGTH_SQ(sample9_offset) * denom_inv);
-    const float w10 = exp(-LENGTH_SQ(sample10_offset) * denom_inv);
-    const float w11 = exp(-LENGTH_SQ(sample11_offset) * denom_inv);
-    const float w12 = exp(-LENGTH_SQ(sample12_offset) * denom_inv);
-    const float w13 = exp(-LENGTH_SQ(sample13_offset) * denom_inv);
-    const float w14 = exp(-LENGTH_SQ(sample14_offset) * denom_inv);
-    const float w15 = exp(-LENGTH_SQ(sample15_offset) * denom_inv);
-    const float weight_sum_inv = 1.0/(
-        w0 + w1 + w2 + w3 + w4 + w5 + w6 + w7 +
-        w8 +w9 + w10 + w11 + w12 + w13 + w14 + w15);
-    //  Weight and sum the samples:
-    const float3 sum = w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6 + w7 * sample7 +
-        w8 * sample8 + w9 * sample9 + w10 * sample10 + w11 * sample11 +
-        w12 * sample12 + w13 * sample13 + w14 * sample14 + w15 * sample15;
-    return sum * weight_sum_inv;
-}
-
-void main()
-{
-    //  Would a viewport-relative size work better for this pass?  (No.)
-    //  PROS:
-    //  1.) Instead of writing an absolute size to user-cgp-constants.h, we'd
-    //      write a viewport scale.  That number could be used to directly scale
-    //      the viewport-resolution bloom sigma and/or triad size to a smaller
-    //      scale.  This way, we could calculate an optimal dynamic sigma no
-    //      matter how the dot pitch is specified.
-    //  CONS:
-    //  1.) Texel smearing would be much worse at small viewport sizes, but
-    //      performance would be much worse at large viewport sizes, so there
-    //      would be no easy way to calculate a decent scale.
-    //  2.) Worse, we could no longer get away with using a constant-size blur!
-    //      Instead, we'd have to face all the same difficulties as the real
-    //      phosphor bloom, which requires static #ifdefs to decide the blur
-    //      size based on the expected triad size...a dynamic value.
-    //  3.) Like the phosphor bloom, we'd have less control over making the blur
-    //      size correct for an optical blur.  That said, we likely overblur (to
-    //      maintain brightness) more than the eye would do by itself: 20/20
-    //      human vision distinguishes ~1 arc minute, or 1/60 of a degree.  The
-    //      highest viewing angle recommendation I know of is THX's 40.04 degree
-    //      recommendation, at which 20/20 vision can distinguish about 2402.4
-    //      lines.  Assuming the "TV lines" definition, that means 1201.2
-    //      distinct light lines and 1201.2 distinct dark lines can be told
-    //      apart, i.e. 1201.2 pairs of lines.  This would correspond to 1201.2
-    //      pairs of alternating lit/unlit phosphors, so 2402.4 phosphors total
-    //      (if they're alternately lit).  That's a max of 800.8 triads.  Using
-    //      a more popular 30 degree viewing angle recommendation, 20/20 vision
-    //      can distinguish 1800 lines, or 600 triads of alternately lit
-    //      phosphors.  In contrast, we currently blur phosphors all the way
-    //      down to 341.3 triads to ensure full brightness.
-    //  4.) Realistically speaking, we're usually just going to use bilinear
-    //      filtering in this pass anyway, but it only works well to limit
-    //      bandwidth if it's done at a small constant scale.
-    
-    //  Get the constants we need to sample:
-//    const sampler2D texture = ORIG_LINEARIZED.texture;
-//    const float2 tex_uv = tex_uv;
-//    const float2 blur_dxdy = blur_dxdy;
-    const float2 texture_size_ = ORIG_LINEARIZEDtexture_size;
-//    const float2 texture_size_inv = texture_size_inv;
-//    const float2 tex_uv_to_pixel_scale = tex_uv_to_pixel_scale;
-    float2 tex_uv_r, tex_uv_g, tex_uv_b;
-
-    if(beam_misconvergence)
-    {
-        const float2 uv_scanline_step = uv_scanline_step;
-        const float2 convergence_offsets_r = get_convergence_offsets_r_vector();
-        const float2 convergence_offsets_g = get_convergence_offsets_g_vector();
-        const float2 convergence_offsets_b = get_convergence_offsets_b_vector();
-        tex_uv_r = tex_uv - convergence_offsets_r * uv_scanline_step;
-        tex_uv_g = tex_uv - convergence_offsets_g * uv_scanline_step;
-        tex_uv_b = tex_uv - convergence_offsets_b * uv_scanline_step;
-    }
-    //  Get the blur sigma:
-    const float bloom_approx_sigma = get_bloom_approx_sigma(IN.output_size.x,
-        estimated_viewport_size_x);
-
-    //  Sample the resized and blurred texture, and apply convergence offsets if
-    //  necessary.  Applying convergence offsets here triples our samples from
-    //  16/9/1 to 48/27/3, but faster and easier than sampling BLOOM_APPROX and
-    //  HALATION_BLUR 3 times at full resolution every time they're used.
-    float3 color_r, color_g, color_b, color;
-    if(bloom_approx_filter > 1.5)
-    {
-        //  Use a 4x4 Gaussian resize.  This is slower but technically correct.
-        if(beam_misconvergence)
-        {
-            color_r = tex2Dresize_gaussian4x4(ORIG_LINEARIZED, tex_uv_r,
-                blur_dxdy, texture_size_, texture_size_inv,
-                tex_uv_to_pixel_scale, bloom_approx_sigma);
-            color_g = tex2Dresize_gaussian4x4(ORIG_LINEARIZED, tex_uv_g,
-                blur_dxdy, texture_size_, texture_size_inv,
-                tex_uv_to_pixel_scale, bloom_approx_sigma);
-            color_b = tex2Dresize_gaussian4x4(ORIG_LINEARIZED, tex_uv_b,
-                blur_dxdy, texture_size_, texture_size_inv,
-                tex_uv_to_pixel_scale, bloom_approx_sigma);
-        }
-        else
-        {
-            color = tex2Dresize_gaussian4x4(ORIG_LINEARIZED, tex_uv,
-                blur_dxdy, texture_size_, texture_size_inv,
-                tex_uv_to_pixel_scale, bloom_approx_sigma);
-        }
-    }
-    else if(bloom_approx_filter > 0.5)
-    {
-        //  Use a 3x3 resize blur.  This is the softest option, because we're
-        //  blurring already blurry bilinear samples.  It doesn't play quite as
-        //  nicely with convergence offsets, but it has its charms.
-        if(beam_misconvergence)
-        {
-            color_r = tex2Dblur3x3resize(ORIG_LINEARIZED, tex_uv_r,
-                blur_dxdy, bloom_approx_sigma);
-            color_g = tex2Dblur3x3resize(ORIG_LINEARIZED, tex_uv_g,
-                blur_dxdy, bloom_approx_sigma);
-            color_b = tex2Dblur3x3resize(ORIG_LINEARIZED, tex_uv_b,
-                blur_dxdy, bloom_approx_sigma);
-        }
-        else
-        {
-            color = tex2Dblur3x3resize(ORIG_LINEARIZED, tex_uv, blur_dxdy);
-        }
-    }
-    else
-    {
-        //  Use bilinear sampling.  This approximates a 4x4 Gaussian resize MUCH
-        //  better than tex2Dblur3x3_resize for the very small sigmas we're
-        //  likely to use at small output resolutions.  (This estimate becomes
-        //  too sharp above ~400x300, but the blurs break down above that
-        //  resolution too, unless min_allowed_viewport_triads is high enough to
-        //  keep bloom_approx_scale_x/min_allowed_viewport_triads < ~1.1658025.)
-        if(beam_misconvergence)
-        {
-            color_r = tex2D_linearize(ORIG_LINEARIZED, tex_uv_r).rgb;
-            color_g = tex2D_linearize(ORIG_LINEARIZED, tex_uv_g).rgb;
-            color_b = tex2D_linearize(ORIG_LINEARIZED, tex_uv_b).rgb;
-        }
-        else
-        {
-            color = tex2D_linearize(ORIG_LINEARIZED, tex_uv).rgb;
-        }
-    }
-    //  Pack the colors from the red/green/blue beams into a single vector:
-    if(beam_misconvergence)
-    {
-        color = float3(color_r.r, color_g.g, color_b.b);
-    }
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang
deleted file mode 100755
index ce42e65cae..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang
+++ /dev/null
@@ -1,2 +0,0 @@
-#version 450
-#include "crt-royale-bloom-approx.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang
deleted file mode 100755
index 245a66622d..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang
+++ /dev/null
@@ -1,166 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	vec4 MASKED_SCANLINESSize;
-	vec4 HALATION_BLURSize;
-	vec4 BRIGHTPASSSize;
-} params;
-
-#define MASKED_SCANLINEStexture MASKED_SCANLINES
-#define MASKED_SCANLINEStexture_size params.MASKED_SCANLINESSize.xy
-#define MASKED_SCANLINESvideo_size params.MASKED_SCANLINESSize.xy
-#define HALATION_BLURtexture HALATION_BLUR
-#define HALATION_BLURtexture_size params.HALATION_BLURSize.xy
-#define HALATION_BLURvideo_size params.HALATION_BLURSize.xy
-#define BRIGHTPASStexture BRIGHTPASS
-#define BRIGHTPASStexture_size params.BRIGHTPASSSize.xy
-#define BRIGHTPASSvideo_size params.BRIGHTPASSSize.xy
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-const float bloom_diff_thresh_ = 1.0/256.0;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-
-///////////////////////////////  VERTEX INCLUDES  //////////////////////////////
-
-#include "../../../../include/gamma-management.h"
-#include "phosphor-mask-resizing.h"
-#include "scanline-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 video_uv;
-layout(location = 1) out vec2 scanline_tex_uv;
-layout(location = 2) out vec2 halation_tex_uv;
-layout(location = 3) out vec2 brightpass_tex_uv;
-layout(location = 4) out vec2 bloom_tex_uv;
-layout(location = 5) out vec2 bloom_dxdy;
-layout(location = 6) out float bloom_sigma_runtime;
-
-// copied from bloom-functions.h
-inline float get_min_sigma_to_blur_triad(const float triad_size,
-    const float thresh)
-{
-    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
-    //              2.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum sigma that will fully blur a phosphor
-    //              triad on the screen to an even color, within thresh.
-    //              This closed-form function was found by curve-fitting data.
-    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
-    return -0.05168 + 0.6113*triad_size -
-        1.122*triad_size*sqrt(0.000416 + thresh);
-    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
-    //return 0.5985*triad_size - triad_size*sqrt(thresh)
-}
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   float2 tex_uv = TexCoord;
-   
-    //  Our various input textures use different coords:
-    const float2 video_uv = tex_uv * IN.texture_size/IN.video_size;
-//    video_uv = video_uv;
-    scanline_tex_uv = video_uv * MASKED_SCANLINESvideo_size /
-        MASKED_SCANLINEStexture_size;
-    halation_tex_uv = video_uv * HALATION_BLURvideo_size /
-        HALATION_BLURtexture_size;
-    brightpass_tex_uv = video_uv * BRIGHTPASSvideo_size /
-        BRIGHTPASStexture_size;
-    bloom_tex_uv = tex_uv;
-
-    //  We're horizontally blurring the bloom input (vertically blurred
-    //  brightpass).  Get the uv distance between output pixels / input texels
-    //  in the horizontal direction (this pass must NOT resize):
-    bloom_dxdy = float2(1.0/IN.texture_size.x, 0.0);
-
-    //  Calculate a runtime bloom_sigma in case it's needed:
-    const float mask_tile_size_x = get_resized_mask_tile_size(
-        IN.output_size, IN.output_size * mask_resize_viewport_scale, false).x;
-    bloom_sigma_runtime = get_min_sigma_to_blur_triad(
-        mask_tile_size_x / mask_triads_per_tile, bloom_diff_thresh_);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 video_uv;
-layout(location = 1) in vec2 scanline_tex_uv;
-layout(location = 2) in vec2 halation_tex_uv;
-layout(location = 3) in vec2 brightpass_tex_uv;
-layout(location = 4) in vec2 bloom_tex_uv;
-layout(location = 5) in vec2 bloom_dxdy;
-layout(location = 6) in float bloom_sigma_runtime;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D HALATION_BLUR;
-layout(set = 0, binding = 4) uniform sampler2D BRIGHTPASS;
-layout(set = 0, binding = 5) uniform sampler2D MASKED_SCANLINES;
-#define bloom_texture Source
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-#include "bloom-functions.h"
-
-void main()
-{
-    //  Blur the vertically blurred brightpass horizontally by 9/17/25/43x:
-    const float bloom_sigma = get_final_bloom_sigma(bloom_sigma_runtime);
-    const float3 blurred_brightpass = tex2DblurNfast(bloom_texture,
-        bloom_tex_uv, bloom_dxdy, bloom_sigma);
-
-    //  Sample the masked scanlines.  Alpha contains the auto-dim factor:
-    const float3 intensity_dim =
-        tex2D_linearize(MASKED_SCANLINEStexture, scanline_tex_uv).rgb;
-    const float auto_dim_factor = levels_autodim_temp;
-    const float undim_factor = 1.0/auto_dim_factor;
-
-    //  Calculate the mask dimpass, add it to the blurred brightpass, and
-    //  undim (from scanline auto-dim) and amplify (from mask dim) the result:
-    const float mask_amplify = get_mask_amplify();
-    const float3 brightpass = tex2D_linearize(BRIGHTPASStexture,
-        brightpass_tex_uv).rgb;
-    const float3 dimpass = intensity_dim - brightpass;
-    const float3 phosphor_bloom = (dimpass + blurred_brightpass) *
-        mask_amplify * undim_factor * levels_contrast;
-
-    //  Sample the halation texture, and let some light bleed into refractive
-    //  diffusion.  Conceptually this occurs before the phosphor bloom, but
-    //  adding it in earlier passes causes black crush in the diffusion colors.
-    const float3 diffusion_color = levels_contrast * tex2D_linearize(
-        HALATION_BLURtexture, halation_tex_uv).rgb;
-    const float3 final_bloom = lerp(phosphor_bloom,
-        diffusion_color, global.diffusion_weight);
-
-    //  Encode and output the bloomed image:
-    FragColor = encode_output(float4(final_bloom, 1.0));
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang
deleted file mode 100755
index e8ac8fe849..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang
+++ /dev/null
@@ -1,112 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 MASKED_SCANLINESSize;
-	vec4 BLOOM_APPROXSize;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../../include/gamma-management.h"
-#include "phosphor-mask-resizing.h"
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-const float bloom_diff_thresh_ = 1.0/256.0;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 bloom_dxdy;
-layout(location = 2) out float bloom_sigma_runtime;
-
-// copied from bloom-functions.h
-inline float get_min_sigma_to_blur_triad(const float triad_size,
-    const float thresh)
-{
-    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
-    //              2.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum sigma that will fully blur a phosphor
-    //              triad on the screen to an even color, within thresh.
-    //              This closed-form function was found by curve-fitting data.
-    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
-    return -0.05168 + 0.6113*triad_size -
-        1.122*triad_size*sqrt(0.000416 + thresh);
-    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
-    //return 0.5985*triad_size - triad_size*sqrt(thresh)
-}
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord * 1.0001;
-   
-	//  Get the uv sample distance between output pixels.  Calculate dxdy like
-    //  blurs/shaders/vertex-shader-blur-fast-vertical.h.
-    const float2 dxdy_scale = IN.video_size/IN.output_size;
-    const float2 dxdy = dxdy_scale/IN.texture_size;
-    //  This blur is vertical-only, so zero out the vertical offset:
-    bloom_dxdy = float2(0.0, dxdy.y);
-
-    //  Calculate a runtime bloom_sigma in case it's needed:
-    const float mask_tile_size_x = get_resized_mask_tile_size(
-        IN.output_size, IN.output_size * mask_resize_viewport_scale, false).x;
-    bloom_sigma_runtime = get_min_sigma_to_blur_triad(
-        mask_tile_size_x / mask_triads_per_tile, bloom_diff_thresh_);
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 bloom_dxdy;
-layout(location = 2) in float bloom_sigma_runtime;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-#include "bloom-functions.h"
-
-void main()
-{
-    //  Blur the brightpass horizontally with a 9/17/25/43x blur:
-    const float bloom_sigma = get_final_bloom_sigma(bloom_sigma_runtime);
-    const float3 color = tex2DblurNfast(input_texture, tex_uv,
-        bloom_dxdy, bloom_sigma);
-    //  Encode and output the blurred image:
-    FragColor = encode_output(float4(color, 1.0));
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-brightpass.slang b/crt/shaders/crt-royale/src/crt-royale-brightpass.slang
deleted file mode 100755
index 49e1a334c8..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-brightpass.slang
+++ /dev/null
@@ -1,164 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 MASKED_SCANLINESSize;
-	vec4 BLOOM_APPROXSize;
-} params;
-
-#define MASKED_SCANLINEStexture MASKED_SCANLINES
-#define MASKED_SCANLINEStexture_size params.MASKED_SCANLINESSize.xy
-#define MASKED_SCANLINESvideo_size params.MASKED_SCANLINESSize.xy
-#define BLOOM_APPROXtexture BLOOM_APPROX
-#define BLOOM_APPROXtexture_size params.BLOOM_APPROXSize.xy
-#define BLOOM_APPROXvideo_size params.BLOOM_APPROXSize.xy
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-const float bloom_diff_thresh_ = 1.0/256.0;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "../../../../include/gamma-management.h"
-#include "phosphor-mask-resizing.h"
-#include "scanline-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 scanline_tex_uv;
-layout(location = 1) out vec2 blur3x3_tex_uv;
-layout(location = 2) out float bloom_sigma_runtime;
-
-// copied from bloom-functions.h
-inline float get_min_sigma_to_blur_triad(const float triad_size,
-    const float thresh)
-{
-    //  Requires:   1.) triad_size is the final phosphor triad size in pixels
-    //              2.) thresh is the max desired pixel difference in the
-    //                  blurred triad (e.g. 1.0/256.0).
-    //  Returns:    Return the minimum sigma that will fully blur a phosphor
-    //              triad on the screen to an even color, within thresh.
-    //              This closed-form function was found by curve-fitting data.
-    //  Estimate: max error = ~0.086036, mean sq. error = ~0.0013387:
-    return -0.05168 + 0.6113*triad_size -
-        1.122*triad_size*sqrt(0.000416 + thresh);
-    //  Estimate: max error = ~0.16486, mean sq. error = ~0.0041041:
-    //return 0.5985*triad_size - triad_size*sqrt(thresh)
-}
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   float2 tex_uv = TexCoord;
-    //  Our various input textures use different coords:
-    float2 video_uv = tex_uv * IN.texture_size/IN.video_size;
-    //video_uv = video_uv;
-    scanline_tex_uv = video_uv * MASKED_SCANLINESvideo_size /
-        MASKED_SCANLINEStexture_size;
-    blur3x3_tex_uv = video_uv * BLOOM_APPROXvideo_size / BLOOM_APPROXtexture_size;
-
-    //  Calculate a runtime bloom_sigma in case it's needed:
-    const float mask_tile_size_x = get_resized_mask_tile_size(
-        IN.output_size, IN.output_size * mask_resize_viewport_scale, false).x;
-    bloom_sigma_runtime = get_min_sigma_to_blur_triad(
-        mask_tile_size_x / mask_triads_per_tile, bloom_diff_thresh_);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 scanline_tex_uv;
-layout(location = 1) in vec2 blur3x3_tex_uv;
-layout(location = 2) in float bloom_sigma_runtime;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D MASKED_SCANLINES;
-layout(set = 0, binding = 3) uniform sampler2D BLOOM_APPROX;
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-#include "bloom-functions.h"
-#include "../../../../include/blur-functions.h"
-
-void main()
-{
-    //  Sample the masked scanlines:
-    const float3 intensity_dim =
-        tex2D_linearize(MASKED_SCANLINEStexture, scanline_tex_uv).rgb;
-    //  Get the full intensity, including auto-undimming, and mask compensation:
-    const float auto_dim_factor = levels_autodim_temp;
-    const float undim_factor = 1.0/auto_dim_factor;
-    const float mask_amplify = get_mask_amplify();
-    const float3 intensity = intensity_dim * undim_factor * mask_amplify *
-        levels_contrast;
-
-    //  Sample BLOOM_APPROX to estimate what a straight blur of masked scanlines
-    //  would look like, so we can estimate how much energy we'll receive from
-    //  blooming neighbors:
-    const float3 phosphor_blur_approx = levels_contrast * tex2D_linearize(
-        BLOOM_APPROXtexture, blur3x3_tex_uv).rgb;
-
-    //  Compute the blur weight for the center texel and the maximum energy we
-    //  expect to receive from neighbors:
-    const float bloom_sigma = get_final_bloom_sigma(bloom_sigma_runtime);
-    const float center_weight = get_center_weight(bloom_sigma);
-    const float3 max_area_contribution_approx =
-        max(float3(0.0, 0.0, 0.0), phosphor_blur_approx - center_weight * intensity);
-    //  Assume neighbors will blur 100% of their intensity (blur_ratio = 1.0),
-    //  because it actually gets better results (on top of being very simple),
-    //  but adjust all intensities for the user's desired underestimate factor:
-    const float3 area_contrib_underestimate =
-        bloom_underestimate_levels * max_area_contribution_approx;
-    const float3 intensity_underestimate =
-        bloom_underestimate_levels * intensity;
-    //  Calculate the blur_ratio, the ratio of intensity we want to blur:
-    #ifdef BRIGHTPASS_AREA_BASED
-        //  This area-based version changes blur_ratio more smoothly and blurs
-        //  more, clipping less but offering less phosphor differentiation:
-        const float3 phosphor_blur_underestimate = bloom_underestimate_levels *
-            phosphor_blur_approx;
-        const float3 soft_intensity = max(intensity_underestimate,
-            phosphor_blur_underestimate * mask_amplify);
-        const float3 blur_ratio_temp =
-            ((float3(1.0, 1.0, 1.0) - area_contrib_underestimate) /
-            soft_intensity - float3(1.0, 1.0, 1.0)) / (center_weight - 1.0);
-    #else
-        const float3 blur_ratio_temp =
-            ((float3(1.0, 1.0, 1.0) - area_contrib_underestimate) /
-            intensity_underestimate - float3(1.0, 1.0, 1.0)) / (center_weight - 1.0);
-    #endif
-    const float3 blur_ratio = clamp(blur_ratio_temp, 0.0, 1.0);
-    //  Calculate the brightpass based on the auto-dimmed, unamplified, masked
-    //  scanlines, encode if necessary, and return!
-    const float3 brightpass = intensity_dim *
-        lerp(blur_ratio, float3(1.0, 1.0, 1.0), global.bloom_excess);
-    FragColor = encode_output(float4(brightpass, 1.0));
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang b/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang
deleted file mode 100755
index 957e6a17d4..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang
+++ /dev/null
@@ -1,107 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-//  PASS SETTINGS:
-//  gamma-management.h needs to know what kind of pipeline we're using and
-//  what pass this is in that pipeline.  This will become obsolete if/when we
-//  can #define things like this in the .cgp preset file.
-#define FIRST_PASS
-#define SIMULATE_CRT_ON_LCD
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "bind-shader-params.h"
-#include "../../../../include/gamma-management.h"
-#include "scanline-functions.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 uv_step;
-layout(location = 2) out float interlaced;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord * 1.00001;
-   uv_step = float2(1.0)/IN.texture_size;
-   
-    //  Detect interlacing: 1.0 = true, 0.0 = false.
-    const float2 _video_size = IN.video_size;
-    interlaced = float(is_interlaced(_video_size.y));
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 uv_step;
-layout(location = 2) in float interlaced;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-void main()
-{
-    //  Linearize the input based on CRT gamma and bob interlaced fields.
-    //  Bobbing ensures we can immediately blur without getting artifacts.
-    //  Note: TFF/BFF won't matter for sources that double-weave or similar.
-    if(bool(interlace_detect))
-    {
-        //  Sample the current line and an average of the previous/next line;
-        //  tex2D_linearize will decode CRT gamma.  Don't bother branching:
-//        const float2 tex_uv = tex_uv;
-        const float2 v_step = float2(0.0, uv_step.y);
-        const float3 curr_line = tex2D_linearize(
-            input_texture, tex_uv).rgb;
-        const float3 last_line = tex2D_linearize(
-            input_texture, tex_uv - v_step).rgb;
-        const float3 next_line = tex2D_linearize(
-            input_texture, tex_uv + v_step).rgb;
-        const float3 interpolated_line = 0.5 * (last_line + next_line);
-        //  If we're interlacing, determine which field curr_line is in:
-        const float modulus = interlaced + 1.0;
-        const float field_offset =
-            fmod(params.frame_count + global.interlace_bff, modulus);
-        const float curr_line_texel = tex_uv.y * IN.texture_size.y;
-        //  Use under_half to fix a rounding bug around exact texel locations.
-        const float line_num_last = floor(curr_line_texel - under_half);
-        const float wrong_field = fmod(line_num_last + field_offset, modulus);
-        //  Select the correct color, and output the result:
-        const float3 color = lerp(curr_line, interpolated_line, wrong_field);
-        FragColor =  encode_output(float4(color, 1.0));
-    }
-    else
-    {
-        FragColor =  encode_output(tex2D_linearize(input_texture, tex_uv));
-    }
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.slang b/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.slang
deleted file mode 100644
index 786adf9dff..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.slang
+++ /dev/null
@@ -1,4 +0,0 @@
-#version 450
-
-#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-#include "crt-royale-geometry-aa-last-pass.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.h b/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.h
deleted file mode 100644
index 9487b66830..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 MASKED_SCANLINESSize;
-	vec4 HALATION_BLURSize;
-	vec4 BRIGHTPASSSize;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#define LAST_PASS
-#define SIMULATE_CRT_ON_LCD
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-#ifndef RUNTIME_GEOMETRY_TILT
-    //  Create a local-to-global rotation matrix for the CRT's coordinate frame
-    //  and its global-to-local inverse.  See the vertex shader for details.
-    //  It's faster to compute these statically if possible.
-    static const float2 sin_tilt = sin(geom_tilt_angle_static);
-    static const float2 cos_tilt = cos(geom_tilt_angle_static);
-    static const float3x3 geom_local_to_global_static = float3x3(
-        cos_tilt.x, sin_tilt.y*sin_tilt.x, cos_tilt.y*sin_tilt.x,
-        0.0, cos_tilt.y, -sin_tilt.y,
-        -sin_tilt.x, sin_tilt.y*cos_tilt.x, cos_tilt.y*cos_tilt.x);
-    static const float3x3 geom_global_to_local_static = float3x3(
-        cos_tilt.x, 0.0, -sin_tilt.x,
-        sin_tilt.y*sin_tilt.x, cos_tilt.y, sin_tilt.y*cos_tilt.x,
-        cos_tilt.y*sin_tilt.x, -sin_tilt.y, cos_tilt.y*cos_tilt.x);
-#endif
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../../../../include/gamma-management.h"
-#include "tex2Dantialias.h"
-#include "geometry-functions.h"
-
-
-///////////////////////////////////  HELPERS  //////////////////////////////////
-
-float2x2 mul_scale(float2 scale, float2x2 matrix)
-{
-    //float2x2 scale_matrix = float2x2(scale.x, 0.0, 0.0, scale.y);
-    //return mul(scale_matrix, matrix);
-    vec4 temp_matrix = (vec4(matrix[0][0], matrix[0][1], matrix[1][0], matrix[1][1])* scale . xxyy);
-    return mat2x2(temp_matrix.x, temp_matrix.y, temp_matrix.z, temp_matrix.w);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec4 video_and_texture_size_inv;
-layout(location = 2) out vec2 output_size_inv;
-layout(location = 3) out vec3 eye_pos_local;
-layout(location = 4) out vec4 geom_aspect_and_overscan;
-layout(location = 5) out vec3 global_to_local_row0;
-layout(location = 6) out vec3 global_to_local_row1;
-layout(location = 7) out vec3 global_to_local_row2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord;
-    video_and_texture_size_inv =
-        float4(1.0, 1.0, 1.0, 1.0) / float4(IN.video_size, IN.texture_size);
-    output_size_inv = float2(1.0, 1.0)/IN.output_size;
-
-    //  Get aspect/overscan vectors from scalar parameters (likely uniforms):
-    const float viewport_aspect_ratio = IN.output_size.x/IN.output_size.y;
-    const float2 geom_aspect = get_aspect_vector(viewport_aspect_ratio);
-    const float2 geom_overscan = get_geom_overscan_vector();
-    geom_aspect_and_overscan = float4(geom_aspect, geom_overscan);
-
-    #ifdef RUNTIME_GEOMETRY_TILT
-        //  Create a local-to-global rotation matrix for the CRT's coordinate
-        //  frame and its global-to-local inverse.  Rotate around the x axis
-        //  first (pitch) and then the y axis (yaw) with yucky Euler angles.
-        //  Positive angles go clockwise around the right-vec and up-vec.
-        //  Runtime shader parameters prevent us from computing these globally,
-        //  but we can still combine the pitch/yaw matrices by hand to cut a
-        //  few instructions.  Note that cg matrices fill row1 first, then row2,
-        //  etc. (row-major order).
-        const float2 geom_tilt_angle = get_geom_tilt_angle_vector();
-        const float2 sin_tilt = sin(geom_tilt_angle);
-        const float2 cos_tilt = cos(geom_tilt_angle);
-        //  Conceptual breakdown:
-              static const float3x3 rot_x_matrix = float3x3(
-                  1.0, 0.0, 0.0,
-                  0.0, cos_tilt.y, -sin_tilt.y,
-                  0.0, sin_tilt.y, cos_tilt.y);
-              static const float3x3 rot_y_matrix = float3x3(
-                  cos_tilt.x, 0.0, sin_tilt.x,
-                  0.0, 1.0, 0.0,
-                  -sin_tilt.x, 0.0, cos_tilt.x);
-              static const float3x3 local_to_global =
-                  mul(rot_y_matrix, rot_x_matrix);
-/*              static const float3x3 global_to_local =
-                  transpose(local_to_global);
-        const float3x3 local_to_global = float3x3(
-            cos_tilt.x, sin_tilt.y*sin_tilt.x, cos_tilt.y*sin_tilt.x,
-            0.0, cos_tilt.y, sin_tilt.y,
-            sin_tilt.x, sin_tilt.y*cos_tilt.x, cos_tilt.y*cos_tilt.x);
-*/        //  This is a pure rotation, so transpose = inverse:
-        const float3x3 global_to_local = transpose(local_to_global);
-        //  Decompose the matrix into 3 float3's for output:
-        global_to_local_row0 = float3(global_to_local[0][0], global_to_local[0][1], global_to_local[0][2]);//._m00_m01_m02);
-        global_to_local_row1 = float3(global_to_local[1][0], global_to_local[1][1], global_to_local[1][2]);//._m10_m11_m12);
-        global_to_local_row2 = float3(global_to_local[2][0], global_to_local[2][1], global_to_local[2][2]);//._m20_m21_m22);
-    #else
-        static const float3x3 global_to_local = geom_global_to_local_static;
-        static const float3x3 local_to_global = geom_local_to_global_static;
-    #endif
-
-    //  Get an optimal eye position based on geom_view_dist, viewport_aspect,
-    //  and CRT radius/rotation:
-    #ifdef RUNTIME_GEOMETRY_MODE
-        const float geom_mode = geom_mode_runtime;
-    #else
-        static const float geom_mode = geom_mode_static;
-    #endif
-    const float3 eye_pos_global =
-        get_ideal_global_eye_pos(local_to_global, geom_aspect, geom_mode);
-    eye_pos_local = mul(global_to_local, eye_pos_global);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec4 video_and_texture_size_inv;
-layout(location = 2) in vec2 output_size_inv;
-layout(location = 3) in vec3 eye_pos_local;
-layout(location = 4) in vec4 geom_aspect_and_overscan;
-layout(location = 5) in vec3 global_to_local_row0;
-layout(location = 6) in vec3 global_to_local_row1;
-layout(location = 7) in vec3 global_to_local_row2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-void main()
-{
-    //  Localize some parameters:
-    const float2 geom_aspect = geom_aspect_and_overscan.xy;
-    const float2 geom_overscan = geom_aspect_and_overscan.zw;
-    const float2 video_size_inv = video_and_texture_size_inv.xy;
-    const float2 texture_size_inv = video_and_texture_size_inv.zw;
-    //const float2 output_size_inv = output_size_inv;
-    #ifdef RUNTIME_GEOMETRY_TILT
-        const float3x3 global_to_local = float3x3(global_to_local_row0,
-            global_to_local_row1, global_to_local_row2);
-    #else
-        static const float3x3 global_to_local = geom_global_to_local_static;
-    #endif
-    #ifdef RUNTIME_GEOMETRY_MODE
-        const float geom_mode = geom_mode_runtime;
-    #else
-        static const float geom_mode = geom_mode_static;
-    #endif
-
-    //  Get flat and curved texture coords for the current fragment point sample
-    //  and a pixel_to_tangent_video_uv matrix for transforming pixel offsets:
-    //  video_uv = relative position in video frame, mapped to [0.0, 1.0] range
-    //  tex_uv = relative position in padded texture, mapped to [0.0, 1.0] range
-    const float2 flat_video_uv = tex_uv * (IN.texture_size * video_size_inv);
-    float2x2 pixel_to_video_uv;
-    float2 video_uv_no_geom_overscan;
-    if(geom_mode > 0.5)
-    {
-        video_uv_no_geom_overscan =
-            get_curved_video_uv_coords_and_tangent_matrix(flat_video_uv,
-                eye_pos_local, output_size_inv, geom_aspect,
-                geom_mode, global_to_local, pixel_to_video_uv);
-    }
-    else
-    {
-        video_uv_no_geom_overscan = flat_video_uv;
-        pixel_to_video_uv = float2x2(
-            output_size_inv.x, 0.0, 0.0, output_size_inv.y);
-    }
-    //  Correct for overscan here (not in curvature code):
-    const float2 video_uv =
-        (video_uv_no_geom_overscan - float2(0.5, 0.5))/geom_overscan + float2(0.5, 0.5);
-    const float2 tex_uv = video_uv * (IN.video_size * texture_size_inv);
-
-    //  Get a matrix transforming pixel vectors to tex_uv vectors:
-    const float2x2 pixel_to_tex_uv =
-        mul_scale(IN.video_size * texture_size_inv /
-            geom_aspect_and_overscan.zw, pixel_to_video_uv);
-
-    //  Sample!  Skip antialiasing if aa_level < 0.5 or both of these hold:
-    //  1.) Geometry/curvature isn't used
-    //  2.) Overscan == float2(1.0, 1.0)
-    //  Skipping AA is sharper, but it's only faster with dynamic branches.
-    const float2 abs_aa_r_offset = abs(get_aa_subpixel_r_offset());
-    // this next check seems to always return true, even when it shouldn't so disabling it for now
-    const bool need_subpixel_aa = false;//abs_aa_r_offset.x + abs_aa_r_offset.y > 0.0;
-    float3 color;
-
-    if(aa_level > 0.5 && (geom_mode > 0.5 || any(bool2((geom_overscan.x != 1.0), (geom_overscan.y != 1.0)))))
-    {
-        //  Sample the input with antialiasing (due to sharp phosphors, etc.):
-        color = tex2Daa(input_texture, tex_uv, pixel_to_tex_uv, float(IN.frame_count));
-    }
-
-    else if(aa_level > 0.5 && need_subpixel_aa)
-    {
-        //  Sample at each subpixel location:
-        color = tex2Daa_subpixel_weights_only(
-            input_texture, tex_uv, pixel_to_tex_uv);
-    }
-    else
-    {
-        color = tex2D_linearize(input_texture, tex_uv).rgb;
-    }
-
-    //  Dim borders and output the final result:
-    const float border_dim_factor = get_border_dim_factor(video_uv, geom_aspect);
-    const float3 final_color = color * border_dim_factor;
-
-    FragColor = encode_output(float4(final_color, 1.0));
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang b/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang
deleted file mode 100755
index 88015a1035..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang
+++ /dev/null
@@ -1,3 +0,0 @@
-#version 450
-
-#include "crt-royale-geometry-aa-last-pass.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang b/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang
deleted file mode 100755
index 201f528ac2..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang
+++ /dev/null
@@ -1,132 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "phosphor-mask-resizing.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 src_tex_uv_wrap;
-layout(location = 1) out vec2 tile_uv_wrap;
-layout(location = 2) out vec2 resize_magnification_scale;
-layout(location = 3) out vec2 src_dxdy;
-layout(location = 4) out vec2 tile_size_uv;
-layout(location = 5) out vec2 input_tiles_per_texture;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   float2 tex_uv = TexCoord.xy;
-	//  First estimate the viewport size (the user will get the wrong number of
-    //  triads if it's wrong and mask_specify_num_triads is 1.0/true).
-    const float2 estimated_viewport_size =
-        IN.output_size / mask_resize_viewport_scale;
-    //  Find the final size of our resized phosphor mask tiles.  We probably
-    //  estimated the viewport size and MASK_RESIZE output size differently last
-    //  pass, so do not swear they were the same. ;)
-    const float2 mask_resize_tile_size = get_resized_mask_tile_size(
-        estimated_viewport_size, IN.output_size, false);
-
-    //  We'll render resized tiles until filling the output FBO or meeting a
-    //  limit, so compute [wrapped] tile uv coords based on the output uv coords
-    //  and the number of tiles that will fit in the FBO.
-    const float2 output_tiles_this_pass = IN.output_size / mask_resize_tile_size;
-    const float2 output_video_uv = tex_uv * IN.texture_size / IN.video_size;
-    tile_uv_wrap = output_video_uv * output_tiles_this_pass;
-
-    //  Get the texel size of an input tile and related values:
-    const float2 input_tile_size = float2(min(
-        mask_resize_src_lut_size.x, IN.video_size.x), mask_resize_tile_size.y);
-    tile_size_uv = input_tile_size / IN.texture_size;
-    input_tiles_per_texture = IN.texture_size / input_tile_size;
-
-    //  Derive [wrapped] texture uv coords from [wrapped] tile uv coords and
-    //  the tile size in uv coords, and save frac() for the fragment shader.
-    src_tex_uv_wrap = tile_uv_wrap * tile_size_uv;
-
-    //  Output the values we need, including the magnification scale and step:
-    //tile_uv_wrap = tile_uv_wrap;
-    //src_tex_uv_wrap = src_tex_uv_wrap;
-    resize_magnification_scale = mask_resize_tile_size / input_tile_size;
-    src_dxdy = float2(1.0/IN.texture_size.x, 0.0);
-    //tile_size_uv = tile_size_uv;
-    //input_tiles_per_texture = input_tiles_per_texture;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 src_tex_uv_wrap;
-layout(location = 1) in vec2 tile_uv_wrap;
-layout(location = 2) in vec2 resize_magnification_scale;
-layout(location = 3) in vec2 src_dxdy;
-layout(location = 4) in vec2 tile_size_uv;
-layout(location = 5) in vec2 input_tiles_per_texture;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-void main()
-{
-    //  The input contains one mask tile horizontally and a number vertically.
-    //  Resize the tile horizontally to its final screen size and repeat it
-    //  until drawing at least mask_resize_num_tiles, leaving it unchanged
-    //  vertically.  Lanczos-resizing the phosphor mask achieves much sharper
-    //  results than mipmapping, outputting >= mask_resize_num_tiles makes for
-    //  easier tiled sampling later.
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        //  Discard unneeded fragments in case our profile allows real branches.
-        const float2 tile_uv_wrap = tile_uv_wrap;
-        if(get_mask_sample_mode() < 0.5 &&
-            max(tile_uv_wrap.x, tile_uv_wrap.y) <= mask_resize_num_tiles)
-        {
-            const float src_dx = src_dxdy.x;
-            const float2 src_tex_uv = frac(src_tex_uv_wrap);
-            const float3 pixel_color = downsample_horizontal_sinc_tiled(input_texture,
-                src_tex_uv, IN.texture_size, src_dxdy.x,
-                resize_magnification_scale.x, tile_size_uv.x);
-            //  The input LUT was linear RGB, and so is our output:
-            FragColor = float4(pixel_color, 1.0);
-        }
-        else
-        {
-            discard;
-        }
-    #else
-        discard;
-        FragColor = float4(1.0);
-    #endif
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang b/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang
deleted file mode 100755
index 5b7d25aefc..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang
+++ /dev/null
@@ -1,169 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "phosphor-mask-resizing.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 src_tex_uv_wrap;
-layout(location = 1) out vec2 resize_magnification_scale;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   float2 tex_uv = TexCoord;
-	//  First estimate the viewport size (the user will get the wrong number of
-    //  triads if it's wrong and mask_specify_num_triads is 1.0/true).
-    const float viewport_y = IN.output_size.y / mask_resize_viewport_scale.y;
-    const float aspect_ratio = geom_aspect_ratio_x / geom_aspect_ratio_y;
-    const float2 estimated_viewport_size =
-        float2(viewport_y * aspect_ratio, viewport_y);
-    //  Estimate the output size of MASK_RESIZE (the next pass).  The estimated
-    //  x component shouldn't matter, because we're not using the x result, and
-    //  we're not swearing it's correct (if we did, the x result would influence
-    //  the y result to maintain the tile aspect ratio).
-    const float2 estimated_mask_resize_output_size =
-        float2(IN.output_size.y * aspect_ratio, IN.output_size.y);
-    //  Find the final intended [y] size of our resized phosphor mask tiles,
-    //  then the tile size for the current pass (resize y only):
-    float2 mask_resize_tile_size = get_resized_mask_tile_size(
-        estimated_viewport_size, estimated_mask_resize_output_size, false);
-    float2 pass_output_tile_size = float2(min(
-        mask_resize_src_lut_size.x, IN.output_size.x), mask_resize_tile_size.y);
-
-    //  We'll render resized tiles until filling the output FBO or meeting a
-    //  limit, so compute [wrapped] tile uv coords based on the output uv coords
-    //  and the number of tiles that will fit in the FBO.
-    const float2 output_tiles_this_pass = IN.output_size / pass_output_tile_size;
-    const float2 output_video_uv = tex_uv * IN.texture_size / IN.video_size;
-    const float2 tile_uv_wrap = output_video_uv * output_tiles_this_pass;
-
-    //  The input LUT is just a single mask tile, so texture uv coords are the
-    //  same as tile uv coords (save frac() for the fragment shader).  The
-    //  magnification scale is also straightforward:
-    src_tex_uv_wrap = tile_uv_wrap;
-    resize_magnification_scale =
-        pass_output_tile_size / mask_resize_src_lut_size;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 src_tex_uv_wrap;
-layout(location = 1) in vec2 resize_magnification_scale;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#ifdef PHOSPHOR_MASK_RESIZE_MIPMAPPED_LUT
-	layout(set = 0, binding = 3) uniform sampler2D mask_grille_texture_large;
-	layout(set = 0, binding = 4) uniform sampler2D mask_slot_texture_large;
-	layout(set = 0, binding = 5) uniform sampler2D mask_shadow_texture_large;
-#else
-	layout(set = 0, binding = 3) uniform sampler2D mask_grille_texture_small;
-	layout(set = 0, binding = 4) uniform sampler2D mask_slot_texture_small;
-	layout(set = 0, binding = 5) uniform sampler2D mask_shadow_texture_small;
-#endif
-
-void main()
-{
-    //  Resize the input phosphor mask tile to the final vertical size it will
-    //  appear on screen.  Keep 1x horizontal size if possible (IN.output_size
-    //  >= mask_resize_src_lut_size), and otherwise linearly sample horizontally
-    //  to fit exactly one tile.  Lanczos-resizing the phosphor mask achieves
-    //  much sharper results than mipmapping, and vertically resizing first
-    //  minimizes the total number of taps required.  We output a number of
-    //  resized tiles >= mask_resize_num_tiles for easier tiled sampling later.
-    //const float2 src_tex_uv_wrap = src_tex_uv_wrap;
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        //  Discard unneeded fragments in case our profile allows real branches.
-        const float2 tile_uv_wrap = src_tex_uv_wrap;
-        if(get_mask_sample_mode() < 0.5 &&
-            tile_uv_wrap.y <= mask_resize_num_tiles)
-        {
-            static const float src_dy = 1.0/mask_resize_src_lut_size.y;
-            const float2 src_tex_uv = frac(src_tex_uv_wrap);
-            float3 pixel_color;
-            //  If mask_type is static, this branch will be resolved statically.
-			#ifdef PHOSPHOR_MASK_RESIZE_MIPMAPPED_LUT
-				if(mask_type < 0.5)
-				{
-					pixel_color = downsample_vertical_sinc_tiled(
-						mask_grille_texture_large, src_tex_uv, mask_resize_src_lut_size,
-						src_dy, resize_magnification_scale.y, 1.0);
-				}
-				else if(mask_type < 1.5)
-				{
-					pixel_color = downsample_vertical_sinc_tiled(
-						mask_slot_texture_large, src_tex_uv, mask_resize_src_lut_size,
-						src_dy, resize_magnification_scale.y, 1.0);
-				}
-				else
-				{
-					pixel_color = downsample_vertical_sinc_tiled(
-						mask_shadow_texture_large, src_tex_uv, mask_resize_src_lut_size,
-						src_dy, resize_magnification_scale.y, 1.0);
-				}
-			#else
-				if(mask_type < 0.5)
-				{
-					pixel_color = downsample_vertical_sinc_tiled(
-						mask_grille_texture_small, src_tex_uv, mask_resize_src_lut_size,
-						src_dy, resize_magnification_scale.y, 1.0);
-				}
-				else if(mask_type < 1.5)
-				{
-					pixel_color = downsample_vertical_sinc_tiled(
-						mask_slot_texture_small, src_tex_uv, mask_resize_src_lut_size,
-						src_dy, resize_magnification_scale.y, 1.0);
-				}
-				else
-				{
-					pixel_color = downsample_vertical_sinc_tiled(
-						mask_shadow_texture_small, src_tex_uv, mask_resize_src_lut_size,
-						src_dy, resize_magnification_scale.y, 1.0);
-				}
-			#endif
-            //  The input LUT was linear RGB, and so is our output:
-            FragColor = float4(pixel_color, 1.0);
-        }
-        else
-        {
-            discard;
-        }
-    #else
-        discard;
-        FragColor = float4(1.0);
-	#endif
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.slang b/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.slang
deleted file mode 100644
index 9f43ec4c2c..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.slang
+++ /dev/null
@@ -1,5 +0,0 @@
-#version 450
-
-#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-#define PHOSPHOR_BLOOM_FAKE
-#include "crt-royale-scanlines-horizontal-apply-mask.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.slang b/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.slang
deleted file mode 100755
index a24aaa4f30..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.slang
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 450
-
-//  Tell crt-royale-scanlines-horizontal-apply-mask.slang to run the "fake bloom"
-//  code at the end.  (Both shader versions share most of the same code.)
-#define PHOSPHOR_BLOOM_FAKE
-#include "crt-royale-scanlines-horizontal-apply-mask.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-intel.slang b/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-intel.slang
deleted file mode 100644
index b38d831225..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-intel.slang
+++ /dev/null
@@ -1,4 +0,0 @@
-#version 450
-
-#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-#include "crt-royale-scanlines-horizontal-apply-mask.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.h b/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.h
deleted file mode 100644
index 7101d323c1..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	vec4 VERTICAL_SCANLINESSize;
-	vec4 BLOOM_APPROXSize;
-	vec4 HALATION_BLURSize;
-	vec4 MASK_RESIZESize;
-} params;
-
-#define VERTICAL_SCANLINEStexture VERTICAL_SCANLINES
-#define VERTICAL_SCANLINEStexture_size params.VERTICAL_SCANLINESSize.xy
-#define VERTICAL_SCANLINESvideo_size params.VERTICAL_SCANLINESSize.xy
-#define BLOOM_APPROXtexture BLOOM_APPROX
-#define BLOOM_APPROXtexture_size params.BLOOM_APPROXSize.xy
-#define BLOOM_APPROXvideo_size params.BLOOM_APPROXSize.xy
-#define HALATION_BLURtexture HALATION_BLUR
-#define HALATION_BLURtexture_size params.HALATION_BLURSize.xy
-#define HALATION_BLURvideo_size params.HALATION_BLURSize.xy
-#ifdef INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-	#define MASK_RESIZEtexture Source
-#else
-	#define MASK_RESIZEtexture MASK_RESIZE
-#endif
-#define MASK_RESIZEtexture_size params.MASK_RESIZESize.xy
-#define MASK_RESIZEvideo_size params.MASK_RESIZESize.xy
-
-float bloom_approx_scale_x = params.OutputSize.x / params.SourceSize.y;
-const float max_viewport_size_x = 1080.0*1024.0*(4.0/3.0);
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-
-///////////////////////////////  VERTEX INCLUDES  ///////////////////////////////
-
-#include "scanline-functions.h"
-#include "phosphor-mask-resizing.h"
-#include "../../../../include/gamma-management.h"
-
-///////////////////////////////////  HELPERS  //////////////////////////////////
-
-inline float4 tex2Dtiled_mask_linearize(const sampler2D tex,
-    const float2 tex_uv)
-{
-    //  If we're manually tiling a texture, anisotropic filtering can get
-    //  confused.  One workaround is to just select the lowest mip level:
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
-            //  TODO: Use tex2Dlod_linearize with a calculated mip level.
-            return tex2Dlod_linearize(tex, float4(tex_uv, 0.0, 0.0));
-        #else
-            #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-                return tex2Dbias_linearize(tex, float4(tex_uv, 0.0, -16.0));
-            #else
-                return tex2D_linearize(tex, tex_uv);
-            #endif
-        #endif
-    #else
-        return tex2D_linearize(tex, tex_uv);
-    #endif
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 video_uv;
-layout(location = 1) out vec2 scanline_tex_uv;
-layout(location = 2) out vec2 blur3x3_tex_uv;
-layout(location = 3) out vec2 halation_tex_uv;
-layout(location = 4) out vec2 scanline_texture_size_inv;
-layout(location = 5) out vec4 mask_tile_start_uv_and_size;
-layout(location = 6) out vec2 mask_tiles_per_screen;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   float2 tex_uv = TexCoord;
-	//  Our various input textures use different coords.
-    video_uv = tex_uv * IN.texture_size/IN.video_size;
-    scanline_texture_size_inv =
-        float2(1.0, 1.0)/VERTICAL_SCANLINEStexture_size;
-    //video_uv = video_uv;
-    scanline_tex_uv = video_uv * VERTICAL_SCANLINESvideo_size *
-        scanline_texture_size_inv;
-    blur3x3_tex_uv = video_uv * BLOOM_APPROXvideo_size /
-        BLOOM_APPROXtexture_size;
-    halation_tex_uv = video_uv * HALATION_BLURvideo_size /
-        HALATION_BLURtexture_size;
-    //scanline_texture_size_inv = scanline_texture_size_inv;
-
-    //  Get a consistent name for the final mask texture size.  Sample mode 0
-    //  uses the manually resized mask, but ignore it if we never resized.
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        const float mask_sample_mode = get_mask_sample_mode();
-        const float2 mask_resize_texture_size = mask_sample_mode < 0.5 ?
-            MASK_RESIZEtexture_size : mask_texture_large_size;
-        const float2 mask_resize_video_size = mask_sample_mode < 0.5 ?
-            MASK_RESIZEvideo_size : mask_texture_large_size;
-    #else
-        const float2 mask_resize_texture_size = mask_texture_large_size;
-        const float2 mask_resize_video_size = mask_texture_large_size;
-    #endif
-    //  Compute mask tile dimensions, starting points, etc.:
-    //float2 mask_tiles_per_screen;
-    mask_tile_start_uv_and_size = get_mask_sampling_parameters(
-        mask_resize_texture_size, mask_resize_video_size, IN.output_size,
-        mask_tiles_per_screen);
-    //mask_tiles_per_screen = mask_tiles_per_screen;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 video_uv;
-layout(location = 1) in vec2 scanline_tex_uv;
-layout(location = 2) in vec2 blur3x3_tex_uv;
-layout(location = 3) in vec2 halation_tex_uv;
-layout(location = 4) in vec2 scanline_texture_size_inv;
-layout(location = 5) in vec4 mask_tile_start_uv_and_size;
-layout(location = 6) in vec2 mask_tiles_per_screen;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D mask_grille_texture_large;
-layout(set = 0, binding = 4) uniform sampler2D mask_slot_texture_large;
-layout(set = 0, binding = 5) uniform sampler2D mask_shadow_texture_large;
-layout(set = 0, binding = 6) uniform sampler2D VERTICAL_SCANLINES;
-layout(set = 0, binding = 7) uniform sampler2D BLOOM_APPROX;
-layout(set = 0, binding = 8) uniform sampler2D HALATION_BLUR;
-#ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-layout(set = 0, binding = 9) uniform sampler2D MASK_RESIZE;
-#endif
-
-//////////////////////////////  FRAGMENT INCLUDES  //////////////////////////////
-
-#include "bloom-functions.h"
-
-void main()
-{
-    //  This pass: Sample (misconverged?) scanlines to the final horizontal
-    //  resolution, apply halation (bouncing electrons), and apply the phosphor
-    //  mask.  Fake a bloom if requested.  Unless we fake a bloom, the output
-    //  will be dim from the scanline auto-dim, mask dimming, and low gamma.
-
-    //  Horizontally sample the current row (a vertically interpolated scanline)
-    //  and account for horizontal convergence offsets, given in units of texels.
-    const float3 scanline_color_dim = sample_rgb_scanline_horizontal(
-        VERTICAL_SCANLINEStexture, scanline_tex_uv,
-        VERTICAL_SCANLINEStexture_size, scanline_texture_size_inv);
-    const float auto_dim_factor = levels_autodim_temp;
-
-    //  Sample the phosphor mask:
-    const float2 tile_uv_wrap = video_uv * mask_tiles_per_screen;
-    const float2 mask_tex_uv = convert_phosphor_tile_uv_wrap_to_tex_uv(
-        tile_uv_wrap, mask_tile_start_uv_and_size);
-    float3 phosphor_mask_sample;
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        const bool sample_orig_luts = get_mask_sample_mode() > 0.5;
-    #else
-        static const bool sample_orig_luts = true;
-    #endif
-    if(sample_orig_luts)
-    {
-        //  If mask_type is static, this branch will be resolved statically.
-        if(mask_type < 0.5)
-        {
-            phosphor_mask_sample = tex2D_linearize(
-                mask_grille_texture_large, mask_tex_uv).rgb;
-        }
-        else if(mask_type < 1.5)
-        {
-            phosphor_mask_sample = tex2D_linearize(
-                mask_slot_texture_large, mask_tex_uv).rgb;
-        }
-        else
-        {
-            phosphor_mask_sample = tex2D_linearize(
-                mask_shadow_texture_large, mask_tex_uv).rgb;
-        }
-    }
-    else
-    {
-        //  Sample the resized mask, and avoid tiling artifacts:
-        phosphor_mask_sample = tex2Dtiled_mask_linearize(
-            MASK_RESIZEtexture, mask_tex_uv).rgb;
-    }
-
-    //  Sample the halation texture (auto-dim to match the scanlines), and
-    //  account for both horizontal and vertical convergence offsets, given
-    //  in units of texels horizontally and same-field scanlines vertically:
-    const float3 halation_color = tex2D_linearize(
-        HALATION_BLURtexture, halation_tex_uv).rgb;
-
-    //  Apply halation: Halation models electrons flying around under the glass
-    //  and hitting the wrong phosphors (of any color).  It desaturates, so
-    //  average the halation electrons to a scalar.  Reduce the local scanline
-    //  intensity accordingly to conserve energy.
-    const float3 halation_intensity_dim =
-        float3(dot(halation_color, float3(auto_dim_factor/3.0)));
-    const float3 electron_intensity_dim = lerp(scanline_color_dim,
-        halation_intensity_dim, global.halation_weight);
-
-    //  Apply the phosphor mask:
-    const float3 phosphor_emission_dim = electron_intensity_dim *
-        phosphor_mask_sample;
-
-    #ifdef PHOSPHOR_BLOOM_FAKE
-        //  The BLOOM_APPROX pass approximates a blurred version of a masked
-        //  and scanlined image.  It's usually used to compute the brightpass,
-        //  but we can also use it to fake the bloom stage entirely.  Caveats:
-        //  1.) A fake bloom is conceptually different, since we're mixing in a
-        //      fully blurred low-res image, and the biggest implication are:
-        //  2.) If mask_amplify is incorrect, results deteriorate more quickly.
-        //  3.) The inaccurate blurring hurts quality in high-contrast areas.
-        //  4.) The bloom_underestimate_levels parameter seems less sensitive.
-        //  Reverse the auto-dimming and amplify to compensate for mask dimming:
-		#define PHOSPHOR_BLOOM_FAKE_WITH_SIMPLE_BLEND
-        #ifdef PHOSPHOR_BLOOM_FAKE_WITH_SIMPLE_BLEND
-            static const float blur_contrast = 1.05;
-        #else
-            static const float blur_contrast = 1.0;
-        #endif
-        const float mask_amplify = get_mask_amplify();
-        const float undim_factor = 1.0/auto_dim_factor;
-        const float3 phosphor_emission =
-            phosphor_emission_dim * undim_factor * mask_amplify;
-        //  Get a phosphor blur estimate, accounting for convergence offsets:
-        const float3 electron_intensity = electron_intensity_dim * undim_factor;
-        const float3 phosphor_blur_approx_soft = tex2D_linearize(
-            BLOOM_APPROXtexture, blur3x3_tex_uv).rgb;
-        const float3 phosphor_blur_approx = lerp(phosphor_blur_approx_soft,
-            electron_intensity, 0.1) * blur_contrast;
-        //  We could blend between phosphor_emission and phosphor_blur_approx,
-        //  solving for the minimum blend_ratio that avoids clipping past 1.0:
-        //      1.0 >= total_intensity
-        //      1.0 >= phosphor_emission * (1.0 - blend_ratio) +
-        //              phosphor_blur_approx * blend_ratio
-        //      blend_ratio = (phosphor_emission - 1.0)/
-        //          (phosphor_emission - phosphor_blur_approx);
-        //  However, this blurs far more than necessary, because it aims for
-        //  full brightness, not minimal blurring.  To fix it, base blend_ratio
-        //  on a max area intensity only so it varies more smoothly:
-        const float3 phosphor_blur_underestimate =
-            phosphor_blur_approx * bloom_underestimate_levels;
-        const float3 area_max_underestimate =
-            phosphor_blur_underestimate * mask_amplify;
-        #ifdef PHOSPHOR_BLOOM_FAKE_WITH_SIMPLE_BLEND
-            const float3 blend_ratio_temp =
-                (area_max_underestimate - float3(1.0, 1.0, 1.0)) /
-                (area_max_underestimate - phosphor_blur_underestimate);
-        #else
-            //  Try doing it like an area-based brightpass.  This is nearly
-            //  identical, but it's worth toying with the code in case I ever
-            //  find a way to make it look more like a real bloom.  (I've had
-            //  some promising textures from combining an area-based blend ratio
-            //  for the phosphor blur and a more brightpass-like blend-ratio for
-            //  the phosphor emission, but I haven't found a way to make the
-            //  brightness correct across the whole color range, especially with
-            //  different bloom_underestimate_levels values.)
-            const float desired_triad_size = lerp(global.mask_triad_size_desired,
-                IN.output_size.x/global.mask_num_triads_desired,
-                global.mask_specify_num_triads);
-            const float bloom_sigma = get_min_sigma_to_blur_triad(
-                desired_triad_size, bloom_diff_thresh);
-            const float center_weight = get_center_weight(bloom_sigma);
-            const float3 max_area_contribution_approx =
-                max(float3(0.0, 0.0, 0.0), phosphor_blur_approx -
-                center_weight * phosphor_emission);
-            const float3 area_contrib_underestimate =
-                bloom_underestimate_levels * max_area_contribution_approx;
-            const float3 blend_ratio_temp =
-                ((float3(1.0, 1.0, 1.0) - area_contrib_underestimate) /
-                area_max_underestimate - float3(1.0, 1.0, 1.0)) / (center_weight - 1.0);
-        #endif
-        //  Clamp blend_ratio in case it's out-of-range, but be SUPER careful:
-        //  min/max/clamp are BIZARRELY broken with lerp (optimization bug?),
-        //  and this redundant sequence avoids bugs, at least on nVidia cards:
-        const float3 blend_ratio_clamped = max(clamp(blend_ratio_temp, 0.0, 1.0), 0.0);
-        const float3 blend_ratio = lerp(blend_ratio_clamped, float3(1.0,1.0,1.0), global.bloom_excess);
-        //  Blend the blurred and unblurred images:
-        const float3 phosphor_emission_unclipped =
-            lerp(phosphor_emission, phosphor_blur_approx, blend_ratio);
-        //  Simulate refractive diffusion by reusing the halation sample.
-        const float3 pixel_color = lerp(phosphor_emission_unclipped,
-            halation_color, global.diffusion_weight);
-    #else
-        const float3 pixel_color = phosphor_emission_dim;
-    #endif
-    //  Encode if necessary, and output.
-    FragColor = encode_output(float4(pixel_color, 1.0));
-}
diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang b/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang
deleted file mode 100755
index 0c2a0b8e7d..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang
+++ /dev/null
@@ -1,2 +0,0 @@
-#version 450
-#include "crt-royale-scanlines-horizontal-apply-mask.h"
diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang b/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang
deleted file mode 100755
index e7d58d93f2..0000000000
--- a/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang
+++ /dev/null
@@ -1,243 +0,0 @@
-#version 450
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../../../../include/compat_macros.inc"
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-#include "scanline-functions.h"
-#include "../../../../include/gamma-management.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 tex_uv;
-layout(location = 1) out vec2 uv_step;                     //  uv size of a texel (x) and scanline (y)
-layout(location = 2) out vec2 il_step_multiple;            //  (1, 1) = progressive, (1, 2) = interlaced
-layout(location = 3) out float pixel_height_in_scanlines;  //  Height of an output pixel in scanlines
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   tex_uv = TexCoord * 1.00001;
-   
-	//  Detect interlacing: il_step_multiple indicates the step multiple between
-    //  lines: 1 is for progressive sources, and 2 is for interlaced sources.
-    float2 video_size_ = IN.video_size.xy;
-    const float y_step = 1.0 + float(is_interlaced(video_size_.y));
-    il_step_multiple = float2(1.0, y_step);
-    //  Get the uv tex coords step between one texel (x) and scanline (y):
-    uv_step = il_step_multiple / IN.texture_size;
-
-    //  If shader parameters are used, {min, max}_{sigma, shape} are runtime
-    //  values.  Compute {sigma, shape}_range outside of scanline_contrib() so
-    //  they aren't computed once per scanline (6 times per fragment and up to
-    //  18 times per vertex):
-	//  TODO/FIXME: if these aren't used, why are they calculated? commenting for now
-//    const floatsigma_range = max(beam_max_sigma, beam_min_sigma) -
-//        beam_min_sigma;
-//    const float shape_range = max(beam_max_shape, beam_min_shape) -
-//        beam_min_shape;
-
-    //  We need the pixel height in scanlines for antialiased/integral sampling:
-    const float ph = (video_size_.y / IN.output_size.y) / 
-        il_step_multiple.y;
-    pixel_height_in_scanlines = ph;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in vec2 tex_uv;
-layout(location = 1) in vec2 uv_step;                      //  uv size of a texel (x) and scanline (y)
-layout(location = 2) in vec2 il_step_multiple;             //  (1, 1) = progressive, (1, 2) = interlaced
-layout(location = 3) in float pixel_height_in_scanlines;   //  Height of an output pixel in scanlines
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-#define input_texture Source
-
-void main()
-{
-    //  This pass: Sample multiple (misconverged?) scanlines to the final
-    //  vertical resolution.  Temporarily auto-dim the output to avoid clipping.
-
-    //  Read some attributes into local variables:
-    float2 texture_size_ = IN.texture_size;
-    float2 texture_size_inv = 1.0/texture_size_;
-    //const float2 uv_step = uv_step;
-    //const float2 il_step_multiple = il_step_multiple;
-    float frame_count = float(IN.frame_count);
-    const float ph = pixel_height_in_scanlines;
-
-    //  Get the uv coords of the previous scanline (in this field), and the
-    //  scanline's distance from this sample, in scanlines.
-    float dist;
-    const float2 scanline_uv = get_last_scanline_uv(tex_uv, texture_size_,
-        texture_size_inv, il_step_multiple, frame_count, dist);
-    //  Consider 2, 3, 4, or 6 scanlines numbered 0-5: The previous and next
-    //  scanlines are numbered 2 and 3.  Get scanline colors colors (ignore
-    //  horizontal sampling, since since IN.output_size.x = video_size.x).
-    //  NOTE: Anisotropic filtering creates interlacing artifacts, which is why
-    //  ORIG_LINEARIZED bobbed any interlaced input before this pass.
-    const float2 v_step = float2(0.0, uv_step.y);
-    const float3 scanline2_color = tex2D_linearize(input_texture, scanline_uv).rgb;
-    const float3 scanline3_color =
-        tex2D_linearize(input_texture, scanline_uv + v_step).rgb;
-    float3 scanline0_color, scanline1_color, scanline4_color, scanline5_color,
-        scanline_outside_color;
-    float dist_round;
-    //  Use scanlines 0, 1, 4, and 5 for a total of 6 scanlines:
-    if(beam_num_scanlines > 5.5)
-    {
-        scanline1_color =
-            tex2D_linearize(input_texture, scanline_uv - v_step).rgb;
-        scanline4_color =
-            tex2D_linearize(input_texture, scanline_uv + 2.0 * v_step).rgb;
-        scanline0_color =
-            tex2D_linearize(input_texture, scanline_uv - 2.0 * v_step).rgb;
-        scanline5_color =
-            tex2D_linearize(input_texture, scanline_uv + 3.0 * v_step).rgb;
-    }
-    //  Use scanlines 1, 4, and either 0 or 5 for a total of 5 scanlines:
-    else if(beam_num_scanlines > 4.5)
-    {
-        scanline1_color =
-            tex2D_linearize(input_texture, scanline_uv - v_step).rgb;
-        scanline4_color =
-            tex2D_linearize(input_texture, scanline_uv + 2.0 * v_step).rgb;
-        //  dist is in [0, 1]
-        dist_round = round(dist);
-        const float2 sample_0_or_5_uv_off =
-            lerp(-2.0 * v_step, 3.0 * v_step, dist_round);
-        //  Call this "scanline_outside_color" to cope with the conditional
-        //  scanline number:
-        scanline_outside_color = tex2D_linearize(
-            input_texture, scanline_uv + sample_0_or_5_uv_off).rgb;
-    }
-    //  Use scanlines 1 and 4 for a total of 4 scanlines:
-    else if(beam_num_scanlines > 3.5)
-    {
-        scanline1_color =
-            tex2D_linearize(input_texture, scanline_uv - v_step).rgb;
-        scanline4_color =
-            tex2D_linearize(input_texture, scanline_uv + 2.0 * v_step).rgb;
-    }
-    //  Use scanline 1 or 4 for a total of 3 scanlines:
-    else if(beam_num_scanlines > 2.5)
-    {
-        //  dist is in [0, 1]
-        dist_round = round(dist);
-        const float2 sample_1or4_uv_off =
-            lerp(-v_step, 2.0 * v_step, dist_round);
-        scanline_outside_color = tex2D_linearize(
-            input_texture, scanline_uv + sample_1or4_uv_off).rgb;
-    }
-    
-    //  Compute scanline contributions, accounting for vertical convergence.
-    //  Vertical convergence offsets are in units of current-field scanlines.
-    //  dist2 means "positive sample distance from scanline 2, in scanlines:"
-    float3 dist2 = float3(dist);
-    if(beam_misconvergence)
-    {
-        const float3 convergence_offsets_vert_rgb =
-            get_convergence_offsets_y_vector();
-        dist2 = float3(dist) - convergence_offsets_vert_rgb;
-    }
-    //  Calculate {sigma, shape}_range outside of scanline_contrib so it's only
-    //  done once per pixel (not 6 times) with runtime params.  Don't reuse the
-    //  vertex shader calculations, so static versions can be constant-folded.
-	const float sigma_range = max(beam_max_sigma, beam_min_sigma) -
-        beam_min_sigma;
-	const float shape_range = max(beam_max_shape, beam_min_shape) -
-        beam_min_shape;
-    //  Calculate and sum final scanline contributions, starting with lines 2/3.
-    //  There is no normalization step, because we're not interpolating a
-    //  continuous signal.  Instead, each scanline is an additive light source.
-    const float3 scanline2_contrib = scanline_contrib(dist2,
-        scanline2_color, ph, sigma_range, shape_range);
-    const float3 scanline3_contrib = scanline_contrib(abs(float3(1.0,1.0,1.0) - dist2),
-        scanline3_color, ph, sigma_range, shape_range);
-    float3 scanline_intensity = scanline2_contrib + scanline3_contrib;
-    if(beam_num_scanlines > 5.5)
-    {
-        const float3 scanline0_contrib =
-            scanline_contrib(dist2 + float3(2.0,2.0,2.0), scanline0_color,
-                ph, sigma_range, shape_range);
-        const float3 scanline1_contrib =
-            scanline_contrib(dist2 + float3(1.0,1.0,1.0), scanline1_color,
-                ph, sigma_range, shape_range);
-        const float3 scanline4_contrib =
-            scanline_contrib(abs(float3(2.0,2.0,2.0) - dist2), scanline4_color,
-                ph, sigma_range, shape_range);
-        const float3 scanline5_contrib =
-            scanline_contrib(abs(float3(3.0) - dist2), scanline5_color,
-                ph, sigma_range, shape_range);
-        scanline_intensity += scanline0_contrib + scanline1_contrib +
-            scanline4_contrib + scanline5_contrib;
-    }
-    else if(beam_num_scanlines > 4.5)
-    {
-        const float3 scanline1_contrib =
-            scanline_contrib(dist2 + float3(1.0,1.0,1.0), scanline1_color,
-                ph, sigma_range, shape_range);
-        const float3 scanline4_contrib =
-            scanline_contrib(abs(float3(2.0,2.0,2.0) - dist2), scanline4_color,
-                ph, sigma_range, shape_range);
-        const float3 dist0or5 = lerp(
-            dist2 + float3(2.0,2.0,2.0), float3(3.0,3.0,3.0) - dist2, dist_round);
-        const float3 scanline0or5_contrib = scanline_contrib(
-            dist0or5, scanline_outside_color, ph, sigma_range, shape_range);
-        scanline_intensity += scanline1_contrib + scanline4_contrib +
-            scanline0or5_contrib;
-    }
-    else if(beam_num_scanlines > 3.5)
-    {
-        const float3 scanline1_contrib =
-            scanline_contrib(dist2 + float3(1.0,1.0,1.0), scanline1_color,
-                ph, sigma_range, shape_range);
-        const float3 scanline4_contrib =
-            scanline_contrib(abs(float3(2.0,2.0,2.0) - dist2), scanline4_color,
-                ph, sigma_range, shape_range);
-        scanline_intensity += scanline1_contrib + scanline4_contrib;
-    }
-    else if(beam_num_scanlines > 2.5)
-    {
-        const float3 dist1or4 = lerp(
-            dist2 + float3(1.0,1.0,1.0), float3(2.0,2.0,2.0) - dist2, dist_round);
-        const float3 scanline1or4_contrib = scanline_contrib(
-            dist1or4, scanline_outside_color, ph, sigma_range, shape_range);
-        scanline_intensity += scanline1or4_contrib;
-    }
-
-    //  Auto-dim the image to avoid clipping, encode if necessary, and output.
-    //  My original idea was to compute a minimal auto-dim factor and put it in
-    //  the alpha channel, but it wasn't working, at least not reliably.  This
-    //  is faster anyway, levels_autodim_temp = 0.5 isn't causing banding.
-    FragColor = encode_output(float4(scanline_intensity * levels_autodim_temp, 1.0));
-}
diff --git a/crt/shaders/crt-royale/src/derived-settings-and-constants.h b/crt/shaders/crt-royale/src/derived-settings-and-constants.h
deleted file mode 100644
index 1c39a9736b..0000000000
--- a/crt/shaders/crt-royale/src/derived-settings-and-constants.h
+++ /dev/null
@@ -1,315 +0,0 @@
-#ifndef DERIVED_SETTINGS_AND_CONSTANTS_H
-#define DERIVED_SETTINGS_AND_CONSTANTS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-/////////////////////////////////  DESCRIPTION  ////////////////////////////////
-
-//  These macros and constants can be used across the whole codebase.
-//  Unlike the values in user-settings.cgh, end users shouldn't modify these.
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../user-settings.h"
-#include "user-cgp-constants.h"
-
-
-///////////////////////////////  FIXED SETTINGS  ///////////////////////////////
-
-//  Avoid dividing by zero; using a macro overloads for float, float2, etc.:
-#define FIX_ZERO(c) (max(abs(c), 0.0000152587890625))   //  2^-16
-
-//  Ensure the first pass decodes CRT gamma and the last encodes LCD gamma.
-#ifndef SIMULATE_CRT_ON_LCD
-    #define SIMULATE_CRT_ON_LCD
-#endif
-
-//  Manually tiling a manually resized texture creates texture coord derivative
-//  discontinuities and confuses anisotropic filtering, causing discolored tile
-//  seams in the phosphor mask.  Workarounds:
-//  a.) Using tex2Dlod disables anisotropic filtering for tiled masks.  It's
-//      downgraded to tex2Dbias without DRIVERS_ALLOW_TEX2DLOD #defined and
-//      disabled without DRIVERS_ALLOW_TEX2DBIAS #defined either.
-//  b.) "Tile flat twice" requires drawing two full tiles without border padding
-//      to the resized mask FBO, and it's incompatible with same-pass curvature.
-//      (Same-pass curvature isn't used but could be in the future...maybe.)
-//  c.) "Fix discontinuities" requires derivatives and drawing one tile with
-//      border padding to the resized mask FBO, but it works with same-pass
-//      curvature.  It's disabled without DRIVERS_ALLOW_DERIVATIVES #defined.
-//  Precedence: a, then, b, then c (if multiple strategies are #defined).
-    #define ANISOTROPIC_TILING_COMPAT_TEX2DLOD              //  129.7 FPS, 4x, flat; 101.8 at fullscreen
-    #define ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE       //  128.1 FPS, 4x, flat; 101.5 at fullscreen
-    #define ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES   //  124.4 FPS, 4x, flat; 97.4 at fullscreen
-//  Also, manually resampling the phosphor mask is slightly blurrier with
-//  anisotropic filtering.  (Resampling with mipmapping is even worse: It
-//  creates artifacts, but only with the fully bloomed shader.)  The difference
-//  is subtle with small triads, but you can fix it for a small cost.
-    //#define ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
-
-
-//////////////////////////////  DERIVED SETTINGS  //////////////////////////////
-
-//  Intel HD 4000 GPU's can't handle manual mask resizing (for now), setting the
-//  geometry mode at runtime, or a 4x4 true Gaussian resize.  Disable
-//  incompatible settings ASAP.  (INTEGRATED_GRAPHICS_COMPATIBILITY_MODE may be
-//  #defined by either user-settings.h or a wrapper .cg that #includes the
-//  current .cg pass.)
-#ifdef INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-    #ifdef PHOSPHOR_MASK_MANUALLY_RESIZE
-        #undef PHOSPHOR_MASK_MANUALLY_RESIZE
-    #endif
-    #ifdef RUNTIME_GEOMETRY_MODE
-        #undef RUNTIME_GEOMETRY_MODE
-    #endif
-    //  Mode 2 (4x4 Gaussian resize) won't work, and mode 1 (3x3 blur) is
-    //  inferior in most cases, so replace 2.0 with 0.0:
-    static const float bloom_approx_filter =
-        bloom_approx_filter_static > 1.5 ? 0.0 : bloom_approx_filter_static;
-#else
-    static const float bloom_approx_filter = bloom_approx_filter_static;
-#endif
-
-//  Disable slow runtime paths if static parameters are used.  Most of these
-//  won't be a problem anyway once the params are disabled, but some will.
-#ifndef RUNTIME_SHADER_PARAMS_ENABLE
-    #ifdef RUNTIME_PHOSPHOR_BLOOM_SIGMA
-        #undef RUNTIME_PHOSPHOR_BLOOM_SIGMA
-    #endif
-    #ifdef RUNTIME_ANTIALIAS_WEIGHTS
-        #undef RUNTIME_ANTIALIAS_WEIGHTS
-    #endif
-    #ifdef RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-        #undef RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-    #endif
-    #ifdef RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-        #undef RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-    #endif
-    #ifdef RUNTIME_GEOMETRY_TILT
-        #undef RUNTIME_GEOMETRY_TILT
-    #endif
-    #ifdef RUNTIME_GEOMETRY_MODE
-        #undef RUNTIME_GEOMETRY_MODE
-    #endif
-    #ifdef FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-        #undef FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-    #endif
-#endif
-
-//  Make tex2Dbias a backup for tex2Dlod for wider compatibility.
-#ifdef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
-    #define ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-#endif
-#ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
-    #define ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
-#endif
-//  Rule out unavailable anisotropic compatibility strategies:
-#ifndef DRIVERS_ALLOW_DERIVATIVES
-    #ifdef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-        #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-    #endif
-#endif
-#ifndef DRIVERS_ALLOW_TEX2DLOD
-    #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
-        #undef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
-    #endif
-    #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
-        #undef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
-    #endif
-    #ifdef ANTIALIAS_DISABLE_ANISOTROPIC
-        #undef ANTIALIAS_DISABLE_ANISOTROPIC
-    #endif
-#endif
-#ifndef DRIVERS_ALLOW_TEX2DBIAS
-    #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-        #undef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-    #endif
-    #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
-        #undef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
-    #endif
-#endif
-//  Prioritize anisotropic tiling compatibility strategies by performance and
-//  disable unused strategies.  This concentrates all the nesting in one place.
-#ifdef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
-    #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-        #undef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-    #endif
-    #ifdef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
-        #undef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
-    #endif
-    #ifdef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-        #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-    #endif
-#else
-    #ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-        #ifdef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
-            #undef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
-        #endif
-        #ifdef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-            #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-        #endif
-    #else
-        //  ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE is only compatible with
-        //  flat texture coords in the same pass, but that's all we use.
-        #ifdef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
-            #ifdef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-                #undef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-            #endif
-        #endif
-    #endif
-#endif
-//  The tex2Dlod and tex2Dbias strategies share a lot in common, and we can
-//  reduce some #ifdef nesting in the next section by essentially OR'ing them:
-#ifdef ANISOTROPIC_TILING_COMPAT_TEX2DLOD
-    #define ANISOTROPIC_TILING_COMPAT_TEX2DLOD_FAMILY
-#endif
-#ifdef ANISOTROPIC_TILING_COMPAT_TEX2DBIAS
-    #define ANISOTROPIC_TILING_COMPAT_TEX2DLOD_FAMILY
-#endif
-//  Prioritize anisotropic resampling compatibility strategies the same way:
-#ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
-    #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
-        #undef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
-    #endif
-#endif
-
-
-///////////////////////  DERIVED PHOSPHOR MASK CONSTANTS  //////////////////////
-
-//  If we can use the large mipmapped LUT without mipmapping artifacts, we
-//  should: It gives us more options for using fewer samples.
-#ifdef DRIVERS_ALLOW_TEX2DLOD
-    #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
-        //  TODO: Take advantage of this!
-        #define PHOSPHOR_MASK_RESIZE_MIPMAPPED_LUT
-        static const float2 mask_resize_src_lut_size = mask_texture_large_size;
-    #else
-        static const float2 mask_resize_src_lut_size = mask_texture_small_size;
-    #endif
-#else
-    static const float2 mask_resize_src_lut_size = mask_texture_small_size;
-#endif
-
-
-//  tex2D's sampler2D parameter MUST be a uniform global, a uniform input to
-//  main_fragment, or a static alias of one of the above.  This makes it hard
-//  to select the phosphor mask at runtime: We can't even assign to a uniform
-//  global in the vertex shader or select a sampler2D in the vertex shader and
-//  pass it to the fragment shader (even with explicit TEXUNIT# bindings),
-//  because it just gives us the input texture or a black screen.  However, we
-//  can get around these limitations by calling tex2D three times with different
-//  uniform samplers (or resizing the phosphor mask three times altogether).
-//  With dynamic branches, we can process only one of these branches on top of
-//  quickly discarding fragments we don't need (cgc seems able to overcome
-//  limigations around dependent texture fetches inside of branches).  Without
-//  dynamic branches, we have to process every branch for every fragment...which
-//  is slower.  Runtime sampling mode selection is slower without dynamic
-//  branches as well.  Let the user's static #defines decide if it's worth it.
-#ifdef DRIVERS_ALLOW_DYNAMIC_BRANCHES
-    #define RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-#else
-    #ifdef FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-        #define RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-    #endif
-#endif
-
-//  We need to render some minimum number of tiles in the resize passes.
-//  We need at least 1.0 just to repeat a single tile, and we need extra
-//  padding beyond that for anisotropic filtering, discontinuitity fixing,
-//  antialiasing, same-pass curvature (not currently used), etc.  First
-//  determine how many border texels and tiles we need, based on how the result
-//  will be sampled:
-#ifdef GEOMETRY_EARLY
-        static const float max_subpixel_offset = aa_subpixel_r_offset_static.x;
-        //  Most antialiasing filters have a base radius of 4.0 pixels:
-        static const float max_aa_base_pixel_border = 4.0 +
-            max_subpixel_offset;
-#else
-    static const float max_aa_base_pixel_border = 0.0;
-#endif
-//  Anisotropic filtering adds about 0.5 to the pixel border:
-#ifndef ANISOTROPIC_TILING_COMPAT_TEX2DLOD_FAMILY
-    static const float max_aniso_pixel_border = max_aa_base_pixel_border + 0.5;
-#else
-    static const float max_aniso_pixel_border = max_aa_base_pixel_border;
-#endif
-//  Fixing discontinuities adds 1.0 more to the pixel border:
-#ifdef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-    static const float max_tiled_pixel_border = max_aniso_pixel_border + 1.0;
-#else
-    static const float max_tiled_pixel_border = max_aniso_pixel_border;
-#endif
-//  Convert the pixel border to an integer texel border.  Assume same-pass
-//  curvature about triples the texel frequency:
-#ifdef GEOMETRY_EARLY
-    static const float max_mask_texel_border =
-        ceil(max_tiled_pixel_border * 3.0);
-#else
-    static const float max_mask_texel_border = ceil(max_tiled_pixel_border);
-#endif
-//  Convert the texel border to a tile border using worst-case assumptions:
-static const float max_mask_tile_border = max_mask_texel_border/
-    (mask_min_allowed_triad_size * mask_triads_per_tile);
-
-//  Finally, set the number of resized tiles to render to MASK_RESIZE, and set
-//  the starting texel (inside borders) for sampling it.
-#ifndef GEOMETRY_EARLY
-    #ifdef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
-        //  Special case: Render two tiles without borders.  Anisotropic
-        //  filtering doesn't seem to be a problem here.
-        static const float mask_resize_num_tiles = 1.0 + 1.0;
-        static const float mask_start_texels = 0.0;
-    #else
-        static const float mask_resize_num_tiles = 1.0 +
-            2.0 * max_mask_tile_border;
-        static const float mask_start_texels = max_mask_texel_border;
-    #endif
-#else
-    static const float mask_resize_num_tiles = 1.0 + 2.0*max_mask_tile_border;
-    static const float mask_start_texels = max_mask_texel_border;
-#endif
-
-//  We have to fit mask_resize_num_tiles into an FBO with a viewport scale of
-//  mask_resize_viewport_scale.  This limits the maximum final triad size.
-//  Estimate the minimum number of triads we can split the screen into in each
-//  dimension (we'll be as correct as mask_resize_viewport_scale is):
-static const float mask_resize_num_triads =
-    mask_resize_num_tiles * mask_triads_per_tile;
-static const float2 min_allowed_viewport_triads =
-    float2(mask_resize_num_triads) / mask_resize_viewport_scale;
-
-
-////////////////////////  COMMON MATHEMATICAL CONSTANTS  ///////////////////////
-
-static const float pi = 3.141592653589;
-//  We often want to find the location of the previous texel, e.g.:
-//      const float2 curr_texel = uv * texture_size;
-//      const float2 prev_texel = floor(curr_texel - float2(0.5)) + float2(0.5);
-//      const float2 prev_texel_uv = prev_texel / texture_size;
-//  However, many GPU drivers round incorrectly around exact texel locations.
-//  We need to subtract a little less than 0.5 before flooring, and some GPU's
-//  require this value to be farther from 0.5 than others; define it here.
-//      const float2 prev_texel =
-//          floor(curr_texel - float2(under_half)) + float2(0.5);
-static const float under_half = 0.4995;
-
-
-#endif  //  DERIVED_SETTINGS_AND_CONSTANTS_H
-
diff --git a/crt/shaders/crt-royale/src/geometry-functions.h b/crt/shaders/crt-royale/src/geometry-functions.h
deleted file mode 100644
index 9e7bfa0aa2..0000000000
--- a/crt/shaders/crt-royale/src/geometry-functions.h
+++ /dev/null
@@ -1,695 +0,0 @@
-#ifndef GEOMETRY_FUNCTIONS_H
-#define GEOMETRY_FUNCTIONS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "bind-shader-params.h"
-
-
-////////////////////////////  MACROS AND CONSTANTS  ////////////////////////////
-
-//  Curvature-related constants:
-#define MAX_POINT_CLOUD_SIZE 9
-
-
-/////////////////////////////  CURVATURE FUNCTIONS /////////////////////////////
-
-float2 quadratic_solve(const float a, const float b_over_2, const float c)
-{
-    //  Requires:   1.) a, b, and c are quadratic formula coefficients
-    //              2.) b_over_2 = b/2.0 (simplifies terms to factor 2 out)
-    //              3.) b_over_2 must be guaranteed < 0.0 (avoids a branch)
-    //  Returns:    Returns float2(first_solution, discriminant), so the caller
-    //              can choose how to handle the "no intersection" case.  The
-    //              Kahan or Citardauq formula is used for numerical robustness.
-    const float discriminant = b_over_2*b_over_2 - a*c;
-    const float solution0 = c/(-b_over_2 + sqrt(discriminant));
-    return float2(solution0, discriminant);
-}
-
-float2 intersect_sphere(const float3 view_vec, const float3 eye_pos_vec)
-{
-    //  Requires:   1.) view_vec and eye_pos_vec are 3D vectors in the sphere's
-    //                  local coordinate frame (eye_pos_vec is a position, i.e.
-    //                  a vector from the origin to the eye/camera)
-    //              2.) geom_radius is a global containing the sphere's radius
-    //  Returns:    Cast a ray of direction view_vec from eye_pos_vec at a
-    //              sphere of radius geom_radius, and return the distance to
-    //              the first intersection in units of length(view_vec).
-    //              http://wiki.cgsociety.org/index.php/Ray_Sphere_Intersection
-    //  Quadratic formula coefficients (b_over_2 is guaranteed negative):
-    const float a = dot(view_vec, view_vec);
-    const float b_over_2 = dot(view_vec, eye_pos_vec);  //  * 2.0 factored out
-    const float c = dot(eye_pos_vec, eye_pos_vec) - geom_radius*geom_radius;
-    return quadratic_solve(a, b_over_2, c);
-}
-
-float2 intersect_cylinder(const float3 view_vec, const float3 eye_pos_vec)
-{
-    //  Requires:   1.) view_vec and eye_pos_vec are 3D vectors in the sphere's
-    //                  local coordinate frame (eye_pos_vec is a position, i.e.
-    //                  a vector from the origin to the eye/camera)
-    //              2.) geom_radius is a global containing the cylinder's radius
-    //  Returns:    Cast a ray of direction view_vec from eye_pos_vec at a
-    //              cylinder of radius geom_radius, and return the distance to
-    //              the first intersection in units of length(view_vec).  The
-    //              derivation of the coefficients is in Christer Ericson's
-    //              Real-Time Collision Detection, p. 195-196, and this version
-    //              uses LaGrange's identity to reduce operations.
-    //  Arbitrary "cylinder top" reference point for an infinite cylinder:
-    const float3 cylinder_top_vec = float3(0.0, geom_radius, 0.0);
-    const float3 cylinder_axis_vec = float3(0.0, 1.0, 0.0);//float3(0.0, 2.0*geom_radius, 0.0);
-    const float3 top_to_eye_vec = eye_pos_vec - cylinder_top_vec;
-    const float3 axis_x_view = cross(cylinder_axis_vec, view_vec);
-    const float3 axis_x_top_to_eye = cross(cylinder_axis_vec, top_to_eye_vec);
-    //  Quadratic formula coefficients (b_over_2 is guaranteed negative):
-    const float a = dot(axis_x_view, axis_x_view);
-    const float b_over_2 = dot(axis_x_top_to_eye, axis_x_view);
-    const float c = dot(axis_x_top_to_eye, axis_x_top_to_eye) -
-        geom_radius*geom_radius;//*dot(cylinder_axis_vec, cylinder_axis_vec);
-    return quadratic_solve(a, b_over_2, c);
-}
-
-float2 cylinder_xyz_to_uv(const float3 intersection_pos_local,
-    const float2 geom_aspect)
-{
-    //  Requires:   An xyz intersection position on a cylinder.
-    //  Returns:    video_uv coords mapped to range [-0.5, 0.5]
-    //  Mapping:    Define square_uv.x to be the signed arc length in xz-space,
-    //              and define square_uv.y = -intersection_pos_local.y (+v = -y).
-    //  Start with a numerically robust arc length calculation.
-    const float angle_from_image_center = atan2(intersection_pos_local.x,
-        intersection_pos_local.z);
-    const float signed_arc_len = angle_from_image_center * geom_radius;
-    //  Get a uv-mapping where [-0.5, 0.5] maps to a "square" area, then divide
-    //  by the aspect ratio to stretch the mapping appropriately:
-    const float2 square_uv = float2(signed_arc_len, -intersection_pos_local.y);
-    const float2 video_uv = square_uv / geom_aspect;
-    return video_uv;
-}
-
-float3 cylinder_uv_to_xyz(const float2 video_uv, const float2 geom_aspect)
-{
-    //  Requires:   video_uv coords mapped to range [-0.5, 0.5]
-    //  Returns:    An xyz intersection position on a cylinder.  This is the
-    //              inverse of cylinder_xyz_to_uv().
-    //  Expand video_uv by the aspect ratio to get proportionate x/y lengths,
-    //  then calculate an xyz position for the cylindrical mapping above.
-    const float2 square_uv = video_uv * geom_aspect;
-    const float arc_len = square_uv.x;
-    const float angle_from_image_center = arc_len / geom_radius;
-    const float x_pos = sin(angle_from_image_center) * geom_radius;
-    const float z_pos = cos(angle_from_image_center) * geom_radius;
-    //  Or: z = sqrt(geom_radius**2 - x**2)
-    //  Or: z = geom_radius/sqrt(1.0 + tan(angle)**2), x = z * tan(angle)
-    const float3 intersection_pos_local = float3(x_pos, -square_uv.y, z_pos);
-    return intersection_pos_local;
-}
-
-float2 sphere_xyz_to_uv(const float3 intersection_pos_local,
-    const float2 geom_aspect)
-{
-    //  Requires:   An xyz intersection position on a sphere.
-    //  Returns:    video_uv coords mapped to range [-0.5, 0.5]
-    //  Mapping:    First define square_uv.x/square_uv.y ==
-    //              intersection_pos_local.x/intersection_pos_local.y.  Then,
-    //              length(square_uv) is the arc length from the image center
-    //              at (0.0, 0.0, geom_radius) along the tangent great circle.
-    //              Credit for this mapping goes to cgwg: I never managed to
-    //              understand his code, but he told me his mapping was based on
-    //              great circle distances when I asked him about it, which
-    //              informed this very similar (almost identical) mapping.
-    //  Start with a numerically robust arc length calculation between the ray-
-    //  sphere intersection point and the image center using a method posted by
-    //  Roger Stafford on comp.soft-sys.matlab:
-    //  https://groups.google.com/d/msg/comp.soft-sys.matlab/zNbUui3bjcA/c0HV_bHSx9cJ
-    const float3 image_center_pos_local = float3(0.0, 0.0, geom_radius);
-    const float cp_len =
-        length(cross(intersection_pos_local, image_center_pos_local));
-    const float dp = dot(intersection_pos_local, image_center_pos_local);
-    const float angle_from_image_center = atan2(cp_len, dp);
-    const float arc_len = angle_from_image_center * geom_radius;
-    //  Get a uv-mapping where [-0.5, 0.5] maps to a "square" area, then divide
-    //  by the aspect ratio to stretch the mapping appropriately:
-    const float2 square_uv_unit = normalize(float2(intersection_pos_local.x,
-        -intersection_pos_local.y));
-    const float2 square_uv = arc_len * square_uv_unit;
-    const float2 video_uv = square_uv / geom_aspect;
-    return video_uv;
-}
-
-float3 sphere_uv_to_xyz(const float2 video_uv, const float2 geom_aspect)
-{
-    //  Requires:   video_uv coords mapped to range [-0.5, 0.5]
-    //  Returns:    An xyz intersection position on a sphere.  This is the
-    //              inverse of sphere_xyz_to_uv().
-    //  Expand video_uv by the aspect ratio to get proportionate x/y lengths,
-    //  then calculate an xyz position for the spherical mapping above.
-    const float2 square_uv = video_uv * geom_aspect;
-    //  Using length or sqrt here butchers the framerate on my 8800GTS if
-    //  this function is called too many times, and so does taking the max
-    //  component of square_uv/square_uv_unit (program length threshold?).
-    //float arc_len = length(square_uv);
-    const float2 square_uv_unit = normalize(square_uv);
-    const float arc_len = square_uv.y/square_uv_unit.y;
-    const float angle_from_image_center = arc_len / geom_radius;
-    const float xy_dist_from_sphere_center =
-        sin(angle_from_image_center) * geom_radius;
-    //float2 xy_pos = xy_dist_from_sphere_center * (square_uv/FIX_ZERO(arc_len));
-    const float2 xy_pos = xy_dist_from_sphere_center * square_uv_unit;
-    const float z_pos = cos(angle_from_image_center) * geom_radius;
-    const float3 intersection_pos_local = float3(xy_pos.x, -xy_pos.y, z_pos);
-    return intersection_pos_local;
-}
-
-float2 sphere_alt_xyz_to_uv(const float3 intersection_pos_local,
-    const float2 geom_aspect)
-{
-    //  Requires:   An xyz intersection position on a cylinder.
-    //  Returns:    video_uv coords mapped to range [-0.5, 0.5]
-    //  Mapping:    Define square_uv.x to be the signed arc length in xz-space,
-    //              and define square_uv.y == signed arc length in yz-space.
-    //  See cylinder_xyz_to_uv() for implementation details (very similar).
-    const float2 angle_from_image_center = atan2(
-        float2(intersection_pos_local.x, -intersection_pos_local.y),
-        intersection_pos_local.zz);
-    const float2 signed_arc_len = angle_from_image_center * geom_radius;
-    const float2 video_uv = signed_arc_len / geom_aspect;
-    return video_uv;
-}
-
-float3 sphere_alt_uv_to_xyz(const float2 video_uv, const float2 geom_aspect)
-{
-    //  Requires:   video_uv coords mapped to range [-0.5, 0.5]
-    //  Returns:    An xyz intersection position on a sphere.  This is the
-    //              inverse of sphere_alt_xyz_to_uv().
-    //  See cylinder_uv_to_xyz() for implementation details (very similar).
-    const float2 square_uv = video_uv * geom_aspect;
-    const float2 arc_len = square_uv;
-    const float2 angle_from_image_center = arc_len / geom_radius;
-    const float2 xy_pos = sin(angle_from_image_center) * geom_radius;
-    const float z_pos = sqrt(geom_radius*geom_radius - dot(xy_pos, xy_pos));
-    return float3(xy_pos.x, -xy_pos.y, z_pos);
-}
-
-inline float2 intersect(const float3 view_vec_local, const float3 eye_pos_local,
-    const float geom_mode)
-{
-    return geom_mode < 2.5 ? intersect_sphere(view_vec_local, eye_pos_local) :
-        intersect_cylinder(view_vec_local, eye_pos_local);
-}
-
-inline float2 xyz_to_uv(const float3 intersection_pos_local,
-    const float2 geom_aspect, const float geom_mode)
-{
-    return geom_mode < 1.5 ?
-            sphere_xyz_to_uv(intersection_pos_local, geom_aspect) :
-        geom_mode < 2.5 ?
-            sphere_alt_xyz_to_uv(intersection_pos_local, geom_aspect) :
-            cylinder_xyz_to_uv(intersection_pos_local, geom_aspect);
-}
-
-inline float3 uv_to_xyz(const float2 uv, const float2 geom_aspect,
-    const float geom_mode)
-{
-    return geom_mode < 1.5 ? sphere_uv_to_xyz(uv, geom_aspect) :
-        geom_mode < 2.5 ? sphere_alt_uv_to_xyz(uv, geom_aspect) :
-        cylinder_uv_to_xyz(uv, geom_aspect);
-}
-
-float2 view_vec_to_uv(const float3 view_vec_local, const float3 eye_pos_local,
-    const float2 geom_aspect, const float geom_mode, out float3 intersection_pos)
-{
-    //  Get the intersection point on the primitive, given an eye position
-    //  and view vector already in its local coordinate frame:
-    const float2 intersect_dist_and_discriminant = intersect(view_vec_local,
-        eye_pos_local, geom_mode);
-    const float3 intersection_pos_local = eye_pos_local +
-        view_vec_local * intersect_dist_and_discriminant.x;
-    //  Save the intersection position to an output parameter:
-    intersection_pos = intersection_pos_local;
-    //  Transform into uv coords, but give out-of-range coords if the
-    //  view ray doesn't intersect the primitive in the first place:
-    return intersect_dist_and_discriminant.y > 0.005 ?
-        xyz_to_uv(intersection_pos_local, geom_aspect, geom_mode) : float2(1.0);
-}
-
-float3 get_ideal_global_eye_pos_for_points(float3 eye_pos,
-    const float2 geom_aspect, const float3 global_coords[MAX_POINT_CLOUD_SIZE],
-    const int num_points)
-{
-    //  Requires:   Parameters:
-    //              1.) Starting eye_pos is a global 3D position at which the
-    //                  camera contains all points in global_coords[] in its FOV
-    //              2.) geom_aspect = get_aspect_vector(
-    //                      IN.output_size.x / IN.output_size.y);
-    //              3.) global_coords is a point cloud containing global xyz
-    //                  coords of extreme points on the simulated CRT screen.
-    //              Globals:
-    //              1.) geom_view_dist must be > 0.0.  It controls the "near
-    //                  plane" used to interpret flat_video_uv as a view
-    //                  vector, which controls the field of view (FOV).
-    //              Eyespace coordinate frame: +x = right, +y = up, +z = back
-    //  Returns:    Return an eye position at which the point cloud spans as
-    //              much of the screen as possible (given the FOV controlled by
-    //              geom_view_dist) without being cropped or sheared.
-    //  Algorithm:
-    //  1.) Move the eye laterally to a point which attempts to maximize the
-    //      the amount we can move forward without clipping the CRT screen.
-    //  2.) Move forward by as much as possible without clipping the CRT.
-    //  Get the allowed movement range by solving for the eye_pos offsets
-    //  that result in each point being projected to a screen edge/corner in
-    //  pseudo-normalized device coords (where xy ranges from [-0.5, 0.5]
-    //  and z = eyespace z):
-    //      pndc_coord = float3(float2(eyespace_xyz.x, -eyespace_xyz.y)*
-    //      geom_view_dist / (geom_aspect * -eyespace_xyz.z), eyespace_xyz.z);
-    //  Notes:
-    //  The field of view is controlled by geom_view_dist's magnitude relative to
-    //  the view vector's x and y components:
-    //      view_vec.xy ranges from [-0.5, 0.5] * geom_aspect
-    //      view_vec.z = -geom_view_dist
-    //  But for the purposes of perspective divide, it should be considered:
-    //      view_vec.xy ranges from [-0.5, 0.5] * geom_aspect / geom_view_dist
-    //      view_vec.z = -1.0
-    static const int max_centering_iters = 1;  //  Keep for easy testing.
-    for(int iter = 0; iter < max_centering_iters; iter++)
-    {
-        //  0.) Get the eyespace coordinates of our point cloud:
-        float3 eyespace_coords[MAX_POINT_CLOUD_SIZE];
-        for(int i = 0; i < num_points; i++)
-        {
-            eyespace_coords[i] = global_coords[i] - eye_pos;
-        }
-        //  1a.)For each point, find out how far we can move eye_pos in each
-        //      lateral direction without the point clipping the frustum.
-        //      Eyespace +y = up, screenspace +y = down, so flip y after
-        //      applying the eyespace offset (on the way to "clip space").
-        //  Solve for two offsets per point based on:
-        //      (eyespace_xyz.xy - offset_dr) * float2(1.0, -1.0) *
-        //      geom_view_dist / (geom_aspect * -eyespace_xyz.z) = float2(-0.5)
-        //      (eyespace_xyz.xy - offset_dr) * float2(1.0, -1.0) *
-        //      geom_view_dist / (geom_aspect * -eyespace_xyz.z) = float2(0.5)
-        //  offset_ul and offset_dr represent the farthest we can move the
-        //  eye_pos up-left and down-right.  Save the min of all offset_dr's
-        //  and the max of all offset_ul's (since it's negative).
-        float abs_radius = abs(geom_radius);  //  In case anyone gets ideas. ;)
-        float2 offset_dr_min = float2(10.0 * abs_radius, 10.0 * abs_radius);
-        float2 offset_ul_max = float2(-10.0 * abs_radius, -10.0 * abs_radius);
-        for(int i = 0; i < num_points; i++)
-        {
-            static const float2 flipy = float2(1.0, -1.0);
-            float3 eyespace_xyz = eyespace_coords[i];
-            float2 offset_dr = eyespace_xyz.xy - float2(-0.5) *
-                (geom_aspect * -eyespace_xyz.z) / (geom_view_dist * flipy);
-            float2 offset_ul = eyespace_xyz.xy - float2(0.5) *
-                (geom_aspect * -eyespace_xyz.z) / (geom_view_dist * flipy);
-            offset_dr_min = min(offset_dr_min, offset_dr);
-            offset_ul_max = max(offset_ul_max, offset_ul);
-        }
-        //  1b.)Update eye_pos: Adding the average of offset_ul_max and
-        //      offset_dr_min gives it equal leeway on the top vs. bottom
-        //      and left vs. right.  Recalculate eyespace_coords accordingly.
-        float2 center_offset = 0.5 * (offset_ul_max + offset_dr_min);
-        eye_pos.xy += center_offset;
-        for(int i = 0; i < num_points; i++)
-        {
-            eyespace_coords[i] = global_coords[i] - eye_pos;
-        }
-        //  2a.)For each point, find out how far we can move eye_pos forward
-        //      without the point clipping the frustum.  Flip the y
-        //      direction in advance (matters for a later step, not here).
-        //      Solve for four offsets per point based on:
-        //      eyespace_xyz_flipy.x * geom_view_dist /
-        //          (geom_aspect.x * (offset_z - eyespace_xyz_flipy.z)) =-0.5
-        //      eyespace_xyz_flipy.y * geom_view_dist /
-        //          (geom_aspect.y * (offset_z - eyespace_xyz_flipy.z)) =-0.5
-        //      eyespace_xyz_flipy.x * geom_view_dist /
-        //          (geom_aspect.x * (offset_z - eyespace_xyz_flipy.z)) = 0.5
-        //      eyespace_xyz_flipy.y * geom_view_dist /
-        //          (geom_aspect.y * (offset_z - eyespace_xyz_flipy.z)) = 0.5
-        //      We'll vectorize the actual computation.  Take the maximum of
-        //      these four for a single offset, and continue taking the max
-        //      for every point (use max because offset.z is negative).
-        float offset_z_max = -10.0 * geom_radius * geom_view_dist;
-        for(int i = 0; i < num_points; i++)
-        {
-            float3 eyespace_xyz_flipy = eyespace_coords[i] *
-                float3(1.0, -1.0, 1.0);
-            float4 offset_zzzz = eyespace_xyz_flipy.zzzz +
-                (eyespace_xyz_flipy.xyxy * geom_view_dist) /
-                (float4(-0.5, -0.5, 0.5, 0.5) * float4(geom_aspect, geom_aspect));
-            //  Ignore offsets that push positive x/y values to opposite
-            //  boundaries, and vice versa, and don't let the camera move
-            //  past a point in the dead center of the screen:
-            offset_z_max = (eyespace_xyz_flipy.x < 0.0) ?
-                max(offset_z_max, offset_zzzz.x) : offset_z_max;
-            offset_z_max = (eyespace_xyz_flipy.y < 0.0) ?
-                max(offset_z_max, offset_zzzz.y) : offset_z_max;
-            offset_z_max = (eyespace_xyz_flipy.x > 0.0) ?
-                max(offset_z_max, offset_zzzz.z) : offset_z_max;
-            offset_z_max = (eyespace_xyz_flipy.y > 0.0) ?
-                max(offset_z_max, offset_zzzz.w) : offset_z_max;
-            offset_z_max = max(offset_z_max, eyespace_xyz_flipy.z);
-        }
-        //  2b.)Update eye_pos: Add the maximum (smallest negative) z offset.
-        eye_pos.z += offset_z_max;
-    }
-    return eye_pos;
-}
-
-float3 get_ideal_global_eye_pos(const float3x3 local_to_global,
-    const float2 geom_aspect, const float geom_mode)
-{
-    //  Start with an initial eye_pos that includes the entire primitive
-    //  (sphere or cylinder) in its field-of-view:
-    const float3 high_view = float3(0.0, geom_aspect.y, -geom_view_dist);
-    const float3 low_view = high_view * float3(1.0, -1.0, 1.0);
-    const float len_sq = dot(high_view, high_view);
-    const float fov = abs(acos(dot(high_view, low_view)/len_sq));
-    //  Trigonometry/similar triangles say distance = geom_radius/sin(fov/2):
-    const float eye_z_spherical = geom_radius/sin(fov*0.5);
-    const float3 eye_pos = geom_mode < 2.5 ?
-        float3(0.0, 0.0, eye_z_spherical) :
-        float3(0.0, 0.0, max(geom_view_dist, eye_z_spherical));
-
-    //  Get global xyz coords of extreme sample points on the simulated CRT
-    //  screen.  Start with the center, edge centers, and corners of the
-    //  video image.  We can't ignore backfacing points: They're occluded
-    //  by closer points on the primitive, but they may NOT be occluded by
-    //  the convex hull of the remaining samples (i.e. the remaining convex
-    //  hull might not envelope points that do occlude a back-facing point.)
-    static const int num_points = MAX_POINT_CLOUD_SIZE;
-    float3 global_coords[MAX_POINT_CLOUD_SIZE];
-    global_coords[0] = mul(local_to_global, uv_to_xyz(float2(0.0, 0.0), geom_aspect, geom_mode));
-    global_coords[1] = mul(local_to_global, uv_to_xyz(float2(0.0, -0.5), geom_aspect, geom_mode));
-    global_coords[2] = mul(local_to_global, uv_to_xyz(float2(0.0, 0.5), geom_aspect, geom_mode));
-    global_coords[3] = mul(local_to_global, uv_to_xyz(float2(-0.5, 0.0), geom_aspect, geom_mode));
-    global_coords[4] = mul(local_to_global, uv_to_xyz(float2(0.5, 0.0), geom_aspect, geom_mode));
-    global_coords[5] = mul(local_to_global, uv_to_xyz(float2(-0.5, -0.5), geom_aspect, geom_mode));
-    global_coords[6] = mul(local_to_global, uv_to_xyz(float2(0.5, -0.5), geom_aspect, geom_mode));
-    global_coords[7] = mul(local_to_global, uv_to_xyz(float2(-0.5, 0.5), geom_aspect, geom_mode));
-    global_coords[8] = mul(local_to_global, uv_to_xyz(float2(0.5, 0.5), geom_aspect, geom_mode));
-    //  Adding more inner image points could help in extreme cases, but too many
-    //  points will kille the framerate.  For safety, default to the initial
-    //  eye_pos if any z coords are negative:
-    float num_negative_z_coords = 0.0;
-    for(int i = 0; i < num_points; i++)
-    {
-        num_negative_z_coords += float(global_coords[0].z < 0.0);
-    }
-    //  Outsource the optimized eye_pos calculation:
-    return num_negative_z_coords > 0.5 ? eye_pos :
-        get_ideal_global_eye_pos_for_points(eye_pos, geom_aspect,
-            global_coords, num_points);
-}
-
-float3x3 get_pixel_to_object_matrix(const float3x3 global_to_local,
-    const float3 eye_pos_local, const float3 view_vec_global,
-    const float3 intersection_pos_local, const float3 normal,
-    const float2 output_size_inv)
-{
-    //  Requires:   See get_curved_video_uv_coords_and_tangent_matrix for
-    //              descriptions of each parameter.
-    //  Returns:    Return a transformation matrix from 2D pixel-space vectors
-    //              (where (+1.0, +1.0) is a vector to one pixel down-right,
-    //              i.e. same directionality as uv texels) to 3D object-space
-    //              vectors in the CRT's local coordinate frame (right-handed)
-    //              ***which are tangent to the CRT surface at the intersection
-    //              position.***  (Basically, we want to convert pixel-space
-    //              vectors to 3D vectors along the CRT's surface, for later
-    //              conversion to uv vectors.)
-    //  Shorthand inputs:
-    const float3 pos = intersection_pos_local;
-    const float3 eye_pos = eye_pos_local;
-    //  Get a piecewise-linear matrix transforming from "pixelspace" offset
-    //  vectors (1.0 = one pixel) to object space vectors in the tangent
-    //  plane (faster than finding 3 view-object intersections).
-    //  1.) Get the local view vecs for the pixels to the right and down:
-    const float3 view_vec_right_global = view_vec_global +
-        float3(output_size_inv.x, 0.0, 0.0);
-    const float3 view_vec_down_global = view_vec_global +
-        float3(0.0, -output_size_inv.y, 0.0);
-    const float3 view_vec_right_local =
-        mul(global_to_local, view_vec_right_global);
-    const float3 view_vec_down_local =
-        mul(global_to_local, view_vec_down_global);
-    //  2.) Using the true intersection point, intersect the neighboring
-    //      view vectors with the tangent plane:
-    const float3 intersection_vec_dot_normal = float3(dot(pos - eye_pos, normal), dot(pos - eye_pos, normal), dot(pos - eye_pos, normal));
-    const float3 right_pos = eye_pos + (intersection_vec_dot_normal /
-        dot(view_vec_right_local, normal))*view_vec_right_local;
-    const float3 down_pos = eye_pos + (intersection_vec_dot_normal /
-        dot(view_vec_down_local, normal))*view_vec_down_local;
-    //  3.) Subtract the original intersection pos from its neighbors; the
-    //      resulting vectors are object-space vectors tangent to the plane.
-    //      These vectors are the object-space transformations of (1.0, 0.0)
-    //      and (0.0, 1.0) pixel offsets, so they form the first two basis
-    //      vectors of a pixelspace to object space transformation.  This
-    //      transformation is 2D to 3D, so use (0, 0, 0) for the third vector.
-    const float3 object_right_vec = right_pos - pos;
-    const float3 object_down_vec = down_pos - pos;
-    const float3x3 pixel_to_object = float3x3(
-        object_right_vec.x, object_down_vec.x, 0.0,
-        object_right_vec.y, object_down_vec.y, 0.0,
-        object_right_vec.z, object_down_vec.z, 0.0);
-    return pixel_to_object;
-}
-
-float3x3 get_object_to_tangent_matrix(const float3 intersection_pos_local,
-    const float3 normal, const float2 geom_aspect, const float geom_mode)
-{
-    //  Requires:   See get_curved_video_uv_coords_and_tangent_matrix for
-    //              descriptions of each parameter.
-    //  Returns:    Return a transformation matrix from 3D object-space vectors
-    //              in the CRT's local coordinate frame (right-handed, +y = up)
-    //              to 2D video_uv vectors (+v = down).
-    //  Description:
-    //  The TBN matrix formed by the [tangent, bitangent, normal] basis
-    //  vectors transforms ordinary vectors from tangent->object space.
-    //  The cotangent matrix formed by the [cotangent, cobitangent, normal]
-    //  basis vectors transforms normal vectors (covectors) from
-    //  tangent->object space.  It's the inverse-transpose of the TBN matrix.
-    //  We want the inverse of the TBN matrix (transpose of the cotangent
-    //  matrix), which transforms ordinary vectors from object->tangent space.
-    //  Start by calculating the relevant basis vectors in accordance with
-    //  Christian Schüler's blog post "Followup: Normal Mapping Without
-    //  Precomputed Tangents":  http://www.thetenthplanet.de/archives/1180
-    //  With our particular uv mapping, the scale of the u and v directions
-    //  is determined entirely by the aspect ratio for cylindrical and ordinary
-    //  spherical mappings, and so tangent and bitangent lengths are also
-    //  determined by it (the alternate mapping is more complex).  Therefore, we
-    //  must ensure appropriate cotangent and cobitangent lengths as well.
-    //  Base these off the uv<=>xyz mappings for each primitive.
-    const float3 pos = intersection_pos_local;
-    static const float3 x_vec = float3(1.0, 0.0, 0.0);
-    static const float3 y_vec = float3(0.0, 1.0, 0.0);
-    //  The tangent and bitangent vectors correspond with increasing u and v,
-    //  respectively.  Mathematically we'd base the cotangent/cobitangent on
-    //  those, but we'll compute the cotangent/cobitangent directly when we can.
-    float3 cotangent_unscaled, cobitangent_unscaled;
-    //  geom_mode should be constant-folded without RUNTIME_GEOMETRY_MODE.
-    if(geom_mode < 1.5)
-    {
-        //  Sphere:
-        //  tangent = normalize(cross(normal, cross(x_vec, pos))) * geom_aspect.x
-        //  bitangent = normalize(cross(cross(y_vec, pos), normal)) * geom_aspect.y
-        //  inv_determinant = 1.0/length(cross(bitangent, tangent))
-        //  cotangent = cross(normal, bitangent) * inv_determinant
-        //            == normalize(cross(y_vec, pos)) * geom_aspect.y * inv_determinant
-        //  cobitangent = cross(tangent, normal) * inv_determinant
-        //            == normalize(cross(x_vec, pos)) * geom_aspect.x * inv_determinant
-        //  Simplified (scale by inv_determinant below):
-        cotangent_unscaled = normalize(cross(y_vec, pos)) * geom_aspect.y;
-        cobitangent_unscaled = normalize(cross(x_vec, pos)) * geom_aspect.x;
-    }
-    else if(geom_mode < 2.5)
-    {
-        //  Sphere, alternate mapping:
-        //  This mapping works a bit like the cylindrical mapping in two
-        //  directions, which makes the lengths and directions more complex.
-        //  Unfortunately, I can't find much of a shortcut:
-        const float3 tangent = normalize(
-            cross(y_vec, float3(pos.x, 0.0, pos.z))) * geom_aspect.x;
-        const float3 bitangent = normalize(
-            cross(x_vec, float3(0.0, pos.yz))) * geom_aspect.y;
-        cotangent_unscaled = cross(normal, bitangent);
-        cobitangent_unscaled = cross(tangent, normal);
-    }
-    else
-    {
-        //  Cylinder:
-        //  tangent = normalize(cross(y_vec, normal)) * geom_aspect.x;
-        //  bitangent = float3(0.0, -geom_aspect.y, 0.0);
-        //  inv_determinant = 1.0/length(cross(bitangent, tangent))
-        //  cotangent = cross(normal, bitangent) * inv_determinant
-        //            == normalize(cross(y_vec, pos)) * geom_aspect.y * inv_determinant
-        //  cobitangent = cross(tangent, normal) * inv_determinant
-        //            == float3(0.0, -geom_aspect.x, 0.0) * inv_determinant
-        cotangent_unscaled = cross(y_vec, normal) * geom_aspect.y;
-        cobitangent_unscaled = float3(0.0, -geom_aspect.x, 0.0);
-    }
-    const float3 computed_normal =
-        cross(cobitangent_unscaled, cotangent_unscaled);
-    const float inv_determinant = rsqrt(dot(computed_normal, computed_normal));
-    const float3 cotangent = cotangent_unscaled * inv_determinant;
-    const float3 cobitangent = cobitangent_unscaled * inv_determinant;
-    //  The [cotangent, cobitangent, normal] column vecs form the cotangent
-    //  frame, i.e. the inverse-transpose TBN matrix.  Get its transpose:
-    const float3x3 object_to_tangent = float3x3(cotangent, cobitangent, normal);
-    return object_to_tangent;
-}
-
-float2 get_curved_video_uv_coords_and_tangent_matrix(
-    const float2 flat_video_uv, const float3 eye_pos_local,
-    const float2 output_size_inv, const float2 geom_aspect,
-    const float geom_mode, const float3x3 global_to_local,
-    out float2x2 pixel_to_tangent_video_uv)
-{
-    //  Requires:   Parameters:
-    //              1.) flat_video_uv coords are in range [0.0, 1.0], where
-    //                  (0.0, 0.0) is the top-left corner of the screen and
-    //                  (1.0, 1.0) is the bottom-right corner.
-    //              2.) eye_pos_local is the 3D camera position in the simulated
-    //                  CRT's local coordinate frame.  For best results, it must
-    //                  be computed based on the same geom_view_dist used here.
-    //              3.) output_size_inv = float2(1.0)/IN.output_size
-    //              4.) geom_aspect = get_aspect_vector(
-    //                      IN.output_size.x / IN.output_size.y);
-    //              5.) geom_mode is a static or runtime mode setting:
-    //                  0 = off, 1 = sphere, 2 = sphere alt., 3 = cylinder
-    //              6.) global_to_local is a 3x3 matrix transforming (ordinary)
-    //                  worldspace vectors to the CRT's local coordinate frame
-    //              Globals:
-    //              1.) geom_view_dist must be > 0.0.  It controls the "near
-    //                  plane" used to interpret flat_video_uv as a view
-    //                  vector, which controls the field of view (FOV).
-    //  Returns:    Return final uv coords in [0.0, 1.0], and return a pixel-
-    //              space to video_uv tangent-space matrix in the out parameter.
-    //              (This matrix assumes pixel-space +y = down, like +v = down.)
-    //              We'll transform flat_video_uv into a view vector, project
-    //              the view vector from the camera/eye, intersect with a sphere
-    //              or cylinder representing the simulated CRT, and convert the
-    //              intersection position into final uv coords and a local
-    //              transformation matrix.
-    //  First get the 3D view vector (geom_aspect and geom_view_dist are globals):
-    //  1.) Center uv around (0.0, 0.0) and make (-0.5, -0.5) and (0.5, 0.5)
-    //      correspond to the top-left/bottom-right output screen corners.
-    //  2.) Multiply by geom_aspect to preemptively "undo" Retroarch's screen-
-    //      space 2D aspect correction.  We'll reapply it in uv-space.
-    //  3.) (x, y) = (u, -v), because +v is down in 2D screenspace, but +y
-    //      is up in 3D worldspace (enforce a right-handed system).
-    //  4.) The view vector z controls the "near plane" distance and FOV.
-    //      For the effect of "looking through a window" at a CRT, it should be
-    //      set equal to the user's distance from their physical screen, in
-    //      units of the viewport's physical diagonal size.
-    const float2 view_uv = (flat_video_uv - float2(0.5)) * geom_aspect;
-    const float3 view_vec_global =
-        float3(view_uv.x, -view_uv.y, -geom_view_dist);
-    //  Transform the view vector into the CRT's local coordinate frame, convert
-    //  to video_uv coords, and get the local 3D intersection position:
-    const float3 view_vec_local = mul(global_to_local, view_vec_global);
-    float3 pos;
-    const float2 centered_uv = view_vec_to_uv(
-        view_vec_local, eye_pos_local, geom_aspect, geom_mode, pos);
-    const float2 video_uv = centered_uv + float2(0.5);
-    //  Get a pixel-to-tangent-video-uv matrix.  The caller could deal with
-    //  all but one of these cases, but that would be more complicated.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        //  Derivatives obtain a matrix very fast, but the direction of pixel-
-        //  space +y seems to depend on the pass.  Enforce the correct direction
-        //  on a best-effort basis (but it shouldn't matter for antialiasing).
-        const float2 duv_dx = ddx(video_uv);
-        const float2 duv_dy = ddy(video_uv);
-        #ifdef LAST_PASS
-            pixel_to_tangent_video_uv = float2x2(
-                duv_dx.x, duv_dy.x,
-                -duv_dx.y, -duv_dy.y);
-        #else
-            pixel_to_tangent_video_uv = float2x2(
-                duv_dx.x, duv_dy.x,
-                duv_dx.y, duv_dy.y);
-        #endif
-    #else
-        //  Manually define a transformation matrix.  We'll assume pixel-space
-        //  +y = down, just like +v = down.
-        if(geom_force_correct_tangent_matrix)
-        {
-            //  Get the surface normal based on the local intersection position:
-            const float3 normal_base = geom_mode < 2.5 ? pos :
-                float3(pos.x, 0.0, pos.z);
-            const float3 normal = normalize(normal_base);
-            //  Get pixel-to-object and object-to-tangent matrices and combine
-            //  them into a 2x2 pixel-to-tangent matrix for video_uv offsets:
-            const float3x3 pixel_to_object = get_pixel_to_object_matrix(
-                global_to_local, eye_pos_local, view_vec_global, pos, normal,
-                output_size_inv);
-            const float3x3 object_to_tangent = get_object_to_tangent_matrix(
-                pos, normal, geom_aspect, geom_mode);
-            const float3x3 pixel_to_tangent3x3 =
-                mul(object_to_tangent, pixel_to_object);
-            pixel_to_tangent_video_uv = float2x2(
-                pixel_to_tangent3x3[0][0], pixel_to_tangent3x3[0][1], pixel_to_tangent3x3[1][0], pixel_to_tangent3x3[1][1]);//._m00_m01_m10_m11);
-        }
-        else
-        {
-            //  Ignore curvature, and just consider flat scaling.  The
-            //  difference is only apparent with strong curvature:
-            pixel_to_tangent_video_uv = float2x2(
-                output_size_inv.x, 0.0, 0.0, output_size_inv.y);
-        }
-    #endif
-    return video_uv;
-}
-
-float get_border_dim_factor(const float2 video_uv, const float2 geom_aspect)
-{
-    //  COPYRIGHT NOTE FOR THIS FUNCTION:
-    //  Copyright (C) 2010-2012 cgwg, 2014 TroggleMonkey
-    //  This function uses an algorithm first coded in several of cgwg's GPL-
-    //  licensed lines in crt-geom-curved.cg and its ancestors.  The line
-    //  between algorithm and code is nearly indistinguishable here, so it's
-    //  unclear whether I could even release this project under a non-GPL
-    //  license with this function included.
-
-    //  Calculate border_dim_factor from the proximity to uv-space image
-    //  borders; geom_aspect/border_size/border/darkness/border_compress are globals:
-    const float2 edge_dists = min(video_uv, float2(1.0) - video_uv) *
-        geom_aspect;
-    const float2 border_penetration =
-        max(float2(border_size) - edge_dists, float2(0.0));
-    const float penetration_ratio = length(border_penetration)/border_size;
-    if (border_size == 0.0)
-        penetration_ratio = 0.0;
-    const float border_escape_ratio = max(1.0 - penetration_ratio, 0.0);
-    const float border_dim_factor =
-        pow(border_escape_ratio, border_darkness) * max(1.0, border_compress);
-    return min(border_dim_factor, 1.0);
-}
-
-
-
-#endif  //  GEOMETRY_FUNCTIONS_H
-
-
-
diff --git a/crt/shaders/crt-royale/src/phosphor-mask-resizing.h b/crt/shaders/crt-royale/src/phosphor-mask-resizing.h
deleted file mode 100644
index dc825620ad..0000000000
--- a/crt/shaders/crt-royale/src/phosphor-mask-resizing.h
+++ /dev/null
@@ -1,677 +0,0 @@
-#ifndef PHOSPHOR_MASK_RESIZING_H
-#define PHOSPHOR_MASK_RESIZING_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-
-/////////////////////////////  CODEPATH SELECTION  /////////////////////////////
-
-//  Choose a looping strategy based on what's allowed:
-//  Dynamic loops not allowed: Use a flat static loop.
-//  Dynamic loops accomodated: Coarsely branch around static loops.
-//  Dynamic loops assumed allowed: Use a flat dynamic loop.
-#ifndef DRIVERS_ALLOW_DYNAMIC_BRANCHES
-    #ifdef ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-        #define BREAK_LOOPS_INTO_PIECES
-    #else
-        #define USE_SINGLE_STATIC_LOOP
-    #endif
-#endif  //  No else needed: Dynamic loops assumed.
-
-
-//////////////////////////////////  CONSTANTS  /////////////////////////////////
-
-//  The larger the resized tile, the fewer samples we'll need for downsizing.
-//  See if we can get a static min tile size > mask_min_allowed_tile_size:
-static const float mask_min_allowed_tile_size = ceil(
-    mask_min_allowed_triad_size * mask_triads_per_tile);
-static const float mask_min_expected_tile_size = 
-        mask_min_allowed_tile_size;
-//  Limit the number of sinc resize taps by the maximum minification factor:
-static const float pi_over_lobes = pi/mask_sinc_lobes;
-static const float max_sinc_resize_samples_float = 2.0 * mask_sinc_lobes *
-    mask_resize_src_lut_size.x/mask_min_expected_tile_size;
-//  Vectorized loops sample in multiples of 4.  Round up to be safe:
-static const float max_sinc_resize_samples_m4 = ceil(
-    max_sinc_resize_samples_float * 0.25) * 4.0;
-
-
-/////////////////////////  RESAMPLING FUNCTION HELPERS  ////////////////////////
-
-inline float get_dynamic_loop_size(const float magnification_scale)
-{
-    //  Requires:   The following global constants must be defined:
-    //              1.) mask_sinc_lobes
-    //              2.) max_sinc_resize_samples_m4
-    //  Returns:    The minimum number of texture samples for a correct downsize
-    //              at magnification_scale.
-    //  We're downsizing, so the filter is sized across 2*lobes output pixels
-    //  (not 2*lobes input texels).  This impacts distance measurements and the
-    //  minimum number of input samples needed.
-    const float min_samples_float = 2.0 * mask_sinc_lobes / magnification_scale;
-    const float min_samples_m4 = ceil(min_samples_float * 0.25) * 4.0;
-    #ifdef DRIVERS_ALLOW_DYNAMIC_BRANCHES
-        const float max_samples_m4 = max_sinc_resize_samples_m4;
-    #else   // ifdef BREAK_LOOPS_INTO_PIECES
-        //  Simulating loops with branches imposes a 128-sample limit.
-        const float max_samples_m4 = min(128.0, max_sinc_resize_samples_m4);
-    #endif
-    return min(min_samples_m4, max_samples_m4);
-}
-
-float2 get_first_texel_tile_uv_and_dist(const float2 tex_uv, 
-    const float2 tex_size, const float dr, 
-    const float input_tiles_per_texture_r, const float samples,
-    static const bool vertical)
-{
-    //  Requires:   1.) dr == du == 1.0/texture_size.x or
-    //                  dr == dv == 1.0/texture_size.y
-    //                  (whichever direction we're resampling in).
-    //                  It's a scalar to save register space.
-    //              2.) input_tiles_per_texture_r is the number of input tiles
-    //                  that can fit in the input texture in the direction we're
-    //                  resampling this pass.
-    //              3.) vertical indicates whether we're resampling vertically
-    //                  this pass (or horizontally).
-    //  Returns:    Pack and return the first sample's tile_uv coord in [0, 1]
-    //              and its texel distance from the destination pixel, in the
-    //              resized dimension only.
-    //  We'll start with the topmost or leftmost sample and work down or right,
-    //  so get the first sample location and distance.  Modify both dimensions
-    //  as if we're doing a one-pass 2D resize; we'll throw away the unneeded
-    //  (and incorrect) dimension at the end.
-    const float2 curr_texel = tex_uv * tex_size;
-    const float2 prev_texel =
-        floor(curr_texel - float2(under_half)) + float2(0.5);
-    const float2 first_texel = prev_texel - float2(samples/2.0 - 1.0);
-    const float2 first_texel_uv_wrap_2D = first_texel * dr;
-    const float2 first_texel_dist_2D = curr_texel - first_texel;
-    //  Convert from tex_uv to tile_uv coords so we can sub fracs for fmods.
-    const float2 first_texel_tile_uv_wrap_2D =
-        first_texel_uv_wrap_2D * input_tiles_per_texture_r;
-    //  Project wrapped coordinates to the [0, 1] range.  We'll do this with all
-    //  samples,but the first texel is special, since it might be negative.
-    const float2 coord_negative =
-        float2((first_texel_tile_uv_wrap_2D.x < 0.),(first_texel_tile_uv_wrap_2D.y < 0.));
-    const float2 first_texel_tile_uv_2D =
-        frac(first_texel_tile_uv_wrap_2D) + coord_negative;
-    //  Pack the first texel's tile_uv coord and texel distance in 1D:
-    const float2 tile_u_and_dist =
-        float2(first_texel_tile_uv_2D.x, first_texel_dist_2D.x);
-    const float2 tile_v_and_dist =
-        float2(first_texel_tile_uv_2D.y, first_texel_dist_2D.y);
-    return vertical ? tile_v_and_dist : tile_u_and_dist;
-    //return lerp(tile_u_and_dist, tile_v_and_dist, float(vertical));
-}
-
-inline float4 tex2Dlod0try(const sampler2D tex, const float2 tex_uv)
-{
-    //  Mipmapping and anisotropic filtering get confused by sinc-resampling.
-    //  One [slow] workaround is to select the lowest mip level:
-    #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DLOD
-        return textureLod(tex, float4(tex_uv, 0.0, 0.0).xy);
-    #else
-        #ifdef ANISOTROPIC_RESAMPLING_COMPAT_TEX2DBIAS
-            return tex2Dbias(tex, float4(tex_uv, 0.0, -16.0));
-        #else
-            return texture(tex, tex_uv);
-        #endif
-    #endif
-}
-
-
-//////////////////////////////  LOOP BODY MACROS  //////////////////////////////
-
-//  Using inline functions can exceed the temporary register limit, so we're
-//  stuck with #define macros (I'm TRULY sorry).  They're declared here instead
-//  of above to be closer to the actual invocation sites.  Steps:
-//  1.) Get the exact texel location.
-//  2.) Sample the phosphor mask (already assumed encoded in linear RGB).
-//  3.) Get the distance from the current pixel and sinc weight:
-//          sinc(dist) = sin(pi * dist)/(pi * dist)
-//      We can also use the slower/smoother Lanczos instead:
-//          L(x) = sinc(dist) * sinc(dist / lobes)
-//  4.) Accumulate the weight sum in weights, and accumulate the weighted texels
-//      in pixel_color (we'll normalize outside the loop at the end).
-//  We vectorize the loop to help reduce the Lanczos window's cost.
-
-    //  The r coord is the coord in the dimension we're resizing along (u or v),
-    //  and first_texel_tile_uv_rrrr is a float4 of the first texel's u or v
-    //  tile_uv coord in [0, 1].  tex_uv_r will contain the tile_uv u or v coord
-    //  for four new texel samples.
-    #define CALCULATE_R_COORD_FOR_4_SAMPLES                                    \
-        const float4 true_i = float4(i_base + i) + float4(0.0, 1.0, 2.0, 3.0); \
-        const float4 tile_uv_r = frac(                                         \
-            first_texel_tile_uv_rrrr + true_i * tile_dr);                      \
-        const float4 tex_uv_r = tile_uv_r * tile_size_uv_r;
-
-    #ifdef PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-        #define CALCULATE_SINC_RESAMPLE_WEIGHTS                                \
-            const float4 pi_dist_over_lobes = pi_over_lobes * dist;            \
-            const float4 weights = min(sin(pi_dist) * sin(pi_dist_over_lobes) /\
-                (pi_dist*pi_dist_over_lobes), float4(1.0));
-    #else
-        #define CALCULATE_SINC_RESAMPLE_WEIGHTS                                \
-            const float4 weights = min(sin(pi_dist)/pi_dist, float4(1.0));
-    #endif
-
-    #define UPDATE_COLOR_AND_WEIGHT_SUMS                                       \
-        const float4 dist = magnification_scale *                              \
-            abs(first_dist_unscaled - true_i);                                 \
-        const float4 pi_dist = pi * dist;                                      \
-        CALCULATE_SINC_RESAMPLE_WEIGHTS;                                       \
-        pixel_color += new_sample0 * weights.xxx;                              \
-        pixel_color += new_sample1 * weights.yyy;                              \
-        pixel_color += new_sample2 * weights.zzz;                              \
-        pixel_color += new_sample3 * weights.www;                              \
-        weight_sum += weights;
-
-    #define VERTICAL_SINC_RESAMPLE_LOOP_BODY                                   \
-        CALCULATE_R_COORD_FOR_4_SAMPLES;                                       \
-        const float3 new_sample0 = tex2Dlod0try(tex,                       \
-            float2(tex_uv.x, tex_uv_r.x)).rgb;                                 \
-        const float3 new_sample1 = tex2Dlod0try(tex,                       \
-            float2(tex_uv.x, tex_uv_r.y)).rgb;                                 \
-        const float3 new_sample2 = tex2Dlod0try(tex,                       \
-            float2(tex_uv.x, tex_uv_r.z)).rgb;                                 \
-        const float3 new_sample3 = tex2Dlod0try(tex,                       \
-            float2(tex_uv.x, tex_uv_r.w)).rgb;                                 \
-        UPDATE_COLOR_AND_WEIGHT_SUMS;
-
-    #define HORIZONTAL_SINC_RESAMPLE_LOOP_BODY                                 \
-        CALCULATE_R_COORD_FOR_4_SAMPLES;                                       \
-        const float3 new_sample0 = tex2Dlod0try(tex,                       \
-            float2(tex_uv_r.x, tex_uv.y)).rgb;                                 \
-        const float3 new_sample1 = tex2Dlod0try(tex,                       \
-            float2(tex_uv_r.y, tex_uv.y)).rgb;                                 \
-        const float3 new_sample2 = tex2Dlod0try(tex,                       \
-            float2(tex_uv_r.z, tex_uv.y)).rgb;                                 \
-        const float3 new_sample3 = tex2Dlod0try(tex,                       \
-            float2(tex_uv_r.w, tex_uv.y)).rgb;                                 \
-        UPDATE_COLOR_AND_WEIGHT_SUMS;
-
-
-////////////////////////////  RESAMPLING FUNCTIONS  ////////////////////////////
-
-float3 downsample_vertical_sinc_tiled(const sampler2D tex,
-    const float2 tex_uv, const float2 tex_size, static const float dr,
-    const float magnification_scale, static const float tile_size_uv_r)
-{
-    //  Requires:   1.) dr == du == 1.0/texture_size.x or
-    //                  dr == dv == 1.0/texture_size.y
-    //                  (whichever direction we're resampling in).
-    //                  It's a scalar to save register space.
-    //              2.) tile_size_uv_r is the number of texels an input tile
-    //                  takes up in the input texture, in the direction we're
-    //                  resampling this pass.
-    //              3.) magnification_scale must be <= 1.0.
-    //  Returns:    Return a [Lanczos] sinc-resampled pixel of a vertically
-    //              downsized input tile embedded in an input texture.  (The
-    //              vertical version is special-cased though: It assumes the
-    //              tile size equals the [static] texture size, since it's used
-    //              on an LUT texture input containing one tile.  For more
-    //              generic use, eliminate the "static" in the parameters.)
-    //  The "r" in "dr," "tile_size_uv_r," etc. refers to the dimension
-    //  we're resizing along, e.g. "dy" in this case.
-    #ifdef USE_SINGLE_STATIC_LOOP
-        //  A static loop can be faster, but it might blur too much from using
-        //  more samples than it should.
-        static const int samples = int(max_sinc_resize_samples_m4);
-    #else
-        const int samples = int(get_dynamic_loop_size(magnification_scale));
-    #endif
-
-    //  Get the first sample location (scalar tile uv coord along the resized
-    //  dimension) and distance from the output location (in texels):
-    static const float input_tiles_per_texture_r = 1.0/tile_size_uv_r;
-    //  true = vertical resize:
-    const float2 first_texel_tile_r_and_dist = get_first_texel_tile_uv_and_dist(
-        tex_uv, tex_size, dr, input_tiles_per_texture_r, samples, true);
-    const float4 first_texel_tile_uv_rrrr = first_texel_tile_r_and_dist.xxxx;
-    const float4 first_dist_unscaled = first_texel_tile_r_and_dist.yyyy;
-    //  Get the tile sample offset:
-    static const float tile_dr = dr * input_tiles_per_texture_r;
-
-    //  Sum up each weight and weighted sample color, varying the looping
-    //  strategy based on our expected dynamic loop capabilities.  See the
-    //  loop body macros above.
-    int i_base = 0;
-    float4 weight_sum = float4(0.0);
-    float3 pixel_color = float3(0.0);
-    static const int i_step = 4;
-    #ifdef BREAK_LOOPS_INTO_PIECES
-        if(samples - i_base >= 64)
-        {
-            for(int i = 0; i < 64; i += i_step)
-            {
-                VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 64;
-        }
-        if(samples - i_base >= 32)
-        {
-            for(int i = 0; i < 32; i += i_step)
-            {
-                VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 32;
-        }
-        if(samples - i_base >= 16)
-        {
-            for(int i = 0; i < 16; i += i_step)
-            {
-                VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 16;
-        }
-        if(samples - i_base >= 8)
-        {
-            for(int i = 0; i < 8; i += i_step)
-            {
-                VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 8;
-        }
-        if(samples - i_base >= 4)
-        {
-            for(int i = 0; i < 4; i += i_step)
-            {
-                VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 4;
-        }
-        //  Do another 4-sample block for a total of 128 max samples.
-        if(samples - i_base > 0)
-        {
-            for(int i = 0; i < 4; i += i_step)
-            {
-                VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-        }
-    #else
-        for(int i = 0; i < samples; i += i_step)
-        {
-            VERTICAL_SINC_RESAMPLE_LOOP_BODY;
-        }
-    #endif
-    //  Normalize so the weight_sum == 1.0, and return:
-    const float2 weight_sum_reduce = weight_sum.xy + weight_sum.zw;
-    const float3 scalar_weight_sum = float3(weight_sum_reduce.x + 
-        weight_sum_reduce.y);
-    return (pixel_color/scalar_weight_sum);
-}
-
-float3 downsample_horizontal_sinc_tiled(const sampler2D tex,
-    const float2 tex_uv, const float2 tex_size, const float dr,
-    const float magnification_scale, const float tile_size_uv_r)
-{
-    //  Differences from downsample_horizontal_sinc_tiled:
-    //  1.) The dr and tile_size_uv_r parameters are not static consts.
-    //  2.) The "vertical" parameter to get_first_texel_tile_uv_and_dist is
-    //      set to false instead of true.
-    //  3.) The horizontal version of the loop body is used.
-    //  TODO: If we can get guaranteed compile-time dead code elimination,
-    //  we can combine the vertical/horizontal downsampling functions by:
-    //  1.) Add an extra static const bool parameter called "vertical."
-    //  2.) Supply it with the result of get_first_texel_tile_uv_and_dist().
-    //  3.) Use a conditional assignment in the loop body macro.  This is the
-    //      tricky part: We DO NOT want to incur the extra conditional
-    //      assignment in the inner loop at runtime!
-    //  The "r" in "dr," "tile_size_uv_r," etc. refers to the dimension
-    //  we're resizing along, e.g. "dx" in this case.
-    #ifdef USE_SINGLE_STATIC_LOOP
-        //  If we have to load all samples, we might as well use them.
-        static const int samples = int(max_sinc_resize_samples_m4);
-    #else
-        const int samples = int(get_dynamic_loop_size(magnification_scale));
-    #endif
-
-    //  Get the first sample location (scalar tile uv coord along resized
-    //  dimension) and distance from the output location (in texels):
-    const float input_tiles_per_texture_r = 1.0/tile_size_uv_r;
-    //  false = horizontal resize:
-    const float2 first_texel_tile_r_and_dist = get_first_texel_tile_uv_and_dist(
-        tex_uv, tex_size, dr, input_tiles_per_texture_r, samples, false);
-    const float4 first_texel_tile_uv_rrrr = first_texel_tile_r_and_dist.xxxx;
-    const float4 first_dist_unscaled = first_texel_tile_r_and_dist.yyyy;
-    //  Get the tile sample offset:
-    const float tile_dr = dr * input_tiles_per_texture_r;
-
-    //  Sum up each weight and weighted sample color, varying the looping
-    //  strategy based on our expected dynamic loop capabilities.  See the
-    //  loop body macros above.
-    int i_base = 0;
-    float4 weight_sum = float4(0.0);
-    float3 pixel_color = float3(0.0);
-    static const int i_step = 4;
-    #ifdef BREAK_LOOPS_INTO_PIECES
-        if(samples - i_base >= 64)
-        {
-            for(int i = 0; i < 64; i += i_step)
-            {
-                HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 64;
-        }
-        if(samples - i_base >= 32)
-        {
-            for(int i = 0; i < 32; i += i_step)
-            {
-                HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 32;
-        }
-        if(samples - i_base >= 16)
-        {
-            for(int i = 0; i < 16; i += i_step)
-            {
-                HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 16;
-        }
-        if(samples - i_base >= 8)
-        {
-            for(int i = 0; i < 8; i += i_step)
-            {
-                HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 8;
-        }
-        if(samples - i_base >= 4)
-        {
-            for(int i = 0; i < 4; i += i_step)
-            {
-                HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-            i_base += 4;
-        }
-        //  Do another 4-sample block for a total of 128 max samples.
-        if(samples - i_base > 0)
-        {
-            for(int i = 0; i < 4; i += i_step)
-            {
-                HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-            }
-        }
-    #else
-        for(int i = 0; i < samples; i += i_step)
-        {
-            HORIZONTAL_SINC_RESAMPLE_LOOP_BODY;
-        }
-    #endif
-    //  Normalize so the weight_sum == 1.0, and return:
-    const float2 weight_sum_reduce = weight_sum.xy + weight_sum.zw;
-    const float3 scalar_weight_sum = float3(weight_sum_reduce.x +
-        weight_sum_reduce.y);
-    return (pixel_color/scalar_weight_sum);
-}
-
-
-////////////////////////////  TILE SIZE CALCULATION  ///////////////////////////
-
-float2 get_resized_mask_tile_size(const float2 estimated_viewport_size,
-    const float2 estimated_mask_resize_output_size,
-    const bool solemnly_swear_same_inputs_for_every_pass)
-{
-    //  Requires:   The following global constants must be defined according to
-    //              certain constraints:
-    //              1.) mask_resize_num_triads: Must be high enough that our
-    //                  mask sampling method won't have artifacts later
-    //                  (long story; see derived-settings-and-constants.h)
-    //              2.) mask_resize_src_lut_size: Texel size of our mask LUT
-    //              3.) mask_triads_per_tile: Num horizontal triads in our LUT
-    //              4.) mask_min_allowed_triad_size: User setting (the more
-    //                  restrictive it is, the faster the resize will go)
-    //              5.) mask_min_allowed_tile_size_x < mask_resize_src_lut_size.x
-    //              6.) mask_triad_size_desired_{runtime, static}
-    //              7.) mask_num_triads_desired_{runtime, static}
-    //              8.) mask_specify_num_triads must be 0.0/1.0 (false/true)
-    //              The function parameters must be defined as follows:
-    //              1.) estimated_viewport_size == (final viewport size);
-    //                  If mask_specify_num_triads is 1.0/true and the viewport
-    //                  estimate is wrong, the number of triads will differ from
-    //                  the user's preference by about the same factor.
-    //              2.) estimated_mask_resize_output_size: Must equal the
-    //                  output size of the MASK_RESIZE pass.
-    //                  Exception: The x component may be estimated garbage if
-    //                  and only if the caller throws away the x result.
-    //              3.) solemnly_swear_same_inputs_for_every_pass: Set to false,
-    //                  unless you can guarantee that every call across every
-    //                  pass will use the same sizes for the other parameters.
-    //              When calling this across multiple passes, always use the
-    //              same y viewport size/scale, and always use the same x
-    //              viewport size/scale when using the x result.
-    //  Returns:    Return the final size of a manually resized mask tile, after
-    //              constraining the desired size to avoid artifacts.  Under
-    //              unusual circumstances, tiles may become stretched vertically
-    //              (see wall of text below).
-    //  Stated tile properties must be correct:
-    static const float tile_aspect_ratio_inv =
-        mask_resize_src_lut_size.y/mask_resize_src_lut_size.x;
-    static const float tile_aspect_ratio = 1.0/tile_aspect_ratio_inv;
-    static const float2 tile_aspect = float2(1.0, tile_aspect_ratio_inv);
-    //  If mask_specify_num_triads is 1.0/true and estimated_viewport_size.x is
-    //  wrong, the user preference will be misinterpreted:
-    const float desired_tile_size_x = mask_triads_per_tile * lerp(
-        global.mask_triad_size_desired,
-        estimated_viewport_size.x / global.mask_num_triads_desired,
-        global.mask_specify_num_triads);
-    if(get_mask_sample_mode() > 0.5)
-    {
-        //  We don't need constraints unless we're sampling MASK_RESIZE.
-        return desired_tile_size_x * tile_aspect;
-    }
-    //  Make sure we're not upsizing:
-    const float temp_tile_size_x =
-        min(desired_tile_size_x, mask_resize_src_lut_size.x);
-    //  Enforce min_tile_size and max_tile_size in both dimensions:
-    const float2 temp_tile_size = temp_tile_size_x * tile_aspect;
-    static const float2 min_tile_size =
-        mask_min_allowed_tile_size * tile_aspect;
-    const float2 max_tile_size =
-        estimated_mask_resize_output_size / mask_resize_num_tiles;
-    const float2 clamped_tile_size =
-        clamp(temp_tile_size, min_tile_size, max_tile_size);
-    //  Try to maintain tile_aspect_ratio.  This is the tricky part:
-    //  If we're currently resizing in the y dimension, the x components
-    //  could be MEANINGLESS.  (If estimated_mask_resize_output_size.x is
-    //  bogus, then so is max_tile_size.x and clamped_tile_size.x.)
-    //  We can't adjust the y size based on clamped_tile_size.x.  If it
-    //  clamps when it shouldn't, it won't clamp again when later passes
-    //  call this function with the correct sizes, and the discrepancy will
-    //  break the sampling coords in MASKED_SCANLINES.  Instead, we'll limit
-    //  the x size based on the y size, but not vice versa, unless the
-    //  caller swears the parameters were the same (correct) in every pass.
-    //  As a result, triads could appear vertically stretched if:
-    //  a.) mask_resize_src_lut_size.x > mask_resize_src_lut_size.y: Wide
-    //      LUT's might clamp x more than y (all provided LUT's are square)
-    //  b.) true_viewport_size.x < true_viewport_size.y: The user is playing
-    //      with a vertically oriented screen (not accounted for anyway)
-    //  c.) mask_resize_viewport_scale.x < masked_resize_viewport_scale.y:
-    //      Viewport scales are equal by default.
-    //  If any of these are the case, you can fix the stretching by setting:
-    //      mask_resize_viewport_scale.x = mask_resize_viewport_scale.y *
-    //          (1.0 / min_expected_aspect_ratio) *
-    //          (mask_resize_src_lut_size.x / mask_resize_src_lut_size.y)
-    const float x_tile_size_from_y =
-        clamped_tile_size.y * tile_aspect_ratio;
-    const float y_tile_size_from_x = lerp(clamped_tile_size.y,
-        clamped_tile_size.x * tile_aspect_ratio_inv,
-        float(solemnly_swear_same_inputs_for_every_pass));
-    const float2 reclamped_tile_size = float2(
-        min(clamped_tile_size.x, x_tile_size_from_y),
-        min(clamped_tile_size.y, y_tile_size_from_x));
-    //  We need integer tile sizes in both directions for tiled sampling to
-    //  work correctly.  Use floor (to make sure we don't round up), but be
-    //  careful to avoid a rounding bug where floor decreases whole numbers:
-    const float2 final_resized_tile_size =
-        floor(reclamped_tile_size + float2(FIX_ZERO(0.0)));
-    return final_resized_tile_size;
-}
-
-
-/////////////////////////  FINAL MASK SAMPLING HELPERS  ////////////////////////
-
-float4 get_mask_sampling_parameters(const float2 mask_resize_texture_size,
-    const float2 mask_resize_video_size, const float2 true_viewport_size,
-    out float2 mask_tiles_per_screen)
-{
-    //  Requires:   1.) Requirements of get_resized_mask_tile_size() must be
-    //                  met, particularly regarding global constants.
-    //              The function parameters must be defined as follows:
-    //              1.) mask_resize_texture_size == MASK_RESIZE.texture_size
-    //                  if get_mask_sample_mode() is 0 (otherwise anything)
-    //              2.) mask_resize_video_size == MASK_RESIZE.video_size
-    //                  if get_mask_sample_mode() is 0 (otherwise anything)
-    //              3.) true_viewport_size == IN.output_size for a pass set to
-    //                  1.0 viewport scale (i.e. it must be correct)
-    //  Returns:    Return a float4 containing:
-    //                  xy: tex_uv coords for the start of the mask tile
-    //                  zw: tex_uv size of the mask tile from start to end
-    //              mask_tiles_per_screen is an out parameter containing the
-    //              number of mask tiles that will fit on the screen.
-    //  First get the final resized tile size.  The viewport size and mask
-    //  resize viewport scale must be correct, but don't solemnly swear they
-    //  were correct in both mask resize passes unless you know it's true.
-    //  (We can better ensure a correct tile aspect ratio if the parameters are
-    //  guaranteed correct in all passes...but if we lie, we'll get inconsistent
-    //  sizes across passes, resulting in broken texture coordinates.)
-    const float mask_sample_mode = get_mask_sample_mode();
-    const float2 mask_resize_tile_size = get_resized_mask_tile_size(
-        true_viewport_size, mask_resize_video_size, false);
-    if(mask_sample_mode < 0.5)
-    {
-        //  Sample MASK_RESIZE: The resized tile is a fraction of the texture
-        //  size and starts at a nonzero offset to allow for border texels:
-        const float2 mask_tile_uv_size = mask_resize_tile_size /
-            mask_resize_texture_size;
-        const float2 skipped_tiles = mask_start_texels/mask_resize_tile_size;
-        const float2 mask_tile_start_uv = skipped_tiles * mask_tile_uv_size;
-        //  mask_tiles_per_screen must be based on the *true* viewport size:
-        mask_tiles_per_screen = true_viewport_size / mask_resize_tile_size;
-        return float4(mask_tile_start_uv, mask_tile_uv_size);
-    }
-    else
-    {
-        //  If we're tiling at the original size (1:1 pixel:texel), redefine a
-        //  "tile" to be the full texture containing many triads.  Otherwise,
-        //  we're hardware-resampling an LUT, and the texture truly contains a
-        //  single unresized phosphor mask tile anyway.
-        static const float2 mask_tile_uv_size = float2(1.0);
-        static const float2 mask_tile_start_uv = float2(0.0);
-        if(mask_sample_mode > 1.5)
-        {
-            //  Repeat the full LUT at a 1:1 pixel:texel ratio without resizing:
-            mask_tiles_per_screen = true_viewport_size/mask_texture_large_size;
-        }
-        else
-        {
-            //  Hardware-resize the original LUT:
-            mask_tiles_per_screen = true_viewport_size / mask_resize_tile_size;
-        }
-        return float4(mask_tile_start_uv, mask_tile_uv_size);
-    }
-}
-/*
-float2 fix_tiling_discontinuities_normalized(const float2 tile_uv,
-    float2 duv_dx, float2 duv_dy)
-{
-    //  Requires:   1.) duv_dx == ddx(tile_uv)
-    //              2.) duv_dy == ddy(tile_uv)
-    //              3.) tile_uv contains tile-relative uv coords in [0, 1],
-    //                  such that (0.5, 0.5) is the center of a tile, etc.
-    //                  ("Tile" can mean texture, the video embedded in the
-    //                  texture, or some other "tile" embedded in a texture.)
-    //  Returns:    Return new tile_uv coords that contain no discontinuities
-    //              across a 2x2 pixel quad.
-    //  Description:
-    //  When uv coords wrap from 1.0 to 0.0, they create a discontinuity in the
-    //  derivatives, which we assume happened if the absolute difference between
-    //  any fragment in a 2x2 block is > ~half a tile.  If the current block has
-    //  a u or v discontinuity and the current fragment is in the first half of
-    //  the tile along that axis (i.e. it wrapped from 1.0 to 0.0), add a tile
-    //  to that coord to make the 2x2 block continuous.  (It will now have a
-    //  coord > 1.0 in the padding area beyond the tile.)  This function takes
-    //  derivatives as parameters so the caller can reuse them.
-    //  In case we're using high-quality (nVidia-style) derivatives, ensure
-    //  diagonically opposite fragments see each other for correctness:
-    duv_dx = abs(duv_dx) + abs(ddy(duv_dx));
-    duv_dy = abs(duv_dy) + abs(ddx(duv_dy));
-    const float2 pixel_in_first_half_tile = float2((tile_uv.x < 0.5),(tile_uv.y < 0.5));
-    const float2 jump_exists = float2(((duv_dx + duv_dy).x > 0.5),((duv_dx + duv_dy).y > 0.5));
-    return tile_uv + jump_exists * pixel_in_first_half_tile;
-}
-*/
-float2 convert_phosphor_tile_uv_wrap_to_tex_uv(const float2 tile_uv_wrap,
-    const float4 mask_tile_start_uv_and_size)
-{
-    //  Requires:   1.) tile_uv_wrap contains tile-relative uv coords, where the
-    //                  tile spans from [0, 1], such that (0.5, 0.5) is at the
-    //                  tile center.  The input coords can range from [0, inf],
-    //                  and their fractional parts map to a repeated tile.
-    //                  ("Tile" can mean texture, the video embedded in the
-    //                  texture, or some other "tile" embedded in a texture.)
-    //              2.) mask_tile_start_uv_and_size.xy contains tex_uv coords
-    //                  for the start of the embedded tile in the full texture.
-    //              3.) mask_tile_start_uv_and_size.zw contains the [fractional]
-    //                  tex_uv size of the embedded tile in the full texture.
-    //  Returns:    Return tex_uv coords (used for texture sampling)
-    //              corresponding to tile_uv_wrap.
-    if(get_mask_sample_mode() < 0.5)
-    {
-        //  Manually repeat the resized mask tile to fill the screen:
-        //  First get fractional tile_uv coords.  Using frac/fmod on coords
-        //  confuses anisotropic filtering; fix it as user options dictate.
-        //  derived-settings-and-constants.h disables incompatible options.
-        #ifdef ANISOTROPIC_TILING_COMPAT_TILE_FLAT_TWICE
-            float2 tile_uv = frac(tile_uv_wrap * 0.5) * 2.0;
-        #else
-            float2 tile_uv = frac(tile_uv_wrap);
-        #endif
-        #ifdef ANISOTROPIC_TILING_COMPAT_FIX_DISCONTINUITIES
-            const float2 tile_uv_dx = ddx(tile_uv);
-            const float2 tile_uv_dy = ddy(tile_uv);
-            tile_uv = fix_tiling_discontinuities_normalized(tile_uv,
-                tile_uv_dx, tile_uv_dy);
-        #endif
-        //  The tile is embedded in a padded FBO, and it may start at a
-        //  nonzero offset if border texels are used to avoid artifacts:
-        const float2 mask_tex_uv = mask_tile_start_uv_and_size.xy +
-            tile_uv * mask_tile_start_uv_and_size.zw;
-        return mask_tex_uv;
-    }
-    else
-    {
-        //  Sample from the input phosphor mask texture with hardware tiling.
-        //  If we're tiling at the original size (mode 2), the "tile" is the
-        //  whole texture, and it contains a large number of triads mapped with
-        //  a 1:1 pixel:texel ratio.  OTHERWISE, the texture contains a single
-        //  unresized tile.  tile_uv_wrap already has correct coords for both!
-        return tile_uv_wrap;
-    }
-}
-
-
-#endif  //  PHOSPHOR_MASK_RESIZING_H
-
diff --git a/crt/shaders/crt-royale/src/scanline-functions.h b/crt/shaders/crt-royale/src/scanline-functions.h
deleted file mode 100644
index a03028cdff..0000000000
--- a/crt/shaders/crt-royale/src/scanline-functions.h
+++ /dev/null
@@ -1,571 +0,0 @@
-#ifndef SCANLINE_FUNCTIONS_H
-#define SCANLINE_FUNCTIONS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../user-settings.h"
-#include "derived-settings-and-constants.h"
-#include "../../../../include/special-functions.h"
-#include "../../../../include/gamma-management.h"
-
-
-/////////////////////////////  SCANLINE FUNCTIONS  /////////////////////////////
-
-inline float3 get_gaussian_sigma(const float3 color, const float sigma_range)
-{
-    //  Requires:   Globals:
-    //              1.) beam_min_sigma and beam_max_sigma are global floats
-    //                  containing the desired minimum and maximum beam standard
-    //                  deviations, for dim and bright colors respectively.
-    //              2.) beam_max_sigma must be > 0.0
-    //              3.) beam_min_sigma must be in (0.0, beam_max_sigma]
-    //              4.) beam_spot_power must be defined as a global float.
-    //              Parameters:
-    //              1.) color is the underlying source color along a scanline
-    //              2.) sigma_range = beam_max_sigma - beam_min_sigma; we take
-    //                  sigma_range as a parameter to avoid repeated computation
-    //                  when beam_{min, max}_sigma are runtime shader parameters
-    //  Optional:   Users may set beam_spot_shape_function to 1 to define the
-    //              inner f(color) subfunction (see below) as:
-    //                  f(color) = sqrt(1.0 - (color - 1.0)*(color - 1.0))
-    //              Otherwise (technically, if beam_spot_shape_function < 0.5):
-    //                  f(color) = pow(color, beam_spot_power)
-    //  Returns:    The standard deviation of the Gaussian beam for "color:"
-    //                  sigma = beam_min_sigma + sigma_range * f(color)
-    //  Details/Discussion:
-    //  The beam's spot shape vaguely resembles an aspect-corrected f() in the
-    //  range [0, 1] (not quite, but it's related).  f(color) = color makes
-    //  spots look like diamonds, and a spherical function or cube balances
-    //  between variable width and a soft/realistic shape.   A beam_spot_power
-    //  > 1.0 can produce an ugly spot shape and more initial clipping, but the
-    //  final shape also differs based on the horizontal resampling filter and
-    //  the phosphor bloom.  For instance, resampling horizontally in nonlinear
-    //  light and/or with a sharp (e.g. Lanczos) filter will sharpen the spot
-    //  shape, but a sixth root is still quite soft.  A power function (default
-    //  1.0/3.0 beam_spot_power) is most flexible, but a fixed spherical curve
-    //  has the highest variability without an awful spot shape.
-    //
-    //  beam_min_sigma affects scanline sharpness/aliasing in dim areas, and its
-    //  difference from beam_max_sigma affects beam width variability.  It only
-    //  affects clipping [for pure Gaussians] if beam_spot_power > 1.0 (which is
-    //  a conservative estimate for a more complex constraint).
-    //
-    //  beam_max_sigma affects clipping and increasing scanline width/softness
-    //  as color increases.  The wider this is, the more scanlines need to be
-    //  evaluated to avoid distortion.  For a pure Gaussian, the max_beam_sigma
-    //  at which the first unused scanline always has a weight < 1.0/255.0 is:
-    //      num scanlines = 2, max_beam_sigma = 0.2089; distortions begin ~0.34
-    //      num scanlines = 3, max_beam_sigma = 0.3879; distortions begin ~0.52
-    //      num scanlines = 4, max_beam_sigma = 0.5723; distortions begin ~0.70
-    //      num scanlines = 5, max_beam_sigma = 0.7591; distortions begin ~0.89
-    //      num scanlines = 6, max_beam_sigma = 0.9483; distortions begin ~1.08
-    //  Generalized Gaussians permit more leeway here as steepness increases.
-    if(beam_spot_shape_function < 0.5)
-    {
-        //  Use a power function:
-        return float3(beam_min_sigma) + sigma_range *
-            pow(color, float3(beam_spot_power));
-    }
-    else
-    {
-        //  Use a spherical function:
-        const float3 color_minus_1 = color - float3(1.0);
-        return float3(beam_min_sigma) + sigma_range *
-            sqrt(float3(1.0) - color_minus_1*color_minus_1);
-    }
-}
-
-inline float3 get_generalized_gaussian_beta(const float3 color,
-    const float shape_range)
-{
-    //  Requires:   Globals:
-    //              1.) beam_min_shape and beam_max_shape are global floats
-    //                  containing the desired min/max generalized Gaussian
-    //                  beta parameters, for dim and bright colors respectively.
-    //              2.) beam_max_shape must be >= 2.0
-    //              3.) beam_min_shape must be in [2.0, beam_max_shape]
-    //              4.) beam_shape_power must be defined as a global float.
-    //              Parameters:
-    //              1.) color is the underlying source color along a scanline
-    //              2.) shape_range = beam_max_shape - beam_min_shape; we take
-    //                  shape_range as a parameter to avoid repeated computation
-    //                  when beam_{min, max}_shape are runtime shader parameters
-    //  Returns:    The type-I generalized Gaussian "shape" parameter beta for
-    //              the given color.
-    //  Details/Discussion:
-    //  Beta affects the scanline distribution as follows:
-    //  a.) beta < 2.0 narrows the peak to a spike with a discontinuous slope
-    //  b.) beta == 2.0 just degenerates to a Gaussian
-    //  c.) beta > 2.0 flattens and widens the peak, then drops off more steeply
-    //      than a Gaussian.  Whereas high sigmas widen and soften peaks, high
-    //      beta widen and sharpen peaks at the risk of aliasing.
-    //  Unlike high beam_spot_powers, high beam_shape_powers actually soften shape
-    //  transitions, whereas lower ones sharpen them (at the risk of aliasing).
-    return beam_min_shape + shape_range * pow(color, float3(beam_shape_power));
-}
-
-float3 scanline_gaussian_integral_contrib(const float3 dist,
-    const float3 color, const float pixel_height, const float sigma_range)
-{
-    //  Requires:   1.) dist is the distance of the [potentially separate R/G/B]
-    //                  point(s) from a scanline in units of scanlines, where
-    //                  1.0 means the sample point straddles the next scanline.
-    //              2.) color is the underlying source color along a scanline.
-    //              3.) pixel_height is the output pixel height in scanlines.
-    //              4.) Requirements of get_gaussian_sigma() must be met.
-    //  Returns:    Return a scanline's light output over a given pixel.
-    //  Details:
-    //  The CRT beam profile follows a roughly Gaussian distribution which is
-    //  wider for bright colors than dark ones.  The integral over the full
-    //  range of a Gaussian function is always 1.0, so we can vary the beam
-    //  with a standard deviation without affecting brightness.  'x' = distance:
-    //      gaussian sample = 1/(sigma*sqrt(2*pi)) * e**(-(x**2)/(2*sigma**2))
-    //      gaussian integral = 0.5 (1.0 + erf(x/(sigma * sqrt(2))))
-    //  Use a numerical approximation of the "error function" (the Gaussian
-    //  indefinite integral) to find the definite integral of the scanline's
-    //  average brightness over a given pixel area.  Even if curved coords were
-    //  used in this pass, a flat scalar pixel height works almost as well as a
-    //  pixel height computed from a full pixel-space to scanline-space matrix.
-    const float3 sigma = get_gaussian_sigma(color, sigma_range);
-    const float3 ph_offset = float3(pixel_height * 0.5);
-    const float3 denom_inv = 1.0/(sigma*sqrt(2.0));
-    const float3 integral_high = erf((dist + ph_offset)*denom_inv);
-    const float3 integral_low = erf((dist - ph_offset)*denom_inv);
-    return color * 0.5*(integral_high - integral_low)/pixel_height;
-}
-
-float3 scanline_generalized_gaussian_integral_contrib(float3 dist,
-    float3 color, float pixel_height, float sigma_range,
-    float shape_range)
-{
-    //  Requires:   1.) Requirements of scanline_gaussian_integral_contrib()
-    //                  must be met.
-    //              2.) Requirements of get_gaussian_sigma() must be met.
-    //              3.) Requirements of get_generalized_gaussian_beta() must be
-    //                  met.
-    //  Returns:    Return a scanline's light output over a given pixel.
-    //  A generalized Gaussian distribution allows the shape (beta) to vary
-    //  as well as the width (alpha).  "gamma" refers to the gamma function:
-    //      generalized sample =
-    //          beta/(2*alpha*gamma(1/beta)) * e**(-(|x|/alpha)**beta)
-    //  ligamma(s, z) is the lower incomplete gamma function, for which we only
-    //  implement two of four branches (because we keep 1/beta <= 0.5):
-    //      generalized integral = 0.5 + 0.5* sign(x) *
-    //          ligamma(1/beta, (|x|/alpha)**beta)/gamma(1/beta)
-    //  See get_generalized_gaussian_beta() for a discussion of beta.
-    //  We base alpha on the intended Gaussian sigma, but it only strictly
-    //  models models standard deviation at beta == 2, because the standard
-    //  deviation depends on both alpha and beta (keeping alpha independent is
-    //  faster and preserves intuitive behavior and a full spectrum of results).
-    const float3 alpha = sqrt(2.0) * get_gaussian_sigma(color, sigma_range);
-    const float3 beta = get_generalized_gaussian_beta(color, shape_range);
-    const float3 alpha_inv = float3(1.0)/alpha;
-    const float3 s = float3(1.0)/beta;
-    const float3 ph_offset = float3(pixel_height * 0.5);
-    //  Pass beta to gamma_impl to avoid repeated divides.  Similarly pass
-    //  beta (i.e. 1/s) and 1/gamma(s) to normalized_ligamma_impl.
-    const float3 gamma_s_inv = float3(1.0)/gamma_impl(s, beta);
-    const float3 dist1 = dist + ph_offset;
-    const float3 dist0 = dist - ph_offset;
-    const float3 integral_high = sign(dist1) * normalized_ligamma_impl(
-        s, pow(abs(dist1)*alpha_inv, beta), beta, gamma_s_inv);
-    const float3 integral_low = sign(dist0) * normalized_ligamma_impl(
-        s, pow(abs(dist0)*alpha_inv, beta), beta, gamma_s_inv);
-    return color * 0.5*(integral_high - integral_low)/pixel_height;
-}
-
-float3 scanline_gaussian_sampled_contrib(const float3 dist, const float3 color,
-    const float pixel_height, const float sigma_range)
-{
-    //  See scanline_gaussian integral_contrib() for detailed comments!
-    //  gaussian sample = 1/(sigma*sqrt(2*pi)) * e**(-(x**2)/(2*sigma**2))
-    const float3 sigma = get_gaussian_sigma(color, sigma_range);
-    //  Avoid repeated divides:
-    const float3 sigma_inv = float3(1.0)/sigma;
-    const float3 inner_denom_inv = 0.5 * sigma_inv * sigma_inv;
-    const float3 outer_denom_inv = sigma_inv/sqrt(2.0*pi);
-    if(beam_antialias_level > 0.5)
-    {
-        //  Sample 1/3 pixel away in each direction as well:
-        const float3 sample_offset = float3(pixel_height/3.0);
-        const float3 dist2 = dist + sample_offset;
-        const float3 dist3 = abs(dist - sample_offset);
-        //  Average three pure Gaussian samples:
-        const float3 scale = color/3.0 * outer_denom_inv;
-        const float3 weight1 = exp(-(dist*dist)*inner_denom_inv);
-        const float3 weight2 = exp(-(dist2*dist2)*inner_denom_inv);
-        const float3 weight3 = exp(-(dist3*dist3)*inner_denom_inv);
-        return scale * (weight1 + weight2 + weight3);
-    }
-    else
-    {
-        return color*exp(-(dist*dist)*inner_denom_inv)*outer_denom_inv;
-    }
-}
-
-float3 scanline_generalized_gaussian_sampled_contrib(float3 dist,
-    float3 color, float pixel_height, float sigma_range,
-    float shape_range)
-{
-    //  See scanline_generalized_gaussian_integral_contrib() for details!
-    //  generalized sample =
-    //      beta/(2*alpha*gamma(1/beta)) * e**(-(|x|/alpha)**beta)
-    const float3 alpha = sqrt(2.0) * get_gaussian_sigma(color, sigma_range);
-    const float3 beta = get_generalized_gaussian_beta(color, shape_range);
-    //  Avoid repeated divides:
-    const float3 alpha_inv = float3(1.0)/alpha;
-    const float3 beta_inv = float3(1.0)/beta;
-    const float3 scale = color * beta * 0.5 * alpha_inv /
-        gamma_impl(beta_inv, beta);
-    if(beam_antialias_level > 0.5)
-    {
-        //  Sample 1/3 pixel closer to and farther from the scanline too.
-        const float3 sample_offset = float3(pixel_height/3.0);
-        const float3 dist2 = dist + sample_offset;
-        const float3 dist3 = abs(dist - sample_offset);
-        //  Average three generalized Gaussian samples:
-        const float3 weight1 = exp(-pow(abs(dist*alpha_inv), beta));
-        const float3 weight2 = exp(-pow(abs(dist2*alpha_inv), beta));
-        const float3 weight3 = exp(-pow(abs(dist3*alpha_inv), beta));
-        return scale/3.0 * (weight1 + weight2 + weight3);
-    }
-    else
-    {
-        return scale * exp(-pow(abs(dist*alpha_inv), beta));
-    }
-}
-
-inline float3 scanline_contrib(float3 dist, float3 color,
-    float pixel_height, const float sigma_range, const float shape_range)
-{
-    //  Requires:   1.) Requirements of scanline_gaussian_integral_contrib()
-    //                  must be met.
-    //              2.) Requirements of get_gaussian_sigma() must be met.
-    //              3.) Requirements of get_generalized_gaussian_beta() must be
-    //                  met.
-    //  Returns:    Return a scanline's light output over a given pixel, using
-    //              a generalized or pure Gaussian distribution and sampling or
-    //              integrals as desired by user codepath choices.
-    if(beam_generalized_gaussian)
-    {
-        if(beam_antialias_level > 1.5)
-        {
-            return scanline_generalized_gaussian_integral_contrib(
-                dist, color, pixel_height, sigma_range, shape_range);
-        }
-        else
-        {
-            return scanline_generalized_gaussian_sampled_contrib(
-                dist, color, pixel_height, sigma_range, shape_range);
-        }
-    }
-    else
-    {
-        if(beam_antialias_level > 1.5)
-        {
-            return scanline_gaussian_integral_contrib(
-                dist, color, pixel_height, sigma_range);
-        }
-        else
-        {
-            return scanline_gaussian_sampled_contrib(
-                dist, color, pixel_height, sigma_range);
-        }
-    }
-}
-
-inline float3 get_raw_interpolated_color(const float3 color0,
-    const float3 color1, const float3 color2, const float3 color3,
-    const float4 weights)
-{
-    //  Use max to avoid bizarre artifacts from negative colors:
-    return max(mul(weights, float4x3(color0, color1, color2, color3)), 0.0);
-}
-
-float3 get_interpolated_linear_color(const float3 color0, const float3 color1,
-    const float3 color2, const float3 color3, const float4 weights)
-{
-    //  Requires:   1.) Requirements of include/gamma-management.h must be met:
-    //                  intermediate_gamma must be globally defined, and input
-    //                  colors are interpreted as linear RGB unless you #define
-    //                  GAMMA_ENCODE_EVERY_FBO (in which case they are
-    //                  interpreted as gamma-encoded with intermediate_gamma).
-    //              2.) color0-3 are colors sampled from a texture with tex2D().
-    //                  They are interpreted as defined in requirement 1.
-    //              3.) weights contains weights for each color, summing to 1.0.
-    //              4.) beam_horiz_linear_rgb_weight must be defined as a global
-    //                  float in [0.0, 1.0] describing how much blending should
-    //                  be done in linear RGB (rest is gamma-corrected RGB).
-    //              5.) RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE must be #defined
-    //                  if beam_horiz_linear_rgb_weight is anything other than a
-    //                  static constant, or we may try branching at runtime
-    //                  without dynamic branches allowed (slow).
-    //  Returns:    Return an interpolated color lookup between the four input
-    //              colors based on the weights in weights.  The final color will
-    //              be a linear RGB value, but the blending will be done as
-    //              indicated above.
-    const float intermediate_gamma = get_intermediate_gamma();
-    //  Branch if beam_horiz_linear_rgb_weight is static (for free) or if the
-    //  profile allows dynamic branches (faster than computing extra pows):
-    #ifndef RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-        #define SCANLINES_BRANCH_FOR_LINEAR_RGB_WEIGHT
-    #else
-        #ifdef DRIVERS_ALLOW_DYNAMIC_BRANCHES
-            #define SCANLINES_BRANCH_FOR_LINEAR_RGB_WEIGHT
-        #endif
-    #endif
-    #ifdef SCANLINES_BRANCH_FOR_LINEAR_RGB_WEIGHT
-        //  beam_horiz_linear_rgb_weight is static, so we can branch:
-        #ifdef GAMMA_ENCODE_EVERY_FBO
-            const float3 gamma_mixed_color = pow(get_raw_interpolated_color(
-                color0, color1, color2, color3, weights), float3(intermediate_gamma));
-            if(beam_horiz_linear_rgb_weight > 0.0)
-            {
-                const float3 linear_mixed_color = get_raw_interpolated_color(
-                    pow(color0, float3(intermediate_gamma)),
-                    pow(color1, float3(intermediate_gamma)),
-                    pow(color2, float3(intermediate_gamma)),
-                    pow(color3, float3(intermediate_gamma)),
-                    weights);
-                return lerp(gamma_mixed_color, linear_mixed_color,
-                    beam_horiz_linear_rgb_weight);
-            }
-            else
-            {
-                return gamma_mixed_color;
-            }
-        #else
-            const float3 linear_mixed_color = get_raw_interpolated_color(
-                color0, color1, color2, color3, weights);
-            if(beam_horiz_linear_rgb_weight < 1.0)
-            {
-                const float3 gamma_mixed_color = get_raw_interpolated_color(
-                    pow(color0, float3(1.0/intermediate_gamma)),
-                    pow(color1, float3(1.0/intermediate_gamma)),
-                    pow(color2, float3(1.0/intermediate_gamma)),
-                    pow(color3, float3(1.0/intermediate_gamma)),
-                    weights);
-                return lerp(gamma_mixed_color, linear_mixed_color,
-                    beam_horiz_linear_rgb_weight);
-            }
-            else
-            {
-                return linear_mixed_color;
-            }
-        #endif  //  GAMMA_ENCODE_EVERY_FBO
-    #else
-        #ifdef GAMMA_ENCODE_EVERY_FBO
-            //  Inputs: color0-3 are colors in gamma-encoded RGB.
-            const float3 gamma_mixed_color = pow(get_raw_interpolated_color(
-                color0, color1, color2, color3, weights), intermediate_gamma);
-            const float3 linear_mixed_color = get_raw_interpolated_color(
-                pow(color0, float3(intermediate_gamma)),
-                pow(color1, float3(intermediate_gamma)),
-                pow(color2, float3(intermediate_gamma)),
-                pow(color3, float3(intermediate_gamma)),
-                weights);
-            return lerp(gamma_mixed_color, linear_mixed_color,
-                beam_horiz_linear_rgb_weight);
-        #else
-            //  Inputs: color0-3 are colors in linear RGB.
-            const float3 linear_mixed_color = get_raw_interpolated_color(
-                color0, color1, color2, color3, weights);
-            const float3 gamma_mixed_color = get_raw_interpolated_color(
-                    pow(color0, float3(1.0/intermediate_gamma)),
-                    pow(color1, float3(1.0/intermediate_gamma)),
-                    pow(color2, float3(1.0/intermediate_gamma)),
-                    pow(color3, float3(1.0/intermediate_gamma)),
-                    weights);
-			// wtf fixme
-//			const float beam_horiz_linear_rgb_weight1 = 1.0;
-            return lerp(gamma_mixed_color, linear_mixed_color,
-                global.beam_horiz_linear_rgb_weight);
-        #endif  //  GAMMA_ENCODE_EVERY_FBO
-    #endif  //  SCANLINES_BRANCH_FOR_LINEAR_RGB_WEIGHT
-}
-
-float3 get_scanline_color(const sampler2D tex, const float2 scanline_uv,
-    const float2 uv_step_x, const float4 weights)
-{
-    //  Requires:   1.) scanline_uv must be vertically snapped to the caller's
-    //                  desired line or scanline and horizontally snapped to the
-    //                  texel just left of the output pixel (color1)
-    //              2.) uv_step_x must contain the horizontal uv distance
-    //                  between texels.
-    //              3.) weights must contain interpolation filter weights for
-    //                  color0, color1, color2, and color3, where color1 is just
-    //                  left of the output pixel.
-    //  Returns:    Return a horizontally interpolated texture lookup using 2-4
-    //              nearby texels, according to weights and the conventions of
-    //              get_interpolated_linear_color().
-    //  We can ignore the outside texture lookups for Quilez resampling.
-    const float3 color1 = texture(tex, scanline_uv).rgb;
-    const float3 color2 = texture(tex, scanline_uv + uv_step_x).rgb;
-    float3 color0 = float3(0.0);
-    float3 color3 = float3(0.0);
-    if(beam_horiz_filter > 0.5)
-    {
-        color0 = texture(tex, scanline_uv - uv_step_x).rgb;
-        color3 = texture(tex, scanline_uv + 2.0 * uv_step_x).rgb;
-    }
-    //  Sample the texture as-is, whether it's linear or gamma-encoded:
-    //  get_interpolated_linear_color() will handle the difference.
-    return get_interpolated_linear_color(color0, color1, color2, color3, weights);
-}
-
-float3 sample_single_scanline_horizontal(const sampler2D tex,
-    const float2 tex_uv, const float2 tex_size,
-    const float2 texture_size_inv)
-{
-    //  TODO: Add function requirements.
-    //  Snap to the previous texel and get sample dists from 2/4 nearby texels:
-    const float2 curr_texel = tex_uv * tex_size;
-    //  Use under_half to fix a rounding bug right around exact texel locations.
-    const float2 prev_texel =
-        floor(curr_texel - float2(under_half)) + float2(0.5);
-    const float2 prev_texel_hor = float2(prev_texel.x, curr_texel.y);
-    const float2 prev_texel_hor_uv = prev_texel_hor * texture_size_inv;
-    const float prev_dist = curr_texel.x - prev_texel_hor.x;
-    const float4 sample_dists = float4(1.0 + prev_dist, prev_dist,
-        1.0 - prev_dist, 2.0 - prev_dist);
-    //  Get Quilez, Lanczos2, or Gaussian resize weights for 2/4 nearby texels:
-    float4 weights;
-    if(beam_horiz_filter < 0.5)
-    {
-        //  Quilez:
-        const float x = sample_dists.y;
-        const float w2 = x*x*x*(x*(x*6.0 - 15.0) + 10.0);
-        weights = float4(0.0, 1.0 - w2, w2, 0.0);
-    }
-    else if(beam_horiz_filter < 1.5)
-    {
-        //  Gaussian:
-        float inner_denom_inv = 1.0/(2.0*beam_horiz_sigma*beam_horiz_sigma);
-        weights = exp(-(sample_dists*sample_dists)*inner_denom_inv);
-    }
-    else
-    {
-        //  Lanczos2:
-        const float4 pi_dists = FIX_ZERO(sample_dists * pi);
-        weights = 2.0 * sin(pi_dists) * sin(pi_dists * 0.5) /
-            (pi_dists * pi_dists);
-    }
-    //  Ensure the weight sum == 1.0:
-    const float4 final_weights = weights/dot(weights, float4(1.0));
-    //  Get the interpolated horizontal scanline color:
-    const float2 uv_step_x = float2(texture_size_inv.x, 0.0);
-    return get_scanline_color(
-        tex, prev_texel_hor_uv, uv_step_x, final_weights);
-}
-
-float3 sample_rgb_scanline_horizontal(const sampler2D tex,
-    const float2 tex_uv, const float2 tex_size,
-    const float2 texture_size_inv)
-{
-    //  TODO: Add function requirements.
-    //  Rely on a helper to make convergence easier.
-    if(beam_misconvergence)
-    {
-        const float3 convergence_offsets_rgb =
-            get_convergence_offsets_x_vector();
-        const float3 offset_u_rgb =
-            convergence_offsets_rgb * texture_size_inv.xxx;
-        const float2 scanline_uv_r = tex_uv - float2(offset_u_rgb.r, 0.0);
-        const float2 scanline_uv_g = tex_uv - float2(offset_u_rgb.g, 0.0);
-        const float2 scanline_uv_b = tex_uv - float2(offset_u_rgb.b, 0.0);
-        const float3 sample_r = sample_single_scanline_horizontal(
-            tex, scanline_uv_r, tex_size, texture_size_inv);
-        const float3 sample_g = sample_single_scanline_horizontal(
-            tex, scanline_uv_g, tex_size, texture_size_inv);
-        const float3 sample_b = sample_single_scanline_horizontal(
-            tex, scanline_uv_b, tex_size, texture_size_inv);
-        return float3(sample_r.r, sample_g.g, sample_b.b);
-    }
-    else
-    {
-        return sample_single_scanline_horizontal(tex, tex_uv, tex_size,
-            texture_size_inv);
-    }
-}
-
-float2 get_last_scanline_uv(const float2 tex_uv, const float2 tex_size,
-    const float2 texture_size_inv, const float2 il_step_multiple,
-    const float frame_count, out float dist)
-{
-    //  Compute texture coords for the last/upper scanline, accounting for
-    //  interlacing: With interlacing, only consider even/odd scanlines every
-    //  other frame.  Top-field first (TFF) order puts even scanlines on even
-    //  frames, and BFF order puts them on odd frames.  Texels are centered at:
-    //      frac(tex_uv * tex_size) == x.5
-    //  Caution: If these coordinates ever seem incorrect, first make sure it's
-    //  not because anisotropic filtering is blurring across field boundaries.
-    //  Note: TFF/BFF won't matter for sources that double-weave or similar.
-	// wtf fixme
-//	const float interlace_bff1 = 1.0;
-    const float field_offset = floor(il_step_multiple.y * 0.75) *
-        fmod(frame_count + float(global.interlace_bff), 2.0);
-    const float2 curr_texel = tex_uv * tex_size;
-    //  Use under_half to fix a rounding bug right around exact texel locations.
-    const float2 prev_texel_num = floor(curr_texel - float2(under_half));
-    const float wrong_field = fmod(
-        prev_texel_num.y + field_offset, il_step_multiple.y);
-    const float2 scanline_texel_num = prev_texel_num - float2(0.0, wrong_field);
-    //  Snap to the center of the previous scanline in the current field:
-    const float2 scanline_texel = scanline_texel_num + float2(0.5);
-    const float2 scanline_uv = scanline_texel * texture_size_inv;
-    //  Save the sample's distance from the scanline, in units of scanlines:
-    dist = (curr_texel.y - scanline_texel.y)/il_step_multiple.y;
-    return scanline_uv;
-}
-
-inline bool is_interlaced(float num_lines)
-{
-    //  Detect interlacing based on the number of lines in the source.
-    if(interlace_detect)
-    {
-        //  NTSC: 525 lines, 262.5/field; 486 active (2 half-lines), 243/field
-        //  NTSC Emulators: Typically 224 or 240 lines
-        //  PAL: 625 lines, 312.5/field; 576 active (typical), 288/field
-        //  PAL Emulators: ?
-        //  ATSC: 720p, 1080i, 1080p
-        //  Where do we place our cutoffs?  Assumptions:
-        //  1.) We only need to care about active lines.
-        //  2.) Anything > 288 and <= 576 lines is probably interlaced.
-        //  3.) Anything > 576 lines is probably not interlaced...
-        //  4.) ...except 1080 lines, which is a crapshoot (user decision).
-        //  5.) Just in case the main program uses calculated video sizes,
-        //      we should nudge the float thresholds a bit.
-        const bool sd_interlace = ((num_lines > 288.5) && (num_lines < 576.5));
-        const bool hd_interlace = bool(interlace_1080i) ?
-            ((num_lines > 1079.5) && (num_lines < 1080.5)) :
-            false;
-        return (sd_interlace || hd_interlace);
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-#endif  //  SCANLINE_FUNCTIONS_H
-
diff --git a/crt/shaders/crt-royale/src/tex2Dantialias.h b/crt/shaders/crt-royale/src/tex2Dantialias.h
deleted file mode 100644
index f9b7f0de6b..0000000000
--- a/crt/shaders/crt-royale/src/tex2Dantialias.h
+++ /dev/null
@@ -1,1393 +0,0 @@
-#ifndef TEX2DANTIALIAS_H
-#define TEX2DANTIALIAS_H
-
-/////////////////////////////  GPL LICENSE NOTICE  /////////////////////////////
-
-//  crt-royale: A full-featured CRT shader, with cheese.
-//  Copyright (C) 2014 TroggleMonkey <trogglemonkey@gmx.com>
-//
-//  This program is free software; you can redistribute it and/or modify it
-//  under the terms of the GNU General Public License as published by the Free
-//  Software Foundation; either version 2 of the License, or any later version.
-//
-//  This program is distributed in the hope that it will be useful, but WITHOUT
-//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-//  more details.
-//
-//  You should have received a copy of the GNU General Public License along with
-//  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-//  Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-/////////////////////////////////  DESCRIPTION  ////////////////////////////////
-
-//  This file provides antialiased and subpixel-aware tex2D lookups.
-//  Requires:   All functions share these requirements:
-//              1.) All requirements of gamma-management.h must be satisfied!
-//              2.) pixel_to_tex_uv must be a 2x2 matrix that transforms pixe-
-//                  space offsets to texture uv offsets.  You can get this with:
-//                      const float2 duv_dx = ddx(tex_uv);
-//                      const float2 duv_dy = ddy(tex_uv);
-//                      const float2x2 pixel_to_tex_uv = float2x2(
-//                          duv_dx.x, duv_dy.x,
-//                          duv_dx.y, duv_dy.y);
-//                  This is left to the user in case the current Cg profile
-//                  doesn't support ddx()/ddy().  Ideally, the user could find
-//                  calculate a distorted tangent-space mapping analytically.
-//                  If not, a simple flat mapping can be obtained with:
-//                      const float2 xy_to_uv_scale = IN.output_size *
-//                          IN.video_size/IN.texture_size;
-//                      const float2x2 pixel_to_tex_uv = float2x2(
-//                          xy_to_uv_scale.x, 0.0,
-//                          0.0, xy_to_uv_scale.y);
-//  Optional:   To set basic AA settings, #define ANTIALIAS_OVERRIDE_BASICS and:
-//              1.) Set an antialiasing level:
-//                      static const float aa_level = {0 (none),
-//                          1 (sample subpixels), 4, 5, 6, 7, 8, 12, 16, 20, 24}
-//              2.) Set a filter type:
-//                      static const float aa_filter = {
-//                          0 (Box, Separable), 1 (Box, Cylindrical),
-//                          2 (Tent, Separable), 3 (Tent, Cylindrical)
-//                          4 (Gaussian, Separable), 5 (Gaussian, Cylindrical)
-//                          6 (Cubic, Separable), 7 (Cubic, Cylindrical)
-//                          8 (Lanczos Sinc, Separable),
-//                          9 (Lanczos Jinc, Cylindrical)}
-//                  If the input is unknown, a separable box filter is used.
-//                  Note: Lanczos Jinc is terrible for sparse sampling, and
-//                  using aa_axis_importance (see below) defeats the purpose.
-//              3.) Mirror the sample pattern on odd frames?
-//                      static const bool aa_temporal = {true, false]
-//                  This helps rotational invariance but can look "fluttery."
-//              The user may #define ANTIALIAS_OVERRIDE_PARAMETERS to override
-//              (all of) the following default parameters with static or uniform
-//              constants (or an accessor function for subpixel offsets):
-//              1.) Cubic parameters:
-//                      static const float aa_cubic_c = 0.5;
-//                  See http://www.imagemagick.org/Usage/filter/#mitchell
-//              2.) Gaussian parameters:
-//                      static const float aa_gauss_sigma =
-//                          0.5/aa_pixel_diameter;
-//              3.) Set subpixel offsets.  This requires an accessor function
-//                  for compatibility with scalar runtime shader params.  Return
-//                  a float2 pixel offset in [-0.5, 0.5] for the red subpixel:
-//                      float2 get_aa_subpixel_r_offset()
-//              The user may also #define ANTIALIAS_OVERRIDE_STATIC_CONSTANTS to
-//              override (all of) the following default static values.  However,
-//              the file's structure requires them to be declared static const:
-//              1.) static const float aa_lanczos_lobes = 3.0;
-//              2.) static const float aa_gauss_support = 1.0/aa_pixel_diameter;
-//                  Note the default tent/Gaussian support radii may appear
-//                  arbitrary, but extensive testing found them nearly optimal
-//                  for tough cases like strong distortion at low AA levels.
-//                  (The Gaussian default is only best for practical gauss_sigma
-//                  values; much larger gauss_sigmas ironically prefer slightly
-//                  smaller support given sparse sampling, and vice versa.)
-//              3.) static const float aa_tent_support = 1.0 / aa_pixel_diameter;
-//              4.) static const float2 aa_xy_axis_importance:
-//                  The sparse N-queens sampling grid interacts poorly with
-//                  negative-lobed 2D filters.  However, if aliasing is much
-//                  stronger in one direction (e.g. horizontally with a phosphor
-//                  mask), it can be useful to downplay sample offsets along the
-//                  other axis.  The support radius in each direction scales with
-//                  aa_xy_axis_importance down to a minimum of 0.5 (box support),
-//                  after which point only the offsets used for calculating
-//                  weights continue to scale downward.  This works as follows:
-//                  If aa_xy_axis_importance = float2(1.0, 1.0/support_radius),
-//                  the vertical support radius will drop to 1.0, and we'll just
-//                  filter vertical offsets with the first filter lobe, while
-//                  horizontal offsets go through the full multi-lobe filter.
-//                  If aa_xy_axis_importance = float2(1.0, 0.0), the vertical
-//                  support radius will drop to box support, and the vertical
-//                  offsets will be ignored entirely (essentially giving us a
-//                  box filter vertically).  The former is potentially smoother
-//                  (but less predictable) and the default behavior of Lanczos
-//                  jinc, whereas the latter is sharper and the default behavior
-//                  of cubics and Lanczos sinc.
-//              5.) static const float aa_pixel_diameter: You can expand the
-//                  pixel diameter to e.g. sqrt(2.0), which may be a better
-//                  support range for cylindrical filters (they don't
-//                  currently discard out-of-circle samples though).
-//              Finally, there are two miscellaneous options:
-//              1.) If you want to antialias a manually tiled texture, you can
-//                  #define ANTIALIAS_DISABLE_ANISOTROPIC to use tex2Dlod() to
-//                  fix incompatibilities with anisotropic filtering.  This is
-//                  slower, and the Cg profile must support tex2Dlod().
-//              2.) If aa_cubic_c is a runtime uniform, you can #define
-//                  RUNTIME_ANTIALIAS_WEIGHTS to evaluate cubic weights once per
-//                  fragment instead of at the usage site (which is used by
-//                  default, because it enables static evaluation).
-//  Description:
-//  Each antialiased lookup follows these steps:
-//  1.) Define a sample pattern of pixel offsets in the range of [-0.5, 0.5]
-//      pixels, spanning the diameter of a rectangular box filter.
-//  2.) Scale these offsets by the support diameter of the user's chosen filter.
-//  3.) Using these pixel offsets from the pixel center, compute the offsets to
-//      predefined subpixel locations.
-//  4.) Compute filter weights based on subpixel offsets.
-//  Much of that can often be done at compile-time.  At runtime:
-//  1.) Project pixel-space offsets into uv-space with a matrix multiplication
-//      to get the uv offsets for each sample.  Rectangular pixels have a
-//      diameter of 1.0.  Circular pixels are not currently supported, but they
-//      might be better with a diameter of sqrt(2.0) to ensure there are no gaps
-//      between them.
-//  2.) Load, weight, and sum samples.
-//  We use a sparse bilinear sampling grid, so there are two major implications:
-//  1.) We can directly project the pixel-space support box into uv-space even
-//      if we're upsizing.  This wouldn't be the case for nearest neighbor,
-//      where we'd have to expand the uv-space diameter to at least the support
-//      size to ensure sufficient filter support.  In our case, this allows us
-//      to treat upsizing the same as downsizing and use static weighting. :)
-//  2.) For decent results, negative-lobed filters must be computed based on
-//      separable weights, not radial distances, because the sparse sampling
-//      makes no guarantees about radial distributions.  Even then, it's much
-//      better to set aa_xy_axis_importance to e.g. float2(1.0, 0.0) to use e.g.
-//      Lanczos2 horizontally and a box filter vertically.  This is mainly due
-//      to the sparse N-queens sampling and a statistically enormous positive or
-//      negative covariance between horizontal and vertical weights.
-//
-//  Design Decision Comments:
-//  "aa_temporal" mirrors the sample pattern on odd frames along the axis that
-//  keeps subpixel weights constant.  This helps with rotational invariance, but
-//  it can cause distracting fluctuations, and horizontal and vertical edges
-//  will look the same.  Using a different pattern on a shifted grid would
-//  exploit temporal AA better, but it would require a dynamic branch or a lot
-//  of conditional moves, so it's prohibitively slow for the minor benefit.
-
-
-/////////////////////////////  SETTINGS MANAGEMENT  ////////////////////////////
-
-#ifndef ANTIALIAS_OVERRIDE_BASICS
-    //  The following settings must be static constants:
-    static const float aa_level = 12.0;
-    static const float aa_filter = 0.0;
-    static const bool aa_temporal = false;
-#endif
-
-#ifndef ANTIALIAS_OVERRIDE_STATIC_CONSTANTS
-    //  Users may override these parameters, but the file structure requires
-    //  them to be static constants; see the descriptions above.
-    static const float aa_pixel_diameter = 1.0;
-    static const float aa_lanczos_lobes = 3.0;
-    static const float aa_gauss_support = 1.0 / aa_pixel_diameter;
-    static const float aa_tent_support = 1.0 / aa_pixel_diameter;
-    
-    //  If we're using a negative-lobed filter, default to using it horizontally
-    //  only, and use only the first lobe vertically or a box filter, over a
-    //  correspondingly smaller range.  This compensates for the sparse sampling
-    //  grid's typically large positive/negative x/y covariance.
-    static const float2 aa_xy_axis_importance =
-        aa_filter < 5.5 ? float2(1.0) :         //  Box, tent, Gaussian
-        aa_filter < 8.5 ? float2(1.0, 0.0) :    //  Cubic and Lanczos sinc
-        aa_filter < 9.5 ? float2(1.0, 1.0/aa_lanczos_lobes) :   //  Lanczos jinc
-        float2(1.0);                            //  Default to box
-#endif
-
-#ifndef ANTIALIAS_OVERRIDE_PARAMETERS
-    //  Users may override these values with their own uniform or static consts.
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c = 0.5;
-    static const float aa_gauss_sigma = 0.5 / aa_pixel_diameter;
-    //  Users may override the subpixel offset accessor function with their own.
-    //  A function is used for compatibility with scalar runtime shader params.
-    inline float2 get_aa_subpixel_r_offset()
-    {
-        return float2(0.0, 0.0);
-    }
-#endif
-
-
-//////////////////////////////////  INCLUDES  //////////////////////////////////
-
-#include "../../../../include/gamma-management.h"
-
-
-//////////////////////////////////  CONSTANTS  /////////////////////////////////
-
-static const float aa_box_support = 0.5;
-static const float aa_cubic_support = 2.0;
-
-
-////////////////////////////  GLOBAL NON-CONSTANTS  ////////////////////////////
-
-//  We'll want to define these only once per fragment at most.
-#ifdef RUNTIME_ANTIALIAS_WEIGHTS
-    float aa_cubic_b;
-    float cubic_branch1_x3_coeff;
-    float cubic_branch1_x2_coeff;
-    float cubic_branch1_x0_coeff;
-    float cubic_branch2_x3_coeff;
-    float cubic_branch2_x2_coeff;
-    float cubic_branch2_x1_coeff;
-    float cubic_branch2_x0_coeff;
-#endif
-
-
-///////////////////////////////////  HELPERS  //////////////////////////////////
-
-void assign_aa_cubic_constants()
-{
-    //  Compute cubic coefficients on demand at runtime, and save them to global
-    //  uniforms.  The B parameter is computed from C, because "Keys cubics"
-    //  with B = 1 - 2C are considered the highest quality.
-    #ifdef RUNTIME_ANTIALIAS_WEIGHTS
-        if(aa_filter > 5.5 && aa_filter < 7.5)
-        {
-            aa_cubic_b = 1.0 - 2.0*aa_cubic_c;
-            cubic_branch1_x3_coeff = 12.0 - 9.0*aa_cubic_b - 6.0*aa_cubic_c;
-            cubic_branch1_x2_coeff = -18.0 + 12.0*aa_cubic_b + 6.0*aa_cubic_c;
-            cubic_branch1_x0_coeff = 6.0 - 2.0 * aa_cubic_b;
-            cubic_branch2_x3_coeff = -aa_cubic_b - 6.0 * aa_cubic_c;
-            cubic_branch2_x2_coeff = 6.0*aa_cubic_b + 30.0*aa_cubic_c;
-            cubic_branch2_x1_coeff = -12.0*aa_cubic_b - 48.0*aa_cubic_c;
-            cubic_branch2_x0_coeff = 8.0*aa_cubic_b + 24.0*aa_cubic_c;
-        }
-    #endif
-}
-
-inline float4 get_subpixel_support_diam_and_final_axis_importance()
-{
-    //  Statically select the base support radius:
-    static const float base_support_radius =
-        aa_filter < 1.5 ? aa_box_support :
-        aa_filter < 3.5 ? aa_tent_support :
-        aa_filter < 5.5 ? aa_gauss_support :
-        aa_filter < 7.5 ? aa_cubic_support :
-        aa_filter < 9.5 ? aa_lanczos_lobes :
-        aa_box_support; //  Default to box
-    //  Expand the filter support for subpixel filtering.
-    const float2 subpixel_support_radius_raw =
-        float2(base_support_radius) + abs(get_aa_subpixel_r_offset());
-    if(aa_filter < 1.5)
-    {
-        //  Ignore aa_xy_axis_importance for box filtering.
-        const float2 subpixel_support_diam =
-            2.0 * subpixel_support_radius_raw;
-        const float2 final_axis_importance = float2(1.0);
-        return float4(subpixel_support_diam, final_axis_importance);
-    }
-    else
-    {
-        //  Scale the support window by aa_xy_axis_importance, but don't narrow
-        //  it further than box support.  This allows decent vertical AA without
-        //  messing up horizontal weights or using something silly like Lanczos4
-        //  horizontally with a huge vertical average over an 8-pixel radius.
-        const float2 subpixel_support_radius = max(float2(aa_box_support, aa_box_support),
-            subpixel_support_radius_raw * aa_xy_axis_importance);
-        //  Adjust aa_xy_axis_importance to compensate for what's already done:
-        const float2 final_axis_importance = aa_xy_axis_importance *
-            subpixel_support_radius_raw/subpixel_support_radius;
-        const float2 subpixel_support_diam = 2.0 * subpixel_support_radius;
-        return float4(subpixel_support_diam, final_axis_importance);
-    }
-}
-
-
-///////////////////////////  FILTER WEIGHT FUNCTIONS  //////////////////////////
-
-inline float eval_box_filter(const float dist)
-{
-    return float(abs(dist) <= aa_box_support);
-}
-
-inline float eval_separable_box_filter(const float2 offset)
-{
-    return float(all(bool2((abs(offset.x) <= aa_box_support), (abs(offset.y) <= aa_box_support))));
-}
-
-inline float eval_tent_filter(const float dist)
-{
-    return clamp((aa_tent_support - dist)/
-        aa_tent_support, 0.0, 1.0);
-}
-
-inline float eval_gaussian_filter(const float dist)
-{
-    return exp(-(dist*dist) / (2.0*aa_gauss_sigma*aa_gauss_sigma));
-}
-
-inline float eval_cubic_filter(const float dist)
-{
-    //  Compute coefficients like assign_aa_cubic_constants(), but statically.
-    #ifndef RUNTIME_ANTIALIAS_WEIGHTS
-        //  When runtime weights are used, these values are instead written to
-        //  global uniforms at the beginning of each tex2Daa* call.
-        const float aa_cubic_b = 1.0 - 2.0*aa_cubic_c;
-        const float cubic_branch1_x3_coeff = 12.0 - 9.0*aa_cubic_b - 6.0*aa_cubic_c;
-        const float cubic_branch1_x2_coeff = -18.0 + 12.0*aa_cubic_b + 6.0*aa_cubic_c;
-        const float cubic_branch1_x0_coeff = 6.0 - 2.0 * aa_cubic_b;
-        const float cubic_branch2_x3_coeff = -aa_cubic_b - 6.0 * aa_cubic_c;
-        const float cubic_branch2_x2_coeff = 6.0*aa_cubic_b + 30.0*aa_cubic_c;
-        const float cubic_branch2_x1_coeff = -12.0*aa_cubic_b - 48.0*aa_cubic_c;
-        const float cubic_branch2_x0_coeff = 8.0*aa_cubic_b + 24.0*aa_cubic_c;
-    #endif
-    const float abs_dist = abs(dist);
-    //  Compute the cubic based on the Horner's method formula in:
-    //  http://www.cs.utexas.edu/users/fussell/courses/cs384g/lectures/mitchell/Mitchell.pdf
-    return (abs_dist < 1.0 ?
-        (cubic_branch1_x3_coeff*abs_dist +
-            cubic_branch1_x2_coeff)*abs_dist*abs_dist +
-            cubic_branch1_x0_coeff :
-        abs_dist < 2.0 ?
-            ((cubic_branch2_x3_coeff*abs_dist +
-                cubic_branch2_x2_coeff)*abs_dist +
-                cubic_branch2_x1_coeff)*abs_dist + cubic_branch2_x0_coeff :
-            0.0)/6.0;
-}
-
-inline float eval_separable_cubic_filter(const float2 offset)
-{
-    //  This is faster than using a specific float2 version:
-    return eval_cubic_filter(offset.x) *
-        eval_cubic_filter(offset.y);
-}
-
-inline float2 eval_sinc_filter(const float2 offset)
-{
-    //  It's faster to let the caller handle the zero case, or at least it
-    //  was when I used macros and the shader preset took a full minute to load.
-    const float2 pi_offset = pi * offset;
-    return sin(pi_offset)/pi_offset;
-}
-
-inline float eval_separable_lanczos_sinc_filter(const float2 offset_unsafe)
-{
-    //  Note: For sparse sampling, you really need to pick an axis to use
-    //  Lanczos along (e.g. set aa_xy_axis_importance = float2(1.0, 0.0)).
-    const float2 offset = FIX_ZERO(offset_unsafe);
-    const float2 xy_weights = eval_sinc_filter(offset) *
-        eval_sinc_filter(offset/aa_lanczos_lobes);
-    return xy_weights.x * xy_weights.y;
-}
-
-inline float eval_jinc_filter_unorm(const float x)
-{
-    //  This is a Jinc approximation for x in [0, 45).  We'll use x in range
-    //  [0, 4*pi) or so.  There are faster/closer approximations based on
-    //  piecewise cubics from [0, 45) and asymptotic approximations beyond that,
-    //  but this has a maximum absolute error < 1/512, and it's simpler/faster
-    //  for shaders...not that it's all that useful for sparse sampling anyway.
-    const float point3845_x = 0.38448566093564*x;
-    const float exp_term = exp(-(point3845_x*point3845_x));
-    const float point8154_plus_x = 0.815362332840791 + x;
-    const float cos_term = cos(point8154_plus_x);
-    return (
-        0.0264727330997042*min(x, 6.83134964622778) +
-        0.680823557250528*exp_term +
-        -0.0597255978950933*min(7.41043194481873, x)*cos_term /
-            (point8154_plus_x + 0.0646074538634482*(x*x) +
-            cos(x)*max(exp_term, cos(x) + cos_term)) -
-        0.180837503591406);
-}
-
-inline float eval_jinc_filter(const float dist)
-{
-    return eval_jinc_filter_unorm(pi * dist);
-}
-
-inline float eval_lanczos_jinc_filter(const float dist)
-{
-    return eval_jinc_filter(dist) * eval_jinc_filter(dist/aa_lanczos_lobes);
-}
-
-
-inline float3 eval_unorm_rgb_weights(const float2 offset,
-    const float2 final_axis_importance)
-{
-    //  Requires:   1.) final_axis_impportance must be computed according to
-    //                  get_subpixel_support_diam_and_final_axis_importance().
-    //              2.) aa_filter must be a global constant.
-    //              3.) offset must be an xy pixel offset in the range:
-    //                      ([-subpixel_support_diameter.x/2,
-    //                      subpixel_support_diameter.x/2],
-    //                      [-subpixel_support_diameter.y/2,
-    //                      subpixel_support_diameter.y/2])
-    //  Returns:    Sample weights at R/G/B destination subpixels for the
-    //              given xy pixel offset.
-    const float2 offset_g = offset * final_axis_importance;
-    const float2 aa_r_offset = get_aa_subpixel_r_offset();
-    const float2 offset_r = offset_g - aa_r_offset * final_axis_importance;
-    const float2 offset_b = offset_g + aa_r_offset * final_axis_importance;
-    //  Statically select a filter:
-    if(aa_filter < 0.5)
-    {
-        return float3(eval_separable_box_filter(offset_r),
-            eval_separable_box_filter(offset_g),
-            eval_separable_box_filter(offset_b));
-    }
-    else if(aa_filter < 1.5)
-    {
-        return float3(eval_box_filter(length(offset_r)),
-            eval_box_filter(length(offset_g)),
-            eval_box_filter(length(offset_b)));
-    }
-    else if(aa_filter < 2.5)
-    {
-        return float3(
-            eval_tent_filter(offset_r.x) * eval_tent_filter(offset_r.y),
-            eval_tent_filter(offset_g.x) * eval_tent_filter(offset_g.y),
-            eval_tent_filter(offset_b.x) * eval_tent_filter(offset_b.y));
-    }
-    else if(aa_filter < 3.5)
-    {
-        return float3(eval_tent_filter(length(offset_r)),
-            eval_tent_filter(length(offset_g)),
-            eval_tent_filter(length(offset_b)));
-    }
-    else if(aa_filter < 4.5)
-    {
-        return float3(
-            eval_gaussian_filter(offset_r.x) * eval_gaussian_filter(offset_r.y),
-            eval_gaussian_filter(offset_g.x) * eval_gaussian_filter(offset_g.y),
-            eval_gaussian_filter(offset_b.x) * eval_gaussian_filter(offset_b.y));
-    }
-    else if(aa_filter < 5.5)
-    {
-        return float3(eval_gaussian_filter(length(offset_r)),
-            eval_gaussian_filter(length(offset_g)),
-            eval_gaussian_filter(length(offset_b)));
-    }
-    else if(aa_filter < 6.5)
-    {
-        return float3(
-            eval_cubic_filter(offset_r.x) * eval_cubic_filter(offset_r.y),
-            eval_cubic_filter(offset_g.x) * eval_cubic_filter(offset_g.y),
-            eval_cubic_filter(offset_b.x) * eval_cubic_filter(offset_b.y));
-    }
-    else if(aa_filter < 7.5)
-    {
-        return float3(eval_cubic_filter(length(offset_r)),
-            eval_cubic_filter(length(offset_g)),
-            eval_cubic_filter(length(offset_b)));
-    }
-    else if(aa_filter < 8.5)
-    {
-        return float3(eval_separable_lanczos_sinc_filter(offset_r),
-            eval_separable_lanczos_sinc_filter(offset_g),
-            eval_separable_lanczos_sinc_filter(offset_b));
-    }
-    else if(aa_filter < 9.5)
-    {
-        return float3(eval_lanczos_jinc_filter(length(offset_r)),
-            eval_lanczos_jinc_filter(length(offset_g)),
-            eval_lanczos_jinc_filter(length(offset_b)));
-    }
-    else
-    {
-        //  Default to a box, because Lanczos Jinc is so bad. ;)
-        return float3(eval_separable_box_filter(offset_r),
-            eval_separable_box_filter(offset_g),
-            eval_separable_box_filter(offset_b));
-    }
-}
-
-
-//////////////////////////////  HELPER FUNCTIONS  //////////////////////////////
-
-inline float4 tex2Daa_tiled_linearize(const sampler2D samp, const float2 s)
-{
-    //  If we're manually tiling a texture, anisotropic filtering can get
-    //  confused.  This is one workaround:
-    #ifdef ANTIALIAS_DISABLE_ANISOTROPIC
-        //  TODO: Use tex2Dlod_linearize with a calculated mip level.
-        return tex2Dlod_linearize(samp, float4(s, 0.0, 0.0));
-    #else
-        return tex2D_linearize(samp, s);
-    #endif
-}
-
-inline float2 get_frame_sign(const float frame)
-{
-    if(aa_temporal)
-    {
-        //  Mirror the sampling pattern for odd frames in a direction that
-        //  lets us keep the same subpixel sample weights:
-        const float frame_odd = float(fmod(frame, 2.0) > 0.5);
-        const float2 aa_r_offset = get_aa_subpixel_r_offset();
-        const float2 mirror = -float2(abs(aa_r_offset.x) < (FIX_ZERO(0.0)), abs(aa_r_offset.y) < (FIX_ZERO(0.0)));
-        return mirror;
-    }
-    else
-    {
-        return float2(1.0, 1.0);
-    }
-}
-
-
-/////////////////////////  ANTIALIASED TEXTURE LOOKUPS  ////////////////////////
-
-float3 tex2Daa_subpixel_weights_only(const sampler2D tex,
-    const float2 tex_uv, const float2x2 pixel_to_tex_uv)
-{
-    //  This function is unlike the others: Just perform a single independent
-    //  lookup for each subpixel.  It may be very aliased.
-    const float2 aa_r_offset = get_aa_subpixel_r_offset();
-    const float2 aa_r_offset_uv_offset = mul(pixel_to_tex_uv, aa_r_offset);
-    const float color_g = tex2D_linearize(tex, tex_uv).g;
-    const float color_r = tex2D_linearize(tex, tex_uv + aa_r_offset_uv_offset).r;
-    const float color_b = tex2D_linearize(tex, tex_uv - aa_r_offset_uv_offset).b;
-    return float3(color_r, color_g, color_b);
-}
-
-//  The tex2Daa* functions compile very slowly due to all the macros and
-//  compile-time math, so only include the ones we'll actually use!
-float3 tex2Daa4x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use an RGMS4 pattern (4-queens):
-    //  . . Q .  : off =(-1.5, -1.5)/4 + (2.0, 0.0)/4
-    //  Q . . .  : off =(-1.5, -1.5)/4 + (0.0, 1.0)/4
-    //  . . . Q  : off =(-1.5, -1.5)/4 + (3.0, 2.0)/4
-    //  . Q . .  : off =(-1.5, -1.5)/4 + (1.0, 3.0)/4
-    //  Static screenspace sample offsets (compute some implicitly):
-    static const float grid_size = 4.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0,1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5,0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(2.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(0.0, 1.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = w1.bgr;
-    const float3 w3 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0,1.0,1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (w0 * sample0 + w1 * sample1 +
-        w2 * sample2 + w3 * sample3);
-}
-
-float3 tex2Daa5x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 5-queens pattern:
-    //  . Q . . .  : off =(-2.0, -2.0)/5 + (1.0, 0.0)/5
-    //  . . . . Q  : off =(-2.0, -2.0)/5 + (4.0, 1.0)/5
-    //  . . Q . .  : off =(-2.0, -2.0)/5 + (2.0, 2.0)/5
-    //  Q . . . .  : off =(-2.0, -2.0)/5 + (0.0, 3.0)/5
-    //  . . . Q .  : off =(-2.0, -2.0)/5 + (3.0, 4.0)/5
-    //  Static screenspace sample offsets (compute some implicitly):
-    static const float grid_size = 5.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(1.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(4.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(2.0, 2.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = w1.bgr;
-    const float3 w4 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 w_sum_inv = float3(1.0)/(w0 + w1 + w2 + w3 + w4);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (w0 * sample0 + w1 * sample1 +
-        w2 * sample2 + w3 * sample3 + w4 * sample4);
-}
-
-float3 tex2Daa6x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 6-queens pattern with a stronger horizontal
-    //  than vertical slant:
-    //  . . . . Q .  : off =(-2.5, -2.5)/6 + (4.0, 0.0)/6
-    //  . . Q . . .  : off =(-2.5, -2.5)/6 + (2.0, 1.0)/6
-    //  Q . . . . .  : off =(-2.5, -2.5)/6 + (0.0, 2.0)/6
-    //  . . . . . Q  : off =(-2.5, -2.5)/6 + (5.0, 3.0)/6
-    //  . . . Q . .  : off =(-2.5, -2.5)/6 + (3.0, 4.0)/6
-    //  . Q . . . .  : off =(-2.5, -2.5)/6 + (1.0, 5.0)/6
-    //  Static screenspace sample offsets (compute some implicitly):
-    static const float grid_size = 6.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(4.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(2.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(0.0, 2.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = w2.bgr;
-    const float3 w4 = w1.bgr;
-    const float3 w5 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    const float2 uv_offset2 = mul(true_pixel_to_tex_uv, xy_offset2 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset2).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset2).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (w0 * sample0 + w1 * sample1 + w2 * sample2 +
-        w3 * sample3 + w4 * sample4 + w5 * sample5);
-}
-
-float3 tex2Daa7x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 7-queens pattern with a queen in the center:
-    //  . Q . . . . .  : off =(-3.0, -3.0)/7 + (1.0, 0.0)/7
-    //  . . . . Q . .  : off =(-3.0, -3.0)/7 + (4.0, 1.0)/7
-    //  Q . . . . . .  : off =(-3.0, -3.0)/7 + (0.0, 2.0)/7
-    //  . . . Q . . .  : off =(-3.0, -3.0)/7 + (3.0, 3.0)/7
-    //  . . . . . . Q  : off =(-3.0, -3.0)/7 + (6.0, 4.0)/7
-    //  . . Q . . . .  : off =(-3.0, -3.0)/7 + (2.0, 5.0)/7
-    //  . . . . . Q .  : off =(-3.0, -3.0)/7 + (5.0, 6.0)/7
-    static const float grid_size = 7.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(1.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(4.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(0.0, 2.0) * xy_step;
-    const float2 xy_offset3 = xy_start_offset + float2(3.0, 3.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = eval_unorm_rgb_weights(xy_offset3, final_axis_importance);
-    const float3 w4 = w2.bgr;
-    const float3 w5 = w1.bgr;
-    const float3 w6 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2;
-    const float3 w_sum = half_sum + half_sum.bgr + w3;
-    const float3 w_sum_inv = float3(1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    const float2 uv_offset2 = mul(true_pixel_to_tex_uv, xy_offset2 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset2).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset2).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample6 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (
-        w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6);
-}
-
-float3 tex2Daa8x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 8-queens pattern.
-    //  . . Q . . . . .  : off =(-3.5, -3.5)/8 + (2.0, 0.0)/8
-    //  . . . . Q . . .  : off =(-3.5, -3.5)/8 + (4.0, 1.0)/8
-    //  . Q . . . . . .  : off =(-3.5, -3.5)/8 + (1.0, 2.0)/8
-    //  . . . . . . . Q  : off =(-3.5, -3.5)/8 + (7.0, 3.0)/8
-    //  Q . . . . . . .  : off =(-3.5, -3.5)/8 + (0.0, 4.0)/8
-    //  . . . . . . Q .  : off =(-3.5, -3.5)/8 + (6.0, 5.0)/8
-    //  . . . Q . . . .  : off =(-3.5, -3.5)/8 + (3.0, 6.0)/8
-    //  . . . . . Q . .  : off =(-3.5, -3.5)/8 + (5.0, 7.0)/8
-    static const float grid_size = 8.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(2.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(4.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(1.0, 2.0) * xy_step;
-    const float2 xy_offset3 = xy_start_offset + float2(7.0, 3.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = eval_unorm_rgb_weights(xy_offset3, final_axis_importance);
-    const float3 w4 = w3.bgr;
-    const float3 w5 = w2.bgr;
-    const float3 w6 = w1.bgr;
-    const float3 w7 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2 + w3;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, and mirror on odd frames if directed:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    const float2 uv_offset2 = mul(true_pixel_to_tex_uv, xy_offset2 * frame_sign);
-    const float2 uv_offset3 = mul(true_pixel_to_tex_uv, xy_offset3 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset2).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset3).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset3).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset2).rgb;
-    const float3 sample6 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample7 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (
-        w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6 + w7 * sample7);
-}
-
-float3 tex2Daa12x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 12-superqueens pattern where no 3 points are
-    //  exactly collinear.
-    //  . . . Q . . . . . . . .  : off =(-5.5, -5.5)/12 + (3.0, 0.0)/12
-    //  . . . . . . . . . Q . .  : off =(-5.5, -5.5)/12 + (9.0, 1.0)/12
-    //  . . . . . . Q . . . . .  : off =(-5.5, -5.5)/12 + (6.0, 2.0)/12
-    //  . Q . . . . . . . . . .  : off =(-5.5, -5.5)/12 + (1.0, 3.0)/12
-    //  . . . . . . . . . . . Q  : off =(-5.5, -5.5)/12 + (11.0, 4.0)/12
-    //  . . . . Q . . . . . . .  : off =(-5.5, -5.5)/12 + (4.0, 5.0)/12
-    //  . . . . . . . Q . . . .  : off =(-5.5, -5.5)/12 + (7.0, 6.0)/12
-    //  Q . . . . . . . . . . .  : off =(-5.5, -5.5)/12 + (0.0, 7.0)/12
-    //  . . . . . . . . . . Q .  : off =(-5.5, -5.5)/12 + (10.0, 8.0)/12
-    //  . . . . . Q . . . . . .  : off =(-5.5, -5.5)/12 + (5.0, 9.0)/12
-    //  . . Q . . . . . . . . .  : off =(-5.5, -5.5)/12 + (2.0, 10.0)/12
-    //  . . . . . . . . Q . . .  : off =(-5.5, -5.5)/12 + (8.0, 11.0)/12
-    static const float grid_size = 12.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(3.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(9.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(6.0, 2.0) * xy_step;
-    const float2 xy_offset3 = xy_start_offset + float2(1.0, 3.0) * xy_step;
-    const float2 xy_offset4 = xy_start_offset + float2(11.0, 4.0) * xy_step;
-    const float2 xy_offset5 = xy_start_offset + float2(4.0, 5.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = eval_unorm_rgb_weights(xy_offset3, final_axis_importance);
-    const float3 w4 = eval_unorm_rgb_weights(xy_offset4, final_axis_importance);
-    const float3 w5 = eval_unorm_rgb_weights(xy_offset5, final_axis_importance);
-    const float3 w6 = w5.bgr;
-    const float3 w7 = w4.bgr;
-    const float3 w8 = w3.bgr;
-    const float3 w9 = w2.bgr;
-    const float3 w10 = w1.bgr;
-    const float3 w11 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2 + w3 + w4 + w5;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0)/w_sum;
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    const float2 uv_offset2 = mul(true_pixel_to_tex_uv, xy_offset2 * frame_sign);
-    const float2 uv_offset3 = mul(true_pixel_to_tex_uv, xy_offset3 * frame_sign);
-    const float2 uv_offset4 = mul(true_pixel_to_tex_uv, xy_offset4 * frame_sign);
-    const float2 uv_offset5 = mul(true_pixel_to_tex_uv, xy_offset5 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset2).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset3).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset4).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset5).rgb;
-    const float3 sample6 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset5).rgb;
-    const float3 sample7 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset4).rgb;
-    const float3 sample8 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset3).rgb;
-    const float3 sample9 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset2).rgb;
-    const float3 sample10 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample11 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (
-        w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6 + w7 * sample7 +
-        w8 * sample8 + w9 * sample9 + w10 * sample10 + w11 * sample11);
-}
-
-float3 tex2Daa16x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 16-superqueens pattern where no 3 points are
-    //  exactly collinear.
-    //  . . Q . . . . . . . . . . . . .  : off =(-7.5, -7.5)/16 + (2.0, 0.0)/16
-    //  . . . . . . . . . Q . . . . . .  : off =(-7.5, -7.5)/16 + (9.0, 1.0)/16
-    //  . . . . . . . . . . . . Q . . .  : off =(-7.5, -7.5)/16 + (12.0, 2.0)/16
-    //  . . . . Q . . . . . . . . . . .  : off =(-7.5, -7.5)/16 + (4.0, 3.0)/16
-    //  . . . . . . . . Q . . . . . . .  : off =(-7.5, -7.5)/16 + (8.0, 4.0)/16
-    //  . . . . . . . . . . . . . . Q .  : off =(-7.5, -7.5)/16 + (14.0, 5.0)/16
-    //  Q . . . . . . . . . . . . . . .  : off =(-7.5, -7.5)/16 + (0.0, 6.0)/16
-    //  . . . . . . . . . . Q . . . . .  : off =(-7.5, -7.5)/16 + (10.0, 7.0)/16
-    //  . . . . . Q . . . . . . . . . .  : off =(-7.5, -7.5)/16 + (5.0, 8.0)/16
-    //  . . . . . . . . . . . . . . . Q  : off =(-7.5, -7.5)/16 + (15.0, 9.0)/16
-    //  . Q . . . . . . . . . . . . . .  : off =(-7.5, -7.5)/16 + (1.0, 10.0)/16
-    //  . . . . . . . Q . . . . . . . .  : off =(-7.5, -7.5)/16 + (7.0, 11.0)/16
-    //  . . . . . . . . . . . Q . . . .  : off =(-7.5, -7.5)/16 + (11.0, 12.0)/16
-    //  . . . Q . . . . . . . . . . . .  : off =(-7.5, -7.5)/16 + (3.0, 13.0)/16
-    //  . . . . . . Q . . . . . . . . .  : off =(-7.5, -7.5)/16 + (6.0, 14.0)/16
-    //  . . . . . . . . . . . . . Q . .  : off =(-7.5, -7.5)/16 + (13.0, 15.0)/16
-    static const float grid_size = 16.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(2.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(9.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(12.0, 2.0) * xy_step;
-    const float2 xy_offset3 = xy_start_offset + float2(4.0, 3.0) * xy_step;
-    const float2 xy_offset4 = xy_start_offset + float2(8.0, 4.0) * xy_step;
-    const float2 xy_offset5 = xy_start_offset + float2(14.0, 5.0) * xy_step;
-    const float2 xy_offset6 = xy_start_offset + float2(0.0, 6.0) * xy_step;
-    const float2 xy_offset7 = xy_start_offset + float2(10.0, 7.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = eval_unorm_rgb_weights(xy_offset3, final_axis_importance);
-    const float3 w4 = eval_unorm_rgb_weights(xy_offset4, final_axis_importance);
-    const float3 w5 = eval_unorm_rgb_weights(xy_offset5, final_axis_importance);
-    const float3 w6 = eval_unorm_rgb_weights(xy_offset6, final_axis_importance);
-    const float3 w7 = eval_unorm_rgb_weights(xy_offset7, final_axis_importance);
-    const float3 w8 = w7.bgr;
-    const float3 w9 = w6.bgr;
-    const float3 w10 = w5.bgr;
-    const float3 w11 = w4.bgr;
-    const float3 w12 = w3.bgr;
-    const float3 w13 = w2.bgr;
-    const float3 w14 = w1.bgr;
-    const float3 w15 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2 + w3 + w4 + w5 + w6 + w7;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    const float2 uv_offset2 = mul(true_pixel_to_tex_uv, xy_offset2 * frame_sign);
-    const float2 uv_offset3 = mul(true_pixel_to_tex_uv, xy_offset3 * frame_sign);
-    const float2 uv_offset4 = mul(true_pixel_to_tex_uv, xy_offset4 * frame_sign);
-    const float2 uv_offset5 = mul(true_pixel_to_tex_uv, xy_offset5 * frame_sign);
-    const float2 uv_offset6 = mul(true_pixel_to_tex_uv, xy_offset6 * frame_sign);
-    const float2 uv_offset7 = mul(true_pixel_to_tex_uv, xy_offset7 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset2).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset3).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset4).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset5).rgb;
-    const float3 sample6 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset6).rgb;
-    const float3 sample7 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset7).rgb;
-    const float3 sample8 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset7).rgb;
-    const float3 sample9 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset6).rgb;
-    const float3 sample10 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset5).rgb;
-    const float3 sample11 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset4).rgb;
-    const float3 sample12 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset3).rgb;
-    const float3 sample13 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset2).rgb;
-    const float3 sample14 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample15 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (
-        w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6 + w7 * sample7 +
-        w8 * sample8 + w9 * sample9 + w10 * sample10 + w11 * sample11 +
-        w12 * sample12 + w13 * sample13 + w14 * sample14 + w15 * sample15);
-}
-
-float3 tex2Daa20x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 20-superqueens pattern where no 3 points are
-    //  exactly collinear and superqueens have a squared attack radius of 13.
-    //  . . . . . . . Q . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (7.0, 0.0)/20
-    //  . . . . . . . . . . . . . . . . Q . . .  : off =(-9.5, -9.5)/20 + (16.0, 1.0)/20
-    //  . . . . . . . . . . . Q . . . . . . . .  : off =(-9.5, -9.5)/20 + (11.0, 2.0)/20
-    //  . Q . . . . . . . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (1.0, 3.0)/20
-    //  . . . . . Q . . . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (5.0, 4.0)/20
-    //  . . . . . . . . . . . . . . . Q . . . .  : off =(-9.5, -9.5)/20 + (15.0, 5.0)/20
-    //  . . . . . . . . . . Q . . . . . . . . .  : off =(-9.5, -9.5)/20 + (10.0, 6.0)/20
-    //  . . . . . . . . . . . . . . . . . . . Q  : off =(-9.5, -9.5)/20 + (19.0, 7.0)/20
-    //  . . Q . . . . . . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (2.0, 8.0)/20
-    //  . . . . . . Q . . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (6.0, 9.0)/20
-    //  . . . . . . . . . . . . . Q . . . . . .  : off =(-9.5, -9.5)/20 + (13.0, 10.0)/20
-    //  . . . . . . . . . . . . . . . . . Q . .  : off =(-9.5, -9.5)/20 + (17.0, 11.0)/20
-    //  Q . . . . . . . . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (0.0, 12.0)/20
-    //  . . . . . . . . . Q . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (9.0, 13.0)/20
-    //  . . . . Q . . . . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (4.0, 14.0)/20
-    //  . . . . . . . . . . . . . . Q . . . . .  : off =(-9.5, -9.5)/20 + (14.0, 15.0)/20
-    //  . . . . . . . . . . . . . . . . . . Q .  : off =(-9.5, -9.5)/20 + (18.0, 16.0)/20
-    //  . . . . . . . . Q . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (8.0, 17.0)/20
-    //  . . . Q . . . . . . . . . . . . . . . .  : off =(-9.5, -9.5)/20 + (3.0, 18.0)/20
-    //  . . . . . . . . . . . . Q . . . . . . .  : off =(-9.5, -9.5)/20 + (12.0, 19.0)/20
-    static const float grid_size = 20.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(7.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(16.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(11.0, 2.0) * xy_step;
-    const float2 xy_offset3 = xy_start_offset + float2(1.0, 3.0) * xy_step;
-    const float2 xy_offset4 = xy_start_offset + float2(5.0, 4.0) * xy_step;
-    const float2 xy_offset5 = xy_start_offset + float2(15.0, 5.0) * xy_step;
-    const float2 xy_offset6 = xy_start_offset + float2(10.0, 6.0) * xy_step;
-    const float2 xy_offset7 = xy_start_offset + float2(19.0, 7.0) * xy_step;
-    const float2 xy_offset8 = xy_start_offset + float2(2.0, 8.0) * xy_step;
-    const float2 xy_offset9 = xy_start_offset + float2(6.0, 9.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = eval_unorm_rgb_weights(xy_offset3, final_axis_importance);
-    const float3 w4 = eval_unorm_rgb_weights(xy_offset4, final_axis_importance);
-    const float3 w5 = eval_unorm_rgb_weights(xy_offset5, final_axis_importance);
-    const float3 w6 = eval_unorm_rgb_weights(xy_offset6, final_axis_importance);
-    const float3 w7 = eval_unorm_rgb_weights(xy_offset7, final_axis_importance);
-    const float3 w8 = eval_unorm_rgb_weights(xy_offset8, final_axis_importance);
-    const float3 w9 = eval_unorm_rgb_weights(xy_offset9, final_axis_importance);
-    const float3 w10 = w9.bgr;
-    const float3 w11 = w8.bgr;
-    const float3 w12 = w7.bgr;
-    const float3 w13 = w6.bgr;
-    const float3 w14 = w5.bgr;
-    const float3 w15 = w4.bgr;
-    const float3 w16 = w3.bgr;
-    const float3 w17 = w2.bgr;
-    const float3 w18 = w1.bgr;
-    const float3 w19 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 + w9;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    const float2 uv_offset2 = mul(true_pixel_to_tex_uv, xy_offset2 * frame_sign);
-    const float2 uv_offset3 = mul(true_pixel_to_tex_uv, xy_offset3 * frame_sign);
-    const float2 uv_offset4 = mul(true_pixel_to_tex_uv, xy_offset4 * frame_sign);
-    const float2 uv_offset5 = mul(true_pixel_to_tex_uv, xy_offset5 * frame_sign);
-    const float2 uv_offset6 = mul(true_pixel_to_tex_uv, xy_offset6 * frame_sign);
-    const float2 uv_offset7 = mul(true_pixel_to_tex_uv, xy_offset7 * frame_sign);
-    const float2 uv_offset8 = mul(true_pixel_to_tex_uv, xy_offset8 * frame_sign);
-    const float2 uv_offset9 = mul(true_pixel_to_tex_uv, xy_offset9 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset2).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset3).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset4).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset5).rgb;
-    const float3 sample6 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset6).rgb;
-    const float3 sample7 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset7).rgb;
-    const float3 sample8 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset8).rgb;
-    const float3 sample9 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset9).rgb;
-    const float3 sample10 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset9).rgb;
-    const float3 sample11 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset8).rgb;
-    const float3 sample12 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset7).rgb;
-    const float3 sample13 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset6).rgb;
-    const float3 sample14 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset5).rgb;
-    const float3 sample15 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset4).rgb;
-    const float3 sample16 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset3).rgb;
-    const float3 sample17 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset2).rgb;
-    const float3 sample18 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample19 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (
-        w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6 + w7 * sample7 +
-        w8 * sample8 + w9 * sample9 + w10 * sample10 + w11 * sample11 +
-        w12 * sample12 + w13 * sample13 + w14 * sample14 + w15 * sample15 +
-        w16 * sample16 + w17 * sample17 + w18 * sample18 + w19 * sample19);
-}
-
-float3 tex2Daa24x(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Use a diagonally symmetric 24-superqueens pattern where no 3 points are
-    //  exactly collinear and superqueens have a squared attack radius of 13.
-    //  . . . . . . Q . . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (6.0, 0.0)/24
-    //  . . . . . . . . . . . . . . . . Q . . . . . . .  : off =(-11.5, -11.5)/24 + (16.0, 1.0)/24
-    //  . . . . . . . . . . Q . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (10.0, 2.0)/24
-    //  . . . . . . . . . . . . . . . . . . . . . Q . .  : off =(-11.5, -11.5)/24 + (21.0, 3.0)/24
-    //  . . . . . Q . . . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (5.0, 4.0)/24
-    //  . . . . . . . . . . . . . . . Q . . . . . . . .  : off =(-11.5, -11.5)/24 + (15.0, 5.0)/24
-    //  . Q . . . . . . . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (1.0, 6.0)/24
-    //  . . . . . . . . . . . Q . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (11.0, 7.0)/24
-    //  . . . . . . . . . . . . . . . . . . . Q . . . .  : off =(-11.5, -11.5)/24 + (19.0, 8.0)/24
-    //  . . . . . . . . . . . . . . . . . . . . . . . Q  : off =(-11.5, -11.5)/24 + (23.0, 9.0)/24
-    //  . . . Q . . . . . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (3.0, 10.0)/24
-    //  . . . . . . . . . . . . . . Q . . . . . . . . .  : off =(-11.5, -11.5)/24 + (14.0, 11.0)/24
-    //  . . . . . . . . . Q . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (9.0, 12.0)/24
-    //  . . . . . . . . . . . . . . . . . . . . Q . . .  : off =(-11.5, -11.5)/24 + (20.0, 13.0)/24
-    //  Q . . . . . . . . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (0.0, 14.0)/24
-    //  . . . . Q . . . . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (4.0, 15.0)/24
-    //  . . . . . . . . . . . . Q . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (12.0, 16.0)/24
-    //  . . . . . . . . . . . . . . . . . . . . . . Q .  : off =(-11.5, -11.5)/24 + (22.0, 17.0)/24
-    //  . . . . . . . . Q . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (8.0, 18.0)/24
-    //  . . . . . . . . . . . . . . . . . . Q . . . . .  : off =(-11.5, -11.5)/24 + (18.0, 19.0)/24
-    //  . . Q . . . . . . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (2.0, 20.0)/24
-    //  . . . . . . . . . . . . . Q . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (13.0, 21.0)/24
-    //  . . . . . . . Q . . . . . . . . . . . . . . . .  : off =(-11.5, -11.5)/24 + (7.0, 22.0)/24
-    //  . . . . . . . . . . . . . . . . . Q . . . . . .  : off =(-11.5, -11.5)/24 + (17.0, 23.0)/24
-    static const float grid_size = 24.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample.  Exploit diagonal symmetry:
-    const float2 xy_offset0 = xy_start_offset + float2(6.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(16.0, 1.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(10.0, 2.0) * xy_step;
-    const float2 xy_offset3 = xy_start_offset + float2(21.0, 3.0) * xy_step;
-    const float2 xy_offset4 = xy_start_offset + float2(5.0, 4.0) * xy_step;
-    const float2 xy_offset5 = xy_start_offset + float2(15.0, 5.0) * xy_step;
-    const float2 xy_offset6 = xy_start_offset + float2(1.0, 6.0) * xy_step;
-    const float2 xy_offset7 = xy_start_offset + float2(11.0, 7.0) * xy_step;
-    const float2 xy_offset8 = xy_start_offset + float2(19.0, 8.0) * xy_step;
-    const float2 xy_offset9 = xy_start_offset + float2(23.0, 9.0) * xy_step;
-    const float2 xy_offset10 = xy_start_offset + float2(3.0, 10.0) * xy_step;
-    const float2 xy_offset11 = xy_start_offset + float2(14.0, 11.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = eval_unorm_rgb_weights(xy_offset3, final_axis_importance);
-    const float3 w4 = eval_unorm_rgb_weights(xy_offset4, final_axis_importance);
-    const float3 w5 = eval_unorm_rgb_weights(xy_offset5, final_axis_importance);
-    const float3 w6 = eval_unorm_rgb_weights(xy_offset6, final_axis_importance);
-    const float3 w7 = eval_unorm_rgb_weights(xy_offset7, final_axis_importance);
-    const float3 w8 = eval_unorm_rgb_weights(xy_offset8, final_axis_importance);
-    const float3 w9 = eval_unorm_rgb_weights(xy_offset9, final_axis_importance);
-    const float3 w10 = eval_unorm_rgb_weights(xy_offset10, final_axis_importance);
-    const float3 w11 = eval_unorm_rgb_weights(xy_offset11, final_axis_importance);
-    const float3 w12 = w11.bgr;
-    const float3 w13 = w10.bgr;
-    const float3 w14 = w9.bgr;
-    const float3 w15 = w8.bgr;
-    const float3 w16 = w7.bgr;
-    const float3 w17 = w6.bgr;
-    const float3 w18 = w5.bgr;
-    const float3 w19 = w4.bgr;
-    const float3 w20 = w3.bgr;
-    const float3 w21 = w2.bgr;
-    const float3 w22 = w1.bgr;
-    const float3 w23 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2 + w3 + w4 +
-        w5 + w6 + w7 + w8 + w9 + w10 + w11;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, mirror on odd frames if directed, and exploit
-    //  diagonal symmetry:
-    const float2 frame_sign = get_frame_sign(frame);
-    const float2 uv_offset0 = mul(true_pixel_to_tex_uv, xy_offset0 * frame_sign);
-    const float2 uv_offset1 = mul(true_pixel_to_tex_uv, xy_offset1 * frame_sign);
-    const float2 uv_offset2 = mul(true_pixel_to_tex_uv, xy_offset2 * frame_sign);
-    const float2 uv_offset3 = mul(true_pixel_to_tex_uv, xy_offset3 * frame_sign);
-    const float2 uv_offset4 = mul(true_pixel_to_tex_uv, xy_offset4 * frame_sign);
-    const float2 uv_offset5 = mul(true_pixel_to_tex_uv, xy_offset5 * frame_sign);
-    const float2 uv_offset6 = mul(true_pixel_to_tex_uv, xy_offset6 * frame_sign);
-    const float2 uv_offset7 = mul(true_pixel_to_tex_uv, xy_offset7 * frame_sign);
-    const float2 uv_offset8 = mul(true_pixel_to_tex_uv, xy_offset8 * frame_sign);
-    const float2 uv_offset9 = mul(true_pixel_to_tex_uv, xy_offset9 * frame_sign);
-    const float2 uv_offset10 = mul(true_pixel_to_tex_uv, xy_offset10 * frame_sign);
-    const float2 uv_offset11 = mul(true_pixel_to_tex_uv, xy_offset11 * frame_sign);
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset0).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset1).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset2).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset3).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset4).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset5).rgb;
-    const float3 sample6 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset6).rgb;
-    const float3 sample7 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset7).rgb;
-    const float3 sample8 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset8).rgb;
-    const float3 sample9 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset9).rgb;
-    const float3 sample10 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset10).rgb;
-    const float3 sample11 = tex2Daa_tiled_linearize(tex, tex_uv + uv_offset11).rgb;
-    const float3 sample12 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset11).rgb;
-    const float3 sample13 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset10).rgb;
-    const float3 sample14 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset9).rgb;
-    const float3 sample15 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset8).rgb;
-    const float3 sample16 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset7).rgb;
-    const float3 sample17 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset6).rgb;
-    const float3 sample18 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset5).rgb;
-    const float3 sample19 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset4).rgb;
-    const float3 sample20 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset3).rgb;
-    const float3 sample21 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset2).rgb;
-    const float3 sample22 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset1).rgb;
-    const float3 sample23 = tex2Daa_tiled_linearize(tex, tex_uv - uv_offset0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (
-        w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6 + w7 * sample7 +
-        w8 * sample8 + w9 * sample9 + w10 * sample10 + w11 * sample11 +
-        w12 * sample12 + w13 * sample13 + w14 * sample14 + w15 * sample15 +
-        w16 * sample16 + w17 * sample17 + w18 * sample18 + w19 * sample19 +
-        w20 * sample20 + w21 * sample21 + w22 * sample22 + w23 * sample23);
-}
-
-float3 tex2Daa_debug_16x_regular(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Sample on a regular 4x4 grid.  This is mainly for testing.
-    static const float grid_size = 4.0;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float2 xy_step = float2(1.0)/grid_size * subpixel_support_diameter;
-    const float2 xy_start_offset = float2(0.5 - grid_size*0.5) * xy_step;
-    //  Get the xy offset of each sample:
-    const float2 xy_offset0 = xy_start_offset + float2(0.0, 0.0) * xy_step;
-    const float2 xy_offset1 = xy_start_offset + float2(1.0, 0.0) * xy_step;
-    const float2 xy_offset2 = xy_start_offset + float2(2.0, 0.0) * xy_step;
-    const float2 xy_offset3 = xy_start_offset + float2(3.0, 0.0) * xy_step;
-    const float2 xy_offset4 = xy_start_offset + float2(0.0, 1.0) * xy_step;
-    const float2 xy_offset5 = xy_start_offset + float2(1.0, 1.0) * xy_step;
-    const float2 xy_offset6 = xy_start_offset + float2(2.0, 1.0) * xy_step;
-    const float2 xy_offset7 = xy_start_offset + float2(3.0, 1.0) * xy_step;
-    //  Compute subpixel weights, and exploit diagonal symmetry for speed.
-    //  (We can't exploit vertical or horizontal symmetry due to uncertain
-    //  subpixel offsets.  We could fix that by rotating xy offsets with the
-    //  subpixel structure, but...no.)
-    const float3 w0 = eval_unorm_rgb_weights(xy_offset0, final_axis_importance);
-    const float3 w1 = eval_unorm_rgb_weights(xy_offset1, final_axis_importance);
-    const float3 w2 = eval_unorm_rgb_weights(xy_offset2, final_axis_importance);
-    const float3 w3 = eval_unorm_rgb_weights(xy_offset3, final_axis_importance);
-    const float3 w4 = eval_unorm_rgb_weights(xy_offset4, final_axis_importance);
-    const float3 w5 = eval_unorm_rgb_weights(xy_offset5, final_axis_importance);
-    const float3 w6 = eval_unorm_rgb_weights(xy_offset6, final_axis_importance);
-    const float3 w7 = eval_unorm_rgb_weights(xy_offset7, final_axis_importance);
-    const float3 w8 = w7.bgr;
-    const float3 w9 = w6.bgr;
-    const float3 w10 = w5.bgr;
-    const float3 w11 = w4.bgr;
-    const float3 w12 = w3.bgr;
-    const float3 w13 = w2.bgr;
-    const float3 w14 = w1.bgr;
-    const float3 w15 = w0.bgr;
-    //  Get the weight sum to normalize the total to 1.0 later:
-    const float3 half_sum = w0 + w1 + w2 + w3 + w4 + w5 + w6 + w7;
-    const float3 w_sum = half_sum + half_sum.bgr;
-    const float3 w_sum_inv = float3(1.0)/(w_sum);
-    //  Scale the pixel-space to texture offset matrix by the pixel diameter.
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    //  Get uv sample offsets, taking advantage of row alignment:
-    const float2 uv_step_x = mul(true_pixel_to_tex_uv, float2(xy_step.x, 0.0));
-    const float2 uv_step_y = mul(true_pixel_to_tex_uv, float2(0.0, xy_step.y));
-    const float2 uv_offset0 = -1.5 * (uv_step_x + uv_step_y);
-    const float2 sample0_uv = tex_uv + uv_offset0;
-    const float2 sample4_uv = sample0_uv + uv_step_y;
-    const float2 sample8_uv = sample0_uv + uv_step_y * 2.0;
-    const float2 sample12_uv = sample0_uv + uv_step_y * 3.0;
-    //  Load samples, linearizing if necessary, etc.:
-    const float3 sample0 = tex2Daa_tiled_linearize(tex, sample0_uv).rgb;
-    const float3 sample1 = tex2Daa_tiled_linearize(tex, sample0_uv + uv_step_x).rgb;
-    const float3 sample2 = tex2Daa_tiled_linearize(tex, sample0_uv + uv_step_x * 2.0).rgb;
-    const float3 sample3 = tex2Daa_tiled_linearize(tex, sample0_uv + uv_step_x * 3.0).rgb;
-    const float3 sample4 = tex2Daa_tiled_linearize(tex, sample4_uv).rgb;
-    const float3 sample5 = tex2Daa_tiled_linearize(tex, sample4_uv + uv_step_x).rgb;
-    const float3 sample6 = tex2Daa_tiled_linearize(tex, sample4_uv + uv_step_x * 2.0).rgb;
-    const float3 sample7 = tex2Daa_tiled_linearize(tex, sample4_uv + uv_step_x * 3.0).rgb;
-    const float3 sample8 = tex2Daa_tiled_linearize(tex, sample8_uv).rgb;
-    const float3 sample9 = tex2Daa_tiled_linearize(tex, sample8_uv + uv_step_x).rgb;
-    const float3 sample10 = tex2Daa_tiled_linearize(tex, sample8_uv + uv_step_x * 2.0).rgb;
-    const float3 sample11 = tex2Daa_tiled_linearize(tex, sample8_uv + uv_step_x * 3.0).rgb;
-    const float3 sample12 = tex2Daa_tiled_linearize(tex, sample12_uv).rgb;
-    const float3 sample13 = tex2Daa_tiled_linearize(tex, sample12_uv + uv_step_x).rgb;
-    const float3 sample14 = tex2Daa_tiled_linearize(tex, sample12_uv + uv_step_x * 2.0).rgb;
-    const float3 sample15 = tex2Daa_tiled_linearize(tex, sample12_uv + uv_step_x * 3.0).rgb;
-    //  Sum weighted samples (weight sum must equal 1.0 for each channel):
-    return w_sum_inv * (
-        w0 * sample0 + w1 * sample1 + w2 * sample2 + w3 * sample3 +
-        w4 * sample4 + w5 * sample5 + w6 * sample6 + w7 * sample7 +
-        w8 * sample8 + w9 * sample9 + w10 * sample10 + w11 * sample11 +
-        w12 * sample12 + w13 * sample13 + w14 * sample14 + w15 * sample15);
-}
-
-float3 tex2Daa_debug_dynamic(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  This function is for testing only: Use an NxN grid with dynamic weights.
-    static const int grid_size = 8;
-    assign_aa_cubic_constants();
-    const float4 ssd_fai = get_subpixel_support_diam_and_final_axis_importance();
-    const float2 subpixel_support_diameter = ssd_fai.xy;
-    const float2 final_axis_importance = ssd_fai.zw;
-    const float grid_radius_in_samples = (float(grid_size) - 1.0)/2.0;
-    const float2 filter_space_offset_step =
-        subpixel_support_diameter/float2(grid_size);
-    const float2 sample0_filter_space_offset =
-        -grid_radius_in_samples * filter_space_offset_step;
-    //  Compute xy sample offsets and subpixel weights:
-    float3 weights[64]; // grid_size * grid_size
-    float3 weight_sum = float3(0.0, 0.0, 0.0);
-    for(int i = 0; i < grid_size; ++i)
-    {
-        for(int j = 0; j < grid_size; ++j)
-        {
-            //  Weights based on xy distances:
-            const float2 offset = sample0_filter_space_offset +
-                float2(j, i) * filter_space_offset_step;
-            const float3 weight = eval_unorm_rgb_weights(offset, final_axis_importance);
-            weights[i*grid_size + j] = weight;
-            weight_sum += weight;
-        }
-    }
-    //  Get uv offset vectors along x and y directions:
-    const float2x2 true_pixel_to_tex_uv =
-        float2x2((pixel_to_tex_uv * aa_pixel_diameter));
-    const float2 uv_offset_step_x = mul(true_pixel_to_tex_uv,
-        float2(filter_space_offset_step.x, 0.0));
-    const float2 uv_offset_step_y = mul(true_pixel_to_tex_uv,
-        float2(0.0, filter_space_offset_step.y));
-    //  Get a starting sample location:
-    const float2 sample0_uv_offset = -grid_radius_in_samples *
-        (uv_offset_step_x + uv_offset_step_y);
-    const float2 sample0_uv = tex_uv + sample0_uv_offset;
-    //  Load, weight, and sum [linearized] samples:
-    float3 sum = float3(0.0, 0.0, 0.0);
-    const float3 weight_sum_inv = float3(1.0)/weight_sum;
-    for(int i = 0; i < grid_size; ++i)
-    {
-        const float2 row_i_first_sample_uv =
-            sample0_uv + i * uv_offset_step_y;
-        for(int j = 0; j < grid_size; ++j)
-        {
-            const float2 sample_uv =
-                row_i_first_sample_uv + j * uv_offset_step_x;
-            sum += weights[i*grid_size + j] *
-                tex2Daa_tiled_linearize(tex, sample_uv).rgb;
-        }
-    }
-    return sum * weight_sum_inv;
-}
-
-
-///////////////////////  ANTIALIASING CODEPATH SELECTION  //////////////////////
-
-inline float3 tex2Daa(const sampler2D tex, const float2 tex_uv,
-    const float2x2 pixel_to_tex_uv, const float frame)
-{
-    //  Statically switch between antialiasing modes/levels:
-    return (aa_level < 0.5) ? tex2D_linearize(tex, tex_uv).rgb :
-        (aa_level < 3.5) ? tex2Daa_subpixel_weights_only(
-            tex, tex_uv, pixel_to_tex_uv) :
-        (aa_level < 4.5) ? tex2Daa4x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 5.5) ? tex2Daa5x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 6.5) ? tex2Daa6x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 7.5) ? tex2Daa7x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 11.5) ? tex2Daa8x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 15.5) ? tex2Daa12x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 19.5) ? tex2Daa16x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 23.5) ? tex2Daa20x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 253.5) ? tex2Daa24x(tex, tex_uv, pixel_to_tex_uv, frame) :
-        (aa_level < 254.5) ? tex2Daa_debug_16x_regular(
-            tex, tex_uv, pixel_to_tex_uv, frame) :
-        tex2Daa_debug_dynamic(tex, tex_uv, pixel_to_tex_uv, frame);
-}
-
-
-#endif  //  TEX2DANTIALIAS_H
-
diff --git a/crt/shaders/crt-royale/src/user-cgp-constants.h b/crt/shaders/crt-royale/src/user-cgp-constants.h
deleted file mode 100644
index 25578cbd5f..0000000000
--- a/crt/shaders/crt-royale/src/user-cgp-constants.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef USER_CGP_CONSTANTS_H
-#define USER_CGP_CONSTANTS_H
-
-//  IMPORTANT:
-//  These constants MUST be set appropriately for the settings in crt-royale.cgp
-//  (or whatever related .cgp file you're using).  If they aren't, you're likely
-//  to get artifacts, the wrong phosphor mask size, etc.  I wish these could be
-//  set directly in the .cgp file to make things easier, but...they can't.
-
-//  PASS SCALES AND RELATED CONSTANTS:
-//  Copy the absolute scale_x for BLOOM_APPROX.  There are two major versions of
-//  this shader: One does a viewport-scale bloom, and the other skips it.  The
-//  latter benefits from a higher bloom_approx_scale_x, so save both separately:
-static const float bloom_approx_size_x = 320.0;
-static const float bloom_approx_size_x_for_fake = 400.0;
-//  Copy the viewport-relative scales of the phosphor mask resize passes
-//  (MASK_RESIZE and the pass immediately preceding it):
-static const float2 mask_resize_viewport_scale = float2(0.0625, 0.0625);
-//  Copy the geom_max_aspect_ratio used to calculate the MASK_RESIZE scales, etc.:
-static const float geom_max_aspect_ratio = 4.0/3.0;
-
-//  PHOSPHOR MASK TEXTURE CONSTANTS:
-//  Set the following constants to reflect the properties of the phosphor mask
-//  texture named in crt-royale.cgp.  The shader optionally resizes a mask tile
-//  based on user settings, then repeats a single tile until filling the screen.
-//  The shader must know the input texture size (default 64x64), and to manually
-//  resize, it must also know the horizontal triads per tile (default 8).
-static const float2 mask_texture_small_size = float2(64.0, 64.0);
-static const float2 mask_texture_large_size = float2(512.0, 512.0);
-static const float mask_triads_per_tile = 8.0;
-//  We need the average brightness of the phosphor mask to compensate for the
-//  dimming it causes.  The following four values are roughly correct for the
-//  masks included with the shader.  Update the value for any LUT texture you
-//  change.  [Un]comment "#define PHOSPHOR_MASK_GRILLE14" depending on whether
-//  the loaded aperture grille uses 14-pixel or 15-pixel stripes (default 15).
-//#define PHOSPHOR_MASK_GRILLE14
-static const float mask_grille14_avg_color = 50.6666666/255.0;
-    //  TileableLinearApertureGrille14Wide7d33Spacing*.png
-    //  TileableLinearApertureGrille14Wide10And6Spacing*.png
-static const float mask_grille15_avg_color = 53.0/255.0;
-    //  TileableLinearApertureGrille15Wide6d33Spacing*.png
-    //  TileableLinearApertureGrille15Wide8And5d5Spacing*.png
-static const float mask_slot_avg_color = 46.0/255.0;
-    //  TileableLinearSlotMask15Wide9And4d5Horizontal8VerticalSpacing*.png
-    //  TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing*.png
-static const float mask_shadow_avg_color = 41.0/255.0;
-    //  TileableLinearShadowMask*.png
-    //  TileableLinearShadowMaskEDP*.png
-
-#ifdef PHOSPHOR_MASK_GRILLE14
-    static const float mask_grille_avg_color = mask_grille14_avg_color;
-#else
-    static const float mask_grille_avg_color = mask_grille15_avg_color;
-#endif
-
-
-#endif  //  USER_CGP_CONSTANTS_H
-
diff --git a/crt/shaders/crt-royale/user-settings.h b/crt/shaders/crt-royale/user-settings.h
deleted file mode 100644
index 154a0c3740..0000000000
--- a/crt/shaders/crt-royale/user-settings.h
+++ /dev/null
@@ -1,363 +0,0 @@
-#ifndef USER_SETTINGS_H
-#define USER_SETTINGS_H
-
-/////////////////////////////  DRIVER CAPABILITIES  ////////////////////////////
-
-//  The Cg compiler uses different "profiles" with different capabilities.
-//  This shader requires a Cg compilation profile >= arbfp1, but a few options
-//  require higher profiles like fp30 or fp40.  The shader can't detect profile
-//  or driver capabilities, so instead you must comment or uncomment the lines
-//  below with "//" before "#define."  Disable an option if you get compilation
-//  errors resembling those listed.  Generally speaking, all of these options
-//  will run on nVidia cards, but only DRIVERS_ALLOW_TEX2DBIAS (if that) is
-//  likely to run on ATI/AMD, due to the Cg compiler's profile limitations.
-
-//  Derivatives: Unsupported on fp20, ps_1_1, ps_1_2, ps_1_3, and arbfp1.
-//  Among other things, derivatives help us fix anisotropic filtering artifacts
-//  with curved manually tiled phosphor mask coords.  Related errors:
-//  error C3004: function "float2 ddx(float2);" not supported in this profile
-//  error C3004: function "float2 ddy(float2);" not supported in this profile
-    //#define DRIVERS_ALLOW_DERIVATIVES
-
-//  Fine derivatives: Unsupported on older ATI cards.
-//  Fine derivatives enable 2x2 fragment block communication, letting us perform
-//  fast single-pass blur operations.  If your card uses coarse derivatives and
-//  these are enabled, blurs could look broken.  Derivatives are a prerequisite.
-    #ifdef DRIVERS_ALLOW_DERIVATIVES
-        #define DRIVERS_ALLOW_FINE_DERIVATIVES
-    #endif
-
-//  Dynamic looping: Requires an fp30 or newer profile.
-//  This makes phosphor mask resampling faster in some cases.  Related errors:
-//  error C5013: profile does not support "for" statements and "for" could not
-//  be unrolled
-    //#define DRIVERS_ALLOW_DYNAMIC_BRANCHES
-
-//  Without DRIVERS_ALLOW_DYNAMIC_BRANCHES, we need to use unrollable loops.
-//  Using one static loop avoids overhead if the user is right, but if the user
-//  is wrong (loops are allowed), breaking a loop into if-blocked pieces with a
-//  binary search can potentially save some iterations.  However, it may fail:
-//  error C6001: Temporary register limit of 32 exceeded; 35 registers
-//  needed to compile program
-    //#define ACCOMODATE_POSSIBLE_DYNAMIC_LOOPS
-
-//  tex2Dlod: Requires an fp40 or newer profile.  This can be used to disable
-//  anisotropic filtering, thereby fixing related artifacts.  Related errors:
-//  error C3004: function "float4 tex2Dlod(sampler2D, float4);" not supported in
-//  this profile
-    //#define DRIVERS_ALLOW_TEX2DLOD
-
-//  tex2Dbias: Requires an fp30 or newer profile.  This can be used to alleviate
-//  artifacts from anisotropic filtering and mipmapping.  Related errors:
-//  error C3004: function "float4 tex2Dbias(sampler2D, float4);" not supported
-//  in this profile
-    //#define DRIVERS_ALLOW_TEX2DBIAS
-
-//  Integrated graphics compatibility: Integrated graphics like Intel HD 4000
-//  impose stricter limitations on register counts and instructions.  Enable
-//  INTEGRATED_GRAPHICS_COMPATIBILITY_MODE if you still see error C6001 or:
-//  error C6002: Instruction limit of 1024 exceeded: 1523 instructions needed
-//  to compile program.
-//  Enabling integrated graphics compatibility mode will automatically disable:
-//  1.) PHOSPHOR_MASK_MANUALLY_RESIZE: The phosphor mask will be softer.
-//      (This may be reenabled in a later release.)
-//  2.) RUNTIME_GEOMETRY_MODE
-//  3.) The high-quality 4x4 Gaussian resize for the bloom approximation
-    //#define INTEGRATED_GRAPHICS_COMPATIBILITY_MODE
-
-
-////////////////////////////  USER CODEPATH OPTIONS  ///////////////////////////
-
-//  To disable a #define option, turn its line into a comment with "//."
-
-//  RUNTIME VS. COMPILE-TIME OPTIONS (Major Performance Implications):
-//  Enable runtime shader parameters in the Retroarch (etc.) GUI?  They override
-//  many of the options in this file and allow real-time tuning, but many of
-//  them are slower.  Disabling them and using this text file will boost FPS.
-#define RUNTIME_SHADER_PARAMS_ENABLE
-//  Specify the phosphor bloom sigma at runtime?  This option is 10% slower, but
-//  it's the only way to do a wide-enough full bloom with a runtime dot pitch.
-#define RUNTIME_PHOSPHOR_BLOOM_SIGMA
-//  Specify antialiasing weight parameters at runtime?  (Costs ~20% with cubics)
-#define RUNTIME_ANTIALIAS_WEIGHTS
-//  Specify subpixel offsets at runtime? (WARNING: EXTREMELY EXPENSIVE!)
-//#define RUNTIME_ANTIALIAS_SUBPIXEL_OFFSETS
-//  Make beam_horiz_filter and beam_horiz_linear_rgb_weight into runtime shader
-//  parameters?  This will require more math or dynamic branching.
-#define RUNTIME_SCANLINES_HORIZ_FILTER_COLORSPACE
-//  Specify the tilt at runtime?  This makes things about 3% slower.
-#define RUNTIME_GEOMETRY_TILT
-//  Specify the geometry mode at runtime?
-#define RUNTIME_GEOMETRY_MODE
-//  Specify the phosphor mask type (aperture grille, slot mask, shadow mask) and
-//  mode (Lanczos-resize, hardware resize, or tile 1:1) at runtime, even without
-//  dynamic branches?  This is cheap if mask_resize_viewport_scale is small.
-#define FORCE_RUNTIME_PHOSPHOR_MASK_MODE_TYPE_SELECT
-
-//  PHOSPHOR MASK:
-//  Manually resize the phosphor mask for best results (slower)?  Disabling this
-//  removes the option to do so, but it may be faster without dynamic branches.
-    #define PHOSPHOR_MASK_MANUALLY_RESIZE
-//  If we sinc-resize the mask, should we Lanczos-window it (slower but better)?
-    #define PHOSPHOR_MASK_RESIZE_LANCZOS_WINDOW
-//  Larger blurs are expensive, but we need them to blur larger triads.  We can
-//  detect the right blur if the triad size is static or our profile allows
-//  dynamic branches, but otherwise we use the largest blur the user indicates
-//  they might need:
-    #define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_3_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_6_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_9_PIXELS
-    //#define PHOSPHOR_BLOOM_TRIADS_LARGER_THAN_12_PIXELS
-    //  Here's a helpful chart:
-    //  MaxTriadSize    BlurSize    MinTriadCountsByResolution
-    //  3.0             9.0         480/640/960/1920 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  6.0             17.0        240/320/480/960 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  9.0             25.0        160/213/320/640 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  12.0            31.0        120/160/240/480 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-    //  18.0            43.0        80/107/160/320 triads at 1080p/1440p/2160p/4320p, 4:3 aspect
-
-
-///////////////////////////////  USER PARAMETERS  //////////////////////////////
-
-//  Note: Many of these static parameters are overridden by runtime shader
-//  parameters when those are enabled.  However, many others are static codepath
-//  options that were cleaner or more convert to code as static constants.
-
-//  GAMMA:
-    static const float crt_gamma_static = 2.5;                  //  range [1, 5]
-    static const float lcd_gamma_static = 2.2;                  //  range [1, 5]
-
-//  LEVELS MANAGEMENT:
-    //  Control the final multiplicative image contrast:
-    static const float levels_contrast_static = 1.0;            //  range [0, 4)
-    //  We auto-dim to avoid clipping between passes and restore brightness
-    //  later.  Control the dim factor here: Lower values clip less but crush
-    //  blacks more (static only for now).
-    static const float levels_autodim_temp = 0.5;               //  range (0, 1]
-
-//  HALATION/DIFFUSION/BLOOM:
-    //  Halation weight: How much energy should be lost to electrons bounding
-    //  around under the CRT glass and exciting random phosphors?
-    static const float halation_weight_static = 0.0;            //  range [0, 1]
-    //  Refractive diffusion weight: How much light should spread/diffuse from
-    //  refracting through the CRT glass?
-    static const float diffusion_weight_static = 0.075;         //  range [0, 1]
-    //  Underestimate brightness: Bright areas bloom more, but we can base the
-    //  bloom brightpass on a lower brightness to sharpen phosphors, or a higher
-    //  brightness to soften them.  Low values clip, but >= 0.8 looks okay.
-    static const float bloom_underestimate_levels_static = 0.8; //  range [0, 5]
-    //  Blur all colors more than necessary for a softer phosphor bloom?
-    static const float bloom_excess_static = 0.0;               //  range [0, 1]
-    //  The BLOOM_APPROX pass approximates a phosphor blur early on with a small
-    //  blurred resize of the input (convergence offsets are applied as well).
-    //  There are three filter options (static option only for now):
-    //  0.) Bilinear resize: A fast, close approximation to a 4x4 resize
-    //      if min_allowed_viewport_triads and the BLOOM_APPROX resolution are sane
-    //      and beam_max_sigma is low.
-    //  1.) 3x3 resize blur: Medium speed, soft/smeared from bilinear blurring,
-    //      always uses a static sigma regardless of beam_max_sigma or
-    //      mask_num_triads_desired.
-    //  2.) True 4x4 Gaussian resize: Slowest, technically correct.
-    //  These options are more pronounced for the fast, unbloomed shader version.
-#ifndef RADEON_FIX
-    static const float bloom_approx_filter_static = 2.0;
-#else
-    static const float bloom_approx_filter_static = 1.0;
-#endif
-
-//  ELECTRON BEAM SCANLINE DISTRIBUTION:
-    //  How many scanlines should contribute light to each pixel?  Using more
-    //  scanlines is slower (especially for a generalized Gaussian) but less
-    //  distorted with larger beam sigmas (especially for a pure Gaussian).  The
-    //  max_beam_sigma at which the closest unused weight is guaranteed <
-    //  1.0/255.0 (for a 3x antialiased pure Gaussian) is:
-    //      2 scanlines: max_beam_sigma = 0.2089; distortions begin ~0.34; 141.7 FPS pure, 131.9 FPS generalized
-    //      3 scanlines, max_beam_sigma = 0.3879; distortions begin ~0.52; 137.5 FPS pure; 123.8 FPS generalized
-    //      4 scanlines, max_beam_sigma = 0.5723; distortions begin ~0.70; 134.7 FPS pure; 117.2 FPS generalized
-    //      5 scanlines, max_beam_sigma = 0.7591; distortions begin ~0.89; 131.6 FPS pure; 112.1 FPS generalized
-    //      6 scanlines, max_beam_sigma = 0.9483; distortions begin ~1.08; 127.9 FPS pure; 105.6 FPS generalized
-    static const float beam_num_scanlines = 3.0;                //  range [2, 6]
-    //  A generalized Gaussian beam varies shape with color too, now just width.
-    //  It's slower but more flexible (static option only for now).
-    static const bool beam_generalized_gaussian = true;
-    //  What kind of scanline antialiasing do you want?
-    //  0: Sample weights at 1x; 1: Sample weights at 3x; 2: Compute an integral
-    //  Integrals are slow (especially for generalized Gaussians) and rarely any
-    //  better than 3x antialiasing (static option only for now).
-    static const float beam_antialias_level = 1.0;              //  range [0, 2]
-    //  Min/max standard deviations for scanline beams: Higher values widen and
-    //  soften scanlines.  Depending on other options, low min sigmas can alias.
-    static const float beam_min_sigma_static = 0.02;            //  range (0, 1]
-    static const float beam_max_sigma_static = 0.3;             //  range (0, 1]
-    //  Beam width varies as a function of color: A power function (0) is more
-    //  configurable, but a spherical function (1) gives the widest beam
-    //  variability without aliasing (static option only for now).
-    static const float beam_spot_shape_function = 0.0;
-    //  Spot shape power: Powers <= 1 give smoother spot shapes but lower
-    //  sharpness.  Powers >= 1.0 are awful unless mix/max sigmas are close.
-    static const float beam_spot_power_static = 1.0/3.0;    //  range (0, 16]
-    //  Generalized Gaussian max shape parameters: Higher values give flatter
-    //  scanline plateaus and steeper dropoffs, simultaneously widening and
-    //  sharpening scanlines at the cost of aliasing.  2.0 is pure Gaussian, and
-    //  values > ~40.0 cause artifacts with integrals.
-    static const float beam_min_shape_static = 2.0;         //  range [2, 32]
-    static const float beam_max_shape_static = 4.0;         //  range [2, 32]
-    //  Generalized Gaussian shape power: Affects how quickly the distribution
-    //  changes shape from Gaussian to steep/plateaued as color increases from 0
-    //  to 1.0.  Higher powers appear softer for most colors, and lower powers
-    //  appear sharper for most colors.
-    static const float beam_shape_power_static = 1.0/4.0;   //  range (0, 16]
-    //  What filter should be used to sample scanlines horizontally?
-    //  0: Quilez (fast), 1: Gaussian (configurable), 2: Lanczos2 (sharp)
-    static const float beam_horiz_filter_static = 0.0;
-    //  Standard deviation for horizontal Gaussian resampling:
-    static const float beam_horiz_sigma_static = 0.35;      //  range (0, 2/3]
-    //  Do horizontal scanline sampling in linear RGB (correct light mixing),
-    //  gamma-encoded RGB (darker, hard spot shape, may better match bandwidth-
-    //  limiting circuitry in some CRT's), or a weighted avg.?
-    static const float beam_horiz_linear_rgb_weight_static = 1.0;   //  range [0, 1]
-    //  Simulate scanline misconvergence?  This needs 3x horizontal texture
-    //  samples and 3x texture samples of BLOOM_APPROX and HALATION_BLUR in
-    //  later passes (static option only for now).
-    static const bool beam_misconvergence = true;
-    //  Convergence offsets in x/y directions for R/G/B scanline beams in units
-    //  of scanlines.  Positive offsets go right/down; ranges [-2, 2]
-    static const float2 convergence_offsets_r_static = float2(0.1, 0.2);
-    static const float2 convergence_offsets_g_static = float2(0.3, 0.4);
-    static const float2 convergence_offsets_b_static = float2(0.5, 0.6);
-    //  Detect interlacing (static option only for now)?
-    static const bool interlace_detect_static = true;
-    //  Assume 1080-line sources are interlaced?
-    static const bool interlace_1080i_static = false;
-    //  For interlaced sources, assume TFF (top-field first) or BFF order?
-    //  (Whether this matters depends on the nature of the interlaced input.)
-    static const bool interlace_bff_static = false;
-
-//  ANTIALIASING:
-    //  What AA level do you want for curvature/overscan/subpixels?  Options:
-    //  0x (none), 1x (sample subpixels), 4x, 5x, 6x, 7x, 8x, 12x, 16x, 20x, 24x
-    //  (Static option only for now)
-    static const float aa_level = 12.0;                     //  range [0, 24]
-    //  What antialiasing filter do you want (static option only)?  Options:
-    //  0: Box (separable), 1: Box (cylindrical),
-    //  2: Tent (separable), 3: Tent (cylindrical),
-    //  4: Gaussian (separable), 5: Gaussian (cylindrical),
-    //  6: Cubic* (separable), 7: Cubic* (cylindrical, poor)
-    //  8: Lanczos Sinc (separable), 9: Lanczos Jinc (cylindrical, poor)
-    //      * = Especially slow with RUNTIME_ANTIALIAS_WEIGHTS
-    static const float aa_filter = 6.0;                     //  range [0, 9]
-    //  Flip the sample grid on odd/even frames (static option only for now)?
-    static const bool aa_temporal = false;
-    //  Use RGB subpixel offsets for antialiasing?  The pixel is at green, and
-    //  the blue offset is the negative r offset; range [0, 0.5]
-    static const float2 aa_subpixel_r_offset_static = float2(-1.0/3.0, 0.0);//float2(0.0);
-    //  Cubics: See http://www.imagemagick.org/Usage/filter/#mitchell
-    //  1.) "Keys cubics" with B = 1 - 2C are considered the highest quality.
-    //  2.) C = 0.5 (default) is Catmull-Rom; higher C's apply sharpening.
-    //  3.) C = 1.0/3.0 is the Mitchell-Netravali filter.
-    //  4.) C = 0.0 is a soft spline filter.
-    static const float aa_cubic_c_static = 0.5;             //  range [0, 4]
-    //  Standard deviation for Gaussian antialiasing: Try 0.5/aa_pixel_diameter.
-    static const float aa_gauss_sigma_static = 0.5;     //  range [0.0625, 1.0]
-
-//  PHOSPHOR MASK:
-    //  Mask type: 0 = aperture grille, 1 = slot mask, 2 = EDP shadow mask
-    static const float mask_type_static = 1.0;                  //  range [0, 2]
-    //  We can sample the mask three ways.  Pick 2/3 from: Pretty/Fast/Flexible.
-    //  0.) Sinc-resize to the desired dot pitch manually (pretty/slow/flexible).
-    //      This requires PHOSPHOR_MASK_MANUALLY_RESIZE to be #defined.
-    //  1.) Hardware-resize to the desired dot pitch (ugly/fast/flexible).  This
-    //      is halfway decent with LUT mipmapping but atrocious without it.
-    //  2.) Tile it without resizing at a 1:1 texel:pixel ratio for flat coords
-    //      (pretty/fast/inflexible).  Each input LUT has a fixed dot pitch.
-    //      This mode reuses the same masks, so triads will be enormous unless
-    //      you change the mask LUT filenames in your .cgp file.
-    static const float mask_sample_mode_static = 0.0;           //  range [0, 2]
-    //  Prefer setting the triad size (0.0) or number on the screen (1.0)?
-    //  If RUNTIME_PHOSPHOR_BLOOM_SIGMA isn't #defined, the specified triad size
-    //  will always be used to calculate the full bloom sigma statically.
-    static const float mask_specify_num_triads_static = 0.0;    //  range [0, 1]
-    //  Specify the phosphor triad size, in pixels.  Each tile (usually with 8
-    //  triads) will be rounded to the nearest integer tile size and clamped to
-    //  obey minimum size constraints (imposed to reduce downsize taps) and
-    //  maximum size constraints (imposed to have a sane MASK_RESIZE FBO size).
-    //  To increase the size limit, double the viewport-relative scales for the
-    //  two MASK_RESIZE passes in crt-royale.cgp and user-cgp-contants.h.
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    static const float mask_triad_size_desired_static = 24.0 / 8.0;
-    //  If mask_specify_num_triads is 1.0/true, we'll go by this instead (the
-    //  final size will be rounded and constrained as above); default 480.0
-    static const float mask_num_triads_desired_static = 480.0;
-    //  How many lobes should the sinc/Lanczos resizer use?  More lobes require
-    //  more samples and avoid moire a bit better, but some is unavoidable
-    //  depending on the destination size (static option for now).
-    static const float mask_sinc_lobes = 3.0;                   //  range [2, 4]
-    //  The mask is resized using a variable number of taps in each dimension,
-    //  but some Cg profiles always fetch a constant number of taps no matter
-    //  what (no dynamic branching).  We can limit the maximum number of taps if
-    //  we statically limit the minimum phosphor triad size.  Larger values are
-    //  faster, but the limit IS enforced (static option only, forever);
-    //      range [1, mask_texture_small_size/mask_triads_per_tile]
-    //  TODO: Make this 1.0 and compensate with smarter sampling!
-    static const float mask_min_allowed_triad_size = 2.0;
-
-//  GEOMETRY:
-    //  Geometry mode:
-    //  0: Off (default), 1: Spherical mapping (like cgwg's),
-    //  2: Alt. spherical mapping (more bulbous), 3: Cylindrical/Trinitron
-    static const float geom_mode_static = 0.0;      //  range [0, 3]
-    //  Radius of curvature: Measured in units of your viewport's diagonal size.
-    static const float geom_radius_static = 2.0;    //  range [1/(2*pi), 1024]
-    //  View dist is the distance from the player to their physical screen, in
-    //  units of the viewport's diagonal size.  It controls the field of view.
-    static const float geom_view_dist_static = 2.0; //  range [0.5, 1024]
-    //  Tilt angle in radians (clockwise around up and right vectors):
-    static const float2 geom_tilt_angle_static = float2(0.0, 0.0);  //  range [-pi, pi]
-    //  Aspect ratio: When the true viewport size is unknown, this value is used
-    //  to help convert between the phosphor triad size and count, along with
-    //  the mask_resize_viewport_scale constant from user-cgp-constants.h.  Set
-    //  this equal to Retroarch's display aspect ratio (DAR) for best results;
-    //  range [1, geom_max_aspect_ratio from user-cgp-constants.h];
-    //  default (256/224)*(54/47) = 1.313069909 (see below)
-    static const float geom_aspect_ratio_static = 1.313069909;
-    //  Before getting into overscan, here's some general aspect ratio info:
-    //  - DAR = display aspect ratio = SAR * PAR; as in your Retroarch setting
-    //  - SAR = storage aspect ratio = DAR / PAR; square pixel emulator frame AR
-    //  - PAR = pixel aspect ratio   = DAR / SAR; holds regardless of cropping
-    //  Geometry processing has to "undo" the screen-space 2D DAR to calculate
-    //  3D view vectors, then reapplies the aspect ratio to the simulated CRT in
-    //  uv-space.  To ensure the source SAR is intended for a ~4:3 DAR, either:
-    //  a.) Enable Retroarch's "Crop Overscan"
-    //  b.) Readd horizontal padding: Set overscan to e.g. N*(1.0, 240.0/224.0)
-    //  Real consoles use horizontal black padding in the signal, but emulators
-    //  often crop this without cropping the vertical padding; a 256x224 [S]NES
-    //  frame (8:7 SAR) is intended for a ~4:3 DAR, but a 256x240 frame is not.
-    //  The correct [S]NES PAR is 54:47, found by blargg and NewRisingSun:
-    //      http://board.zsnes.com/phpBB3/viewtopic.php?f=22&t=11928&start=50
-    //      http://forums.nesdev.com/viewtopic.php?p=24815#p24815
-    //  For flat output, it's okay to set DAR = [existing] SAR * [correct] PAR
-    //  without doing a. or b., but horizontal image borders will be tighter
-    //  than vertical ones, messing up curvature and overscan.  Fixing the
-    //  padding first corrects this.
-    //  Overscan: Amount to "zoom in" before cropping.  You can zoom uniformly
-    //  or adjust x/y independently to e.g. readd horizontal padding, as noted
-    //  above: Values < 1.0 zoom out; range (0, inf)
-    static const float2 geom_overscan_static = float2(1.0, 1.0);// * 1.005 * (1.0, 240/224.0)
-    //  Compute a proper pixel-space to texture-space matrix even without ddx()/
-    //  ddy()?  This is ~8.5% slower but improves antialiasing/subpixel filtering
-    //  with strong curvature (static option only for now).
-    static const bool geom_force_correct_tangent_matrix = true;
-
-//  BORDERS:
-    //  Rounded border size in texture uv coords:
-    static const float border_size_static = 0.015;           //  range [0, 0.5]
-    //  Border darkness: Moderate values darken the border smoothly, and high
-    //  values make the image very dark just inside the border:
-    static const float border_darkness_static = 2.0;        //  range [0, inf)
-    //  Border compression: High numbers compress border transitions, narrowing
-    //  the dark border area.
-    static const float border_compress_static = 2.5;        //  range [1, inf)
-
-
-#endif  //  USER_SETTINGS_H
-
diff --git a/crt/shaders/crt-sines.slang b/crt/shaders/crt-sines.slang
deleted file mode 100644
index 5a747dcf2d..0000000000
--- a/crt/shaders/crt-sines.slang
+++ /dev/null
@@ -1,192 +0,0 @@
-#version 450
-
-/*
-   April 2023
-   Fast CRT shader by DariusG.
- 
-*/
-layout(push_constant) uniform Push
-{
-    uint FrameCount;
-	float SCANLINE1;
-	float SCANLINE2;
-	float INTERLACE;
-	float SCALE;
-	float MSK1;
-	float MSK2;
-	float MSK_SIZE;
-	float FADE;
-	float PRESERVE;
-   float SAT;
-   float SIZE;
-   float BLUR;
-   float NOISE;
-   float SEGA;
-   float INGAMMA;
-   float OUTGAMMA,WPR,WPG,WPB,BOOST, BOOSTD;
-} params;
-
-#pragma parameter SIZE "   Soft Pixel Size" 0.5 0.125 4.0 0.125
-#pragma parameter BLUR "   Pixel Softness" 0.6 0.0 1.0 0.05
-#pragma parameter SCANLINE1 "Scanline Strength Dark" 0.75 0.0 1.0 0.05
-#pragma parameter SCANLINE2 "Scanline Strength Bright" 0.4 0.0 1.0 0.05
-#pragma parameter INTERLACE "Interlace Mode" 1.0 0.0 1.0 1.0
-#pragma parameter SCALE "Scanlines downscale"  1.0 1.0 2.0 1.0
-#pragma parameter MSK1 "   Mask Brightness Dark" 0.3 0.0 1.0 0.05
-#pragma parameter MSK2 "   Mask Brightness Bright" 0.6 0.0 1.0 0.05
-#pragma parameter MSK_SIZE "   Mask Size" 0.5002 0.5002 1.0 0.1666
-#pragma parameter FADE "   Mask/Scanlines fade" 0.2 0.0 1.0 0.05
-#pragma parameter PRESERVE "Protect Bright Colors" 0.7 0.0 1.0 0.01
-#pragma parameter SAT "Saturation" 1.0 0.0 2.0 0.05
-#pragma parameter INGAMMA "Gamma In" 2.4 1.0 4.0 0.05
-#pragma parameter OUTGAMMA "Gamma Out" 2.25 1.0 4.0 0.05
-#pragma parameter SEGA "Brightness Fix 1.0:Sega, 2:Amiga/ST" 0.0 0.0 2.0 1.0
-#pragma parameter NOISE "Add Noise" 0.0 0.0 1.0 0.01
-#pragma parameter WPR "  Shift to Red" 0.0 -0.25 0.25 0.01
-#pragma parameter WPG "  Shift to Green" 0.0 -0.25 0.25 0.01
-#pragma parameter WPB "  Shift to Blue" 0.0 -0.25 0.25 0.01
-#pragma parameter BOOST "  Bright Boost" 1.3 1.0 2.0 0.05
-#pragma parameter BOOSTD "  Dark Boost" 1.45 1.0 2.0 0.05
-
-#define OUTGAMMA params.OUTGAMMA
-#define INGAMMA params.INGAMMA
-#define SEGA params.SEGA
-#define NOISE params.NOISE
-#define SIZE params.SIZE
-#define BLUR params.BLUR
-#define SCANLINE1 params.SCANLINE1
-#define SCANLINE2 params.SCANLINE2
-#define INTERLACE params.INTERLACE
-#define SCALE params.SCALE
-#define MSK1 params.MSK1
-#define MSK2 params.MSK2
-#define MSK_SIZE params.MSK_SIZE 
-#define FADE params.FADE 
-#define PRESERVE params.PRESERVE
-#define GAMMA params.GAMMA
-#define SAT params.SAT
-#define WPR params.WPR
-#define WPG params.WPG
-#define WPB params.WPB
-#define BOOST params.BOOST
-#define BOOSTD params.BOOSTD
-
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-} global;
-
-#define iTimer float(params.FrameCount/60.0)
-#define OutputSize global.OutputSize
-#define SourceSize global.SourceSize
-#define pi  3.141592654
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 omega;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.0001;
-    omega = vec2(pi * OutputSize.x, pi * SourceSize.y/SCALE);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 omega;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-float snow(vec2 pos)
-{
-    return fract(sin(iTimer * dot(pos.xy ,vec2(13,78.233))) * 43758.5453);
-}
-
-
-
-void main()
-{
-
-   vec2 pos = vTexCoord.xy;
-/// SHARP-BILINEAR  Author: rsn8887
- 	vec2 texel = pos * SourceSize.xy;
- 	vec2 texel2 = pos * OutputSize.xy;
-   vec2 scale = max(floor(OutputSize.xy / SourceSize.xy), vec2(1.0, 1.0));
-   vec2 pixel = vec2(SIZE/OutputSize.x,0.0);
-	vec2 pixely = vec2(0.0,SIZE/OutputSize.y);
-
-   vec2 texel_floored = floor(texel);
-   vec2 texel_floored2 = floor(texel2);
-   vec2 s = fract(texel);
-   vec2 s2 = fract(texel2);
-   vec2 region_range = 0.5 - 0.5 / scale;
-
-   // Figure out where in the texel to sample to get correct pre-scaled bilinear.
-   // Uses the hardware bilinear interpolator to avoid having to sample 4 times manually.
-
-   vec2 center_dist = s - 0.5;
-   vec2 center_dist2 = s2 - 0.5;
-   vec2 f = (center_dist - clamp(center_dist, -region_range, region_range)) * scale + 0.5;
-   vec2 f2 = (center_dist2 - clamp(center_dist2, -region_range, region_range))/scale  + 0.5;
-
-   vec2 mod_texel = texel_floored + f;
-   vec2 mod_texel2 = texel_floored2 + f2;
-   vec2 uv=mod_texel / SourceSize.xy;
-   vec2 uv2=mod_texel2 / OutputSize.xy;
-
-/// "GHOST" PIXELS LEFT/RIGHT CALCULATION
-   vec3 col   = texture(Source, uv).rgb;
-   vec3 colr  = texture(Source, uv2-pixel).rgb;
-   vec3 coll  = texture(Source, uv2+pixel).rgb;
-   vec3 cold  = texture(Source, uv2-pixely).rgb;
-
-	vec3 color = vec3 (col.r*(1.0-BLUR) + coll.r*BLUR,
-						    col.g*(1.0-BLUR)                              + cold.g*BLUR,
-						    col.b*(1.0-BLUR)               + colr.b*BLUR);
-
-  
-    vec3 lumweight=vec3(0.3,0.6,0.1);
-    float lum = dot(color,lumweight);
-
- 
-//APPLY MASK 
-         float MSK  = mix(MSK1,MSK2,lum);       
-         float mask = mix(abs(sin(vTexCoord.x*omega.x*MSK_SIZE)), 1.0, lum*PRESERVE);
-
-         float scan = 1.0;
-         float SCANLINE = mix(SCANLINE1,SCANLINE2,lum);
-//INTERLACING MODE FIX SCANLINES
-    if (INTERLACE > 0.0 && global.OriginalSize.y > 400.0 ) scan; else
-         color *=  SCANLINE * sin(fract(vTexCoord.y*SourceSize.y/SCALE)*3.141529) +(1.0-SCANLINE);
-    color = pow(color,vec3(INGAMMA));
-
-         color =mix(color*mask, color, dot(color, vec3(FADE)));
-    
-    color *= mix(BOOSTD,BOOST,lum);
-    color *= vec3(1.0+WPR,     1.0-WPR/2.0, 1.0-WPR/2.0);
-    color *= vec3(1.0-WPG/2.0, 1.0+WPG,     1.0-WPG/2.0);
-    color *= vec3(1.0-WPB/2.0, 1.0-WPB/2.0, 1.0+WPB);
-    
-    color *= 1.0 + snow(uv * 2.0) * (1.0-lum) *NOISE;
-	 if (SEGA == 1.0) color *= 1.0625; else if (SEGA == 2.0) color *=2.0; else color;
-
-	 color = pow(color,vec3(1.0/OUTGAMMA));
-
-//FAST SATURATION CONTROL
-        if(SAT !=1.0)
-        {
-        vec3 gray = vec3(lum);
-        color = vec3(mix(gray, color, SAT));
-        }
-
-    FragColor = vec4(color,1.0);
-}
diff --git a/crt/shaders/crt-slangtest/common.inc b/crt/shaders/crt-slangtest/common.inc
deleted file mode 100644
index 396c778ff5..0000000000
--- a/crt/shaders/crt-slangtest/common.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-layout(push_constant, std140) uniform UBO
-{
-   vec4 SourceSize;
-   float OUT_GAMMA;
-   float BOOST;
-} global;
-
-layout(binding = 0, std140) uniform UBO1
-{
-   mat4 MVP;
-};
-
diff --git a/crt/shaders/crt-slangtest/cubic.slang b/crt/shaders/crt-slangtest/cubic.slang
deleted file mode 100644
index 4db4853571..0000000000
--- a/crt/shaders/crt-slangtest/cubic.slang
+++ /dev/null
@@ -1,43 +0,0 @@
-#version 450
-
-#include "common.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   float u = vTexCoord.x * global.SourceSize.x - 0.5;
-   float a = fract(u);
-   vec2 tex = vec2((floor(u) + 0.5) * global.SourceSize.z, vTexCoord.y);
-
-#define TEX(x, y) textureLodOffset(Source, tex, 0.0, ivec2(x, y)).rgb
-
-   vec3 i0 = TEX(-1, 0);
-   vec3 i1 = TEX( 0, 0);
-   vec3 i2 = TEX(+1, 0);
-   vec3 i3 = TEX(+2, 0);
-
-   float a2 = a * a;
-   float a3 = a2 * a;
-
-   vec3 color = i1 +
-      (i2 - i0) * 0.5 * a +
-      (i0 - (2.5 * i1) + (2.0 * i2) - (0.5 * i3)) * a2 +
-      ((i3 - i0) + 3.0 * (i1 - i2)) * 0.5 * a3;
-
-   FragColor = vec4(color, 1.0);
-}
diff --git a/crt/shaders/crt-slangtest/linearize.slang b/crt/shaders/crt-slangtest/linearize.slang
deleted file mode 100644
index c1fb2a3b65..0000000000
--- a/crt/shaders/crt-slangtest/linearize.slang
+++ /dev/null
@@ -1,34 +0,0 @@
-#version 450
-#include "parameters.inc"
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   float GAMMA;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec3 gamma(vec3 v)
-{
-   return pow(v, vec3(global.GAMMA));
-}
-
-void main()
-{
-   FragColor = vec4(gamma(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/crt/shaders/crt-slangtest/parameters.inc b/crt/shaders/crt-slangtest/parameters.inc
deleted file mode 100644
index e55bbb04d4..0000000000
--- a/crt/shaders/crt-slangtest/parameters.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma parameter OUT_GAMMA "Monitor Output Gamma" 2.2 1.8 2.4
-#pragma parameter BOOST "Color Boost" 1.0 0.2 2.0 0.02
-#pragma parameter GAMMA "CRT gamma" 2.5 2.0 3.0 0.02
diff --git a/crt/shaders/crt-slangtest/scanline.slang b/crt/shaders/crt-slangtest/scanline.slang
deleted file mode 100644
index f771de02c0..0000000000
--- a/crt/shaders/crt-slangtest/scanline.slang
+++ /dev/null
@@ -1,54 +0,0 @@
-#version 450
-
-#include "common.inc"
-#include "parameters.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec3 invgamma(vec3 v)
-{
-   return pow(clamp(v, vec3(0.0), vec3(1.0)), vec3(1.0 / global.OUT_GAMMA));
-}
-
-float luma(vec3 col)
-{
-   return dot(col, vec3(0.29, 0.60, 0.11));
-}
-
-void main()
-{
-   vec2 tex = vTexCoord * global.SourceSize.xy;
-
-   float fraction = fract(tex.y) - 0.5;
-   tex.y = floor(tex.y) + 0.5;
-   tex = tex * global.SourceSize.zw;
-
-#define TEX(x, y) textureLodOffset(Source, tex, 0.0, ivec2(x, y)).rgb
-   vec3 l0 = TEX(0, -1);
-   vec3 l1 = TEX(0,  0);
-   vec3 l2 = TEX(0,  1);
-
-   vec3 dist = (3.5 - 1.0 * vec3(luma(l0), luma(l1), luma(l2))) * (fraction + vec3(+1.0, 0.0, -1.0));
-   dist = exp2(-dist * dist);
-
-   vec3 color =
-      dist.x * l0 +
-      dist.y * l1 +
-      dist.z * l2;
-
-   FragColor = vec4(invgamma(global.BOOST * color), 1.0);
-}
diff --git a/crt/shaders/crt-slangtest/sinc.slang b/crt/shaders/crt-slangtest/sinc.slang
deleted file mode 100644
index 6a353d970f..0000000000
--- a/crt/shaders/crt-slangtest/sinc.slang
+++ /dev/null
@@ -1,49 +0,0 @@
-#version 450
-
-#include "common.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-#define PI 3.1415926535
-
-float sinc(float x)
-{
-   return sin(x) / x;
-}
-
-float kernel_(float x)
-{
-   x = max(abs(x) * PI, 0.0001);
-   return sinc(x) * sinc(0.5 * x);
-}
-
-void main()
-{
-   float u = vTexCoord.x * global.SourceSize.x - 0.5;
-   float a = fract(u);
-   vec2 tex = vec2((floor(u) + 0.5) * global.SourceSize.z, vTexCoord.y);
-
-#define TEX(x, y) textureLodOffset(Source, tex, 0.0, ivec2(x, y)).rgb
-
-   vec3 color =
-      kernel_(a + 1.0) * TEX(-1, 0) +
-      kernel_(a      ) * TEX( 0, 0) +
-      kernel_(a - 1.0) * TEX( 1, 0) +
-      kernel_(a - 2.0) * TEX( 2, 0);
-
-   FragColor = vec4(color, 1.0);
-}
diff --git a/crt/shaders/crt-yo6/KV-M1420B.png b/crt/shaders/crt-yo6/KV-M1420B.png
deleted file mode 100644
index 7322c424f9..0000000000
Binary files a/crt/shaders/crt-yo6/KV-M1420B.png and /dev/null differ
diff --git a/crt/shaders/crt-yo6/crt-yo6-flat-trinitron-tv.slang b/crt/shaders/crt-yo6/crt-yo6-flat-trinitron-tv.slang
deleted file mode 100644
index e93d2b3e23..0000000000
--- a/crt/shaders/crt-yo6/crt-yo6-flat-trinitron-tv.slang
+++ /dev/null
@@ -1,112 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-  vec4 SourceSize;
-  vec4 OriginalSize;
-  vec4 OutputSize;
-  uint FrameCount;
-  float TVL;
-  float VSIZE;
-  float VZOOM;
-  float VOFF;
-  float VOFFC;
-  float GAMMA;
-} params;
-
-#pragma parameter TVL   "TVL (0:Auto)"      0.0      0.0 16384.0 1.0
-#pragma parameter VSIZE "V-Size (0:Auto)"   0.0      0.0 16384.0 1.0
-#pragma parameter VOFF  "V-Offset"          0.0 -16384.0 16384.0 1.0
-#pragma parameter VOFFC "V-Offset Centered" 1.0      0.0     1.0 1.0
-#pragma parameter VZOOM "V-Zoom (2:Auto)"   2.0      2.0    15.0 1.0
-#pragma parameter GAMMA "Gamma"             1.8      0.0     4.0 0.1
-
-#define TEX_SIZE vec2(2560.0, 117.0)
-#define NB_ZOOM_LEVEL 13
-#define PAT_NFO_A const vec4 pat_nfo_a[NB_ZOOM_LEVEL] = { \
-  vec4( 2.0,  3.0, 0.0,   0.0), \
-  vec4( 3.0,  4.0, 1.0,   3.0), \
-  vec4( 3.0,  5.0, 1.0,   7.0), \
-  vec4( 4.0,  6.0, 1.0,  12.0), \
-  vec4( 5.0,  7.0, 1.0,  18.0), \
-  vec4( 5.0,  8.0, 1.0,  25.0), \
-  vec4( 6.0,  9.0, 2.0,  33.0), \
-  vec4( 7.0, 10.0, 2.0,  42.0), \
-  vec4( 7.0, 11.0, 2.0,  52.0), \
-  vec4( 8.0, 12.0, 2.0,  63.0), \
-  vec4( 9.0, 13.0, 3.0,  75.0), \
-  vec4( 9.0, 14.0, 3.0,  88.0), \
-  vec4(10.0, 15.0, 3.0, 102.0)  \
-}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-  mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vXY;
-layout(location = 1) out vec4 patNFO;
-layout(location = 2) out vec4 crtSize;
-layout(location = 3) out float vOff;
-
-void main()
-{
-  PAT_NFO_A;
-  float vsize = int(params.VSIZE) <= 0 ? params.SourceSize.y : params.VSIZE;
-  float tvl = int(params.TVL) <= 0 ? (vsize * 2.0) : params.TVL;
-  vec2 crt_sz = vec2(tvl, vsize);
-
-  int zoom = int(params.VZOOM) - 3;
-  if (zoom < 0) {
-    zoom = 0;
-    for (int level = 1; level < NB_ZOOM_LEVEL; level++) {
-       vec2 out_sz = pat_nfo_a[level].xy * crt_sz;
-       if (out_sz.x > params.OutputSize.x || out_sz.y > params.OutputSize.y) {
-         break;
-       }
-       zoom = level;
-    }
-  }
-  vec2 out_sz = pat_nfo_a[zoom].xy * crt_sz;
-
-  vXY = (TexCoord * params.OutputSize.xy) - floor((params.OutputSize.xy - out_sz) / 2.0);
-  patNFO = pat_nfo_a[zoom];
-  crtSize = vec4(out_sz, crt_sz);
-  vOff = params.VOFF +
-    ((int(params.VOFFC) == 1) ? (floor((params.SourceSize.y - crt_sz.y) / 2.0)) : 0.0);
-  gl_Position = global.MVP * Position;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vXY;
-layout(location = 1) in vec4 patNFO;
-layout(location = 2) in vec4 crtSize;
-layout(location = 3) in float vOff;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D TEX;
-
-float clip_px(vec2 pos) {
-  vec2 s = (sign(pos) + 1.0) / 2.0;
-  return s.x * s.y;
-} 
-
-void main()
-{
-  float row = floor(vXY.y / patNFO.y) + vOff + 0.5;
-  vec3 dst = vec3(0.0);
-  for (int ch = 0; ch < 3; ch++) {
-    vec2 xy = vXY + vec2(float(1 - ch) * patNFO.z, 0.0);
-    float col = floor(xy.x / patNFO.x) + 0.5;
-    vec3 src = texture(Source, vec2(col / crtSize.z, row / params.SourceSize.y)).rgb;
-    vec2 uv = vec2(floor(pow(src[ch], params.GAMMA) * 255.0) * patNFO.x, patNFO.w) + mod(xy, patNFO.xy);
-    dst[ch] = texture(TEX, uv / TEX_SIZE).r;
-  }
-  float clip = clip_px(vec2(row, params.SourceSize.y - row)) * clip_px(vXY) * clip_px(crtSize.xy - vXY);
-  FragColor = vec4(dst * clip, 1.0);
-}
diff --git a/crt/shaders/crt-yo6/crt-yo6-native-resolution.slang b/crt/shaders/crt-yo6/crt-yo6-native-resolution.slang
deleted file mode 100644
index a127cc148c..0000000000
--- a/crt/shaders/crt-yo6/crt-yo6-native-resolution.slang
+++ /dev/null
@@ -1,42 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-  vec4 SourceSize;
-  vec4 OriginalSize;
-  vec4 OutputSize;
-  uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-  mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out float vU;
-layout(location = 1) out float vY;
-
-void main()
-{
-  gl_Position = global.MVP * Position;
-  vU = TexCoord.x;
-  vY = (TexCoord.y * params.OutputSize.y) - 
-       round((params.OutputSize.y - params.SourceSize.y) / 2.0);
-}
-
-#pragma stage fragment
-layout(location = 0) in float vU;
-layout(location = 1) in float vY;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-  float clip0 = (sign(vY) + 1.0) / 2.0;
-  float clipH = (sign(params.SourceSize.y - vY) + 1.0) / 2.0;
-  vec3 col = texture(Source, vec2(vU, vY / params.SourceSize.y)).rgb;
-  FragColor = vec4(clip0 * clipH * col, 1.0); 
-}
diff --git a/crt/shaders/crt-yo6/crt-yo6-warp.slang b/crt/shaders/crt-yo6/crt-yo6-warp.slang
deleted file mode 100644
index 322c994abb..0000000000
--- a/crt/shaders/crt-yo6/crt-yo6-warp.slang
+++ /dev/null
@@ -1,43 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-  vec4 SourceSize;
-  vec4 OriginalSize;
-  vec4 OutputSize;
-  uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-  mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-  gl_Position = global.MVP * Position;
-  vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D TEX_CRT;
-
-
-void main()
-{
-  const vec3 packed = texture(TEX_CRT, vTexCoord).rgb; 
-
-  const vec2 dudv = ((packed.rg * 255.0) / 16.0) - 7.0;
-  const vec2 uv0 = vTexCoord * params.SourceSize.xy;
-  const vec2 uv = (uv0 + dudv) / params.SourceSize.xy;
-
-  FragColor = vec4(packed.b * texture(Source, uv).rgb, 1.0);
-}
diff --git a/crt/shaders/crt-yo6/phosphor-flat-trinitron-tv.png b/crt/shaders/crt-yo6/phosphor-flat-trinitron-tv.png
deleted file mode 100644
index 58e141763e..0000000000
Binary files a/crt/shaders/crt-yo6/phosphor-flat-trinitron-tv.png and /dev/null differ
diff --git a/crt/shaders/fake-crt-geom-potato.slang b/crt/shaders/fake-crt-geom-potato.slang
deleted file mode 100644
index df06618c26..0000000000
--- a/crt/shaders/fake-crt-geom-potato.slang
+++ /dev/null
@@ -1,97 +0,0 @@
-#version 450
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-    float SIZE;
-} params;
-
-// Parameter lines go here:
-
-#pragma parameter SIZE "Mask Type " 2.0 2.00 3.00 1.0
-#define SIZE params.SIZE
-
-#define OriginalSize params.OriginalSize
-#define OutputSize params.OutputSize
-#define SourceSize params.SourceSize
-
-#define pi 3.141592654
-	
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 2) out  float fragpos;
-
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.0001;
-    fragpos = vTexCoord.x*OutputSize.x*pi*2.0/SIZE;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(location = 2) in  float fragpos;
-
-
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-vec2 Warp(vec2 pos)
-{
-    pos = pos*2.0-1.0;
-    pos *= vec2(1.0+pos.y*pos.y*0.03, 1.0+pos.x*pos.x*0.04);
-    pos = pos*0.5+0.5;
-    return pos;
-}
-
-void main()
-{
-vec2 pos = Warp(vTexCoord);
-vec2 corn = min(pos, 1.0-pos);    // This is used to mask the rounded
-  corn.x = 0.0002/corn.x;         // corners later on
-
-float y = pos.y*SourceSize.y;
-vec2 dx = vec2(SourceSize.z*0.75,0.0);
-vec2 dy = vec2(0.0,SourceSize.w*0.5);
-
-// precalculated kaizer window filter
-vec3 res = vec3(0.0);
-res += texture(Source,pos -dx).rgb*-0.26565;
-res += texture(Source,pos -dy).rgb*-0.26565;
-res += texture(Source,pos ).rgb*1.5313;
-
-
-vec3 clean = res;
-float w = dot(vec3(0.15),res);
-
-// vignette  
-float x = (vTexCoord.x-0.5);  // range -0.5 to 0.5, 0.0 being center of screen
-      x = x*x;   
-res *= (0.25+x)*sin((y-0.25)*pi*2.0)+(0.75-x);
-res *= 0.15*sin(fragpos)+0.85;
-
-res = mix(res,clean, w);
-
-res *= vec3(1.0,0.9,1.15);
-
-
-float lum = dot(vec3(0.29,0.6,0.11),res);
-res = mix(vec3(lum),res, 1.1);
-
-res *= mix(1.25,1.0,w);
-if (corn.y <= corn.x || corn.x < 0.0001 )res = vec3(0.0);
-
-FragColor.rgb = res;   
-}
diff --git a/crt/shaders/fake-crt-geom.slang b/crt/shaders/fake-crt-geom.slang
deleted file mode 100644
index cab4b25093..0000000000
--- a/crt/shaders/fake-crt-geom.slang
+++ /dev/null
@@ -1,167 +0,0 @@
-#version 450
-
-// Simple scanlines with curvature and mask effects lifted from crt-geom
-// original by hunterk, edited by DariusG
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-  float SCANLINE_SINE_COMP_B;
-  float warpX;
-  float warpY;
-  float corner_round;
-  float cgwg;
-  float boost,monitor_gamma,crt_gamma;
-  float SIZE,GLOW_LINE;
-
-} params;
-
-// Parameter lines go here:
-#pragma parameter SCANLINE_SINE_COMP_B "Scanline Intensity" 0.3 0.0 1.0 0.05
-#pragma parameter SIZE "Scanline size" 1.0 0.5 2.0 0.5
-#pragma parameter warpX "warpX" 0.03 0.0 0.125 0.01
-#pragma parameter warpY "warpY" 0.05 0.0 0.125 0.01
-#pragma parameter corner_round "Corner Roundness" 0.030 0.005 0.100 0.005
-#pragma parameter cgwg "CGWG mask brightness" 0.7 0.0 1.0 0.1
-#pragma parameter crt_gamma "CRT Gamma" 2.4 1.0 4.0 0.05
-#pragma parameter monitor_gamma "Monitor Gamma" 2.25 1.0 4.0 0.05
-#pragma parameter boost "Bright boost " 0.20 0.00 1.00 0.02
-#pragma parameter GLOW_LINE "Glowing line" 0.006 0.00 0.20 0.001
-
-
-#define SCANLINE_SINE_COMP_B params.SCANLINE_SINE_COMP_B
-#define SIZE params.SIZE
-#define warpX params.warpX
-#define warpY params.warpY
-#define corner_round params.corner_round
-#define cgwg params.cgwg
-#define crt_gamma params.crt_gamma
-#define monitor_gamma params.monitor_gamma
-#define boost params.boost
-#define GLOW_LINE params.GLOW_LINE
-
-
-#define OutputSize params.OutputSize
-#define SourceSize params.SourceSize
-#define OriginalSize params.OriginalSize
-#define FrameCount params.FrameCount
-#define pi 3.141592
-#define in_gamma  vec4(crt_gamma, crt_gamma, crt_gamma, 1.0)
-#define out_gamma  vec4(1.0 / monitor_gamma, 1.0 / monitor_gamma, 1.0 / monitor_gamma, 1.0)
-#define scale vec4(SourceSize.xy/OriginalSize.xy,OriginalSize.xy/SourceSize.xy)
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-#define iTimer (float(FrameCount)*60.0)
-
-
-vec4 scanline(vec2 coord, vec4 frame, float l)
-{
-    float SCANLINE_SINE_COMP = mix(SCANLINE_SINE_COMP_B*1.5,SCANLINE_SINE_COMP_B,l);
-    vec3 res = frame.xyz;
-    vec3 scanline = res * (SCANLINE_SINE_COMP*sin(fract(coord.y*SIZE*SourceSize.y)*pi)+1.0- SCANLINE_SINE_COMP);
-
-    return vec4(scanline, 1.0);
-}
-
-
-// Distortion of scanlines, and end of screen alpha.
-vec2 Warp(vec2 pos)
-{
-    pos  = pos*2.0-1.0;    
-    pos *= vec2(1.0 + (pos.y*pos.y)*warpX, 1.0 + (pos.x*pos.x)*warpY);
-    
-    return pos*0.5 + 0.5;
-}
-
-float corner(vec2 coord)
-{               
-
-                coord *= scale.xy;
-                coord = (coord - vec2(0.5)) * 1.0 + vec2(0.5);
-                coord = min(coord, vec2(1.0)-coord) * vec2(1.0, OriginalSize.y/OriginalSize.x);
-                vec2 cdist = vec2(corner_round);
-                coord = (cdist - min(coord,cdist));
-                float dist = sqrt(dot(coord,coord));
-                return clamp((cdist.x-dist)*300.0,0.0, 1.0);
-}  
-
-
-// mask calculation
-    // cgwg mask.
-    vec4 Mask(vec2 pos)
-    {
-      vec3 mask = vec3(1.0);
-    
-      float m = fract(pos.x*0.5);
-      if (m<0.5) return vec4(cgwg,cgwg,cgwg,1.0);
-      else return vec4(mask,1.0);
- 
-    }
-
- float randomPass(vec2 coords)
- {
-    return fract(smoothstep(-120.0, 0.0, coords.y - (SourceSize.y + 120.0) * fract(iTimer * 0.00015)));
-}
-
-
-void main()
-{
-
-    vec2 pos = Warp(vTexCoord.xy*(scale.xy))*scale.zw;
-        vec2 OGL2Pos = pos * SourceSize.xy;
-        vec2 pC4 = floor(OGL2Pos) + 0.5;
-        vec2 coord = pC4 / SourceSize.xy;
-
-        vec2 tc = vec2(pos.x, coord.y);
-
-    vec4 res = texture(Source, tc);
-    float l = max(max(res.r,res.g),res.b);
-    res = scanline(pos,res,l);
-    res = scanline(1.0-pos,res,l);
-    res = scanline(1.0+pos,res,l);
-    res = pow(res,in_gamma);
-
-    // apply the mask; looks bad with vert scanlines so make them mutually exclusive
-    res *= Mask(vTexCoord *OutputSize.xy * 1.0001);
-
-#if defined GL_ES
-    // hacky clamp fix for GLES
-    vec2 bordertest = (tc);
-    if ( bordertest.x > 0.0001 && bordertest.x < 0.9999 && bordertest.y > 0.0001 && bordertest.y < 0.9999)
-        res = res;
-    else
-        res = vec4(0.,0.,0.,0.);
-#endif
-    vec4 color = res;
-
-    // re-apply the gamma curve for the mask path
-    color = pow(color, out_gamma);
-    color += boost*color;
-    color += randomPass(tc * SourceSize.xy) * GLOW_LINE;
-    FragColor = color*corner(tc);
-
-} 
diff --git a/crt/shaders/fakelottes.slang b/crt/shaders/fakelottes.slang
deleted file mode 100644
index 8bacfa9216..0000000000
--- a/crt/shaders/fakelottes.slang
+++ /dev/null
@@ -1,199 +0,0 @@
-#version 450
-
-// Simple scanlines with curvature and mask effects lifted from crt-lottes
-// by hunterk
-
-////////////////////////////////////////////////////////////////////
-////////////////////////////  SETTINGS  ////////////////////////////
-/////  comment these lines to disable effects and gain speed  //////
-////////////////////////////////////////////////////////////////////
-
-#define MASK // fancy, expensive phosphor mask effect
-#define CURVATURE // applies barrel distortion to the screen
-#define SCANLINES  // applies horizontal scanline effect
-//#define ROTATE_SCANLINES // for TATE games; also disables the mask effects, which look bad with it
-#define EXTRA_MASKS // disable these if you need extra registers freed up
-
-////////////////////////////////////////////////////////////////////
-//////////////////////////  END SETTINGS  //////////////////////////
-////////////////////////////////////////////////////////////////////
-
-// prevent stupid behavior
-#if defined ROTATE_SCANLINES && !defined SCANLINES
-	#define SCANLINES
-#endif
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float shadowMask;
-	float SCANLINE_SINE_COMP_B;
-	float warpX;
-	float warpY;
-	float maskDark;
-	float maskLight;
-	float monitor_gamma;
-	float crt_gamma;
-	float SCANLINE_SINE_COMP_A;
-	float SCANLINE_BASE_BRIGHTNESS;
-} params;
-
-#pragma parameter shadowMask "shadowMask" 1.0 0.0 4.0 1.0
-#pragma parameter SCANLINE_SINE_COMP_B "Scanline Intensity" 0.40 0.0 1.0 0.05
-#pragma parameter warpX "warpX" 0.031 0.0 0.125 0.01
-#pragma parameter warpY "warpY" 0.041 0.0 0.125 0.01
-#pragma parameter maskDark "maskDark" 0.5 0.0 2.0 0.1
-#pragma parameter maskLight "maskLight" 1.5 0.0 2.0 0.1
-#pragma parameter crt_gamma "CRT Gamma" 2.5 1.0 4.0 0.05
-#pragma parameter monitor_gamma "Monitor Gamma" 2.2 1.0 4.0 0.05
-#pragma parameter SCANLINE_SINE_COMP_A "Scanline Sine Comp A" 0.0 0.0 0.10 0.01
-#pragma parameter SCANLINE_BASE_BRIGHTNESS "Scanline Base Brightness" 0.95 0.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 scanline(vec2 coord, vec4 frame)
-{
-#if defined SCANLINES
-	vec2 omega = vec2(3.1415 * params.OutputSize.x, 2.0 * 3.1415 * params.SourceSize.y);
-	vec2 sine_comp = vec2(params.SCANLINE_SINE_COMP_A, params.SCANLINE_SINE_COMP_B);
-	vec3 res = frame.xyz;
-	#ifdef ROTATE_SCANLINES
-		sine_comp = sine_comp.yx;
-		omega = omega.yx;
-	#endif
-	vec3 scanline = res * (params.SCANLINE_BASE_BRIGHTNESS + dot(sine_comp * sin(coord * omega), vec2(1.0, 1.0)));
-
-	return vec4(scanline.x, scanline.y, scanline.z, 1.0);
-#else
-	return frame;
-#endif
-}
-
-#ifdef CURVATURE
-// Distortion of scanlines, and end of screen alpha.
-vec2 Warp(vec2 pos)
-{
-    pos  = pos*2.0-1.0;    
-    pos *= vec2(1.0 + (pos.y*pos.y)*params.warpX, 1.0 + (pos.x*pos.x)*params.warpY);
-    
-    return pos*0.5 + 0.5;
-}
-#endif
-
-#if defined MASK && !defined ROTATE_SCANLINES
-	// Shadow mask.
-	vec4 Mask(vec2 pos)
-	{
-		vec3 mask = vec3(params.maskDark, params.maskDark, params.maskDark);
-	  
-		// Very compressed TV style shadow mask.
-		if (params.shadowMask == 1.0) 
-		{
-			float line = params.maskLight;
-			float odd = 0.0;
-			
-			if (fract(pos.x*0.166666666) < 0.5) odd = 1.0;
-			if (fract((pos.y + odd) * 0.5) < 0.5) line = params.maskDark;  
-			
-			pos.x = fract(pos.x*0.333333333);
-
-			if      (pos.x < 0.333) mask.r = params.maskLight;
-			else if (pos.x < 0.666) mask.g = params.maskLight;
-			else                    mask.b = params.maskLight;
-			mask*=line;  
-		} 
-
-		// Aperture-grille.
-		else if (params.shadowMask == 2.0) 
-		{
-			pos.x = fract(pos.x*0.333333333);
-
-			if      (pos.x < 0.333) mask.r = params.maskLight;
-			else if (pos.x < 0.666) mask.g = params.maskLight;
-			else                    mask.b = params.maskLight;
-		} 
-	#ifdef EXTRA_MASKS
-		// These can cause moire with curvature and scanlines
-		// so they're an easy target for freeing up registers
-		
-		// Stretched VGA style shadow mask (same as prior shaders).
-		else if (params.shadowMask == 3.0) 
-		{
-			pos.x += pos.y*3.0;
-			pos.x  = fract(pos.x*0.166666666);
-
-			if      (pos.x < 0.333) mask.r = params.maskLight;
-			else if (pos.x < 0.666) mask.g = params.maskLight;
-			else                    mask.b = params.maskLight;
-		}
-
-		// VGA style shadow mask.
-		else if (params.shadowMask == 4.0) 
-		{
-			pos.xy  = floor(pos.xy*vec2(1.0, 0.5));
-			pos.x  += pos.y*3.0;
-			pos.x   = fract(pos.x*0.166666666);
-
-			if      (pos.x < 0.333) mask.r = params.maskLight;
-			else if (pos.x < 0.666) mask.g = params.maskLight;
-			else                    mask.b = params.maskLight;
-		}
-	#endif
-		
-		else mask = vec3(1.,1.,1.);
-
-		return vec4(mask, 1.0);
-	}
-#endif
-
-void main()
-{
-#ifdef CURVATURE
-	vec2 pos = Warp(vTexCoord.xy);
-#else
-	vec2 pos = vTexCoord.xy;
-#endif
-
-#if defined MASK && !defined ROTATE_SCANLINES
-	// mask effects look bad unless applied in linear gamma space
-	vec4 in_gamma = vec4(params.crt_gamma, params.crt_gamma, params.crt_gamma, 1.0);
-	vec4 out_gamma = vec4(1.0 / params.monitor_gamma, 1.0 / params.monitor_gamma, 1.0 / params.monitor_gamma, 1.0);
-	vec4 res = pow(texture(Source, pos), in_gamma);
-#else
-	vec4 res = texture(Source, pos);
-#endif
-
-#if defined MASK && !defined ROTATE_SCANLINES
-	// apply the mask; looks bad with vert scanlines so make them mutually exclusive
-	res *= Mask(vTexCoord * params.OutputSize.xy * 1.0001);
-#endif
-
-#if defined MASK && !defined ROTATE_SCANLINES
-	// re-apply the gamma curve for the mask path
-    FragColor = pow(scanline(pos-vec2(0.0,0.25*params.SourceSize.w), res), out_gamma);
-#else
-	FragColor = scanline(pos, res);
-#endif
-}
diff --git a/crt/shaders/glow-trails/combine.slang b/crt/shaders/glow-trails/combine.slang
deleted file mode 100644
index bff6d3c29c..0000000000
--- a/crt/shaders/glow-trails/combine.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float screen_combine;
-	float haze_strength;
-} params;
-
-#pragma parameter screen_combine "Screen Combine" 0.0 0.0 1.0 1.0
-#pragma parameter haze_strength "Haze Strength" 0.5 0.0 1.0 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PASS1;
-
-void main()
-{
-vec4 blurred = pow(texture(Source, vTexCoord), vec4(2.2));
-vec4 unblurred = pow(texture(PASS1, vTexCoord), vec4(2.2));
-vec4 dark = vec4(pow(mix(unblurred, blurred, params.haze_strength), vec4(1.0 / 2.2)));//vec4(pow((unblurred + blurred) / 2.0, vec4(1.0 / 2.2)));
-vec4 bright = vec4(pow(vec4(1.0) - (vec4(1.0) - unblurred) * (vec4(1.0) - blurred), vec4(1.0 / 2.2)));
-   FragColor = (params.screen_combine < 0.5) ? dark : bright;
-}
\ No newline at end of file
diff --git a/crt/shaders/glow-trails/glow-trails0.slang b/crt/shaders/glow-trails/glow-trails0.slang
deleted file mode 100644
index ff5c1d74b7..0000000000
--- a/crt/shaders/glow-trails/glow-trails0.slang
+++ /dev/null
@@ -1,66 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float mixfactor;
-	float threshold;
-} params;
-
-#pragma parameter mixfactor "Motionblur Fadeout" 0.5 0.0 1.0 0.01
-#pragma parameter threshold "Brightness Threshold" 0.9 0.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-float key(float avg)
-{
-	float guess = 1.5 - (1.5 / (avg * 0.1 + 1.0));
-	return max(0.0, guess) + 0.1;
-}
-
-mat3 yiq2rgb_mat = mat3(
-   1.0, 1.0, 1.0,
-   0.956, -0.2720, -1.1060,
-   0.6210, -0.6474, 1.7046
-);
-
-mat3 yiq_mat = mat3(
-      0.2989, 0.5959, 0.2115,
-      0.5870, -0.2744, -0.5229,
-      0.1140, -0.3216, 0.3114
-);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Trails0Feedback;
-
-void main()
-{
-	vec3 frame   = texture(Source, vTexCoord).rgb;
-	float luma   = (frame.rrr * yiq_mat).r;
-    float trails = clamp(luma - params.threshold, 0.0, 1.0);
-    vec4 fdback  = pow(texture(Trails0Feedback, vTexCoord), vec4(2.2));
-    vec4 mixed   = clamp((1.0 - params.mixfactor) * vec4(trails) - params.mixfactor * fdback, 0.0, 1.0) + params.mixfactor * fdback;
-//	vec4 current = pow(texture(Source, vTexCoord), vec4(2.2));
-    
-    FragColor = pow(mixed, vec4(1.0 / 2.2));
-}
diff --git a/crt/shaders/glow-trails/glow-trails1.slang b/crt/shaders/glow-trails/glow-trails1.slang
deleted file mode 100644
index 9fe43721e7..0000000000
--- a/crt/shaders/glow-trails/glow-trails1.slang
+++ /dev/null
@@ -1,47 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float trail_bright;
-} params;
-
-#pragma parameter trail_bright "Phos. Trail Brightness" 0.25 0.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-mat3 yiq_mat = mat3(
-      0.2989, 0.5959, 0.2115,
-      0.5870, -0.2744, -0.5229,
-      0.1140, -0.3216, 0.3114
-);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D glow_trails_refpass;
-
-void main()
-{
-	vec4 trails = texture(Source, vTexCoord).rgba;
-	vec4 current = pow(texture(glow_trails_refpass, vTexCoord).rgba, vec4(2.2));
-   FragColor = vec4(pow(current + vec4(clamp(trails.r - current.r, 0.0, 1.0) * params.trail_bright), vec4(1.0 / 2.2)));
-}
diff --git a/crt/shaders/glow/blur_horiz.slang b/crt/shaders/glow/blur_horiz.slang
deleted file mode 100644
index 7594041a93..0000000000
--- a/crt/shaders/glow/blur_horiz.slang
+++ /dev/null
@@ -1,46 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "blur_params.inc"
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-void main()
-{
-    vec3 col = vec3(0.0);
-    float dx = 4.0 * global.SourceSize.z; // Mipmapped
-
-    float k_total = 0.0;
-    for (int i = -TAPS; i <= TAPS; i++)
-    {
-        float k  = kernel(i);
-        k_total += k;
-        col     += k * texture(Source, vTexCoord + vec2(float(i) * dx, 0.0)).rgb;
-    }
-
-    FragColor = vec4(col / k_total, 1.0);
-}
diff --git a/crt/shaders/glow/blur_params.inc b/crt/shaders/glow/blur_params.inc
deleted file mode 100644
index 1a8615ce0f..0000000000
--- a/crt/shaders/glow/blur_params.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-// Higher value, more centered glow.
-// Lower values might need more taps.
-#define GLOW_FALLOFF 0.35
-#define TAPS 4
-
diff --git a/crt/shaders/glow/blur_vert.slang b/crt/shaders/glow/blur_vert.slang
deleted file mode 100644
index df4747085d..0000000000
--- a/crt/shaders/glow/blur_vert.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "blur_params.inc"
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-void main()
-{
-    vec3 col = vec3(0.0);
-    float dy = global.SourceSize.w;
-
-    float k_total = 0.0;
-    for (int i = -TAPS; i <= TAPS; i++)
-    {
-        float k = kernel(i);
-        k_total += k;
-        col += k * texture(Source, vTexCoord + vec2(0.0, float(i) * dy)).rgb;
-    }
-
-    FragColor = vec4(col / k_total, 1.0);
-}
diff --git a/crt/shaders/glow/gauss_horiz.slang b/crt/shaders/glow/gauss_horiz.slang
deleted file mode 100644
index 9cdf6f8173..0000000000
--- a/crt/shaders/glow/gauss_horiz.slang
+++ /dev/null
@@ -1,55 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
-layout(location = 1) out float data_pix_no;
-layout(location = 2) out float data_one;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-
-    data_pix_no = vTexCoord.x * global.SourceSize.x;
-    data_one    = global.SourceSize.z;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 1) in  float data_pix_no;
-layout(location = 2) in  float data_one;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define INV_SQRT_2_PI 0.38 // Doesn't have to be accurate.
-
-#define HORIZ_GAUSS_WIDTH 0.5
-
-void main()
-{
-    float texel      = floor(data_pix_no);
-    float phase      = data_pix_no - texel;
-    float base_phase = phase - 0.5;
-    vec2 tex         = vec2((texel + 0.5) * global.SourceSize.z, vTexCoord.y);
-
-    vec3 col = vec3(0.0);
-    for (int i = -2; i <= 2; i++)
-    {
-        float phase = base_phase - float(i);
-        float g = INV_SQRT_2_PI * exp(-0.5 * phase * phase / (HORIZ_GAUSS_WIDTH * HORIZ_GAUSS_WIDTH)) / HORIZ_GAUSS_WIDTH;
-        col += texture(Source, tex + vec2(float(i) * data_one, 0.0)).rgb * g;
-    }
-
-    FragColor = vec4(col, 1.0);
-}
diff --git a/crt/shaders/glow/gauss_vert.slang b/crt/shaders/glow/gauss_vert.slang
deleted file mode 100644
index d8016e24f9..0000000000
--- a/crt/shaders/glow/gauss_vert.slang
+++ /dev/null
@@ -1,78 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float BOOST;
-} params;
-
-#pragma parameter BOOST "Color Boost" 1.0 0.5 1.5 0.02
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
-layout(location = 1) out vec2  data_pix_no;
-layout(location = 2) out float data_one;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-
-    data_pix_no = vTexCoord * global.SourceSize.xy - vec2(0.0, 0.5);
-    data_one    = global.SourceSize.w;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 1) in  vec2  data_pix_no;
-layout(location = 2) in  float data_one;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define CRT_GEOM_BEAM 1
-
-vec3 beam(vec3 color, float dist)
-{
-#if CRT_GEOM_BEAM
-    vec3 wid     = 2.0 + 2.0 * pow(color, vec3(4.0));
-    vec3 weights = vec3(abs(dist) * 3.333333333);
-
-    return 2.0 * color * exp(-pow(weights * inversesqrt(0.5 * wid), wid)) / (0.6 + 0.2 * wid);
-#else
-    float reciprocal_width = 4.0;
-    vec3 x = dist * reciprocal_width;
-
-    return 2.0 * color * exp(-0.5 * x * x) * reciprocal_width;
-#endif
-}
-
-void main()
-{
-    vec2  texel = floor(data_pix_no);
-    float phase = data_pix_no.y - texel.y;
-    vec2  tex   = vec2(texel + 0.5) * global.SourceSize.zw;
-
-    vec3 top    = texture(Source, tex + vec2(0.0, 0 * data_one)).rgb;
-    vec3 bottom = texture(Source, tex + vec2(0.0, 1 * data_one)).rgb;
-
-    float dist0 = phase;
-    float dist1 = 1.0 - phase;
-
-    vec3 scanline = vec3(0.0);
-
-    scanline += beam(top,    dist0);
-    scanline += beam(bottom, dist1);
-
-    FragColor = vec4(params.BOOST * scanline * 0.869565217391304, 1.0);
-}
-
diff --git a/crt/shaders/glow/lanczos_horiz.slang b/crt/shaders/glow/lanczos_horiz.slang
deleted file mode 100644
index 42d7acfe01..0000000000
--- a/crt/shaders/glow/lanczos_horiz.slang
+++ /dev/null
@@ -1,67 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
-layout(location = 1) out float data_pix_no;
-layout(location = 2) out float data_one;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-
-    data_pix_no = vTexCoord.x * global.SourceSize.x;
-    data_one    = global.SourceSize.z;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 1) in  float data_pix_no;
-layout(location = 2) in  float data_one;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define PI 3.14159265359
-
-float sinc(float x)
-{
-    if (abs(x) < 0.001)
-        return 1.0;
-
-    x *= PI;
-    return sin(x) / x;
-}
-
-#define BOOST 1.0
-
-void main()
-{
-    float texel      = floor(data_pix_no);
-    float phase      = data_pix_no - texel;
-    float base_phase = phase - 0.5;
-    vec2 tex         = vec2((texel + 0.5) * global.SourceSize.z, vTexCoord.y);
-
-    vec3 col = vec3(0.0);
-    for (int i = -2; i <= 2; i++)
-    {
-        float phase = base_phase - float(i);
-        if (abs(phase) < 2.0)
-        {
-            float g = BOOST * sinc(phase) * sinc(0.5 * phase);
-            col += texture(Source, tex + vec2(float(i) * data_one, 0.0)).rgb * g;
-        }
-    }
-
-    FragColor = vec4(col, 1.0);
-}
diff --git a/crt/shaders/glow/linearize.slang b/crt/shaders/glow/linearize.slang
deleted file mode 100644
index e66f7f7311..0000000000
--- a/crt/shaders/glow/linearize.slang
+++ /dev/null
@@ -1,40 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float INPUT_GAMMA;
-} params;
-
-#pragma parameter INPUT_GAMMA "Input Gamma" 2.4 2.0 2.6 0.02
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 color = texture(Source, vTexCoord).rgb;
-
-    FragColor  = vec4(pow(color, vec3(params.INPUT_GAMMA)), 1.0);
-}
diff --git a/crt/shaders/glow/resolve.slang b/crt/shaders/glow/resolve.slang
deleted file mode 100644
index 6c1bfb43f8..0000000000
--- a/crt/shaders/glow/resolve.slang
+++ /dev/null
@@ -1,204 +0,0 @@
-#version 450
-
-// Original bits by Themaister
-// Moire mitigation bits by Timothy Lottes, added by hunterk
- 
-layout(push_constant) uniform Push
-{
-   float BLOOM_STRENGTH;
-   float OUTPUT_GAMMA;
-   float CURVATURE;
-   float warpX;
-   float warpY;
-   float shadowMask;
-   float maskDark;
-   float maskLight;
-   float cornersize;
-   float cornersmooth;
-   float noise_amt;
-} params;
- 
-#pragma parameter BLOOM_STRENGTH "Glow Strength" 0.45 0.0 0.8 0.05
-#pragma parameter OUTPUT_GAMMA "Monitor Gamma" 2.2 1.8 2.6 0.02
-#pragma parameter CURVATURE "Curvature" 0.0 0.0 1.0 1.0
-#pragma parameter warpX "Curvature X-Axis" 0.031 0.0 0.125 0.01
-#pragma parameter warpY "Curvature Y-Axis" 0.041 0.0 0.125 0.01
-vec2 Distortion = vec2(params.warpX, params.warpY) * 15.;
-#pragma parameter cornersize "Corner Size" 0.01 0.001 1.0 0.005
-#define cornersize params.cornersize
-#pragma parameter cornersmooth "Corner Smoothness" 1000.0 80.0 2000.0 100.0
-#define cornersmooth params.cornersmooth
-#pragma parameter noise_amt "Noise Amount" 1.0 0.0 5.0 0.25
-#pragma parameter shadowMask "Mask Effect" 0.0 0.0 4.0 1.0
-#pragma parameter maskDark "maskDark" 0.5 0.0 2.0 0.1
-#pragma parameter maskLight "maskLight" 1.5 0.0 2.0 0.1
- 
-#define iTime mod(float(global.FrameCount) / 60.0, 600.0)
-#define fragCoord (vTexCoord.xy * global.OutputSize.xy)
- 
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-    vec4 CRTPassSize;
-   uint FrameCount;
-} global;
- 
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
- 
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
- 
-#pragma stage fragment
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-layout(set = 0, binding = 2) uniform sampler2D CRTPass;
- 
-// For debugging
-#define BLOOM_ONLY 0
- 
-#define CRT_PASS CRTPass
- 
-// Convert from linear to sRGB.
-//float Srgb(float c){return(c<0.0031308?c*12.92:1.055*pow(c,0.41666)-0.055);}
-vec4 Srgb(vec4 c){return pow(c, vec4(1.0 / 2.2));}
- 
-// Convert from sRGB to linear.
-//float Linear(float c){return(c<=0.04045)?c/12.92:pow((c+0.055)/1.055,2.4);}
-float Linear(float c){return pow(c, 2.2);}
- 
-float rand(vec2 n) { 
-	return fract(sin(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
-}
-
-float noise(vec2 p){
-	vec2 ip = floor(p);
-	vec2 u = fract(p);
-	u = u*u*(3.0-2.0*u);
-	
-	float res = mix(
-		mix(rand(ip),rand(ip+vec2(1.0,0.0)),u.x),
-		mix(rand(ip+vec2(0.0,1.0)),rand(ip+vec2(1.0,1.0)),u.x),u.y);
-	return res*res;
-}
-
-const vec2 corner_aspect   = vec2(1.0,  0.75);
-
-float corner(vec2 coord)
-{
-    coord = (coord - vec2(0.5)) + vec2(0.5, 0.5);
-    coord = min(coord, vec2(1.0) - coord) * corner_aspect;
-    vec2 cdist = vec2(cornersize);
-    coord = (cdist - min(coord, cdist));
-    float dist = sqrt(dot(coord, coord));
-    
-    return clamp((cdist.x - dist)*cornersmooth, 0.0, 1.0);
-}
-
-vec2 Warp(vec2 texCoord){
-  float offset_x = noise(sin(gl_FragCoord.xy) * float(mod(global.FrameCount, 361.)));
-  float offset_y = noise(cos(gl_FragCoord.yx) * float(mod(global.FrameCount, 873.)));
-  vec2 noisecoord = texCoord + vec2(offset_x, offset_y) * 0.001 * params.noise_amt;
-  vec2 curvedCoords = noisecoord * 2.0 - 1.0;
-  float curvedCoordsDistance = sqrt(curvedCoords.x*curvedCoords.x+curvedCoords.y*curvedCoords.y);
-
-  curvedCoords = curvedCoords / curvedCoordsDistance;
-
-  curvedCoords = curvedCoords * (1.0-pow(vec2(1.0-(curvedCoordsDistance/1.4142135623730950488016887242097)),(1.0/(1.0+Distortion*0.2))));
-
-  curvedCoords = curvedCoords / (1.0-pow(vec2(0.29289321881345247559915563789515),(1.0/(vec2(1.0)+Distortion*0.2))));
-
-  curvedCoords = curvedCoords * 0.5 + 0.5;
-  return curvedCoords;
-}
- 
-// Shadow mask.
-vec3 Mask(vec2 pos)
-{
-    vec3 mask = vec3(params.maskDark, params.maskDark, params.maskDark);
- 
-    // Very compressed TV style shadow mask.
-    if (params.shadowMask == 1.0)
-    {
-        float line = params.maskLight;
-        float odd = 0.0;
-       
-        if (fract(pos.x*0.166666666) < 0.5) odd = 1.0;
-        if (fract((pos.y + odd) * 0.5) < 0.5) line = params.maskDark;  
-       
-        pos.x = fract(pos.x*0.333333333);
- 
-        if      (pos.x < 0.333) mask.r = params.maskLight;
-        else if (pos.x < 0.666) mask.g = params.maskLight;
-        else                    mask.b = params.maskLight;
-        mask*=line;  
-    }
- 
-    // Aperture-grille.
-    else if (params.shadowMask == 2.0)
-    {
-        pos.x = fract(pos.x*0.333333333);
- 
-        if      (pos.x < 0.333) mask.r = params.maskLight;
-        else if (pos.x < 0.666) mask.g = params.maskLight;
-        else                    mask.b = params.maskLight;
-    }
- 
-    // Stretched VGA style shadow mask (same as prior shaders).
-    else if (params.shadowMask == 3.0)
-    {
-        pos.x += pos.y*3.0;
-        pos.x  = fract(pos.x*0.166666666);
- 
-        if      (pos.x < 0.333) mask.r = params.maskLight;
-        else if (pos.x < 0.666) mask.g = params.maskLight;
-        else                    mask.b = params.maskLight;
-    }
- 
-    // VGA style shadow mask.
-    else if (params.shadowMask == 4.0)
-    {
-        pos.xy  = floor(pos.xy*vec2(1.0, 0.5));
-        pos.x  += pos.y*3.0;
-        pos.x   = fract(pos.x*0.166666666);
- 
-        if      (pos.x < 0.333) mask.r = params.maskLight;
-        else if (pos.x < 0.666) mask.g = params.maskLight;
-        else                    mask.b = params.maskLight;
-    }
- 
-    return mask;
-}
- 
-void main()
-{
-   vec2 pp = vTexCoord.xy;
-   pp = (params.CURVATURE > 0.5) ? Warp(pp) : pp;
-   
-#if BLOOM_ONLY
-    vec3 source = BLOOM_STRENGTH * texture(Source, pp).rgb;
-#else
- 
-    vec3 source = 1.15 * texture(CRT_PASS, pp).rgb;
-    vec3 bloom  = texture(Source, pp).rgb;
-    source     += params.BLOOM_STRENGTH * bloom;
-#endif
-    FragColor = vec4(pow(clamp(source, 0.0, 1.0), vec3(1.0 / params.OUTPUT_GAMMA)), 1.0);
-     /* TODO/FIXME - hacky clamp fix */
-    if ( pp.x > 0.0001 && pp.x < 0.9999 && pp.y > 0.0001 && pp.y < 0.9999)
-        FragColor.rgb = FragColor.rgb;
-    else
-FragColor.rgb = vec3(0.0);
-FragColor.rgb *= (params.CURVATURE > 0.5) ? corner(pp) : 1.0;
-if (params.shadowMask > 0.0)
-        FragColor.rgb = pow(pow(FragColor.rgb, vec3(2.2)) * Mask(vTexCoord.xy * global.OutputSize.xy * 1.000001), vec3(1.0 / 2.2));
-}
diff --git a/crt/shaders/glow/threshold.slang b/crt/shaders/glow/threshold.slang
deleted file mode 100644
index b53406fba9..0000000000
--- a/crt/shaders/glow/threshold.slang
+++ /dev/null
@@ -1,43 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float GLOW_WHITEPOINT;
-    float GLOW_ROLLOFF;
-} params;
-
-#pragma parameter GLOW_WHITEPOINT "Glow Whitepoint" 1.0 0.5 1.1 0.02
-#pragma parameter GLOW_ROLLOFF "Glow Rolloff" 3.0 1.2 6.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4  Position;
-layout(location = 1) in  vec2  TexCoord;
-layout(location = 0) out vec2  vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-#pragma format R8G8B8A8_SRGB
-layout(location = 0) in  vec2  vTexCoord;
-layout(location = 0) out vec4  FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 color  = 1.15 * texture(Source, vTexCoord).rgb;
-    vec3 factor = clamp(color / params.GLOW_WHITEPOINT, 0.0, 1.0);
-
-    FragColor = vec4(pow(factor, vec3(params.GLOW_ROLLOFF)), 1.0);
-}
diff --git a/crt/shaders/metacrt/Image.slang b/crt/shaders/metacrt/Image.slang
deleted file mode 100644
index 1e6a031e0f..0000000000
--- a/crt/shaders/metacrt/Image.slang
+++ /dev/null
@@ -1,391 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float flip_image;
-} params;
-
-#define vFragCoord vTexCoord.xy * params.OutputSize.xy
-#define iResolution params.OutputSize.xy
-#define iTime params.FrameCount / 60.0
-#define iChannel0 Source
-#define iChannel1 cubeMap
-#define iChannel2 table
-#define iMouse vec3(0.0)
-#define vFragColor FragColor
-#define fragColor FragColor
-
-#pragma parameter flip_image "Flip Image (for hardware-rendered cores)" 0.0 0.0 1.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = (bool(params.flip_image)) ? vec2(TexCoord.x, 1.0 - TexCoord.y) : TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D cubeMap;
-layout(set = 0, binding = 4) uniform sampler2D table;
-
-// Meta CRT - @P_Malin
-// https://www.shadertoy.com/view/4dlyWX#
-// In which I add and remove aliasing
-
-// Uncomment different defines in Buf B to run different shaders on TV
-
-// Postprocessing Pass
-// Motion blur, Depth of Field, Vignetting & Tonemap
-
-
-#define ENABLE_DOF
-#define ENABLE_MOTION_BLUR
-
-///////////////////////////
-// Hash Functions
-///////////////////////////
-
-// From: Hash without Sine by Dave Hoskins
-// https://www.shadertoy.com/view/4djSRW
-
-// *** Use this for integer stepped ranges, ie Value-Noise/Perlin noise functions.
-//#define HASHSCALE1 .1031
-//#define HASHSCALE3 vec3(.1031, .1030, .0973)
-//#define HASHSCALE4 vec4(1031, .1030, .0973, .1099)
-
-// For smaller input rangers like audio tick or 0-1 UVs use these...
-#define HASHSCALE1 443.8975
-#define HASHSCALE3 vec3(443.897, 441.423, 437.195)
-#define HASHSCALE4 vec3(443.897, 441.423, 437.195, 444.129)
-
-
-//----------------------------------------------------------------------------------------
-//  2 out, 1 in...
-vec2 hash21(float p)
-{
-	vec3 p3 = fract(vec3(p) * HASHSCALE3);
-	p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.xx+p3.yz)*p3.zy);
-
-}
-
-///  2 out, 3 in...
-vec2 hash23(vec3 p3)
-{
-	p3 = fract(p3 * HASHSCALE3);
-    p3 += dot(p3, p3.yzx+19.19);
-    return fract((p3.xx+p3.yz)*p3.zy);
-}
-
-//  1 out, 3 in...
-float hash13(vec3 p3)
-{
-	p3  = fract(p3 * HASHSCALE1);
-    p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.x + p3.y) * p3.z);
-}
-
-
-///////////////////////////
-// Data Storage
-///////////////////////////
-
-vec4 LoadVec4( sampler2D tex, in ivec2 vAddr )
-{
-    return texelFetch( tex, vAddr, 0 );
-}
-
-vec3 LoadVec3( sampler2D tex, in ivec2 vAddr )
-{
-    return LoadVec4( tex, vAddr ).xyz;
-}
-
-bool AtAddress( ivec2 p, ivec2 c ) { return all( equal( p, c ) ); }
-
-void StoreVec4( in ivec2 vAddr, in vec4 vValue, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    fragColor = AtAddress( fragCoord, vAddr ) ? vValue : fragColor;
-}
-
-void StoreVec3( in ivec2 vAddr, in vec3 vValue, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    StoreVec4( vAddr, vec4( vValue, 0.0 ), fragColor, fragCoord);
-}
-
-///////////////////////////
-// Camera
-///////////////////////////
-
-struct CameraState
-{
-    vec3 vPos;
-    vec3 vTarget;
-    float fFov;
-    vec2 vJitter;
-    float fPlaneInFocus;
-};
-    
-void Cam_LoadState( out CameraState cam, sampler2D tex, ivec2 addr )
-{
-    vec4 vPos = LoadVec4( tex, addr + ivec2(0,0) );
-    cam.vPos = vPos.xyz;
-    vec4 targetFov = LoadVec4( tex, addr + ivec2(1,0) );
-    cam.vTarget = targetFov.xyz;
-    cam.fFov = targetFov.w;
-    vec4 jitterDof = LoadVec4( tex, addr + ivec2(2,0) );
-    cam.vJitter = jitterDof.xy;
-    cam.fPlaneInFocus = jitterDof.z;
-}
-
-void Cam_StoreState( ivec2 addr, const in CameraState cam, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    StoreVec4( addr + ivec2(0,0), vec4( cam.vPos, 0 ), fragColor, fragCoord );
-    StoreVec4( addr + ivec2(1,0), vec4( cam.vTarget, cam.fFov ), fragColor, fragCoord );    
-    StoreVec4( addr + ivec2(2,0), vec4( cam.vJitter, cam.fPlaneInFocus, 0 ), fragColor, fragCoord );    
-}
-
-mat3 Cam_GetWorldToCameraRotMatrix( const CameraState cameraState )
-{
-    vec3 vForward = normalize( cameraState.vTarget - cameraState.vPos );
-	vec3 vRight = normalize( cross(vec3(0, 1, 0), vForward) );
-	vec3 vUp = normalize( cross(vForward, vRight) );
-    
-    return mat3( vRight, vUp, vForward );
-}
-
-vec2 Cam_GetViewCoordFromUV( const in vec2 vUV )
-{
-	vec2 vWindow = vUV * 2.0 - 1.0;
-	vWindow.x *= iResolution.x / iResolution.y;
-
-	return vWindow;	
-}
-
-void Cam_GetCameraRay( const vec2 vUV, const CameraState cam, out vec3 vRayOrigin, out vec3 vRayDir )
-{
-    vec2 vView = Cam_GetViewCoordFromUV( vUV );
-    vRayOrigin = cam.vPos;
-    float fPerspDist = 1.0 / tan( radians( cam.fFov ) );
-    vRayDir = normalize( Cam_GetWorldToCameraRotMatrix( cam ) * vec3( vView, fPerspDist ) );
-}
-
-vec2 Cam_GetUVFromWindowCoord( const in vec2 vWindow )
-{
-    vec2 vScaledWindow = vWindow;
-    vScaledWindow.x *= iResolution.y / iResolution.x;
-
-    return (vScaledWindow * 0.5 + 0.5);
-}
-
-vec2 Cam_WorldToWindowCoord(const in vec3 vWorldPos, const in CameraState cameraState )
-{
-    vec3 vOffset = vWorldPos - cameraState.vPos;
-    vec3 vCameraLocal;
-
-    vCameraLocal = vOffset * Cam_GetWorldToCameraRotMatrix( cameraState );
-	
-    vec2 vWindowPos = vCameraLocal.xy / (vCameraLocal.z * tan( radians( cameraState.fFov ) ));
-    
-    return vWindowPos;
-}
-
-float EncodeDepthAndObject( float depth, int objectId )
-{
-    //depth = max( 0.0, depth );
-    //objectId = max( 0, objectId + 1 );
-    //return exp2(-depth) + float(objectId);
-    return depth;
-}
-
-float DecodeDepthAndObjectId( float value, out int objectId )
-{
-    objectId = 0;
-    return max(0.0, value);
-    //objectId = int( floor( value ) ) - 1; 
-    //return abs( -log2(fract(value)) );
-}
-
-///////////////////////////////
-
-vec3 Tonemap( vec3 x )
-{
-#if 0 
-    
-    vec3 luminanceCoeffsBT709 = vec3( 0.2126f, 0.7152f, 0.0722f );
-    float f = dot( x, luminanceCoeffsBT709 );
-    x /= f;        
-    f = 1.0f - exp(-f);    
-    x *= f;    
-    x = mix( x, vec3(f), f*f );
-    
-    return x;
-#else       
-    float a = 0.010;
-    float b = 0.132;
-    float c = 0.010;
-    float d = 0.163;
-    float e = 0.101;
-
-    return ( x * ( a * x + b ) ) / ( x * ( c * x + d ) + e );    
-#endif    
-}
-
-
-float GetVignetting( const in vec2 vUV, float fScale, float fPower, float fStrength )
-{
-	vec2 vOffset = (vUV - 0.5) * sqrt(2.0) * fScale;
-	
-	float fDist = max( 0.0, 1.0 - length( vOffset ) );
-    
-	float fShade = 1.0 - pow( fDist, fPower );
-    
-    fShade = 1.0 - fShade * fStrength;
-
-	return fShade;
-}
-
-
-
-
-float GetCoC( float fDistance, float fPlaneInFocus )
-{
-#ifdef ENABLE_DOF    
-	// http://http.developer.nvidia.com/GPUGems/gpugems_ch23.html
-
-    float fAperture = min(1.0, fPlaneInFocus * fPlaneInFocus * 0.5);
-    float fFocalLength = 0.03;
-    
-	return abs(fAperture * (fFocalLength * (fDistance - fPlaneInFocus)) /
-          (fDistance * (fPlaneInFocus - fFocalLength)));  
-#else
-    return 0.0f;
-#endif    
-}
-
-// Depth of field pass
-
-#define BLUR_TAPS 64
-float fGolden = 3.141592 * (3.0 - sqrt(5.0));
-
-#define MOD2 vec2(4.438975,3.972973)
-
-float Hash( float p ) 
-{
-    // https://www.shadertoy.com/view/4djSRW - Dave Hoskins
-	vec2 p2 = fract(vec2(p) * MOD2);
-    p2 += dot(p2.yx, p2.xy+19.19);
-	return fract(p2.x * p2.y);    
-}
-
-void main()
-{
-   vec2 fragCoord = vTexCoord.xy * params.OutputSize.xy;
-    CameraState camCurr;
-	Cam_LoadState( camCurr, iChannel0, ivec2(0) );
-
-    CameraState camPrev;
-	Cam_LoadState( camPrev, iChannel0, ivec2(3,0) );
-    
-	vec2 vUV = fragCoord.xy / iResolution.xy;
- 	//vUV -= camCurr.vJitter / iResolution.xy;    // TAA has removed jitter
-
-    vec4 vSample = texelFetch( iChannel0, ivec2(fragCoord.xy), 0 ).rgba;
-    
-    int iObjectId;
-    float fDepth = DecodeDepthAndObjectId( vSample.w, iObjectId );
-    
-    vec3 vRayOrigin, vRayDir;
-    
-    Cam_GetCameraRay( vUV, camCurr, vRayOrigin, vRayDir );    
-    vec3 vWorldPos = vRayOrigin + vRayDir * fDepth;
-        
-    vec2 vPrevUV = Cam_GetUVFromWindowCoord( Cam_WorldToWindowCoord(vWorldPos, camPrev) );// - camPrev.vJitter / iResolution.xy;
-        
-	vec3 vResult = vec3(0.0);
-    
-    float fTot = 0.0;
-    
-    float fPlaneInFocus = camCurr.fPlaneInFocus;
-        
-	float fCoC = GetCoC( fDepth, camCurr.fPlaneInFocus );
-        
-    float r = 1.0;
-    vec2 vangle = vec2(0.0,fCoC); // Start angle
-    
-    float fWeight = max( 0.001, fCoC );    
-    vResult.rgb = vSample.rgb * fWeight;
-    fTot += fWeight;
-    
-#if defined(ENABLE_DOF) || defined(ENABLE_MOTION_BLUR)    
-    float fMotionBlurTaps = float(BLUR_TAPS);
-    
-    float fShutterAngle = 0.5;
-    
-    float f = 0.0;
-    float fIndex = 0.0;
-    for(int i=1; i<BLUR_TAPS; i++)
-    {
-        float fRandomT = Hash( iTime + fIndex + vUV.x + vUV.y * 12.345);
-        float fOrderedT = fIndex / fMotionBlurTaps;
-        
-        float fDofT = fOrderedT;
-        float fMotionT = fRandomT;
-        
-        vec2 vTapUV = vUV;
-        #ifdef ENABLE_MOTION_BLUR
-        vTapUV = mix( vTapUV, vPrevUV, (fMotionT - 0.5) * fShutterAngle );
-        #endif
-                
-        // http://blog.marmakoide.org/?p=1
-        
-        float fTheta = fDofT * fGolden * fMotionBlurTaps;
-        float fRadius = fCoC * sqrt( fDofT * fMotionBlurTaps ) / sqrt( fMotionBlurTaps );        
-        
-        vTapUV += vec2( sin(fTheta), cos(fTheta) ) * fRadius;
-        
-        vec4 vTapSample = textureLod( iChannel0, vTapUV, 0.0 ).rgba;
-	    //vec4 vTapTexel = texelFetch( iChannel0, ivec2(vTapUV.xy * iResolution.xy), 0 ).rgba;
-        
-        int iTapObjectId;
-        float fTapDepth = DecodeDepthAndObjectId( vTapSample.w, iTapObjectId );
-        
-        if ( fTapDepth > 0.0 )
-        {            
-  		  	float fCurrCoC = GetCoC( fTapDepth, fPlaneInFocus );
-            
-            float fCurrWeight = max( 0.001, fCurrCoC );
-            
-    		vResult += vTapSample.rgb * fCurrWeight;
-        	fTot += fCurrWeight;
-        }
-        f += 1.0;
-        fIndex += 1.0;
-    }
-#endif    
-    vResult /= fTot;
-    
-	fragColor = vec4(vResult, 1.0);    
-    
-    float fShade = GetVignetting( vUV, 0.7, 2.0, 1.0 );
-    
-    fragColor.rgb *= fShade;
-    
-    fragColor.rgb = Tonemap( fragColor.rgb );
-    fragColor.a = 1.0;
-}
diff --git a/crt/shaders/metacrt/basilica.png b/crt/shaders/metacrt/basilica.png
deleted file mode 100644
index 499eea619d..0000000000
Binary files a/crt/shaders/metacrt/basilica.png and /dev/null differ
diff --git a/crt/shaders/metacrt/bufC.slang b/crt/shaders/metacrt/bufC.slang
deleted file mode 100644
index ddc8ea0c2b..0000000000
--- a/crt/shaders/metacrt/bufC.slang
+++ /dev/null
@@ -1,1183 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float cam_spot, noise_intensity, cam_loc_y, cam_loc_x, cam_zoom, cam_angle_y, cam_angle_x, cam_fov;
-} params;
-
-#pragma parameter cam_spot "Cam Loc (0 = Custom, -1 = cycle)" 0.0 -1.0 9.0 1.0
-#pragma parameter noise_intensity "Noise Intensity" 0.03 0.0 0.5 0.01
-#pragma parameter cam_angle_y "Tilt Cam Y" 0.24 -0.5 0.5 0.01
-#pragma parameter cam_angle_x "Turn Cam X" 0.0 -0.5 0.5 0.01
-#pragma parameter cam_zoom "Custom Cam Zoom" -0.915 -2.0 2.0 0.05
-#pragma parameter cam_loc_y "Rotate World Y Axis" 0.25 0.0001 1.0 0.01
-#pragma parameter cam_loc_x "Rotate World X Axis" 0.0  -0.5 0.5 0.01
-#pragma parameter cam_fov "Custom Cam FOV" 10.0 0.0 100.0 1.0
-
-#define vFragCoord vTexCoord.xy * params.OutputSize.xy
-#define iResolution params.OutputSize.xy
-#define iTime params.FrameCount / 60.0
-#define iChannel0 Source
-#define iChannel1 cubeMap
-#define iChannel2 table
-#define iMouse vec3(0.0)
-#define vFragColor FragColor
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position * vec4(1.0,-1.0,1.0,1.0);
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D cubeMap;
-layout(set = 0, binding = 4) uniform sampler2D table;
-
-// Meta CRT - @P_Malin
-// https://www.shadertoy.com/view/4dlyWX#
-// In which I add and remove aliasing
-
-// Scene Rendering
-
-//#define ENABLE_TAA_JITTER
-
-#define kMaxTraceDist 1000.0
-#define kFarDist 1100.0
-
-#define MAT_FG_BEGIN 	10
-
-#define PI 3.141592654
-
-///////////////////////////
-// Hash Functions
-///////////////////////////
-
-// From: Hash without Sine by Dave Hoskins
-// https://www.shadertoy.com/view/4djSRW
-
-// *** Use this for integer stepped ranges, ie Value-Noise/Perlin noise functions.
-//#define HASHSCALE1 .1031
-//#define HASHSCALE3 vec3(.1031, .1030, .0973)
-//#define HASHSCALE4 vec4(1031, .1030, .0973, .1099)
-
-// For smaller input rangers like audio tick or 0-1 UVs use these...
-#define HASHSCALE1 443.8975
-#define HASHSCALE3 vec3(443.897, 441.423, 437.195)
-#define HASHSCALE4 vec3(443.897, 441.423, 437.195, 444.129)
-
-
-//----------------------------------------------------------------------------------------
-//  1 out, 1 in...
-float hash11(float p)
-{
-	vec3 p3  = fract(vec3(p) * HASHSCALE1);
-    p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.x + p3.y) * p3.z);
-}
-
-//  2 out, 1 in...
-vec2 hash21(float p)
-{
-	vec3 p3 = fract(vec3(p) * HASHSCALE3);
-	p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.xx+p3.yz)*p3.zy);
-
-}
-
-///  2 out, 3 in...
-vec2 hash23(vec3 p3)
-{
-	p3 = fract(p3 * HASHSCALE3);
-    p3 += dot(p3, p3.yzx+19.19);
-    return fract((p3.xx+p3.yz)*p3.zy);
-}
-
-//  1 out, 3 in...
-float hash13(vec3 p3)
-{
-	p3  = fract(p3 * HASHSCALE1);
-    p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.x + p3.y) * p3.z);
-}
-
-
-///////////////////////////
-// Data Storage
-///////////////////////////
-
-vec4 LoadVec4( sampler2D tex, in ivec2 vAddr )
-{
-    return texelFetch( tex, vAddr, 0 );
-}
-
-vec3 LoadVec3( sampler2D tex, in ivec2 vAddr )
-{
-    return LoadVec4( tex, vAddr ).xyz;
-}
-
-bool AtAddress( ivec2 p, ivec2 c ) { return all( equal( p, c ) ); }
-
-void StoreVec4( in ivec2 vAddr, in vec4 vValue, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    fragColor = AtAddress( fragCoord, vAddr ) ? vValue : fragColor;
-}
-
-void StoreVec3( in ivec2 vAddr, in vec3 vValue, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    StoreVec4( vAddr, vec4( vValue, 0.0 ), fragColor, fragCoord);
-}
-
-///////////////////////////
-// Camera
-///////////////////////////
-
-struct CameraState
-{
-    vec3 vPos;
-    vec3 vTarget;
-    float fFov;
-    vec2 vJitter;
-    float fPlaneInFocus;
-};
-    
-void Cam_LoadState( out CameraState cam, sampler2D tex, ivec2 addr )
-{
-    vec4 vPos = LoadVec4( tex, addr + ivec2(0,0) );
-    cam.vPos = vPos.xyz;
-    vec4 targetFov = LoadVec4( tex, addr + ivec2(1,0) );
-    cam.vTarget = targetFov.xyz;
-    cam.fFov = targetFov.w;
-    vec4 jitterDof = LoadVec4( tex, addr + ivec2(2,0) );
-    cam.vJitter = jitterDof.xy;
-    cam.fPlaneInFocus = jitterDof.z;
-}
-
-void Cam_StoreState( ivec2 addr, const in CameraState cam, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    StoreVec4( addr + ivec2(0,0), vec4( cam.vPos, 0 ), fragColor, fragCoord );
-    StoreVec4( addr + ivec2(1,0), vec4( cam.vTarget, cam.fFov ), fragColor, fragCoord );    
-    StoreVec4( addr + ivec2(2,0), vec4( cam.vJitter, cam.fPlaneInFocus, 0 ), fragColor, fragCoord );    
-}
-
-mat3 Cam_GetWorldToCameraRotMatrix( const CameraState cameraState )
-{
-    vec3 vForward = normalize( cameraState.vTarget - cameraState.vPos );
-	vec3 vRight = normalize( cross(vec3(0, 1, 0), vForward) );
-	vec3 vUp = normalize( cross(vForward, vRight) );
-    
-    return mat3( vRight, vUp, vForward );
-}
-
-vec2 Cam_GetViewCoordFromUV( const in vec2 vUV )
-{
-	vec2 vWindow = vUV * 2.0 - 1.0;
-	vWindow.x *= iResolution.x / iResolution.y;
-
-	return vWindow;	
-}
-
-void Cam_GetCameraRay( const vec2 vUV, const CameraState cam, out vec3 vRayOrigin, out vec3 vRayDir )
-{
-    vec2 vView = Cam_GetViewCoordFromUV( vUV );
-    vRayOrigin = cam.vPos;
-    float fPerspDist = 1.0 / tan( radians( cam.fFov ) );
-    vRayDir = normalize( Cam_GetWorldToCameraRotMatrix( cam ) * vec3( vView, fPerspDist ) );
-}
-
-vec2 Cam_GetUVFromWindowCoord( const in vec2 vWindow )
-{
-    vec2 vScaledWindow = vWindow;
-    vScaledWindow.x *= iResolution.y / iResolution.x;
-
-    return (vScaledWindow * 0.5 + 0.5);
-}
-
-vec2 Cam_WorldToWindowCoord(const in vec3 vWorldPos, const in CameraState cameraState )
-{
-    vec3 vOffset = vWorldPos - cameraState.vPos;
-    vec3 vCameraLocal;
-
-    vCameraLocal = vOffset * Cam_GetWorldToCameraRotMatrix( cameraState );
-	
-    vec2 vWindowPos = vCameraLocal.xy / (vCameraLocal.z * tan( radians( cameraState.fFov ) ));
-    
-    return vWindowPos;
-}
-
-float EncodeDepthAndObject( float depth, int objectId )
-{
-    //depth = max( 0.0, depth );
-    //objectId = max( 0, objectId + 1 );
-    //return exp2(-depth) + float(objectId);
-    return depth;
-}
-
-float DecodeDepthAndObjectId( float value, out int objectId )
-{
-    objectId = 0;
-    return max(0.0, value);
-    //objectId = int( floor( value ) ) - 1; 
-    //return abs( -log2(fract(value)) );
-}
-
-///////////////////////////////
-
-///////////////////////////
-// Scene
-///////////////////////////
-
-struct SceneResult
-{
-	float fDist;
-	int iObjectId;
-    vec3 vUVW;
-};
-    
-void Scene_Union( inout SceneResult a, in SceneResult b )
-{
-    if ( b.fDist < a.fDist )
-    {
-        a = b;
-    }
-}
-
-    
-void Scene_Subtract( inout SceneResult a, in SceneResult b )
-{
-    if ( a.fDist < -b.fDist )
-    {
-        a.fDist = -b.fDist;
-        a.iObjectId = b.iObjectId;
-        a.vUVW = b.vUVW;
-    }
-}
-
-SceneResult Scene_GetDistance( vec3 vPos );    
-
-vec3 Scene_GetNormal(const in vec3 vPos)
-{
-    const float fDelta = 0.0001;
-    vec2 e = vec2( -1, 1 );
-    
-    vec3 vNormal = 
-        Scene_GetDistance( e.yxx * fDelta + vPos ).fDist * e.yxx + 
-        Scene_GetDistance( e.xxy * fDelta + vPos ).fDist * e.xxy + 
-        Scene_GetDistance( e.xyx * fDelta + vPos ).fDist * e.xyx + 
-        Scene_GetDistance( e.yyy * fDelta + vPos ).fDist * e.yyy;
-    
-    return normalize( vNormal );
-}    
-    
-SceneResult Scene_Trace( const in vec3 vRayOrigin, const in vec3 vRayDir, float minDist, float maxDist )
-{	
-    SceneResult result;
-    result.fDist = 0.0;
-    result.vUVW = vec3(0.0);
-    result.iObjectId = -1;
-    
-	float t = minDist;
-	const int kRaymarchMaxIter = 128;
-	for(int i=0; i<kRaymarchMaxIter; i++)
-	{		
-        float epsilon = 0.0001 * t;
-		result = Scene_GetDistance( vRayOrigin + vRayDir * t );
-        if ( abs(result.fDist) < epsilon )
-		{
-			break;
-		}
-                        
-        if ( t > maxDist )
-        {
-            result.iObjectId = -1;
-	        t = maxDist;
-            break;
-        }       
-        
-        if ( result.fDist > 1.0 )
-        {
-            result.iObjectId = -1;            
-        }    
-        
-        t += result.fDist;        
-	}
-    
-    result.fDist = t;
-
-
-    return result;
-}    
-
-float Scene_TraceShadow( const in vec3 vRayOrigin, const in vec3 vRayDir, const in float fMinDist, const in float fLightDist )
-{
-    //return 1.0;
-    //return ( Scene_Trace( vRayOrigin, vRayDir, 0.1, fLightDist ).fDist < fLightDist ? 0.0 : 1.0;
-    
-	float res = 1.0;
-    float t = fMinDist;
-    for( int i=0; i<16; i++ )
-    {
-		float h = Scene_GetDistance( vRayOrigin + vRayDir * t ).fDist;
-        res = min( res, 8.0*h/t );
-        t += clamp( h, 0.02, 0.10 );
-        if( h<0.0001 || t>fLightDist ) break;
-    }
-    return clamp( res, 0.0, 1.0 );    
-}
-
-float Scene_GetAmbientOcclusion( const in vec3 vPos, const in vec3 vDir )
-{
-    float fOcclusion = 0.0;
-    float fScale = 1.0;
-    for( int i=0; i<5; i++ )
-    {
-        float fOffsetDist = 0.001 + 0.1*float(i)/4.0;
-        vec3 vAOPos = vDir * fOffsetDist + vPos;
-        float fDist = Scene_GetDistance( vAOPos ).fDist;
-        fOcclusion += (fOffsetDist - fDist) * fScale;
-        fScale *= 0.4;
-    }
-    
-    return clamp( 1.0 - 30.0*fOcclusion, 0.0, 1.0 );
-}
-
-///////////////////////////
-// Lighting
-///////////////////////////
-    
-struct SurfaceInfo
-{
-    vec3 vPos;
-    vec3 vNormal;
-    vec3 vBumpNormal;    
-    vec3 vAlbedo;
-    vec3 vR0;
-    float fSmoothness;
-    vec3 vEmissive;
-};
-    
-SurfaceInfo Scene_GetSurfaceInfo( const in vec3 vRayOrigin,  const in vec3 vRayDir, SceneResult traceResult );
-
-struct SurfaceLighting
-{
-    vec3 vDiffuse;
-    vec3 vSpecular;
-};
-    
-SurfaceLighting Scene_GetSurfaceLighting( const in vec3 vRayDir, in SurfaceInfo surfaceInfo );
-
-float Light_GIV( float dotNV, float k)
-{
-	return 1.0 / ((dotNV + 0.0001) * (1.0 - k)+k);
-}
-
-void Light_Add(inout SurfaceLighting lighting, SurfaceInfo surface, const in vec3 vViewDir, const in vec3 vLightDir, const in vec3 vLightColour)
-{
-	float fNDotL = clamp(dot(vLightDir, surface.vBumpNormal), 0.0, 1.0);
-	
-	lighting.vDiffuse += vLightColour * fNDotL;
-    
-	vec3 vH = normalize( -vViewDir + vLightDir );
-	float fNdotV = clamp(dot(-vViewDir, surface.vBumpNormal), 0.0, 1.0);
-	float fNdotH = clamp(dot(surface.vBumpNormal, vH), 0.0, 1.0);
-    
-	float alpha = 1.0 - surface.fSmoothness;
-	// D
-
-	float alphaSqr = alpha * alpha;
-	float denom = fNdotH * fNdotH * (alphaSqr - 1.0) + 1.0;
-	float d = alphaSqr / (PI * denom * denom);
-
-	float k = alpha / 2.0;
-	float vis = Light_GIV(fNDotL, k) * Light_GIV(fNdotV, k);
-
-	float fSpecularIntensity = d * vis * fNDotL;    
-	lighting.vSpecular += vLightColour * fSpecularIntensity;    
-}
-
-void Light_AddPoint(inout SurfaceLighting lighting, SurfaceInfo surface, const in vec3 vViewDir, const in vec3 vLightPos, const in vec3 vLightColour)
-{    
-    vec3 vPos = surface.vPos;
-	vec3 vToLight = vLightPos - vPos;	
-    
-	vec3 vLightDir = normalize(vToLight);
-	float fDistance2 = dot(vToLight, vToLight);
-	float fAttenuation = 100.0 / (fDistance2);
-	
-	float fShadowFactor = Scene_TraceShadow( surface.vPos, vLightDir, 0.1, length(vToLight) );
-	
-	Light_Add( lighting, surface, vViewDir, vLightDir, vLightColour * fShadowFactor * fAttenuation);
-}
-
-void Light_AddDirectional(inout SurfaceLighting lighting, SurfaceInfo surface, const in vec3 vViewDir, const in vec3 vLightDir, const in vec3 vLightColour)
-{	
-	float fAttenuation = 1.0;
-	float fShadowFactor = Scene_TraceShadow( surface.vPos, vLightDir, 0.1, 10.0 );
-	
-	Light_Add( lighting, surface, vViewDir, vLightDir, vLightColour * fShadowFactor * fAttenuation);
-}
-
-vec3 Light_GetFresnel( vec3 vView, vec3 vNormal, vec3 vR0, float fGloss )
-{
-    float NdotV = max( 0.0, dot( vView, vNormal ) );
-
-    return vR0 + (vec3(1.0) - vR0) * pow( 1.0 - NdotV, 5.0 ) * pow( fGloss, 20.0 );
-}
-
-void Env_AddPointLightFlare(inout vec3 vEmissiveGlow, const in vec3 vRayOrigin, const in vec3 vRayDir, const in float fIntersectDistance, const in vec3 vLightPos, const in vec3 vLightColour)
-{
-    vec3 vToLight = vLightPos - vRayOrigin;
-    float fPointDot = dot(vToLight, vRayDir);
-    fPointDot = clamp(fPointDot, 0.0, fIntersectDistance);
-
-    vec3 vClosestPoint = vRayOrigin + vRayDir * fPointDot;
-    float fDist = length(vClosestPoint - vLightPos);
-	vEmissiveGlow += sqrt(vLightColour * 0.05 / (fDist * fDist));
-}
-
-void Env_AddDirectionalLightFlareToFog(inout vec3 vFogColour, const in vec3 vRayDir, const in vec3 vLightDir, const in vec3 vLightColour)
-{
-	float fDirDot = clamp(dot(vLightDir, vRayDir) * 0.5 + 0.5, 0.0, 1.0);
-	float kSpreadPower = 2.0;
-	vFogColour += vLightColour * pow(fDirDot, kSpreadPower) * 0.25;
-}
-
-
-///////////////////////////
-// Rendering
-///////////////////////////
-
-vec4 Env_GetSkyColor( const vec3 vViewPos, const vec3 vViewDir );
-vec3 Env_ApplyAtmosphere( const in vec3 vColor, const in vec3 vRayOrigin,  const in vec3 vRayDir, const in float fDist );
-vec3 FX_Apply( in vec3 vColor, const in vec3 vRayOrigin,  const in vec3 vRayDir, const in float fDist);
-
-vec4 Scene_GetColorAndDepth( vec3 vRayOrigin, vec3 vRayDir )
-{
-	vec3 vResultColor = vec3(0.0);
-            
-	SceneResult firstTraceResult;
-    
-    float fStartDist = 0.0f;
-    float fMaxDist = 10.0f;
-    
-    vec3 vRemaining = vec3(1.0);
-    
-	for( int iPassIndex=0; iPassIndex < 3; iPassIndex++ )
-    {
-    	SceneResult traceResult = Scene_Trace( vRayOrigin, vRayDir, fStartDist, fMaxDist );
-
-        if ( iPassIndex == 0 )
-        {
-            firstTraceResult = traceResult;
-        }
-        
-        vec3 vColor = vec3(0);
-        vec3 vReflectAmount = vec3(0);
-        
-		if( traceResult.iObjectId < 0 )
-		{
-            vColor = Env_GetSkyColor( vRayOrigin, vRayDir ).rgb;
-        }
-        else
-        {
-            
-            SurfaceInfo surfaceInfo = Scene_GetSurfaceInfo( vRayOrigin, vRayDir, traceResult );
-            SurfaceLighting surfaceLighting = Scene_GetSurfaceLighting( vRayDir, surfaceInfo );
-                
-            // calculate reflectance (Fresnel)
-			vReflectAmount = Light_GetFresnel( -vRayDir, surfaceInfo.vBumpNormal, surfaceInfo.vR0, surfaceInfo.fSmoothness );
-			
-			vColor = (surfaceInfo.vAlbedo * surfaceLighting.vDiffuse + surfaceInfo.vEmissive) * (vec3(1.0) - vReflectAmount); 
-            
-            vec3 vReflectRayOrigin = surfaceInfo.vPos;
-            vec3 vReflectRayDir = normalize( reflect( vRayDir, surfaceInfo.vBumpNormal ) );
-            fStartDist = 0.001 / max(0.0000001,abs(dot( vReflectRayDir, surfaceInfo.vNormal ))); 
-
-            vColor += surfaceLighting.vSpecular * vReflectAmount;            
-
-			vColor = Env_ApplyAtmosphere( vColor, vRayOrigin, vRayDir, traceResult.fDist );
-			vColor = FX_Apply( vColor, vRayOrigin, vRayDir, traceResult.fDist );
-            
-            vRayOrigin = vReflectRayOrigin;
-            vRayDir = vReflectRayDir;
-        }
-        
-        vResultColor += vColor * vRemaining;
-        vRemaining *= vReflectAmount;        
-    }
- 
-    return vec4( vResultColor, EncodeDepthAndObject( firstTraceResult.fDist, firstTraceResult.iObjectId ) );
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////
-// Scene Description
-/////////////////////////
-
-// Materials
-
-#define MAT_SKY		 	-1
-#define MAT_DEFAULT 	 0
-#define MAT_SCREEN		 1
-#define MAT_TV_CASING    2
-#define MAT_TV_TRIM      3
-#define MAT_CHROME       4
-
-
-vec3 PulseIntegral( vec3 x, float s1, float s2 )
-{
-    // Integral of function where result is 1.0 between s1 and s2 and 0 otherwise        
-
-    // V1
-    //if ( x > s2 ) return s2 - s1;
-	//else if ( x > s1 ) return x - s1;
-	//return 0.0f; 
-    
-    // V2
-    //return clamp( (x - s1), 0.0f, s2 - s1);
-    //return t;
-    
-    return clamp( (x - s1), vec3(0.0f), vec3(s2 - s1));
-}
-
-float PulseIntegral( float x, float s1, float s2 )
-{
-    // Integral of function where result is 1.0 between s1 and s2 and 0 otherwise        
-
-    // V1
-    //if ( x > s2 ) return s2 - s1;
-	//else if ( x > s1 ) return x - s1;
-	//return 0.0f; 
-    
-    // V2
-    //return clamp( (x - s1), 0.0f, s2 - s1);
-    //return t;
-    
-    return clamp( (x - s1), (0.0f), (s2 - s1));
-}
-
-vec3 Bayer( vec2 vUV, vec2 vBlur )
-{
-    vec3 x = vec3(vUV.x);
-    vec3 y = vec3(vUV.y);           
-
-    x += vec3(0.66, 0.33, 0.0);
-    y += 0.5 * step( fract( x * 0.5 ), vec3(0.5) );
-        
-    //x -= 0.5f;
-    //y -= 0.5f;
-    
-    x = fract( x );
-    y = fract( y );
-    
-    // cell centered at 0.5
-    
-    vec2 vSize = vec2(0.16f, 0.75f);
-    
-    vec2 vMin = 0.5 - vSize * 0.5;
-    vec2 vMax = 0.5 + vSize * 0.5;
-    
-    vec3 vResult= vec3(0.0);
-    
-    vec3 vResultX = (PulseIntegral( x + vBlur.x, vMin.x, vMax.x) - PulseIntegral( x - vBlur.x, vMin.x, vMax.x)) / min( vBlur.x, 1.0);
-    vec3 vResultY = (PulseIntegral(y + vBlur.y, vMin.y, vMax.y) - PulseIntegral(y - vBlur.y, vMin.y, vMax.y))  / min( vBlur.y, 1.0);
-    
-    vResult = min(vResultX,vResultY)  * 5.0;
-        
-    //vResult = vec3(1.0);
-    
-    return vResult;
-}
-
-vec3 GetPixelMatrix( vec2 vUV )
-{
-#if 1
-    vec2 dx = dFdx( vUV );
-    vec2 dy = dFdy( vUV );
-    float dU = length( vec2( dx.x, dy.x ) );
-    float dV = length( vec2( dx.y, dy.y ) );
-    if (dU <= 0.0 || dV <= 0.0 ) return vec3(1.0);
-    return Bayer( vUV, vec2(dU, dV) * 1.0);
-#else
-    return vec3(1.0);
-#endif
-}
-
-float Scanline( float y, float fBlur )
-{   
-    float fResult = sin( y * 10.0 ) * 0.45 + 0.55;
-    return mix( fResult, 1.0f, min( 1.0, fBlur ) );
-}
-
-
-float GetScanline( vec2 vUV )
-{
-#if 1
-    vUV.y *= 0.25;
-    vec2 dx = dFdx( vUV );
-    vec2 dy = dFdy( vUV );
-    float dV = length( vec2( dx.y, dy.y ) );
-    if (dV <= 0.0 ) return 1.0;
-    return Scanline( vUV.y, dV * 1.3 );
-#else
-    return 1.0;
-#endif
-}
-
-
-vec2 kScreenRsolution = vec2(480.0f, 576.0f);
-
-struct Interference
-{
-    float noise;
-    float scanLineRandom;
-};
-
-float InterferenceHash(float p)
-{
-    float hashScale = 0.1031;
-
-    vec3 p3  = fract(vec3(p, p, p) * hashScale);
-    p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.x + p3.y) * p3.z);
-}
-
-
-float InterferenceSmoothNoise1D( float x )
-{
-    float f0 = floor(x);
-    float fr = fract(x);
-
-    float h0 = InterferenceHash( f0 );
-    float h1 = InterferenceHash( f0 + 1.0 );
-
-    return h1 * fr + h0 * (1.0 - fr);
-}
-
-
-float InterferenceNoise( vec2 uv )
-{
-	float displayVerticalLines = 483.0;
-    float scanLine = floor(uv.y * displayVerticalLines); 
-    float scanPos = scanLine + uv.x;
-	float timeSeed = fract( iTime * 123.78 );
-    
-    return InterferenceSmoothNoise1D( scanPos * 234.5 + timeSeed * 12345.6 );
-}
-    
-Interference GetInterference( vec2 vUV )
-{
-    Interference interference;
-        
-    interference.noise = InterferenceNoise( vUV );
-    interference.scanLineRandom = InterferenceHash(vUV.y * 100.0 + fract(iTime * 1234.0) * 12345.0);
-    
-    return interference;
-}
-    
-vec3 SampleScreen( vec3 vUVW )
-{   
-    vec3 vAmbientEmissive = vec3(0.01);
-    vec3 vBlackEmissive = vec3(0.02);
-    float fBrightness = 1.75;
-    vec2 vResolution = 2.4999 * params.SourceSize.xy;
-    vec2 vPixelCoord = vUVW.xy * vResolution;
-    
-    vec3 vPixelMatrix = GetPixelMatrix( vPixelCoord );
-    float fScanline = GetScanline( vPixelCoord );
-      
-    vec2 vTextureUV = vUVW.xy;
-    //vec2 vTextureUV = vPixelCoord;
-    vTextureUV = floor(vTextureUV * vResolution * 2.0) / (vResolution * 2.0f);
-    
-    Interference interference = GetInterference( vTextureUV );
-
-    float noiseIntensity = params.noise_intensity;
-    
-    //vTextureUV.x += (interference.scanLineRandom * 2.0f - 1.0f) * 0.025f * noiseIntensity;
-    
-    
-    vec3 vPixelEmissive = textureLod( iChannel0, vec2(vTextureUV.x, 1.0 - vTextureUV.y), 0.0 ).rgb;
-        
-    vPixelEmissive = clamp( vPixelEmissive + (interference.noise - 0.5) * 2.0 * noiseIntensity, 0.0, 1.0 );
-    
-	vec3 vResult = (vPixelEmissive * vPixelEmissive * fBrightness + vBlackEmissive) * vPixelMatrix * fScanline + vAmbientEmissive;
-    
-    // TODO: feather edge?
-    if( any( greaterThanEqual( vUVW.xy, vec2(1.0) ) ) || any ( lessThan( vUVW.xy, vec2(0.0) ) ) || ( vUVW.z > 0.0 ) )
-    {
-        return vec3(0.0);
-    }
-    
-    return vResult;
-    
-}
-
-SurfaceInfo Scene_GetSurfaceInfo( const in vec3 vRayOrigin,  const in vec3 vRayDir, SceneResult traceResult )
-{
-    SurfaceInfo surfaceInfo;
-    
-    surfaceInfo.vPos = vRayOrigin + vRayDir * (traceResult.fDist);
-    
-    surfaceInfo.vNormal = Scene_GetNormal( surfaceInfo.vPos ); 
-    surfaceInfo.vBumpNormal = surfaceInfo.vNormal;
-    surfaceInfo.vAlbedo = vec3(1.0);
-    surfaceInfo.vR0 = vec3( 0.02 );
-    surfaceInfo.fSmoothness = 1.0;
-    surfaceInfo.vEmissive = vec3( 0.0 );
-    //return surfaceInfo;
-        
-    if ( traceResult.iObjectId == MAT_DEFAULT )
-    {
-    	surfaceInfo.vR0 = vec3( 0.02 );
-	    surfaceInfo.vAlbedo = textureLod( iChannel2, traceResult.vUVW.xz * 2.0, 0.0 ).rgb;
-        surfaceInfo.vAlbedo = surfaceInfo.vAlbedo * surfaceInfo.vAlbedo;
-                        
-    	surfaceInfo.fSmoothness = clamp( 1.0 - surfaceInfo.vAlbedo.r * surfaceInfo.vAlbedo.r * 2.0, 0.0, 1.0);
-        
-    }
-    
-    if ( traceResult.iObjectId == MAT_SCREEN )
-    {
-        surfaceInfo.vAlbedo = vec3(0.02); 
-        surfaceInfo.vEmissive = SampleScreen( traceResult.vUVW );        
-    }
-
-    if ( traceResult.iObjectId == MAT_TV_CASING )
-    {
-        surfaceInfo.vAlbedo = vec3(0.5, 0.4, 0.3); 
-	    surfaceInfo.fSmoothness = 0.4;        
-    }
-    
-    if ( traceResult.iObjectId == MAT_TV_TRIM )
-    {
-        surfaceInfo.vAlbedo = vec3(0.03, 0.03, 0.05); 
-	    surfaceInfo.fSmoothness = 0.5;
-    }    
-
-    if ( traceResult.iObjectId == MAT_CHROME )
-    {
-        surfaceInfo.vAlbedo = vec3(0.01, 0.01, 0.01); 
-	    surfaceInfo.fSmoothness = 0.9;
-    	surfaceInfo.vR0 = vec3( 0.8 );
-    }    
- 
-    return surfaceInfo;
-}
-
-// Scene Description
-
-float SmoothMin( float a, float b, float k )
-{
-	//return min(a,b);
-	
-	
-    //float k = 0.06;
-	float h = clamp( 0.5 + 0.5*(b-a)/k, 0.0, 1.0 );
-	return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-float UdRoundBox( vec3 p, vec3 b, float r )
-{
-    //vec3 vToFace = abs(p) - b;
-    //vec3 vConstrained = max( vToFace, 0.0 );
-    //return length( vConstrained ) - r;
-    return length(max(abs(p)-b,0.0))-r;
-}
-
-SceneResult Scene_GetCRT( vec3 vScreenDomain, vec2 vScreenWH, float fScreenCurveRadius, float fBevel, float fDepth )
-{
-    SceneResult resultScreen;
-#if 1
-    vec3 vScreenClosest;
-    vScreenClosest.xy = max(abs(vScreenDomain.xy)-vScreenWH,0.0);
-    vec2 vCurveScreenDomain = vScreenDomain.xy;
-    vCurveScreenDomain = clamp( vCurveScreenDomain, -vScreenWH, vScreenWH );
-    float fCurveScreenProjection2 = fScreenCurveRadius * fScreenCurveRadius - vCurveScreenDomain.x * vCurveScreenDomain.x - vCurveScreenDomain.y * vCurveScreenDomain.y;
-    float fCurveScreenProjection = sqrt( fCurveScreenProjection2 ) - fScreenCurveRadius;
-    vScreenClosest.z = vScreenDomain.z - clamp( vScreenDomain.z, -fCurveScreenProjection, fDepth );
-    resultScreen.vUVW.z = vScreenDomain.z + fCurveScreenProjection;        
-    resultScreen.fDist = (length( vScreenClosest ) - fBevel) * 0.95;
-    //resultScreen.fDist = (length( vScreenDomain - vec3(0,0,fScreenCurveRadius)) - fScreenCurveRadius - fBevel);    
-#endif    
-    
-#if 0
-    vec3 vScreenClosest;
-    vScreenClosest.xyz = max(abs(vScreenDomain.xyz)-vec3(vScreenWH, fDepth),0.0);
-    float fRoundDist = length( vScreenClosest.xyz ) - fBevel;
-    float fSphereDist = length( vScreenDomain - vec3(0,0,fScreenCurveRadius) ) - (fScreenCurveRadius + fBevel);    
-    resultScreen.fDist = max(fRoundDist, fSphereDist);
-#endif    
-    
-    resultScreen.vUVW.xy = (vScreenDomain.xy / vScreenWH) * 0.5 + 0.5f;
-	resultScreen.iObjectId = MAT_SCREEN;
-    return resultScreen;
-}
-
-SceneResult Scene_GetComputer( vec3 vPos )
-{
-    SceneResult resultComputer;
-    resultComputer.vUVW = vPos.xzy;
-	
-    float fXSectionStart = -0.2;
-    float fXSectionLength = 0.15;
-    float fXSectionT = clamp( (vPos.z - fXSectionStart) / fXSectionLength, 0.0, 1.0);
-    float fXSectionR1 = 0.03;
-    float fXSectionR2 = 0.05;
-    float fXSectionR = mix( fXSectionR1, fXSectionR2, fXSectionT );
-    float fXSectionZ = fXSectionStart + fXSectionT * fXSectionLength;
-    
-    vec2 vXSectionCentre = vec2(fXSectionR, fXSectionZ );
-    vec2 vToPos = vPos.yz - vXSectionCentre;
-    float l = length( vToPos );
-    if ( l > fXSectionR ) l = fXSectionR;
-    vec2 vXSectionClosest = vXSectionCentre + normalize(vToPos) * l;
-    //float fXSectionDist = length( vXSectionClosest ) - fXSectionR;
-    
-    float x = max( abs( vPos.x ) - 0.2f, 0.0 );
-
-    resultComputer.fDist = length( vec3(x, vXSectionClosest - vPos.yz) )-0.01;
-    //resultComputer.fDist = x;
-        
-    resultComputer.iObjectId = MAT_TV_CASING;
-/*
-    vec3 vKeyPos = vPos.xyz - vec3(0,0.125,0);
-    vKeyPos.y -= vKeyPos.z * (fXSectionR2 - fXSectionR1) * 2.0 / fXSectionLength;
-    float fDomainRepeatScale = 0.02;
-    if ( fract(vKeyPos.z * 0.5 / fDomainRepeatScale + 0.25) > 0.5) vKeyPos.x += fDomainRepeatScale * 0.5;
-    vec2 vKeyIndex = round(vKeyPos.xz / fDomainRepeatScale);
-    vKeyIndex.x = clamp( vKeyIndex.x, -8.0, 8.0 );
-    vKeyIndex.y = clamp( vKeyIndex.y, -10.0, -5.0 );
-    //vKeyPos.xz = (fract( vKeyPos.xz / fDomainRepeatScale ) - 0.5) * fDomainRepeatScale;
-    vKeyPos.xz = (vKeyPos.xz - (vKeyIndex) * fDomainRepeatScale);
-    vKeyPos.xz /= 0.7 + vKeyPos.y;
-    SceneResult resultKey;    
-    resultKey.vUVW = vPos.xzy;
-    resultKey.fDist = UdRoundBox( vKeyPos, vec3(0.01), 0.001 );
-    resultKey.iObjectId = MAT_TV_TRIM;
-    Scene_Union( resultComputer, resultKey );
-*/    
-    return resultComputer;
-}
-
-SceneResult Scene_GetDistance( vec3 vPos )
-{
-    SceneResult result;
-    
-	//result.fDist = vPos.y;
-    float fBenchBevel = 0.01;
-    result.fDist = UdRoundBox( vPos - vec3(0,-0.02-fBenchBevel,0.0), vec3(2.0, 0.02, 1.0), fBenchBevel );
-    result.vUVW = vPos;
-	result.iObjectId = MAT_DEFAULT;        
-    
-    vec3 vSetPos = vec3(0.0, 0.0, 0.0);
-    vec3 vScreenPos = vSetPos + vec3(0.0, 0.25, 0.00);
-    
-    //vPos.x = fract( vPos.x - 0.5) - 0.5;
-    
-    vec2 vScreenWH = vec2(4.0, 3.0) / 25.0;
-
-    SceneResult resultSet;
-    resultSet.vUVW = vPos.xzy;
-	resultSet.fDist = UdRoundBox( vPos - vScreenPos - vec3(0.0,-0.01,0.2), vec3(.21, 0.175, 0.18), 0.01 );
-    resultSet.iObjectId = MAT_TV_CASING;
-    Scene_Union( result, resultSet );
-
-    SceneResult resultSetRecess;
-    resultSetRecess.vUVW = vPos.xzy;
-    resultSetRecess.fDist = UdRoundBox( vPos - vScreenPos - vec3(0.0,-0.0, -0.05), vec3(vScreenWH + 0.01, 0.05) + 0.005, 0.015 );
-    resultSetRecess.iObjectId = MAT_TV_TRIM;
-	Scene_Subtract( result, resultSetRecess );
-    
-    SceneResult resultSetBase;
-    resultSetBase.vUVW = vPos.xzy;
-    float fBaseBevel = 0.03;
-	resultSetBase.fDist = UdRoundBox( vPos - vSetPos - vec3(0.0,0.04,0.22), vec3(0.2, 0.04, 0.17) - fBaseBevel, fBaseBevel );
-    resultSetBase.iObjectId = MAT_TV_CASING;
-    Scene_Union( result, resultSetBase );
-
-	SceneResult resultScreen = Scene_GetCRT( vPos - vScreenPos, vScreenWH, 0.75f, 0.02f, 0.1f );
-    Scene_Union( result, resultScreen );    
-    
-    //SceneResult resultComputer = Scene_GetComputer( vPos - vec3(0.0, 0.0, -0.1) );
-    //Scene_Union( result, resultComputer );
-
-    SceneResult resultSphere;
-    resultSet.vUVW = vPos.xzy;
-	resultSet.fDist = length(vPos - vec3(0.35,0.075,-0.1)) - 0.075;
-    resultSet.iObjectId = MAT_CHROME;
-    Scene_Union( result, resultSet );    
-   
-    return result;
-}
-
-
-
-// Scene Lighting
-
-vec3 g_vSunDir = normalize(vec3(0.3, 0.4, -0.5));
-vec3 g_vSunColor = vec3(1, 0.95, 0.8) * 3.0;
-vec3 g_vAmbientColor = vec3(0.8, 0.8, 0.8) * 1.0;
-
-SurfaceLighting Scene_GetSurfaceLighting( const in vec3 vViewDir, in SurfaceInfo surfaceInfo )
-{
-    SurfaceLighting surfaceLighting;
-    
-    surfaceLighting.vDiffuse = vec3(0.0);
-    surfaceLighting.vSpecular = vec3(0.0);    
-    
-    Light_AddDirectional( surfaceLighting, surfaceInfo, vViewDir, g_vSunDir, g_vSunColor );
-    
-    Light_AddPoint( surfaceLighting, surfaceInfo, vViewDir, vec3(1.4, 2.0, 0.8), vec3(1,1,1) * 0.2 );
-    
-    float fAO = Scene_GetAmbientOcclusion( surfaceInfo.vPos, surfaceInfo.vNormal );
-    // AO
-    surfaceLighting.vDiffuse += fAO * (surfaceInfo.vBumpNormal.y * 0.5 + 0.5) * g_vAmbientColor;
-    
-    return surfaceLighting;
-}
-
-// Environment
-
-vec4 Env_GetSkyColor( const vec3 vViewPos, const vec3 vViewDir )
-{
-	vec4 vResult = vec4( 0.0, 0.0, 0.0, kFarDist );
-
-//#if 1
-    vec3 vEnvMap = textureLod( iChannel1, (vViewDir.xy - vec2(0.0, 1.0)) / 2., 0.0 ).rgb;
-    vResult.rgb = vEnvMap;
-//#endif    
-    
-//#if 0
-//    vec3 vEnvMap = textureLod( iChannel1, vViewDir.zyx, 0.0 ).rgb;
-//    vEnvMap = vEnvMap * vEnvMap;
-//    float kEnvmapExposure = 0.999;
-//    vResult.rgb = -log2(1.0 - vEnvMap * kEnvmapExposure);
-
-//#endif
-    
-    // Sun
-    //float NdotV = dot( g_vSunDir, vViewDir );
-    //vResult.rgb += smoothstep( cos(radians(.7)), cos(radians(.5)), NdotV ) * g_vSunColor * 5000.0;
-
-    return vResult;	
-}
-
-float Env_GetFogFactor(const in vec3 vRayOrigin,  const in vec3 vRayDir, const in float fDist )
-{    
-	float kFogDensity = 0.00001;
-	return exp(fDist * -kFogDensity);	
-}
-
-vec3 Env_GetFogColor(const in vec3 vDir)
-{    
-	return vec3(0.2, 0.5, 0.6) * 2.0;		
-}
-
-vec3 Env_ApplyAtmosphere( const in vec3 vColor, const in vec3 vRayOrigin,  const in vec3 vRayDir, const in float fDist )
-{
-    //return vColor;
-    vec3 vResult = vColor;
-    
-    
-	float fFogFactor = Env_GetFogFactor( vRayOrigin, vRayDir, fDist );
-	vec3 vFogColor = Env_GetFogColor( vRayDir );	
-	//Env_AddDirectionalLightFlareToFog( vFogColor, vRayDir, g_vSunDir, g_vSunColor * 3.0);    
-    vResult = mix( vFogColor, vResult, fFogFactor );
-
-    return vResult;	    
-}
-
-
-vec3 FX_Apply( in vec3 vColor, const in vec3 vRayOrigin,  const in vec3 vRayDir, const in float fDist)
-{    
-    return vColor;
-}
-
-
-vec4 MainCommon( vec3 vRayOrigin, vec3 vRayDir )
-{
-	vec4 vColorLinAndDepth = Scene_GetColorAndDepth( vRayOrigin, vRayDir );    
-    vColorLinAndDepth.rgb = max( vColorLinAndDepth.rgb, vec3(0.0) );
-    
-    vec4 vFragColor = vColorLinAndDepth;
-    
-    float fExposure = 2.0f;
-    
-    vFragColor.rgb *= fExposure;
-    
-    vFragColor.a = vColorLinAndDepth.w;
-    
-    return vFragColor;
-}
-
-CameraState GetCameraPosition( int index )
-{
-    CameraState cam;
-
-    vec3 vFocus = vec3(0,0.25,-0.012);   
-    
-    if ( index > 9 )
-    {
-    	index = int(hash11(float(index) / 10.234) * 100.0);
-    	index = index % 10;
-    }
-
-    //index=2;
-    
-    if ( index == 1 )
-    {
-        cam.vPos = vec3(-0.1,0.2,-0.08);
-        cam.vTarget = vec3(0,0.25,0.1);
-        cam.fFov = 10.0;
-    }
-    if ( index == 0 )
-    {
-        cam.vPos = vec3(params.cam_loc_x,params.cam_loc_y,params.cam_zoom);
-        cam.vTarget = vec3(params.cam_angle_x,params.cam_angle_y,0.0);
-        cam.fFov = params.cam_fov;
-    }
-    if ( index == 2 )
-    {
-        cam.vPos = vec3(-0.8,0.3,-1.0);
-        cam.vTarget = vec3(0.4,0.18,0.5);
-        cam.fFov = 10.0;
-    }
-    if ( index == 3 )
-    {
-        cam.vPos = vec3(-0.8,1.0,-1.5);
-        cam.vTarget = vec3(0.2,0.0,0.5);
-        cam.fFov = 10.0;
-    }
-    if ( index == 4 )
-    {
-        cam.vPos = vec3(-0.8,0.3,-1.0);
-        cam.vTarget = vec3(0.4,0.18,0.5);
-        cam.fFov = 20.0;
-    }
-    if ( index == 5 )
-    {
-        cam.vPos = vec3(-0.244,0.334,-0.0928);
-        cam.vTarget = vec3(0,0.25,0.1);
-        cam.fFov = 20.0;
-    }
-    if ( index == 6 )
-    {
-        cam.vPos = vec3(0.0,0.1,-0.5);
-        cam.vTarget = vec3(0.2,0.075,-0.1);
-        vFocus = cam.vTarget; 
-        cam.fFov = 15.0;
-    }
-    if ( index == 7 )
-    {
-        cam.vPos = vec3(-0.01,0.01,-0.25);
-        cam.vTarget = vec3(0.01,0.27,0.1);
-        vFocus = cam.vTarget; 
-        cam.fFov = 23.0;
-    }
-    if ( index == 8 )
-    {
-        cam.vPos = vec3(-0.23,0.3,-0.05);
-        cam.vTarget = vec3(0.1,0.2,0.1);
-        cam.fFov = 15.0;
-    }
-    if ( index == 9 )
-    {
-        cam.vPos = vec3(0.4,0.2,-0.2);
-        cam.vTarget = vec3(-0.1,0.25,0.1);
-        cam.fFov = 12.0;
-    }
-    
-    cam.fPlaneInFocus = length( vFocus - cam.vPos);
-    cam.vJitter = vec2(0.0);        
-    
-    return cam;
-}
-
-void main()
-{
-    vec2 vUV = vFragCoord.xy / iResolution.xy; 
-
-    CameraState cam;
-    
-    {
-    	CameraState camA;
-    	CameraState camB;
-    
-      if(params.cam_spot > -0.5){
-        camA = GetCameraPosition(int(params.cam_spot));
-        cam.vPos = camA.vPos;
-        cam.vTarget = camA.vTarget;
-        cam.fFov = camA.fFov;
-        cam.fPlaneInFocus = camA.fPlaneInFocus;
-      }
-      else{        
-        float fSeqTime = iTime;
-        float fSequenceSegLength = 5.0;
-        float fSeqIndex = floor(fSeqTime / fSequenceSegLength);
-        float fSeqPos = fract(fSeqTime / fSequenceSegLength);
-        int iIndex = int(fSeqIndex);
-		int iIndexNext = int(fSeqIndex) + 1;
-        camA = GetCameraPosition(iIndex);
-        camB = GetCameraPosition(iIndexNext);
-        
-        float t = smoothstep(0.3, 1.0, fSeqPos);
-        cam.vPos = mix(camA.vPos, camB.vPos, t );
-        cam.vTarget = mix(camA.vTarget, camB.vTarget, t );
-        cam.fFov = mix(camA.fFov, camB.fFov, t );
-        cam.fPlaneInFocus = mix(camA.fPlaneInFocus, camB.fPlaneInFocus, t );
-      }
-    }
-
-#if 0    
-    if ( iMouse.z > 0.0 )
-    {
-        float fDist = 0.01 + 3.0 * (iMouse.y / iResolution.y);
-
-        float fAngle = (iMouse.x / iResolution.x) * radians(360.0);
-    	//float fElevation = (iMouse.y / iResolution.y) * radians(90.0);
-    	float fElevation = 0.15f * radians(90.0);    
-
-        cam.vPos = vec3(sin(fAngle) * fDist * cos(fElevation),sin(fElevation) * fDist,cos(fAngle) * fDist * cos(fElevation));
-        cam.vTarget = vec3(0,0.25,0.1);
-        cam.vPos +=cam.vTarget;
-        cam.fFov = 20.0 / (1.0 + fDist * 0.5);
-    	vec3 vFocus = vec3(0,0.25,-0.012);	    
-	    cam.fPlaneInFocus = length( vFocus - cam.vPos );
-    }
-#endif
-   
-#ifdef ENABLE_TAA_JITTER
-    cam.vJitter = hash21( fract( iTime ) ) - 0.5f;
-#else
-    cam.vJitter = vec2(1.0);
-#endif
-    
-            
-    vec3 vRayOrigin, vRayDir;
-    vec2 vJitterUV = vUV + cam.vJitter / iResolution.xy;
-    Cam_GetCameraRay( vJitterUV, cam, vRayOrigin, vRayDir );
- 
-    float fHitDist = 0.0f;
-    vFragColor = MainCommon( vRayOrigin, vRayDir );
-    
-    
-	Cam_StoreState( ivec2(0), cam, vFragColor, ivec2(vFragCoord.xy) ); 
-}
\ No newline at end of file
diff --git a/crt/shaders/metacrt/bufD.slang b/crt/shaders/metacrt/bufD.slang
deleted file mode 100644
index b9da5c66d9..0000000000
--- a/crt/shaders/metacrt/bufD.slang
+++ /dev/null
@@ -1,311 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define vFragCoord vTexCoord.xy * params.OutputSize.xy
-#define iResolution params.OutputSize.xy
-#define iTime params.FrameCount / 60.0
-#define iChannel0 Source
-#define iChannel1 cubeMap
-#define iChannel2 table
-#define iMouse vec3(0.0)
-#define vFragColor FragColor
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D cubeMap;
-layout(set = 0, binding = 4) uniform sampler2D table;
-
-// Meta CRT - @P_Malin
-// https://www.shadertoy.com/view/4dlyWX#
-// In which I add and remove aliasing
-
-// Temporal Anti-aliasing Pass
-
-#define ENABLE_TAA
-
-///////////////////////////
-// Hash Functions
-///////////////////////////
-
-// From: Hash without Sine by Dave Hoskins
-// https://www.shadertoy.com/view/4djSRW
-
-// *** Use this for integer stepped ranges, ie Value-Noise/Perlin noise functions.
-//#define HASHSCALE1 .1031
-//#define HASHSCALE3 vec3(.1031, .1030, .0973)
-//#define HASHSCALE4 vec4(1031, .1030, .0973, .1099)
-
-// For smaller input rangers like audio tick or 0-1 UVs use these...
-#define HASHSCALE1 443.8975
-#define HASHSCALE3 vec3(443.897, 441.423, 437.195)
-#define HASHSCALE4 vec3(443.897, 441.423, 437.195, 444.129)
-
-
-//----------------------------------------------------------------------------------------
-//  2 out, 1 in...
-vec2 hash21(float p)
-{
-	vec3 p3 = fract(vec3(p) * HASHSCALE3);
-	p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.xx+p3.yz)*p3.zy);
-
-}
-
-///  2 out, 3 in...
-vec2 hash23(vec3 p3)
-{
-	p3 = fract(p3 * HASHSCALE3);
-    p3 += dot(p3, p3.yzx+19.19);
-    return fract((p3.xx+p3.yz)*p3.zy);
-}
-
-//  1 out, 3 in...
-float hash13(vec3 p3)
-{
-	p3  = fract(p3 * HASHSCALE1);
-    p3 += dot(p3, p3.yzx + 19.19);
-    return fract((p3.x + p3.y) * p3.z);
-}
-
-
-///////////////////////////
-// Data Storage
-///////////////////////////
-
-vec4 LoadVec4( sampler2D tex, in ivec2 vAddr )
-{
-    return texelFetch( tex, vAddr, 0 );
-}
-
-vec3 LoadVec3( sampler2D tex, in ivec2 vAddr )
-{
-    return LoadVec4( tex, vAddr ).xyz;
-}
-
-bool AtAddress( ivec2 p, ivec2 c ) { return all( equal( p, c ) ); }
-
-void StoreVec4( in ivec2 vAddr, in vec4 vValue, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    fragColor = AtAddress( fragCoord, vAddr ) ? vValue : fragColor;
-}
-
-void StoreVec3( in ivec2 vAddr, in vec3 vValue, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    StoreVec4( vAddr, vec4( vValue, 0.0 ), fragColor, fragCoord);
-}
-
-///////////////////////////
-// Camera
-///////////////////////////
-
-struct CameraState
-{
-    vec3 vPos;
-    vec3 vTarget;
-    float fFov;
-    vec2 vJitter;
-    float fPlaneInFocus;
-};
-    
-void Cam_LoadState( out CameraState cam, sampler2D tex, ivec2 addr )
-{
-    vec4 vPos = LoadVec4( tex, addr + ivec2(0,0) );
-    cam.vPos = vPos.xyz;
-    vec4 targetFov = LoadVec4( tex, addr + ivec2(1,0) );
-    cam.vTarget = targetFov.xyz;
-    cam.fFov = targetFov.w;
-    vec4 jitterDof = LoadVec4( tex, addr + ivec2(2,0) );
-    cam.vJitter = jitterDof.xy;
-    cam.fPlaneInFocus = jitterDof.z;
-}
-
-void Cam_StoreState( ivec2 addr, const in CameraState cam, inout vec4 fragColor, in ivec2 fragCoord )
-{
-    StoreVec4( addr + ivec2(0,0), vec4( cam.vPos, 0 ), fragColor, fragCoord );
-    StoreVec4( addr + ivec2(1,0), vec4( cam.vTarget, cam.fFov ), fragColor, fragCoord );    
-    StoreVec4( addr + ivec2(2,0), vec4( cam.vJitter, cam.fPlaneInFocus, 0 ), fragColor, fragCoord );    
-}
-
-mat3 Cam_GetWorldToCameraRotMatrix( const CameraState cameraState )
-{
-    vec3 vForward = normalize( cameraState.vTarget - cameraState.vPos );
-	vec3 vRight = normalize( cross(vec3(0, 1, 0), vForward) );
-	vec3 vUp = normalize( cross(vForward, vRight) );
-    
-    return mat3( vRight, vUp, vForward );
-}
-
-vec2 Cam_GetViewCoordFromUV( const in vec2 vUV )
-{
-	vec2 vWindow = vUV * 2.0 - 1.0;
-	vWindow.x *= iResolution.x / iResolution.y;
-
-	return vWindow;	
-}
-
-void Cam_GetCameraRay( const vec2 vUV, const CameraState cam, out vec3 vRayOrigin, out vec3 vRayDir )
-{
-    vec2 vView = Cam_GetViewCoordFromUV( vUV );
-    vRayOrigin = cam.vPos;
-    float fPerspDist = 1.0 / tan( radians( cam.fFov ) );
-    vRayDir = normalize( Cam_GetWorldToCameraRotMatrix( cam ) * vec3( vView, fPerspDist ) );
-}
-
-vec2 Cam_GetUVFromWindowCoord( const in vec2 vWindow )
-{
-    vec2 vScaledWindow = vWindow;
-    vScaledWindow.x *= iResolution.y / iResolution.x;
-
-    return (vScaledWindow * 0.5 + 0.5);
-}
-
-vec2 Cam_WorldToWindowCoord(const in vec3 vWorldPos, const in CameraState cameraState )
-{
-    vec3 vOffset = vWorldPos - cameraState.vPos;
-    vec3 vCameraLocal;
-
-    vCameraLocal = vOffset * Cam_GetWorldToCameraRotMatrix( cameraState );
-	
-    vec2 vWindowPos = vCameraLocal.xy / (vCameraLocal.z * tan( radians( cameraState.fFov ) ));
-    
-    return vWindowPos;
-}
-
-float EncodeDepthAndObject( float depth, int objectId )
-{
-    //depth = max( 0.0, depth );
-    //objectId = max( 0, objectId + 1 );
-    //return exp2(-depth) + float(objectId);
-    return depth;
-}
-
-float DecodeDepthAndObjectId( float value, out int objectId )
-{
-    objectId = 0;
-    return max(0.0, value);
-    //objectId = int( floor( value ) ) - 1; 
-    //return abs( -log2(fract(value)) );
-}
-
-///////////////////////////////
-
-
-#define iChannelCurr iChannel0
-#define iChannelHistory iChannel1
-
-vec3 Tonemap( vec3 x )
-{
-    float a = 0.010;
-    float b = 0.132;
-    float c = 0.010;
-    float d = 0.163;
-    float e = 0.101;
-
-    return ( x * ( a * x + b ) ) / ( x * ( c * x + d ) + e );
-}
-
-vec3 TAA_ColorSpace( vec3 color )
-{
-    return Tonemap(color);
-}
-
-void main()
-{
-    CameraState camCurr;
-	Cam_LoadState( camCurr, iChannelCurr, ivec2(0) );
-    
-    CameraState camPrev;
-	Cam_LoadState( camPrev, iChannelHistory, ivec2(0) );
-
-    vec2 vUV = vFragCoord.xy / iResolution.xy;
- 	vec2 vUnJitterUV = vUV - camCurr.vJitter / iResolution.xy;    
-    
-    vFragColor = textureLod(iChannelCurr, vUnJitterUV, 0.0);
-    
-    
-#ifdef ENABLE_TAA
-    vec3 vRayOrigin, vRayDir;
-    Cam_GetCameraRay( vUV, camCurr, vRayOrigin, vRayDir );    
-    float fDepth;
-    int iObjectId;
-    vec4 vCurrTexel = texelFetch( iChannelCurr, ivec2(vFragCoord.xy), 0);
-    fDepth = DecodeDepthAndObjectId( vCurrTexel.w, iObjectId );
-    vec3 vWorldPos = vRayOrigin + vRayDir * fDepth;
-    
-    vec2 vPrevUV = Cam_GetUVFromWindowCoord( Cam_WorldToWindowCoord(vWorldPos, camPrev) );// + camPrev.vJitter / iResolution.xy;
-        
-    if ( all( greaterThanEqual( vPrevUV, vec2(0) )) && all( lessThan( vPrevUV, vec2(1) )) )
-	{
-        vec3 vMin = vec3( 10000);
-        vec3 vMax = vec3(-10000);
-        
-	    ivec2 vCurrXY = ivec2(floor(vFragCoord.xy));    
-        
-        int iNeighborhoodSize = 1;
-        for ( int iy=-iNeighborhoodSize; iy<=iNeighborhoodSize; iy++)
-        {
-            for ( int ix=-iNeighborhoodSize; ix<=iNeighborhoodSize; ix++)
-            {
-                ivec2 iOffset = ivec2(ix, iy);
-		        vec3 vTest = TAA_ColorSpace( texelFetch( iChannelCurr, vCurrXY + iOffset, 0 ).rgb );
-                                
-                vMin = min( vMin, vTest );
-                vMax = max( vMax, vTest );
-            }
-        }
-        
-        float epsilon = 0.001;
-        vMin -= epsilon;
-        vMax += epsilon;
-        
-        float fBlend = 0.0f;
-        
-        //ivec2 vPrevXY = ivec2(floor(vPrevUV.xy * iResolution.xy));
-        vec4 vHistory = textureLod( iChannelHistory, vPrevUV, 0.0 );
-
-        vec3 vPrevTest = TAA_ColorSpace( vHistory.rgb );
-        if( all( greaterThanEqual(vPrevTest, vMin ) ) && all( lessThanEqual( vPrevTest, vMax ) ) )
-        {
-            fBlend = 0.9;
-            //vFragColor.r *= 0.0;
-        }
-        
-        vFragColor.rgb = mix( vFragColor.rgb, vHistory.rgb, fBlend);
-    }  
-    else
-    {
-        //vFragColor.gb *= 0.0;
-    }
-
-#endif
-    
-    vFragColor.rgb += (hash13( vec3( vFragCoord, iTime ) ) * 2.0 - 1.0) * 0.03;
-    
-	Cam_StoreState( ivec2(0), camCurr, vFragColor, ivec2(vFragCoord.xy) );    
-	Cam_StoreState( ivec2(3,0), camPrev, vFragColor, ivec2(vFragCoord.xy) ); 
-}
\ No newline at end of file
diff --git a/crt/shaders/metacrt/gradient.png b/crt/shaders/metacrt/gradient.png
deleted file mode 100644
index f76cca271b..0000000000
Binary files a/crt/shaders/metacrt/gradient.png and /dev/null differ
diff --git a/crt/shaders/metacrt/woodgrain.png b/crt/shaders/metacrt/woodgrain.png
deleted file mode 100644
index 3f3da31eb0..0000000000
Binary files a/crt/shaders/metacrt/woodgrain.png and /dev/null differ
diff --git a/crt/shaders/phosphorlut/luts/aperture-grille.png b/crt/shaders/phosphorlut/luts/aperture-grille.png
deleted file mode 100644
index 1dd89791dc..0000000000
Binary files a/crt/shaders/phosphorlut/luts/aperture-grille.png and /dev/null differ
diff --git a/crt/shaders/phosphorlut/luts/shadowmask.png b/crt/shaders/phosphorlut/luts/shadowmask.png
deleted file mode 100644
index 6c45dfc3c2..0000000000
Binary files a/crt/shaders/phosphorlut/luts/shadowmask.png and /dev/null differ
diff --git a/crt/shaders/phosphorlut/luts/slotmask.png b/crt/shaders/phosphorlut/luts/slotmask.png
deleted file mode 100644
index 90a0f8bcdc..0000000000
Binary files a/crt/shaders/phosphorlut/luts/slotmask.png and /dev/null differ
diff --git a/crt/shaders/phosphorlut/phosphorlut-pass0.slang b/crt/shaders/phosphorlut/phosphorlut-pass0.slang
deleted file mode 100644
index ad0d06987b..0000000000
--- a/crt/shaders/phosphorlut/phosphorlut-pass0.slang
+++ /dev/null
@@ -1,56 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float PHOSPHOR_SCALE_X;
-	float PHOSPHOR_SCALE_Y;
-	float phosphor_layout;
-} params;
-
-#pragma parameter PHOSPHOR_SCALE_X "Phosphor Scale X" 2.0 1.0 12.0 1.0
-#pragma parameter PHOSPHOR_SCALE_Y "Phosphor Scale Y" 4.0 1.0 12.0 1.0
-#pragma parameter phosphor_layout "Phosphor Layout" 1.0 1.0 3.0 1.0
-
-#define PHOSPHOR_SCALE_X params.PHOSPHOR_SCALE_X
-#define PHOSPHOR_SCALE_Y params.PHOSPHOR_SCALE_Y
-#define phosphor_layout params.phosphor_layout
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D shadow;
-layout(set = 0, binding = 4) uniform sampler2D aperture;
-layout(set = 0, binding = 5) uniform sampler2D slot;
-layout(set = 0, binding = 6) uniform sampler2D firstPass;
-
-void main()
-{
-	vec4 screen = vec4(texture(firstPass, vTexCoord).rgb, 1.0);
-	vec2 LUTeffectiveCoord = vec2(fract(vTexCoord.x * params.SourceSize.x / PHOSPHOR_SCALE_X), fract(vTexCoord.y * params.SourceSize.y / PHOSPHOR_SCALE_Y));
-	vec4 phosphor_grid;
-	if (phosphor_layout == 1.0) phosphor_grid = vec4(texture(shadow, LUTeffectiveCoord).rgb, 1.0);
-	if (phosphor_layout == 2.0) phosphor_grid = vec4(texture(aperture, LUTeffectiveCoord).rgb, 1.0);
-	if (phosphor_layout == 3.0) phosphor_grid = vec4(texture(slot, LUTeffectiveCoord).rgb, 1.0);
-   FragColor = screen * phosphor_grid;
-}
\ No newline at end of file
diff --git a/crt/shaders/phosphorlut/phosphorlut-pass1.slang b/crt/shaders/phosphorlut/phosphorlut-pass1.slang
deleted file mode 100644
index 6d10b6463a..0000000000
--- a/crt/shaders/phosphorlut/phosphorlut-pass1.slang
+++ /dev/null
@@ -1,52 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float diffusion;
-	float out_gamma;
-} params;
-
-#pragma parameter diffusion "Halation Strength" 0.5 0.0 1.0 0.01
-#pragma parameter out_gamma "Display Gamma" 2.2 1.5 3.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D firstPass;
-layout(set = 0, binding = 3) uniform sampler2D blurPass;
-layout(set = 0, binding = 4) uniform sampler2D phosphorPass;
-//layout(set = 0, binding = 5) uniform sampler2D blurPassV;
-
-void main()
-{
-	vec3 scanlines = texture(firstPass, vTexCoord).rgb;
-//	vec3 blurV = texture(blurPassV, vTexCoord).rgb;
-	vec3 blurH = texture(blurPass, vTexCoord).rgb;
-	vec3 blurLines = (scanlines + blurH) / 2.0;
-	vec3 phosphors = texture(phosphorPass, vTexCoord).rgb;
-	vec3 glow = (phosphors + blurH) / 2.0;
-	vec3 halation = mix(blurLines, phosphors, params.diffusion);
-	//vec3 halation = 1.0 - (1.0 - phosphors) * (1.0 - blurLines);
-	halation = 1.0 - (1.0 - halation) * (1.0 - scanlines);
-   FragColor = vec4(pow(halation, vec3(1.0 / params.out_gamma)), 1.0);
-}
\ No newline at end of file
diff --git a/crt/shaders/slotmask.slang b/crt/shaders/slotmask.slang
deleted file mode 100644
index df66402e5e..0000000000
--- a/crt/shaders/slotmask.slang
+++ /dev/null
@@ -1,137 +0,0 @@
-#version 450
-
-/*
-   OSSC Slot Mask simulator
-   by DariusG @2023
-
-*/
-
-layout(push_constant) uniform Push
-{
- float MASK_INTENSITY;
- float InputGamma;
- float OutputGamma;
- float THRESH,size, msk_scale;
-} params;
-
-// Parameter lines go here:
-
-#pragma parameter msk_scale "Mask Scale, to be equal to OSSC LINES" 4.0 3.0 5.0 1.0
-#define msk_scale params.msk_scale
-
-#pragma parameter MASK_INTENSITY "Mask Brightness" 0.2 0.0 1.0 0.05
-#define MASK_INTENSITY params.MASK_INTENSITY
-
-#pragma parameter size "Mask Size" 1.0 1.0 8.0 1.0
-#define size params.size
-
-#pragma parameter THRESH "Mask Threshold" 0.3 0.0 1.0 0.05
-#define THRESH params.THRESH
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} global;
-
-#define SourceSize global.SourceSize
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 ps;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord.xy = TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 ps;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-vec3 mask(vec2 pos, vec3 col)
-{
-    vec3 msk = vec3 (MASK_INTENSITY);
-    float x,y;
-    vec2 p = pos*global.OutputSize.xy;
-    p = (p/size);
-
-if (msk_scale == 3.0)
-{
-     x = fract(p.x/6.0);
-     y = fract(p.y/3.0);
-    if (x < 0.5){     
-     if (x<1.0/6.0 &&                   y > 1.0/3.0) msk.b = 1.0;
-     else if (x<2.0/6.0 && x>1.0/6.0 && y > 1.0/3.0 ) msk.g = 1.0;
-     else if (x<3.0/6.0 && x>2.0/6.0 && y > 1.0/3.0 ) msk.r = 1.0;
-    }
-
- else if (x > 0.4999){     
-     if (x<4.0/6.0 &&                   y < 2.0/3.0 || x<4.0/6.0 &&              y >= 3.0/3.0 ) msk.b = 1.0;
-     else if (x<5.0/6.0 && x>4.0/6.0 && y < 2.0/3.0 || x<5.0/6.0 && x>4.0/6.0 && y >= 3.0/3.0) msk.g = 1.0;
-     else if (x<6.0/6.0 && x>5.0/6.0 && y < 2.0/3.0 || x<6.0/6.0 && x>5.0/6.0 && y >= 3.0/3.0) msk.r = 1.0;
-    }
-}
-     
-
-if (msk_scale == 4.0)
-{
-     x = fract(p.x/6.0);
-     y = fract(p.y/4.0);
-    if (x < 0.5){     
-     if (x<1.0/6.0 &&                   y > 1.0/4.0) msk.b = 1.0;
-     else if (x<2.0/6.0 && x>1.0/6.0 && y > 1.0/4.0 ) msk.g = 1.0;
-     else if (x<3.0/6.0 && x>2.0/6.0 && y > 1.0/4.0 ) msk.r = 1.0;
-    }
-
- else if (x > 0.4999){     
-     if (x<4.0/6.0 &&                   y < 2.0/4.0 || x<4.0/6.0 && y >= 3.0/4.0 ) msk.b = 1.0;
-     else if (x<5.0/6.0 && x>4.0/6.0 && y < 2.0/4.0 || x<5.0/6.0 && x>4.0/6.0 && y >= 3.0/4.0) msk.g = 1.0;
-     else if (x<6.0/6.0 && x>5.0/6.0 && y < 2.0/4.0 || x<6.0/6.0 && x>5.0/6.0 && y >= 3.0/4.0) msk.r = 1.0;
-    }
-}
-
-if (msk_scale == 5.0)
-{
-     x = fract(p.x/6.0);
-     y = fract(p.y/5.0);
-    if (x < 0.5){     
-     if (x<1.0/6.0 &&                   y > 1.0/5.0) msk.b = 1.0;
-     else if (x<2.0/6.0 && x>1.0/6.0 && y > 1.0/5.0 ) msk.g = 1.0;
-     else if (x<3.0/6.0 && x>2.0/6.0 && y > 1.0/5.0 ) msk.r = 1.0;
-    }
-
- else if (x > 0.4999){     
-     if      (x<4.0/6.0              && y < 2.0/5.0 || x<4.0/6.0              && y >= 3.0/5.0) msk.b = 1.0;
-     else if (x<5.0/6.0 && x>4.0/6.0 && y < 2.0/5.0 || x<5.0/6.0 && x>4.0/6.0 && y >= 3.0/5.0 ) msk.g = 1.0;
-     else if (x<6.0/6.0 && x>5.0/6.0 && y < 2.0/5.0 || x<6.0/6.0 && x>5.0/6.0 && y >= 3.0/5.0 ) msk.r = 1.0;
-    }
-}
-
-    col *= msk;
-    
-    return col;
-}
-
-void main()
-{    
-    vec3 col = texture(Source,vTexCoord).rgb;  
-    float l = dot(col,vec3(0.22,0.70,0.08));
-
-    col = col*col;
-    col = mix(mask(vTexCoord,col), col,l*THRESH);
-    col = sqrt(col);
-    
-    col *= mix(1.0,1.3,l);  //brightboost
-    FragColor = vec4(col, 1.0);
-} 
diff --git a/crt/shaders/snes-hires-blend.slang b/crt/shaders/snes-hires-blend.slang
deleted file mode 100644
index 8a51c457a9..0000000000
--- a/crt/shaders/snes-hires-blend.slang
+++ /dev/null
@@ -1,64 +0,0 @@
-#version 450
-
-/*
-    SNES Hires Blend Fix
-    by OV2, Sp00kyFox, hunterk
-Filter:    Nearest
-Scale:    1x
-The original shader has the problem that it blends every horizontal pair of adjacent pixels where it should only blend pairwise disjointed pixel pairs instead.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-	vec2 ps = params.SourceSize.zw;
-	float dx = ps.x;
-	float dy = ps.y;
-	t1 = vTexCoord.xxxy + vec4( -dx, 0., dx, 0.); // L, C, R
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec3 c = texture(Source, t1.yw).xyz;
-	vec3 final;
-	if (params.SourceSize.x < 500.0) final = c;
-	else
-	{
-		// pixel location
-		float fp = round(fract(0.5*vTexCoord.x*params.SourceSize.x));
-
-		// reading the texels
-		vec3 l = texture(Source, t1.xw).xyz;
-		vec3 r = texture(Source, t1.zw).xyz;
-
-		// output
-		final = (((l.x == c.x)||(r.x == c.x))&&((l.y == c.y)||(r.y == c.y))&&((l.z == c.z)||(r.z == c.z))) ? c : (fp > 0.5 ? mix(c,r,0.5) : mix(c,l,0.5));
-	}
-	FragColor = vec4(final, 1.0);
-}
\ No newline at end of file
diff --git a/crt/shaders/torridgristle/Scanline-Interpolation.slang b/crt/shaders/torridgristle/Scanline-Interpolation.slang
deleted file mode 100644
index c80cfa774f..0000000000
--- a/crt/shaders/torridgristle/Scanline-Interpolation.slang
+++ /dev/null
@@ -1,36 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec2 texCoordHard = vec2(vTexCoord.x,(floor(vTexCoord.y*params.SourceSize.y)+0.5)/params.SourceSize.y);
-   FragColor = vec4(texture(Source, texCoordHard).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/crt/shaders/vt220/vt220.slang b/crt/shaders/vt220/vt220.slang
deleted file mode 100644
index 5a58741bce..0000000000
--- a/crt/shaders/vt220/vt220.slang
+++ /dev/null
@@ -1,303 +0,0 @@
-#version 450
-
-// vt220
-// by sprash3
-// https://www.shadertoy.com/view/XdtfzX
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#pragma parameter curvature "Curve Radius" 3.0 0.0 10.0 0.1
-#pragma parameter width "Width" 1.0 0.0 2.0 0.01
-#pragma parameter height "Height" 1.12 0.0 2.0 0.01
-#pragma parameter smoothness "Border Blur" 1.0 0.0 10.0 0.1
-#pragma parameter shine "Screen Reflection" 1.0 0.0 10.0 0.1
-#pragma parameter blur_size "Reflection Blur" 3.0 0.0 5.0 0.05
-#pragma parameter dimmer "Ambient Brightness" 0.5 0.0 1.0 0.05
-#pragma parameter csize "Corner size" 0.045 0.0 0.07 0.01
-#pragma parameter mask "Mask Type" 2.0 0.0 19.0 1.0
-#pragma parameter mask_strength "Mask Strength" 0.5 0.0 1.0 0.05
-#pragma parameter zoom "Viewing Distance" 0.85 0.0 2.0 0.01
-#pragma parameter SCANLINE_SINE_COMP_B "Scanline Darkness" 0.15 0.0 1.0 0.05
-#pragma parameter ntsc_toggle "NTSC Toggle" 0.0 0.0 1.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-   float ntsc_toggle, curvature, width, height, smoothness, shine, blur_size, dimmer, csize, mask, zoom, mask_strength, SCANLINE_BASE_BRIGHTNESS, SCANLINE_SINE_COMP_A, SCANLINE_SINE_COMP_B;
-} global;
-
-#define SCANLINE_SINE_COMP_B global.SCANLINE_SINE_COMP_B
-
-int mask_picker = int(global.mask);
-vec2 omega = vec2(3.141592654 * params.OutputSize.x, 2.0 * 3.141592654 * params.SourceSize.y);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D vt220_refpass;
-
-#define iTime (float(params.FrameCount) / 60.0)
-const vec3 iMouse = vec3(0.0);
-#define iResolution params.OutputSize.xy
-
-//#define LIGHTS_ON true
-//#define LIGHTS_ON false
-//#define LIGHTS_ON sin(fract(iTime/23.)+2.74) + 0.1*abs(sin(iTime*1000.)) <.0
-
-#define WIDTH 0.48 * global.width
-#define HEIGHT 0.3 * global.height
-#define CURVE global.curvature
-#define SMOOTH 0.004 * global.smoothness
-#define SHINE 0.66 * global.shine
-
-#define PHOSPHOR_COL vec4(0.75, 0.75, 0.75, 0.0)
-#define BEZEL_COL vec4(0.8, 0.8, 0.6, 0.0)
-
-#define REFLECTION_BLUR_ITERATIONS 5
-#define REFLECTION_BLUR_SIZE 0.04 * global.blur_size
-
-#include "../../../include/subpixel_masks.h"
-
-vec3 scanline(vec3 res, vec2 coord)
-{
-   vec2 sine_comp = vec2(0.0, SCANLINE_SINE_COMP_B);
-   vec3 scanline = res * ((1.0 - SCANLINE_SINE_COMP_B/3.) + dot(sine_comp * sin(coord * omega), vec2(1.0, 1.0)));
-   return vec3(scanline.x, scanline.y, scanline.z);
-}
-
-
-float roundSquare(vec2 p, vec2 b, float r)
-{
-    return length(max(abs(p)-b,0.0))-r;
-}
-
-float rand(vec2 co){
-    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-}
-
-vec2 CurvedSurface(vec2 uv, float r)
-{
-    return r * uv/sqrt(r * r - dot(uv, uv));
-}
-
-float corner(vec2 coord)
-{
-	coord = (coord - vec2(0.5)) * 1.0 + vec2(0.5);
-	coord = min(coord, vec2(1.0)-coord) * vec2(1.0, params.OutputSize.y/params.OutputSize.x);
-	vec2 cdist = vec2(max(global.csize, max((1.0-smoothstep(100.0,600.0,800.0))*0.01,0.002)));
-	coord = (cdist - min(coord,cdist));
-	float dist = sqrt(dot(coord,coord));
-	return clamp((cdist.x-dist)*800.0,0.0, 1.0);
-}
-
-// Coordinates for content
-vec2 crtCurvA(vec2 uv) 
-{
-    float r = CURVE;
-    if (iMouse.z > 0.) r *= exp(0.5 - iMouse.y/iResolution.y);
-    uv = (uv / iResolution.xy - 0.5) / vec2(iResolution.y/iResolution.x, 1.) * 1.88 * global.zoom;
-	uv = CurvedSurface(uv, r);
-	uv *= 0.5 / vec2(WIDTH, HEIGHT);
-   uv *= vec2(0.985,0.95);
-    uv = (uv / 2.0) + 0.5;        
-   	if (iMouse.z > 0.) uv.x -= iMouse.x/iResolution.x - 0.5;
-    
-	return uv;
-}
-
-// Coordinates for the rest
-vec2 crtCurvB(vec2 uv, float r) 
-{
-    r = CURVE * r;
-    if (iMouse.z > 0.) r *= exp(0.5-iMouse.y/iResolution.y);
-    uv = (uv / iResolution.xy - 0.5) / vec2(iResolution.y/iResolution.x, 1.) * 2.0 * global.zoom;
-	uv = CurvedSurface(uv, r);
-    uv = (uv / 2.0) + 0.5;
-  	if (iMouse.z > 0.) uv.x -= iMouse.x/iResolution.x - 0.5;
-    
-	return uv;
-}
-
-// Coordinates for the shine
-vec2 crtCurvS(vec2 uv, float r) 
-{
-    r = CURVE * r;
-    if (iMouse.z > 0.) r *= exp(0.5-iMouse.y/iResolution.y);
-    uv = (uv / iResolution.xy - 0.5) / vec2(iResolution.y/iResolution.x, 1.) * 2.0 * global.zoom;
-	uv = CurvedSurface(uv, r);
-    uv = (uv / 2.0) + 0.5;
-    
-	return uv;
-}
-
-
-// standard roundSquare
-float stdRS(vec2 uv, float r)
-{
-    return roundSquare(uv - 0.5, vec2(WIDTH, HEIGHT) + r, 0.05);
-}
-
-// Calculate normal to distance function and move along
-// normal with distance to get point of reflection
-vec2 borderReflect(vec2 p, float r)
-{
-    float eps = 0.0001;
-    vec2 epsx = vec2(eps,0.0);
-    vec2 epsy = vec2(0.0,eps);
-    vec2 b = (1.+vec2(r,r))* 0.5;
-    r /= 3.0;
-    
-    p -= 0.5;
-    vec2 normal = vec2(roundSquare(p-epsx,b,r)-roundSquare(p+epsx,b,r),
-                       roundSquare(p-epsy,b,r)-roundSquare(p+epsy,b,r))/eps;
-    float d = roundSquare(p, b, r);
-    p += 0.5;
-    p = vec2(1.-p.x,p.y);
-    return p + d*normal;
-}
-
-vec2 getCurves(in vec2 coord, out vec2 uvC, out vec2 uvS, out vec2 uvE)
-{
-    uvC = crtCurvA(coord);			// Content Layer
-    uvS = crtCurvB(coord, 1.);		// Screen Layer
-    uvE = crtCurvB(coord, 1.25);	// Enclosure Layer
-    
-    return uvC;
-}
-
-vec4 bezelGen(sampler2D iChannel0, vec2 fragCoord, vec4 image)
-{
-    vec4 c = vec4(0.0, 0.0, 0.0, 0.0);
-    
-// curvature needs to be applied to host shader
-    vec2 uvC, uvS, uvE;  
-    uvC = getCurves(fragCoord, uvC, uvS, uvE);
-// end curvature
-
-    vec4 c1 = vec4(0.0); vec4 c2 = vec4(0.0);
-//    if (LIGHTS_ON) {
-        // From my shader https://www.shadertoy.com/view/MtBXW3
-        
-   float ambient = 0.1;
-
-        // Glass Shine 
-        vec2 uvSh = crtCurvS(fragCoord, 1.);
-    	c1 += max(0.0, SHINE - distance(uvSh, vec2(0.5, 1.0))) *
-            smoothstep(SMOOTH/2.0, -SMOOTH/2.0, stdRS(uvS + vec2(0., 0.03), 0.0));
-
-	    // Ambient
-	    c1 += max(0.0, ambient - 0.5*distance(uvS, vec2(0.5,0.5))) *
-	        smoothstep(SMOOTH, -SMOOTH, stdRS(uvS, 0.0));
-
-	    // Enclosure Layer 
-        uvSh = crtCurvS(fragCoord, 1.25);
-    	vec4 b = vec4(0., 0., 0., 0.);
-    	for(int i=0; i<12; i++)
-			b += (clamp(BEZEL_COL + rand(uvSh+float(i))*0.05-0.025, 0., 1.) +
-				rand(uvE+1.0+float(i))*0.25 * cos((uvSh.x-0.5)*3.1415*1.5))/12.;
-        
-        // Inner Border
-        const float HHW = 0.5 * HEIGHT/WIDTH;
-        
-    	c1 += b/3.*( 1. + smoothstep(HHW - 0.025, HHW + 0.025, abs(atan(uvS.x-0.5, uvS.y-0.5))/3.1415) 
-       		+ smoothstep(HHW + 0.025, HHW - 0.025, abs(atan(uvS.x-0.5, 0.5-uvS.y))/3.1415) )* 
-			smoothstep(-SMOOTH, SMOOTH, stdRS(uvS, 0.0)) * 
-			smoothstep(SMOOTH, -SMOOTH, stdRS(uvE, 0.05));
-    
-		// Inner Border Shine
-  		c1 += (b - 0.4)* 
-			smoothstep(-SMOOTH*2.0, SMOOTH*2.0, roundSquare(uvE-vec2(0.5, 0.505), vec2(WIDTH, HEIGHT) + 0.05, 0.05)) * 
-			smoothstep(SMOOTH*2.0, -SMOOTH*2.0, roundSquare(uvE-vec2(0.5, 0.495), vec2(WIDTH, HEIGHT) + 0.05, 0.05));
-        
-    	// Outer Border
-    	c1 += b * 
-			smoothstep(-SMOOTH, SMOOTH, roundSquare(uvE-vec2(0.5, 0.5), vec2(WIDTH, HEIGHT) + 0.05, 0.05)) * 
-			smoothstep(SMOOTH, -SMOOTH, roundSquare(uvE-vec2(0.5, 0.5), vec2(WIDTH, HEIGHT) + 0.15, 0.05)); 
-
-    	// Outer Border Shine
-		c1 += (b - 0.4)* 
-			smoothstep(-SMOOTH*2.0, SMOOTH*2.0, roundSquare(uvE-vec2(0.5, 0.495), vec2(WIDTH, HEIGHT) + 0.15, 0.05)) * 
-			smoothstep(SMOOTH*2.0, -SMOOTH*2.0, roundSquare(uvE-vec2(0.5, 0.505), vec2(WIDTH, HEIGHT) + 0.15, 0.05));
-        
-        // Table and room
-        c1 += max(0. , (1. - 2.0* fragCoord.y/iResolution.y)) * vec4(1, 1, 1, 0.) *
-            smoothstep(-0.25, 0.25, roundSquare(uvC - vec2(0.5, -0.2), vec2(WIDTH+0.25, HEIGHT-0.15), .1)) *
-            smoothstep(-SMOOTH*2.0, SMOOTH*2.0, roundSquare(uvE-vec2(0.5, 0.5), vec2(WIDTH, HEIGHT) + 0.15, 0.05));
-        
-//    } else {
-        // From my shader https://www.shadertoy.com/view/lt2SDK
-        
-   ambient = 0.2;
-
-        // Ambient
-	    c2 += max(0.0, ambient - 0.3*distance(uvS, vec2(0.5,0.5))) *
-	        smoothstep(SMOOTH, -SMOOTH, stdRS(uvS, 0.0));
-        
-	    // Inner Border               
-	  	c2 += BEZEL_COL * ambient * 0.7 *
-	        smoothstep(-SMOOTH, SMOOTH, stdRS(uvS, 0.0)) * 
-	        smoothstep(SMOOTH, -SMOOTH, stdRS(uvE, 0.05));
-    
-	    // Corner
-	  	c2 -= (BEZEL_COL )* 
-	        smoothstep(-SMOOTH*2.0, SMOOTH*10.0, stdRS(uvE, 0.05)) * 
-	        smoothstep(SMOOTH*2.0, -SMOOTH*2.0, stdRS(uvE, 0.05));
-
-	    // Outer Border
-	    c2 += BEZEL_COL * ambient *
-	       	smoothstep(-SMOOTH, SMOOTH, stdRS(uvE, 0.05)) * 
-	        smoothstep(SMOOTH, -SMOOTH, stdRS(uvE, 0.15)); 
-    
-	    // Inner Border Reflection
-	    for(int i = 0; i < REFLECTION_BLUR_ITERATIONS; i++)
-	    {
-	    	vec2 uvR = borderReflect(uvC + (vec2(rand(uvC+float(i)), rand(uvC+float(i)+0.1))-0.5)*REFLECTION_BLUR_SIZE, 0.05) ;
-	    	c2 += (PHOSPHOR_COL - BEZEL_COL*ambient) * texture(iChannel0, 1.-vec2(uvR.x, uvR.y)) / float(REFLECTION_BLUR_ITERATIONS) * 
-		        smoothstep(-SMOOTH, SMOOTH, stdRS(uvS, 0.0)) * 
-				smoothstep(SMOOTH, -SMOOTH, stdRS(uvE, 0.05));
-	    }
-// commenting because mipmaps are a crapshoot with slang; TODO: try again with GLSL
-//	    // Bloom using composed MipMaps
-//	    c2 += textureLod(iChannel0, vec2(uvC.x, 1.0-uvC.y), 3.) * smoothstep(0., -SMOOTH*20., stdRS(uvS, -0.02)) * 0.5;
-//	   	c2 += textureLod(iChannel0, vec2(uvC.x, 1.0-uvC.y), 4.) * smoothstep(0., -SMOOTH*20., stdRS(uvS, -0.02)) * 0.5;
-//	    c2 += textureLod(iChannel0, vec2(uvC.x, 1.0-uvC.y), 5.) * smoothstep(0., -SMOOTH*20., stdRS(uvS, -0.02)) * 0.5;
-//    }
-    // mix light and dark for variable brightness
-    c = mix(c2, c1, global.dimmer);
-
-   if (uvC.x > 0. && uvC.x < 1. && uvC.y > 0. && uvC.y < 1.)
-      c += vec4(image);
-      return c;
-}
-
-void main()
-{
-   vec2 fragCoord = vec2(vTexCoord.x, 1.0-vTexCoord.y) * params.OutputSize.xy;
-   vec2 uvC, uvS, uvE;  
-   uvC = getCurves(fragCoord, uvC, uvS, uvE);
-   
-   vec3 sample_image = (global.ntsc_toggle > 0.5) ? texture(Source, vec2(uvC.x, 1.0-uvC.y)).rgb : texture(vt220_refpass, vec2(uvC.x, 1.0-uvC.y)).rgb;
-
-   vec4 image = vec4(sample_image * corner(uvC) * mask_weights(gl_FragCoord.xy, global.mask_strength, mask_picker), 1.0);
-   image.rgb = pow(image.rgb, vec3(2.5/2.2)); //CRT-like gamma correction
-   image.rgb = scanline(image.rgb, uvC.xy); //apply scanlines
-   FragColor = (global.ntsc_toggle > 0.5) ? bezelGen(Source, fragCoord.xy, image) : bezelGen(vt220_refpass, fragCoord.xy, image); //apply bezel
-}
diff --git a/crt/shaders/yee64.slang b/crt/shaders/yee64.slang
deleted file mode 100644
index 3a9b6136ac..0000000000
--- a/crt/shaders/yee64.slang
+++ /dev/null
@@ -1,104 +0,0 @@
-#version 450
-
-// ported from ReShade
-
-layout(push_constant) uniform Push
-{
-	float viewSizeHD;
-	float brightness;
-	float intensityR;
-	float intensityG;
-	float intensityB;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#pragma parameter viewSizeHD "Min Dimming Res" 720.0 0.0 2190.0 1.0
-int viewSizeHD = int(params.viewSizeHD);
-#pragma parameter brightness "CRT Brightness" 1.5 0.0 5.0 0.1
-#pragma parameter intensityR "Red Dimming Intensity" 1.2 0.0 2.0 0.1
-#pragma parameter intensityG "Green Dimming Intensity" 0.9 0.0 2.0 0.1
-#pragma parameter intensityB "Blue Dimming Intensity" 0.9 0.0 2.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 FinalViewportSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-
-	vec2 textureSize = params.SourceSize.xy; // Size of Internal Framebuffer
-	vec2 viewSize = global.FinalViewportSize.xy; // Size of final Viewport
-	vec2 pixelSize = params.OriginalSize.xy; // Size of Game resolution;
-
-    vec2 texelPos = (textureSize.xy / pixelSize.xy) * vTexCoord.xy;
-    vec4 size     = (pixelSize.xy / textureSize.xy).xyxy * texelPos.xyxy;
-    vec2 exp    = size.zw * textureSize.xy + -floor(size.zw * textureSize.xy) + -0.5;
-
-	vec4 factor  =vec4(0.0,0.0,0.0,0.0);
-	factor.x = pow(2.0, pow(-1.0 - exp.x, 2.0) * (-3.0));
-    factor.y = pow(2.0, pow( 1.0 - exp.x, 2.0) * (-3.0));
-    factor.z = pow(2.0, pow(-2.0 - exp.x, 2.0) * (-3.0));
-    factor.w = pow(2.0, pow( 2.0 - exp.x, 2.0) * (-3.0));
-	float  factor2 = pow(2.0, pow(exp.x, 2.0) * -3.0); // used for the same stuff as 'factor', just doesn't fit in a vec4 :)
-
-	vec3 power = vec3(0.0,0.0,0.0);
-	power.x = pow(2.0, pow(exp.y, 2.0) * -8.0);
-	power.y = pow(2.0, pow(-exp.y + -1.0, 2.0) * -8.0);
-	power.z = pow(2.0, pow(-exp.y + 1.0, 2.0) * -8.0);
-
-	vec2 viewPos      = floor(texelPos.xy * viewSize.xy) + 0.5;
-	float intencityPos  = fract((viewPos.y * 3.0 + viewPos.x) * 0.166667);
-	vec3 intencity = vec3(params.intensityR, params.intensityG, params.intensityB);
-
-	vec4 scanlineIntencity = vec4(0.0,0.0,0.0,0.0);
-	if (intencityPos < 0.333)
-		scanlineIntencity.rgb = intencity.xyz;
-	else if (intencityPos < 0.666)
-		scanlineIntencity.rgb = intencity.zxy;
-	else
-		scanlineIntencity.rgb = intencity.yzx;
-
-	vec3 color1  = texture(Source, (floor(size.zw * textureSize.xy   + vec2( 1, -1))   + 0.5)      / textureSize.xy).rgb * factor.y * params.brightness;
-    vec3 color2  = texture(Source, (floor(size.zw * textureSize.xy   + vec2(-2,  0))   + 0.5)      / textureSize.xy).rgb * factor.z * params.brightness;
-    vec3 color3  = texture(Source, (floor(size.zw * textureSize.xy   + vec2(-1,  0))   + 0.5)      / textureSize.xy).rgb * factor.x * params.brightness;
-    vec3 color4  = texture(Source, (floor(size.zw * textureSize.xy   + vec2( 1,  0))   + 0.5)      / textureSize.xy).rgb * factor.y * params.brightness;
-    vec3 color5  = texture(Source, (floor(size.zw * textureSize.xy   + 0)                + 0.5)      / textureSize.xy).rgb * factor2  * params.brightness;
-    vec3 color6  = texture(Source, (floor(size.zw * textureSize.xy   + vec2(-1,  1))   + 0.5)      / textureSize.xy).rgb * factor.x * params.brightness;
-    vec3 color7  = texture(Source, (floor(size.zw * textureSize.xy   + vec2( 2,  0))   + 0.5)      / textureSize.xy).rgb * factor.w * params.brightness;
-    vec3 color8  = texture(Source, (floor(size.zw * textureSize.xy   + -1)               + 0.5)      / textureSize.xy).rgb * factor.x * params.brightness;
-    vec3 color9  = texture(Source, (floor(size.zw * textureSize.xy   + vec2( 0, -1))   + 0.5)      / textureSize.xy).rgb * factor2  * params.brightness;
-    vec3 color10 = texture(Source, (floor(size.zw * textureSize.xy   + 1)                + 0.5)      / textureSize.xy).rgb * factor.y * params.brightness;
-    vec3 color11 = texture(Source, (floor(size.xy * textureSize.xy   + vec2( 0,  1))   + 0.5)      / textureSize.xy).rgb * factor2  * params.brightness;
-
-	vec3 final = 
-	power.x * (color2 + color3 + color4 + color5 + color7) / (factor.z + factor.x + factor.y + factor2 + factor.w) +
-	power.y * (color1 + color8 + color9)                   / (factor.y + factor.x + factor2)                 +
-	power.z * (color10 + color6 + color11)                 / (factor.y + factor.x + factor2);
-
-	vec4 outColor = vec4(0.0,0.0,0.0,0.0);
-	outColor.xyz = params.viewSizeHD < viewSize.y ? (scanlineIntencity.rgb * final.rgb) : final.rgb;
-	outColor.w = 1.0;
-	
-	FragColor.xyzw = outColor.xyzw;
-}
\ No newline at end of file
diff --git a/crt/shaders/yeetron.slang b/crt/shaders/yeetron.slang
deleted file mode 100644
index 032a3a9e96..0000000000
--- a/crt/shaders/yeetron.slang
+++ /dev/null
@@ -1,94 +0,0 @@
-#version 450
-
-// ported from ReShade
-
-layout(push_constant) uniform Push
-{
-	float viewSizeHD;
-	float intensityR;
-	float intensityG;
-	float intensityB;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#pragma parameter viewSizeHD "Min Dimming Res" 720.0 0.0 2190.0 1.0
-int viewSizeHD = int(params.viewSizeHD);
-#pragma parameter intensityR "Red Dimming Intensity" 1.2 0.0 2.0 0.1
-#pragma parameter intensityG "Green Dimming Intensity" 0.9 0.0 2.0 0.1
-#pragma parameter intensityB "Blue Dimming Intensity" 0.9 0.0 2.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 FinalViewportSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	float RSDK_PI = 3.14159;
-	vec2 textureSize = params.SourceSize.xy; // Size of Internal Framebuffer
-	vec2 viewSize = global.FinalViewportSize.xy; // Size of final Viewport
-	vec2 pixelSize = params.OriginalSize.xy; // Size of Game resolution;
-	
-	vec2 viewPos      = floor((textureSize.xy / pixelSize.xy) * vTexCoord.xy * viewSize.xy) + 0.5;
-    float intencityPos  = fract((viewPos.y * 3.0 + viewPos.x) * 0.166667);
-
-	vec3 intencity = vec3(params.intensityR, params.intensityG, params.intensityB);
-    vec4 scanlineIntencity = vec4(0.0,0.0,0.0,0.0);
-    if (intencityPos < 0.333)
-        scanlineIntencity.rgb = intencity.xyz;
-    else if (intencityPos < 0.666)
-        scanlineIntencity.rgb = intencity.zxy;
-    else
-        scanlineIntencity.rgb = intencity.yzx;
-
-    vec2 pixelPos         = vTexCoord.xy * textureSize.xy;
-    vec2 roundedPixelPos  = floor(pixelPos.xy);
-
-    scanlineIntencity.a = clamp(abs(sin(pixelPos.y * RSDK_PI)) + 0.25, 0.5, 1.0);
-    pixelPos.xy         = fract(pixelPos.xy) + -0.5;
-
-    vec2 invTexPos = -vTexCoord.xy * textureSize.xy + (roundedPixelPos + 0.5);
-    
-    vec2 newTexPos = vec2(0.0,0.0);
-    newTexPos.x = clamp(-abs(invTexPos.x * 0.5) + 1.5, 0.8, 1.25);
-    newTexPos.y = clamp(-abs(invTexPos.y * 2.0) + 1.25, 0.5, 1.0);
-
-    vec2 colorMod;
-    colorMod.x = newTexPos.x * newTexPos.y;
-    colorMod.y = newTexPos.x * ((scanlineIntencity.a + newTexPos.y) * 0.5);
-
-    scanlineIntencity.w *= newTexPos.x;
-
-    vec2 texPos   = ((pixelPos.xy + -clamp(pixelPos.xy, -0.25, 0.25)) * 2.0 + roundedPixelPos + 0.5) / textureSize.xy;
-    vec4 texColor = texture(Source, texPos.xy);
-
-    vec3 blendedColor = vec3(0.0,0.0,0.0);
-    blendedColor.x  = scanlineIntencity.a * texColor.x;
-    blendedColor.yz = colorMod.xy * texColor.yz;
-
-    vec4 outColor;
-    outColor.xyz    = viewSize.y >= params.viewSizeHD ? (scanlineIntencity.rgb * blendedColor.rgb) : blendedColor.xyz;
-    outColor.w      = texColor.w;
-	
-	FragColor = outColor.xyzw;
-}
\ No newline at end of file
diff --git a/crt/vector-glow-alt-render.slangp b/crt/vector-glow-alt-render.slangp
deleted file mode 100644
index 9d9b72a6c8..0000000000
--- a/crt/vector-glow-alt-render.slangp
+++ /dev/null
@@ -1,31 +0,0 @@
-shaders = 4
-
-shader0 = "../misc/shaders/image-adjustment.slang"
-alias0 = PASS1
-wrap_mode0 = mirrored_repeat
-
-shader1 = "../blurs/shaders/royale/blur43fast-vertical.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.0"
-wrap_mode1 = mirrored_repeat
-
-shader2 = "../blurs/shaders/royale/blur43fast-horizontal.slang"
-filter_linear2 = "true"
-scale_type2 = "source"
-scale2 = "1.0"
-wrap_mode2 = mirrored_repeat
-
-shader3 = "shaders/glow-trails/combine.slang"
-scale_type3 = "viewport"
-scale3 = 1.0
-wrap_mode3 = mirrored_repeat
-
-parameters = "mixfactor;threshold;trail_bright;glowFactor;haze_strength;luminance;screen_combine"
-mixfactor = "0.18"
-threshold = "0.90"
-trail_bright = "0.30"
-glowFactor = "0.10"
-haze_strength = "0.75"
-luminance = "1.50"
-screen_combine = "1.0"
diff --git a/crt/vector-glow.slangp b/crt/vector-glow.slangp
deleted file mode 100644
index 2f1b568162..0000000000
--- a/crt/vector-glow.slangp
+++ /dev/null
@@ -1,57 +0,0 @@
-shaders = 10
-
-shader0 = ../stock.slang
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
-alias0 = glow_trails_refpass
-
-shader1 = shaders/glow-trails/glow-trails0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = Trails0
-
-shader2 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear2 = "true"
-scale_type2 = "source"
-scale2 = "1.0"
-srgb_framebuffer2 = "true"
-
-shader3 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias3 = "TRAIL_BLUR"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-shader4 = shaders/glow-trails/glow-trails1.slang
-
-shader5 = "../anti-aliasing/shaders/advanced-aa.slang"
-alias5 = PASS1
-
-shader6 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear6 = "true"
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-shader7 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-
-shader8 = "shaders/glow-trails/combine.slang"
-
-shader9 = "../misc/shaders/image-adjustment.slang"
-scale_type9 = viewport
-
-parameters = "mixfactor;threshold;trail_bright;glowFactor;haze_strength;luminance;bright"
-mixfactor = "0.18"
-threshold = "0.90"
-trail_bright = "0.30"
-glowFactor = "0.10"
-haze_strength = "0.25"
-luminance = "1.50"
-bright = "1.0"
diff --git a/crt/vt220.slangp b/crt/vt220.slangp
deleted file mode 100644
index cbe88a0ffb..0000000000
--- a/crt/vt220.slangp
+++ /dev/null
@@ -1,37 +0,0 @@
-shaders = 6
-
-shader0 = ../stock.slang
-alias0 = vt220_refpass
-
-shader1 = ../stock.slang
-alias1 = PrePass0
-
-shader2 = shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias2 = NPass1
-scale_type_x2 = source
-scale_type_y2 = source
-scale_x2 = 4.0
-scale_y2 = 1.0
-float_framebuffer2 = true
-filter_linear2 = false
-
-shader3 = shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear3 = true
-float_framebuffer3 = true
-scale_type3 = source
-scale_x3 = 0.5
-scale_y3 = 1.0
-
-shader4 = shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 1.0
-scale_y4 = 1.0
-
-shader5 = shaders/vt220/vt220.slang
-mipmap_input5 = true
-wrap_mode5 = mirrored_repeat
-scale_type5 = viewport
-
-parameters = "quality"
-quality = 1.0
diff --git a/crt/yee64.slangp b/crt/yee64.slangp
deleted file mode 100644
index d80f6aec2a..0000000000
--- a/crt/yee64.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/yee64.slang
-scale_type0 = viewport
diff --git a/crt/yeetron.slangp b/crt/yeetron.slangp
deleted file mode 100644
index 86ab4def9f..0000000000
--- a/crt/yeetron.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/yeetron.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/denoisers/shaders/fast-bilateral-3d.slang b/denoisers/shaders/fast-bilateral-3d.slang
deleted file mode 100644
index b11002d1a0..0000000000
--- a/denoisers/shaders/fast-bilateral-3d.slang
+++ /dev/null
@@ -1,101 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float FB_RES;
-	float SIGMA_R;
-	float SIGMA_D;
-} params;
-
-#pragma parameter FB_RES "Bilateral Internal Res" 2.0 1.0 8.0 1.0
-#pragma parameter SIGMA_R "Bilateral Blur" 0.4 0.0 2.0 0.1
-#pragma parameter SIGMA_D "Bilateral Space" 3.0 0.0 10.0 0.2
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define GET(M,K) (texture(Source,tc+M*dx+K*dy).xyz)
-
-#define BIL(M,K) {\
-	col=GET(M,K);\
-	ds=M*M+K*K;\
-	weight=exp(-ds/sd2)*exp(-(col-center)*(col-center)/si2);\
-	color+=(weight*col);\
-	wsum+=weight;\
-	}
-
-void main()
-{
-      float ds, sd2, si2;
-      float sigma_d = params.SIGMA_D;
-      float sigma_r = params.SIGMA_R*0.04;
-
-      vec3 color = vec3(0.0, 0.0, 0.0);
-      vec3 wsum = vec3(0.0, 0.0, 0.0);
-      vec3 weight;
-
-      vec2 dx = vec2(params.FB_RES, 0.0) * params.SourceSize.zw;
-      vec2 dy = vec2(0.0, params.FB_RES) * params.SourceSize.zw;
-
-      sd2 = 2.0 * sigma_d * sigma_d;
-      si2 = 2.0 * sigma_r * sigma_r;
-
-      vec2 tc = vTexCoord;
-
-      vec3 col;
-      vec3 center = GET(0,0);
-     // center = sqrt(center);
-
-      BIL(-2,-2)
-      BIL(-1,-2)
-      BIL( 0,-2)
-      BIL( 1,-2)
-      BIL( 2,-2)
-      BIL(-2,-1)
-      BIL(-1,-1)
-      BIL( 0,-1)
-      BIL( 1,-1)
-      BIL( 2,-1)
-      BIL(-2, 0)
-      BIL(-1, 0)
-      BIL( 0, 0)
-      BIL( 1, 0)
-      BIL( 2, 0)
-      BIL(-2, 1)
-      BIL(-1, 1)
-      BIL( 0, 1)
-      BIL( 1, 1)
-      BIL( 2, 1)
-      BIL(-2, 2)
-      BIL(-1, 2)
-      BIL( 0, 2)
-      BIL( 1, 2)
-      BIL( 2, 2)
-
-      // Weight normalization
-      color /= wsum;
-
-      FragColor = vec4(color, 1.);
-}
\ No newline at end of file
diff --git a/denoisers/shaders/slow-bilateral.slang b/denoisers/shaders/slow-bilateral.slang
deleted file mode 100644
index 665c02738b..0000000000
--- a/denoisers/shaders/slow-bilateral.slang
+++ /dev/null
@@ -1,82 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SIGMA;
-	float BSIGMA;
-} params;
-
-#pragma parameter SIGMA "Sigma" 10.0 1.0 20.0 1.0
-#pragma parameter BSIGMA "BSigma" 0.1 0.01 0.5 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define MSIZE 15
-
-float normpdf(in float x, in float sigma)
-{
-	return 0.39894*exp(-0.5*x*x/(sigma*sigma))/sigma;
-}
-
-float normpdf3(in vec3 v, in float sigma)
-{
-	return 0.39894*exp(-0.5*dot(v,v)/(sigma*sigma))/sigma;
-}
-
-void main()
-{
-	vec2 fragcoord = vTexCoord * params.OutputSize.xy;
-	vec3 c = texture(Source,  (fragcoord.xy / params.OutputSize.xy)).rgb;
-	
-	//declare stuff
-	const int kSize = (MSIZE-1)/2;
-	float kernel[MSIZE];
-	vec3 final_colour = vec3(0.0);
-	
-	//create the 1-D kernel
-	float Z = 0.0;
-	for (int j = 0; j <= kSize; ++j)
-	{
-		kernel[kSize+j] = kernel[kSize-j] = normpdf(float(j), params.SIGMA);
-	}
-	
-	vec3 cc;
-	float factor;
-	float bZ = 1.0/normpdf(0.0, params.BSIGMA);
-	//read out the texels
-	for (int i=-kSize; i <= kSize; ++i)
-	{
-		for (int j=-kSize; j <= kSize; ++j)
-		{
-			cc = texture(Source, (fragcoord.xy+vec2(float(i),float(j))) / params.OutputSize.xy).rgb;
-			factor = normpdf3(cc-c, params.BSIGMA)*bZ*kernel[kSize+j]*kernel[kSize+i];
-			Z += factor;
-			final_colour += factor*cc;
-		}
-	}
-	
-	FragColor = vec4(final_colour/Z, 1.0);
-}
\ No newline at end of file
diff --git a/denoisers/slow-bilateral.slangp b/denoisers/slow-bilateral.slangp
deleted file mode 100644
index 0a74e70221..0000000000
--- a/denoisers/slow-bilateral.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/slow-bilateral.slang
-scale_type0 = source
-filter_linear0 = true
-scale0 = 1.0
\ No newline at end of file
diff --git a/dithering/bayer-matrix-dithering.slangp b/dithering/bayer-matrix-dithering.slangp
deleted file mode 100644
index ba3c3d69f8..0000000000
--- a/dithering/bayer-matrix-dithering.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/bayer-matrix-dithering.slang
-filter_linear0 = false
-scale_type0 = source
diff --git a/dithering/checkerboard-dedither.slangp b/dithering/checkerboard-dedither.slangp
deleted file mode 100644
index aa3038acac..0000000000
--- a/dithering/checkerboard-dedither.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-shaders = 4
-
-shader0 = shaders/checkerboard-dedither/linearize.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-alias0 = LinearGamma
-
-shader1 = shaders/checkerboard-dedither/checkerboard-dedither-pass1.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = shaders/checkerboard-dedither/checkerboard-dedither-pass2.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = shaders/checkerboard-dedither/checkerboard-dedither-pass3.slang
-filter_linear3 = false
-scale_type3 = source
diff --git a/dithering/gdapt.slangp b/dithering/gdapt.slangp
deleted file mode 100644
index 8ec7fbdb9f..0000000000
--- a/dithering/gdapt.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 2
-
-shader0 = shaders/gdapt/gdapt-pass0.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-
-shader1 = shaders/gdapt/gdapt-pass1.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
diff --git a/dithering/mdapt.slangp b/dithering/mdapt.slangp
deleted file mode 100644
index c895ef8a83..0000000000
--- a/dithering/mdapt.slangp
+++ /dev/null
@@ -1,29 +0,0 @@
-shaders = 6
-
-shader0 = ../stock.slang
-alias0 = mdapt_refpass
-
-shader1 = shaders/mdapt/passes/mdapt-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = shaders/mdapt/passes/mdapt-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = shaders/mdapt/passes/mdapt-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = shaders/mdapt/passes/mdapt-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = shaders/mdapt/passes/mdapt-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
diff --git a/dithering/ps1-dedither-boxblur.slangp b/dithering/ps1-dedither-boxblur.slangp
deleted file mode 100644
index b773f1de9b..0000000000
--- a/dithering/ps1-dedither-boxblur.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ps1dither/PS1-Undither-BoxBlur.slang
-filter_linear0 = true
-scale_type0 = source
-scale0 = 1.0
\ No newline at end of file
diff --git a/dithering/ps1-dedither-comparison.slangp b/dithering/ps1-dedither-comparison.slangp
deleted file mode 100644
index 712b25a043..0000000000
--- a/dithering/ps1-dedither-comparison.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 2
-
-shader0 = shaders/ps1dither/PS1-Undither-AntiBayer.slang
-filter_linear0 = true
-scale_type0 = source
-scale0 = 1.0
-
-shader1 = shaders/ps1dither/PS1-Undither-Comparison-MkII.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
\ No newline at end of file
diff --git a/dithering/ps1-dither.slangp b/dithering/ps1-dither.slangp
deleted file mode 100644
index 78054fa27b..0000000000
--- a/dithering/ps1-dither.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ps1dither/PS1-Undither-AntiBayer.slang
-filter_linear0 = true
-scale_type0 = source
-scale0 = 1.0
\ No newline at end of file
diff --git a/dithering/sgenpt-mix-multipass.slangp b/dithering/sgenpt-mix-multipass.slangp
deleted file mode 100644
index f04bc243f4..0000000000
--- a/dithering/sgenpt-mix-multipass.slangp
+++ /dev/null
@@ -1,34 +0,0 @@
-shaders = 6
-
-shader0 = shaders/sgenpt-mix/linearize.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-alias0 = LinearGamma
-
-shader1 = shaders/sgenpt-mix/sgenpt-mix-pass1.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = shaders/sgenpt-mix/sgenpt-mix-pass2.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = shaders/sgenpt-mix/sgenpt-mix-pass3.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = CB_Output
-
-shader4 = shaders/sgenpt-mix/sgenpt-mix-pass4.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-
-shader5 = shaders/sgenpt-mix/sgenpt-mix-pass5.slang
-filter_linear5 = false
-scale_type5 = source
-
diff --git a/dithering/shaders/bayer-matrix-dithering.slang b/dithering/shaders/bayer-matrix-dithering.slang
deleted file mode 100644
index c6b7041079..0000000000
--- a/dithering/shaders/bayer-matrix-dithering.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-// 8x8 Bayer matrix dithering
-// by Martins Upitis
-// license: "All the content here is and will be free to use for everyone, but a donation is always nice."
-// url: http://devlog-martinsh.blogspot.com/2011/03/glsl-8x8-bayer-matrix-dithering.html
-// adapted for RetroArch by hunterk
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float animate;
-	float dither_size;
-} params;
-
-#pragma parameter animate "Dithering Animation" 0.0 0.0 1.0 1.0
-#pragma parameter dither_size "Dither Size" 0.0 0.0 0.95 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-float find_closest(int x, int y, float c0)
-{
-
-int dither[8][8] = {
-{ 0, 32, 8, 40, 2, 34, 10, 42}, /* 8x8 Bayer ordered dithering */
-{48, 16, 56, 24, 50, 18, 58, 26}, /* pattern. Each input pixel */
-{12, 44, 4, 36, 14, 46, 6, 38}, /* is scaled to the 0..63 range */
-{60, 28, 52, 20, 62, 30, 54, 22}, /* before looking in this table */
-{ 3, 35, 11, 43, 1, 33, 9, 41}, /* to determine the action. */
-{51, 19, 59, 27, 49, 17, 57, 25},
-{15, 47, 7, 39, 13, 45, 5, 37},
-{63, 31, 55, 23, 61, 29, 53, 21} }; 
-
-float limit = 0.0;
-if(x < 8)
-{
-limit = (dither[x][y]+1)/64.0;
-}
-
-
-if(c0 < limit)
-return 0.0;
-return 1.0;
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-float Scale = 3.0 + mod(2.0 * params.FrameCount, 32.0) * params.animate + params.dither_size;
-vec4 lum = vec4(0.299, 0.587, 0.114, 0);
-float grayscale = dot(texture(Source, vTexCoord), lum);
-vec3 rgb = texture(Source, vTexCoord).rgb;
-
-vec2 xy = (vTexCoord * params.OutputSize.xy) * Scale;
-int x = int(mod(xy.x, 8));
-int y = int(mod(xy.y, 8));
-
-vec3 finalRGB;
-finalRGB.r = find_closest(x, y, rgb.r);
-finalRGB.g = find_closest(x, y, rgb.g);
-finalRGB.b = find_closest(x, y, rgb.b);
-
-float final = find_closest(x, y, grayscale);
-
-   FragColor = vec4(finalRGB, 1.0);
-}
diff --git a/dithering/shaders/blue-noise/LDR_RGB1_0.png b/dithering/shaders/blue-noise/LDR_RGB1_0.png
deleted file mode 100644
index f36ebc3660..0000000000
Binary files a/dithering/shaders/blue-noise/LDR_RGB1_0.png and /dev/null differ
diff --git a/dithering/shaders/cbod-v1/cbod-v1-pass1.slang b/dithering/shaders/cbod-v1/cbod-v1-pass1.slang
deleted file mode 100644
index 41a2d18c24..0000000000
--- a/dithering/shaders/cbod-v1/cbod-v1-pass1.slang
+++ /dev/null
@@ -1,81 +0,0 @@
-#version 450
-
-/*
-/   "Conditional Blending of Dither" Shader v1.0 - Pass 1
-/   Copyright (c) 2013, Alexander Kulagin <coastkid3d@gmail.com>
-/   All Rights reserved.
-/ 
-/   Redistribution and use in source and binary forms, with or without
-/   modification, are permitted provided that the following conditions are met:
-/ 
-/     * Redistributions of source code must retain the above copyright notice,
-/       this list of conditions and the following disclaimer.
-/ 
-/     * Redistributions in binary form must reproduce the above copyright
-/       notice, this list of conditions and the following disclaimer in the
-/       documentation and/or other materials provided with the distribution.
-/ 
-/   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-/   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-/   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-/   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-/   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-/   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-/   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-/   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-/   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-/   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-/   POSSIBILITY OF SUCH DAMAGE.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-  vec2 uv = vTexCoord - (params.SourceSize.zw) * 0.25;
-  vec2 uv_shift = (params.SourceSize.zw);
-	vec3 src = texture(Source, uv).rgb;
- 
-  // Searching for the Vertical Dithering Zones
-	vec3 dither_v_zone = vec3(texture(Source, uv + vec2(uv_shift.x, 0.)).rgb == texture(Source, uv - vec2(uv_shift.x, 0.)).rgb);
-  dither_v_zone = vec3(smoothstep(0.2, 1.0, dot(dither_v_zone, vec3(0.33333))));
-  
-  // Searching for High Contrast "Safe" Zones 
-  vec3 safe_zone = vec3(abs(dot(texture(Source, uv).rgb - texture(Source, uv - vec2(uv_shift.x, 0.)).rgb, vec3(0.3333))));
-  safe_zone = vec3(lessThan(safe_zone , vec3(0.45)));
- 
-  // Horizontal Bluring by 1 pixel
-  vec3 blur_h = (texture(Source, uv).rgb + texture(Source, uv - vec2(uv_shift.x, 0.)).rgb) * 0.5;
-  
-  // Final Blend between Source and Blur using Dithering Zone and Safe Zone
-  vec3 finalcolor = mix(src, blur_h, dither_v_zone * safe_zone);
-  
-   FragColor = vec4(finalcolor, 1.0);
-}
\ No newline at end of file
diff --git a/dithering/shaders/cbod-v1/cbod-v1-pass2.slang b/dithering/shaders/cbod-v1/cbod-v1-pass2.slang
deleted file mode 100644
index c3dbd682e3..0000000000
--- a/dithering/shaders/cbod-v1/cbod-v1-pass2.slang
+++ /dev/null
@@ -1,81 +0,0 @@
-#version 450
-
-/*
-/   "Conditional Blending of Dither" Shader v1.0 - Pass 2
-/   Copyright (c) 2013, Alexander Kulagin <coastkid3d@gmail.com>
-/   All Rights reserved.
-/ 
-/   Redistribution and use in source and binary forms, with or without
-/   modification, are permitted provided that the following conditions are met:
-/ 
-/     * Redistributions of source code must retain the above copyright notice,
-/       this list of conditions and the following disclaimer.
-/ 
-/     * Redistributions in binary form must reproduce the above copyright
-/       notice, this list of conditions and the following disclaimer in the
-/       documentation and/or other materials provided with the distribution.
-/ 
-/   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-/   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-/   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-/   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-/   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-/   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-/   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-/   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-/   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-/   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-/   POSSIBILITY OF SUCH DAMAGE.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-  vec2 uv = vTexCoord - (params.SourceSize.zw) * 0.25;
-  vec2 uv_shift = (params.SourceSize.zw);
-	vec3 src = texture(Source, uv).rgb;
- 
-  // Searching for the Horizontal Dithering Zones
-	vec3 dither_h_zone = vec3(texture(Source, uv + vec2(0., uv_shift.y)).rgb == texture(Source, uv - vec2(0., uv_shift.y)).rgb);
-  dither_h_zone = vec3(smoothstep(0.2, 1.0, dot(dither_h_zone, vec3(0.33333))));
-  
-  // Searching for High Contrast "Safe" Zones 
-  vec3 safe_zone = vec3(abs(dot(texture(Source, uv).rgb - texture(Source, uv - vec2(0., uv_shift.y)).rgb, vec3(0.3333))));
-  safe_zone = vec3(lessThan(safe_zone , vec3(0.45)));
- 
-  // Vertical Bluring by 1 pixel
-  vec3 blur_v = (texture(Source, uv).rgb + texture(Source, uv - vec2(0., uv_shift.y)).rgb) * 0.5;
-  
-  // Final Blend between Source and Blur using Dithering Zone and Safe Zone
-  vec3 finalcolor = mix(src, blur_v, dither_h_zone * safe_zone);
-  
-   FragColor = vec4(finalcolor, 1.0);
-}
\ No newline at end of file
diff --git a/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass1.slang b/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass1.slang
deleted file mode 100644
index 7fb6ac2ffd..0000000000
--- a/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass1.slang
+++ /dev/null
@@ -1,107 +0,0 @@
-#version 450
-
-/*
-   Checkerboard Dedither - pass1
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float CD_BLEND_OPTION;
-    float CD_BLEND_LEVEL;
-} params;
-
-#pragma parameter CD_BLEND_OPTION    "CHECKERBOARD-DEDITHER: [ OFF | ON ]" 1.0  0.0 1.0  1.0
-#pragma parameter CD_BLEND_LEVEL     "    Blend Level"                     1.0  0.0 1.0  0.1
-
-#define CD_BLEND_OPTION             params.CD_BLEND_OPTION
-#define CD_BLEND_LEVEL              params.CD_BLEND_LEVEL
-
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));}
-vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec3 C  = texture(Source, vTexCoord    ).xyz;
-    vec3 L  = texture(Source, vTexCoord -dx).xyz;
-    vec3 R  = texture(Source, vTexCoord +dx).xyz;
-    vec3 U  = texture(Source, vTexCoord -dy).xyz;
-    vec3 D  = texture(Source, vTexCoord +dy).xyz;
-    vec3 UL = texture(Source, vTexCoord -dx -dy).xyz;
-    vec3 UR = texture(Source, vTexCoord +dx -dy).xyz;
-    vec3 DL = texture(Source, vTexCoord -dx +dy).xyz;
-    vec3 DR = texture(Source, vTexCoord +dx +dy).xyz;
-
-    vec3 color = C;
-
-    if (CD_BLEND_OPTION == 1)
-    {
-        float diff = dot(max(C, max(L, R)) - min(C, min(L, R)), Y);
-
-        diff *= (1.0 - CD_BLEND_LEVEL);
-
-        vec3 min_sample = max(min_s(C, L, R), min_s(C, U, D));
-        vec3 max_sample = min(max_s(C, L, R), max_s(C, U, D));
-
-        color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D);
-
-        color = clamp(color, min_sample, max_sample);
-    }
-
-    float luma_diff = abs(dot(C, Y)-dot(color, Y));
-
-    FragColor = vec4(color, luma_diff);
-}
diff --git a/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass2.slang b/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass2.slang
deleted file mode 100644
index 0b5d452c9a..0000000000
--- a/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass2.slang
+++ /dev/null
@@ -1,142 +0,0 @@
-#version 450
-
-/*
-   Checkerboard Dedither - pass2
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float CD_BLEND_LEVEL;
-} params;
-
-#pragma parameter CD_BLEND_LEVEL               "    Blend Level"                1.0  0.0 1.0  0.1
-
-#define CD_BLEND_LEVEL             params.CD_BLEND_LEVEL
-
-#define PATTERN(A)                 step(Delta,A)
-
-const float Delta = 0.000000001;
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D LinearGamma;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec4 C =  texture(Source, vTexCoord        );
-    vec4 L =  texture(Source, vTexCoord -dx    );
-    vec4 R =  texture(Source, vTexCoord +dx    );
-    vec4 U =  texture(Source, vTexCoord     -dy);
-    vec4 D =  texture(Source, vTexCoord     +dy);
-    vec4 UL = texture(Source, vTexCoord -dx -dy);
-    vec4 UR = texture(Source, vTexCoord +dx -dy);
-    vec4 DL = texture(Source, vTexCoord -dx +dy);
-    vec4 DR = texture(Source, vTexCoord +dx +dy);
-
-    vec4 L2 =  texture(Source, vTexCoord -2.0*dx    );
-    vec4 R2 =  texture(Source, vTexCoord +2.0*dx    );
-    vec4 U2 =  texture(Source, vTexCoord     -2.0*dy);
-    vec4 D2 =  texture(Source, vTexCoord     +2.0*dy);
-
-    vec4 UL2 =  texture(Source, vTexCoord -2.0*dx -dy);
-    vec4 UR2 =  texture(Source, vTexCoord +2.0*dx -dy);
-    vec4 DL2 =  texture(Source, vTexCoord -2.0*dx +dy);
-    vec4 DR2 =  texture(Source, vTexCoord +2.0*dx +dy);
-
-    vec4 LU2 =  texture(Source, vTexCoord -dx -2.0*dy);
-    vec4 RU2 =  texture(Source, vTexCoord +dx -2.0*dy);
-    vec4 LD2 =  texture(Source, vTexCoord -dx +2.0*dy);
-    vec4 RD2 =  texture(Source, vTexCoord +dx -2.0*dy);
-
-    vec3 color =  C.rgb;
-
-    vec3 oriC = texture(LinearGamma, vTexCoord        ).rgb;
-    vec3 oriL = texture(LinearGamma, vTexCoord -dx    ).rgb;
-    vec3 oriR = texture(LinearGamma, vTexCoord +dx    ).rgb;
-    vec3 oriU = texture(LinearGamma, vTexCoord     -dy).rgb;
-    vec3 oriD = texture(LinearGamma, vTexCoord     +dy).rgb;
-
-    float count1 = 0.0;
-    float count2 = 0.0;
-
-    float diff  = (1.0 - CD_BLEND_LEVEL);
-
-//      LU2  U2  RU2
-//  UL2  UL   U  UR  UR2
-//   L2   L   C   R   R2
-//  DL2  DL   D  DR  DR2
-//      LD2  D2  RD2
-
-    count1 += PATTERN(L.a*D.a*R.a);
-    count1 += PATTERN(L.a*U.a*R.a);
-    count1 += PATTERN(L.a*UL.a*R.a*UR.a + L.a*DL.a*R.a*DR.a);
-
-    count1 += PATTERN(U.a*D2.a*(UL.a*LD2.a + UR.a*RD2.a) + U2.a*D.a*(LU2.a*DL.a + RU2.a*DR.a));
-
-    count2 += PATTERN(U.a*L.a*D.a);
-    count2 += PATTERN(U.a*R.a*D.a);
-    count2 += PATTERN(U.a*UR.a*D.a*DR.a + D.a*DL.a*U.a*UL.a);
-
-    count2 += PATTERN(L.a*R2.a*(DL.a*DR2.a + UL.a*UR2.a) + L2.a*R.a*(DL2.a*DR.a + UL2.a*UR.a));
-
-    if ((count1 * count2) > 0.0 && count1 == count2)
-        color = 0.5*(1.0+diff)*oriC + 0.125*(1.0-diff)*(oriL + oriR + oriU + oriD);
-    else if (count1 > 0.0 && count1 > count2)
-        color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriL + oriR);
-    else if (count2 > 0.0 && count2 > count1)
-        color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriU + oriD);
-
-    float luma_diff = abs(dot(oriC, Y)-dot(color, Y));
-
-    FragColor = vec4(color, luma_diff);
-}
diff --git a/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass3.slang b/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass3.slang
deleted file mode 100644
index 3f8d695607..0000000000
--- a/dithering/shaders/checkerboard-dedither/checkerboard-dedither-pass3.slang
+++ /dev/null
@@ -1,152 +0,0 @@
-#version 450
-
-/*
-   Checkerboard Dedither - pass3
-   
-   2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is 
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-    float CD_MITIG_NEIGHBRS;
-    float CD_MITIG_LINES;
-    float CD_ADJUST_VIEW;
-    float UseGamma;
-} params;
-
-#pragma parameter CD_MITIG_NEIGHBRS            "    Mitigate Errors (neighbors)" 1.0  0.0 4.0  1.0
-#pragma parameter CD_MITIG_LINES               "    Mitigate Errors (regions)"   0.0  0.0 1.0  1.0
-#pragma parameter CD_ADJUST_VIEW               "    Adjust View"                 0.0  0.0 1.0  1.0
-#pragma parameter UseGamma                     "    Gamma Slider"                1.0  0.0 1.0  0.1
-
-#define CD_MITIG_NEIGHBRS   params.CD_MITIG_NEIGHBRS
-#define CD_MITIG_LINES      params.CD_MITIG_LINES
-#define CD_ADJUST_VIEW      params.CD_ADJUST_VIEW
-#define UseGamma            params.UseGamma
-#define OuputGamma          (UseGamma+1.0)
-
-#define GAMMA_OUT(color)    pow(color, vec3(1.0 / OuputGamma, 1.0 / OuputGamma, 1.0 / OuputGamma))
-
-#define PATTERN(A)          step(Delta,A)
-
-const float Delta = 0.000000001;
-const vec3 Y = vec3( 0.299,  0.587,  0.114);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D LinearGamma;
-
-void main()
-{
-    vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw;
-    vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw;
-
-    // Reading the texels.
-    vec4 C =  texture(Source, vTexCoord        );
-    vec4 L =  texture(Source, vTexCoord -dx    );
-    vec4 R =  texture(Source, vTexCoord +dx    );
-    vec4 U =  texture(Source, vTexCoord     -dy);
-    vec4 D =  texture(Source, vTexCoord     +dy);
-    vec4 UL = texture(Source, vTexCoord -dx -dy);
-    vec4 UR = texture(Source, vTexCoord +dx -dy);
-    vec4 DL = texture(Source, vTexCoord -dx +dy);
-    vec4 DR = texture(Source, vTexCoord +dx +dy);
-
-    vec4 L2 =  texture(Source, vTexCoord -2.0*dx    );
-    vec4 R2 =  texture(Source, vTexCoord +2.0*dx    );
-    vec4 U2 =  texture(Source, vTexCoord     -2.0*dy);
-    vec4 D2 =  texture(Source, vTexCoord     +2.0*dy);
-
-    vec4 L3 =  texture(Source, vTexCoord -3.0*dx    );
-    vec4 R3 =  texture(Source, vTexCoord +3.0*dx    );
-    vec4 U3 =  texture(Source, vTexCoord     -3.0*dy);
-    vec4 D3 =  texture(Source, vTexCoord     +3.0*dy);
-
-    vec3 color =  C.rgb;
-
-    vec3 oriC = texture(LinearGamma, vTexCoord        ).rgb;
-
-    float count   = 0.0;
-    float count2  = 0.0;
-    float count3  = 0.0;
-
-//              U3
-//              U2     
-//          UL   U  UR     
-//  L3  L2   L   C   R   R2  R3
-//          DL   D  DR     
-//              D2     
-//              D3
-
-    count += PATTERN(L.a);
-    count += PATTERN(R.a);
-    count += PATTERN(U.a);
-    count += PATTERN(D.a);
-    count += PATTERN(UL.a*UR.a*DL.a*DR.a);
-
-    count2 += PATTERN(L.a*UL.a*U.a + U.a*UR.a*R.a + R.a*DR.a*D.a + D.a*DL.a*L.a);
-
-    count3 += PATTERN(L3.a*L2.a*L.a);
-    count3 += PATTERN(L2.a*L.a*R.a);
-    count3 += PATTERN(L.a*R.a*R2.a);
-    count3 += PATTERN(R.a*R2.a*R3.a);
-
-    count3 += PATTERN(U3.a*U2.a*U.a);
-    count3 += PATTERN(U2.a*U.a*D.a);
-    count3 += PATTERN(U.a*D.a*D2.a);
-    count3 += PATTERN(D.a*D2.a*D3.a);
-
-    if ((count < CD_MITIG_NEIGHBRS)  && (count2 < 1.0))
-        color = oriC;
-    else if ((CD_MITIG_LINES == 1.0) && (count3 < 1.0))
-        color = oriC;
-
-    float luma_diff = abs(dot(oriC, Y)-dot(color, Y));
-
-    color = mix(color, vec3(luma_diff), CD_ADJUST_VIEW);
-
-    FragColor = vec4(GAMMA_OUT(color), 1.0);
-}
diff --git a/dithering/shaders/checkerboard-dedither/linearize.slang b/dithering/shaders/checkerboard-dedither/linearize.slang
deleted file mode 100644
index 60cff027fc..0000000000
--- a/dithering/shaders/checkerboard-dedither/linearize.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float CD_BLEND_OPTION;
-	float UseGamma;
-} params;
-
-#pragma parameter CD_BLEND_OPTION    "CHECKERBOARD-DEDITHER: [ OFF | ON ]" 1.0  0.0 1.0  1.0
-#pragma parameter UseGamma           "    Gamma Slider"                    1.0  0.0 1.0  0.1
-
-#define UseGamma     params.UseGamma
-#define InputGamma   (UseGamma+1.0)
-
-#define GAMMA_IN(color)     pow(color, vec3(InputGamma, InputGamma, InputGamma))
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(GAMMA_IN(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/dithering/shaders/gdapt/gdapt-pass0.slang b/dithering/shaders/gdapt/gdapt-pass0.slang
deleted file mode 100644
index f452f32457..0000000000
--- a/dithering/shaders/gdapt/gdapt-pass0.slang
+++ /dev/null
@@ -1,78 +0,0 @@
-#version 450
-
-/*
-   Genesis Dithering and Pseudo Transparency Shader v1.3 - Pass 0
-   by Sp00kyFox, 2014
-
-   Neighbor anaylsis via dot product of the difference vectors.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float MODE;
-	float PWR;
-} params;
-
-#pragma parameter MODE "GDAPT Monochrome Analysis"	0.0 0.0 1.0 1.0
-#pragma parameter PWR  "GDAPT Color Metric Exp"		2.0 0.0 10.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define dotfix(x,y) clamp(dot(x,y), 0.0, 1.0)	// NVIDIA Fix
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*t1).xyz
-
-// Reference: http://www.compuphase.com/cmetric.htm
-float eq(vec3 A, vec3 B)
-{
-	vec3 diff = A-B;
-	float  ravg = (A.x + B.x) * 0.5;
-
-	diff *= diff * vec3(2.0 + ravg, 4.0, 3.0 - ravg);
-	
-	return pow( smoothstep(3.0, 0.0, sqrt(diff.x + diff.y + diff.z)), params.PWR );
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 t1;
-
-void main()
-{
-   gl_Position = global.MVP * vec4(Position.xy, 0.0, 1.0);
-   vTexCoord = TexCoord;
-   t1 = params.SourceSize.zw;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 t1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec3 C = TEX( 0, 0);
-	vec3 L = TEX(-1, 0);
-	vec3 R = TEX( 1, 0);
-
-	float tag = 0.0;
-
-	if(params.MODE > 0.5){
-		tag = ((L == R) && (C != L)) ? 1.0 : 0.0;
-	}
-	else{
-		tag = dotfix(normalize(C-L), normalize(C-R)) * eq(L,R);
-	}
-
-   FragColor = vec4(C, tag);
-}
diff --git a/dithering/shaders/gdapt/gdapt-pass1.slang b/dithering/shaders/gdapt/gdapt-pass1.slang
deleted file mode 100644
index d12e44c032..0000000000
--- a/dithering/shaders/gdapt/gdapt-pass1.slang
+++ /dev/null
@@ -1,103 +0,0 @@
-#version 450
-
-/*
-   Genesis Dithering and Pseudo Transparency Shader v1.3 - Pass 1
-   by Sp00kyFox, 2014
-
-   Blends pixels based on detected dithering patterns.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float STEPS;
-	float DEBUG;
-	float linear_gamma;
-} params;
-
-#pragma parameter STEPS "GDAPT Error Prevention LVL"	1.0 0.0 5.0 1.0
-#pragma parameter DEBUG "GDAPT Adjust View"		0.0 0.0 1.0 1.0
-#pragma parameter linear_gamma "Use Linear Gamma"		0.0 0.0 1.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*t1)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 t1;
-
-void main()
-{
-   gl_Position = global.MVP * vec4(Position.xy, 0.0, 1.0);
-   vTexCoord = TexCoord;
-   t1 = params.SourceSize.zw;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 t1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec4 C = TEX( 0, 0);
-	vec4 L = TEX(-1, 0);
-	vec4 R = TEX( 1, 0);
-	
-	if(params.linear_gamma > 0.5)
-	{
-		C.xyz = pow(C.xyz, vec3(2.2)).xyz;
-		L.xyz = pow(L.xyz, vec3(2.2)).xyz;
-		R.xyz = pow(R.xyz, vec3(2.2)).xyz;
-	}
-	
-	float str = 0.0;
-
-	if(params.STEPS == 0.0){
-		str = C.w;
-	}
-	else if(params.STEPS == 1.0){
-		str = min(max(L.w, R.w), C.w);
-	}
-	else if(params.STEPS == 2.0){
-		str = min(max(min(max(TEX(-2,0).w, R.w), L.w), min(R.w, TEX(2,0).w)), C.w);				
-	}
-	else if(params.STEPS == 3.0){
-		float tmp = min(R.w, TEX(2,0).w);
-		str = min(max(min(max(min(max(TEX(-3,0).w, R.w), TEX(-2,0).w), tmp), L.w), min(tmp, TEX(3,0).w)), C.w);
-	}
-	else if(params.STEPS == 4.0){
-		float tmp1 = min(R.w, TEX(2,0).w);
-		float tmp2 = min(tmp1, TEX(3,0).w);
-		str = min(max(min(max(min(max(min(max(TEX(-4,0).w, R.w), TEX(-3,0).w), tmp1), TEX(-2,0).w), tmp2), L.w), min(tmp2, TEX(4,0).w)), C.w);
-	}
-	else{
-		float tmp1 = min(R.w, TEX(2,0).w);
-		float tmp2 = min(tmp1, TEX(3,0).w);
-		float tmp3 = min(tmp2, TEX(4,0).w);
-		str = min(max(min(max(min(max(min(max(min(max(TEX(-5,0).w, R.w), TEX(-4,0).w), tmp1), TEX(-3,0).w), tmp2), TEX(-2,0).w), tmp3), L.w), min(tmp3, TEX(5,0).w)), C.w);
-	}
-
-
-	if(params.DEBUG > 0.5)
-		FragColor = vec4(str);
-
-	float sum  = L.w + R.w;
-	float wght = max(L.w, R.w);
-	      wght = (wght == 0.0) ? 1.0 : sum/wght;
-
-   vec4 final = vec4(mix(C.xyz, (wght*C.xyz + L.w*L.xyz + R.w*R.xyz)/(wght + sum), str), 1.0);
-   FragColor = final;
-   if(params.linear_gamma > 0.5) FragColor = pow(final, vec4(1.0 / 2.2));
-}
\ No newline at end of file
diff --git a/dithering/shaders/mdapt/README.md b/dithering/shaders/mdapt/README.md
deleted file mode 100644
index 2f9983ee9e..0000000000
--- a/dithering/shaders/mdapt/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# mdapt v2.8 - merge dithering and pseudo transparency
-
-## Introduction
-
-In many old arcade or console games you will find dithering effects which are there to compensate for platform weaknesses like missing transparency support or small color palettes. This works well since back then the monitors (CRTs) had scanline bleeding and other certain features which merged the dithering through the display technology. But nowadays every pixel will displayed perfectly so dithering won't look like it should be.
-
-There are already shaders out there who are trying to simulate how a CRT displays an image. mdapt though goes a different way and tries to detect dithering patterns by analyzing the relation between neighbored pixels. This way only these specific parts of the image are blended. The resulting image (still in the original resolution) is now a good base for further scaling with advanced algorithms (like xBR) which on there own usually have a hard time with dithering.
-
-## Algorithm
-
-mdapt can detect two basic dithering patterns. Checkerboard (CB) and vertical lines (VL). It actually doesn't matter of how many colors the pattern consists and mdapt doesn't use difference thresholds to determinie similarity at all. The algorithm just looks for regular "up and downs" between the pixels. There will always be errors though since the dithering process itself is lossy and not invertible. But mdapt tries to balance it by checking if there are enough detections in one local area.
-
-## Usage
-
-In RetroArch's shader options load one of the provided .cgp files. There are several configuration parameters which you can use via the parameter submenu.
\ No newline at end of file
diff --git a/dithering/shaders/mdapt/passes/mdapt-pass0.slang b/dithering/shaders/mdapt/passes/mdapt-pass0.slang
deleted file mode 100644
index 689b998a3a..0000000000
--- a/dithering/shaders/mdapt/passes/mdapt-pass0.slang
+++ /dev/null
@@ -1,94 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 0
-   by Sp00kyFox, 2014
-
-   Neighbor analysis via color metric and dot product of the difference vectors.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float MDAPTMODE;
-	float MDAPTPWR;
-} params;
-
-#pragma parameter MDAPTMODE "MDAPT Monochrome Analysis"	0.0 0.0 1.0 1.0
-#pragma parameter MDAPTPWR  "MDAPT Color Metric Exp"		2.0 0.0 10.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define dotfix(x,y) clamp(dot(x,y), 0.0, 1.0)	// NVIDIA Fix
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-// Reference: http://www.compuphase.com/cmetric.htm
-float eq(vec3 A, vec3 B)
-{
-	vec3 diff = A-B;
-	float  ravg = (A.x + B.x) * 0.5;
-
-	diff *= diff * vec3(2.0 + ravg, 4.0, 3.0 - ravg);
-	
-	return pow( smoothstep(3.0, 0.0, sqrt(diff.x + diff.y + diff.z)), params.MDAPTPWR );
-}
-
-float and_(float a, float b, float c, float d, float e, float f){
-	return min(a, min(b, min(c, min(d, min(e,f)))));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	/*
-		  U
-		L C R
-		  D	
-	*/
-
-	vec3 C = TEX( 0., 0.).xyz;
-	vec3 L = TEX(-1., 0.).xyz;
-	vec3 R = TEX( 1., 0.).xyz;
-	vec3 U = TEX( 0.,-1.).xyz;
-	vec3 D = TEX( 0., 1.).xyz;
-
-
-	vec3 res = vec3(0.0);
-
-	if(params.MDAPTMODE > 0.5){
-		res.x = float((L == R) && (C != L));
-		res.y = float((U == D) && (C != U));
-		res.z = float(bool(res.x) && bool(res.y) && (L == U));
-	}
-	else{
-		vec3 dCL = normalize(C-L), dCR = normalize(C-R), dCD = normalize(C-D), dCU = normalize(C-U);
-
-		res.x = dotfix(dCL, dCR) * eq(L,R);
-		res.y = dotfix(dCU, dCD) * eq(U,D);
-		res.z = and_(res.x, res.y, dotfix(dCL, dCU) * eq(L,U), dotfix(dCL, dCD) * eq(L,D), dotfix(dCR, dCU) * eq(R,U), dotfix(dCR, dCD) * eq(R,D));
-	}
-
-   FragColor = vec4(res, 1.0);
-}
diff --git a/dithering/shaders/mdapt/passes/mdapt-pass1.slang b/dithering/shaders/mdapt/passes/mdapt-pass1.slang
deleted file mode 100644
index 95313b790e..0000000000
--- a/dithering/shaders/mdapt/passes/mdapt-pass1.slang
+++ /dev/null
@@ -1,85 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 1
-   by Sp00kyFox, 2014
-
-   Preparing checkerboard patterns.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-
-float and_(float a, float b){
-	return min(a,b);
-}
-
-float and_(float a, float b, float c){
-	return min(a, min(b,c));
-}
-
-float or_(float a, float b){
-	return max(a,b);
-}
-
-float or_(float a, float b, float c, float d, float e){
-	return max(a, max(b, max(c, max(d,e))));
-}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	/*
-		UL U UR
-		L  C R
-		DL D DR
-	*/
-
-	vec3 C = TEX( 0., 0.).xyz;
-	vec3 L = TEX(-1., 0.).xyz;
-	vec3 R = TEX( 1., 0.).xyz;
-	vec3 D = TEX( 0., 1.).xyz;
-	vec3 U = TEX( 0.,-1.).xyz;
-	
-	float UL = TEX(-1.,-1.).z;
-	float UR = TEX( 1.,-1.).z;
-	float DL = TEX(-1., 1.).z;
-	float DR = TEX( 1., 1.).z;
-
-	// Checkerboard Pattern Completion
-	float prCB = or_(C.z,
-		and_(L.z, R.z, or_(U.x, D.x)),
-		and_(U.z, D.z, or_(L.y, R.y)),
-		and_(C.x, or_(and_(UL, UR), and_(DL, DR))),
-		and_(C.y, or_(and_(UL, DL), and_(UR, DR))));
-   FragColor = vec4(C.x, prCB, 0.0, 0.0);
-}
\ No newline at end of file
diff --git a/dithering/shaders/mdapt/passes/mdapt-pass2.slang b/dithering/shaders/mdapt/passes/mdapt-pass2.slang
deleted file mode 100644
index 7d3886b651..0000000000
--- a/dithering/shaders/mdapt/passes/mdapt-pass2.slang
+++ /dev/null
@@ -1,107 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 2
-   by Sp00kyFox, 2014
-
-   Eliminating isolated detections.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float VL_LO;
-	float VL_HI;
-	float CB_LO;
-	float CB_HI;
-} params;
-
-#pragma parameter VL_LO "MDAPT VL LO Thresh" 1.25 0.0 10.0 0.05
-#pragma parameter VL_HI "MDAPT VL HI Thresh" 1.75 0.0 10.0 0.05
-#pragma parameter CB_LO "MDAPT CB LO Thresh" 5.25 0.0 25.0 0.05
-#pragma parameter CB_HI "MDAPT CB HI Thresh" 5.75 0.0 25.0 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-#define and(x,y) min(x,y)
-#define or(x,y)  max(x,y)
-
-vec2 sigmoid(vec2 signal){
-	return smoothstep(vec2(params.VL_LO, params.CB_LO), vec2(params.VL_HI, params.CB_HI), signal);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	/*
-		NW  UUL U2 UUR NE
-		ULL UL  U1 UR  URR
-		L2  L1  C  R1  R2
-		DLL DL  D1 DR  DRR	
-		SW  DDL D2 DDR SE
-	*/
-
-	vec2 C = TEX( 0., 0.).xy;
-	
-
-	vec2 hits = vec2(0.0);
-	
-	//phase 1
-	vec2 L1 = TEX(-1., 0.).xy;
-	vec2 R1 = TEX( 1., 0.).xy;
-	vec2 U1 = TEX( 0.,-1.).xy;
-	vec2 D1 = TEX( 0., 1.).xy;
-
-	//phase 2
-	vec2 L2 = and(TEX(-2., 0.).xy, L1);
-	vec2 R2 = and(TEX( 2., 0.).xy, R1);
-	vec2 U2 = and(TEX( 0.,-2.).xy, U1);
-	vec2 D2 = and(TEX( 0., 2.).xy, D1);
-	vec2 UL = and(TEX(-1.,-1.).xy, or(L1, U1));
-	vec2 UR = and(TEX( 1.,-1.).xy, or(R1, U1));
-	vec2 DL = and(TEX(-1., 1.).xy, or(L1, D1));
-	vec2 DR = and(TEX( 1., 1.).xy, or(R1, D1));
-
-	//phase 3
-	vec2 ULL = and(TEX(-2.,-1.).xy, or(L2, UL));
-	vec2 URR = and(TEX( 2.,-1.).xy, or(R2, UR));
-	vec2 DRR = and(TEX( 2., 1.).xy, or(R2, DR));
-	vec2 DLL = and(TEX(-2., 1.).xy, or(L2, DL));
-	vec2 UUL = and(TEX(-1.,-2.).xy, or(U2, UL));
-	vec2 UUR = and(TEX( 1.,-2.).xy, or(U2, UR));
-	vec2 DDR = and(TEX( 1., 2.).xy, or(D2, DR));
-	vec2 DDL = and(TEX(-1., 2.).xy, or(D2, DL));
-
-	//phase 4
-	hits += and(TEX(-2.,-2.).xy, or(UUL, ULL));
-	hits += and(TEX( 2.,-2.).xy, or(UUR, URR));
-	hits += and(TEX(-2., 2.).xy, or(DDL, DLL));
-	hits += and(TEX( 2., 2.).xy, or(DDR, DRR));
-
-	hits += (ULL + URR + DRR + DLL + L2 + R2) + vec2(0.0, 1.0) * (C + U1 + U2 + D1 + D2 + L1 + R1 + UL + UR + DL + DR + UUL + UUR + DDR + DDL);
-
-   FragColor = vec4(C * sigmoid(hits), C);
-}
\ No newline at end of file
diff --git a/dithering/shaders/mdapt/passes/mdapt-pass3.slang b/dithering/shaders/mdapt/passes/mdapt-pass3.slang
deleted file mode 100644
index a464082ef1..0000000000
--- a/dithering/shaders/mdapt/passes/mdapt-pass3.slang
+++ /dev/null
@@ -1,93 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 3
-   by Sp00kyFox, 2014
-
-   Backpropagation and checkerboard smoothing.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define TEX(dx,dy)   texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-#define TEXt0(dx,dy) texture(mdapt_refpass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-bool eq(vec3 A, vec3 B){
-	return (A == B);
-}
-
-float and_(float a, float b){
-	return min(a,b);
-}
-
-float or_(float a, float b, float c, float d, float e, float f, float g, float h, float i){
-	return max(a, max(b, max(c, max(d, max(e, max(f, max(g, max(h,i))))))));
-}
-
-vec2 and_(vec2 a, vec2 b){
-	return min(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b){
-	return max(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b, vec2 c, vec2 d){
-	return max(a, max(b, max(c,d)));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D mdapt_refpass;
-
-void main()
-{
-	/*
-		UL U UR
-		L  C R
-		DL D DR
-	*/
-
-	vec4 C  = TEX( 0., 0.);		vec3 c  = TEXt0( 0., 0.).xyz;
-	vec2 L  = TEX(-1., 0.).xy;	vec3 l  = TEXt0(-1., 0.).xyz;
-	vec2 R  = TEX( 1., 0.).xy;	vec3 r  = TEXt0( 1., 0.).xyz;
-	vec2 U  = TEX( 0.,-1.).xy;	vec3 u  = TEXt0( 0.,-1.).xyz;
-	vec2 D  = TEX( 0., 1.).xy;	vec3 d  = TEXt0( 0., 1.).xyz;
-	float UL = TEX(-1.,-1.).y;	vec3 ul = TEXt0(-1.,-1.).xyz;
-	float UR = TEX( 1.,-1.).y;	vec3 ur = TEXt0( 1.,-1.).xyz;
-	float DL = TEX(-1., 1.).y;	vec3 dl = TEXt0(-1., 1.).xyz;
-	float DR = TEX( 1., 1.).y;	vec3 dr = TEXt0( 1., 1.).xyz;
-
-	// Backpropagation
-	C.xy = or_(C.xy, and_(C.zw, or_(L, R, U, D)));
-
-	// Checkerboard Smoothing
-	C.y = or_(C.y, min(U.y, float(eq(c,u))), min(D.y, float(eq(c,d))), min(L.y, float(eq(c,l))), min(R.y, float(eq(c,r))), min(UL, float(eq(c,ul))), min(UR, float(eq(c,ur))), min(DL, float(eq(c,dl))), min(DR, float(eq(c,dr))));
-
-   FragColor = vec4(C);
-}
diff --git a/dithering/shaders/mdapt/passes/mdapt-pass4.slang b/dithering/shaders/mdapt/passes/mdapt-pass4.slang
deleted file mode 100644
index c61d3eb477..0000000000
--- a/dithering/shaders/mdapt/passes/mdapt-pass4.slang
+++ /dev/null
@@ -1,162 +0,0 @@
-#version 450
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v2.8 - Pass 4
-   by Sp00kyFox, 2014
-
-   Blends pixels based on detected dithering patterns.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float VL;
-	float CB;
-	float DEBUG;
-	float linear_gamma;
-} params;
-
-#pragma parameter VL    "MDAPT Vertical Lines"	0.0 0.0 1.0 1.0
-#pragma parameter CB    "MDAPT Checkerboard"	1.0 0.0 1.0 1.0
-#pragma parameter DEBUG "MDAPT Adjust View"	0.0 0.0 1.0 1.0
-#pragma parameter linear_gamma "MDAPT Linear Gamma Blend"	0.0 0.0 1.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D mdapt_refpass;
-
-//#define TEX(dx,dy)   texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-//#define TEXt0(dx,dy) texture(mdapt_refpass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-
-vec4 TEX(float dx, float dy){
-	if(params.linear_gamma > 0.5) return pow(texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw), vec4(2.2));
-	else return texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw);
-}
-
-vec4 TEXt0(float dx, float dy){
-	if(params.linear_gamma > 0.5) return pow(texture(mdapt_refpass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw), vec4(2.2));
-	else return texture(mdapt_refpass, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw);
-}
-
-bool eq(vec3 A, vec3 B){
-	return (A == B);
-}
-
-float and_(float a, float b){
-	return min(a,b);
-}
-
-float or_(float a, float b){
-	return max(a,b);
-}
-
-float or_(float a, float b, float c, float d, float e, float f, float g, float h, float i){
-	return max(a, max(b, max(c, max(d, max(e, max(f, max(g, max(h,i))))))));
-}
-
-vec2 and_(vec2 a, vec2 b){
-	return min(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b){
-	return max(a,b);
-}
-
-vec2 or_(vec2 a, vec2 b, vec2 c, vec2 d){
-	return max(a, max(b, max(c,d)));
-}
-
-void main()
-{
-	/*
-		UL U UR
-		L  C R
-		DL D DR	
-	*/
-
-	vec4 C = TEX( 0., 0.);		vec3 c = TEXt0( 0., 0.).xyz;
-	vec2 L = TEX(-1., 0.).xy;	vec3 l = TEXt0(-1., 0.).xyz;
-	vec2 R = TEX( 1., 0.).xy;	vec3 r = TEXt0( 1., 0.).xyz;
-	vec2 U = TEX( 0.,-1.).xy;
-	vec2 D = TEX( 0., 1.).xy;
-
-	float  prVL = 0.0,		prCB = 0.0;
-	vec3 fVL  = vec3(0.0),	fCB  = vec3(0.0);
-
-
-	// Backpropagation
-	C.xy = or_(C.xy, and_(C.zw, or_(L.xy, R.xy, U.xy, D.xy)));
-
-
-	if(params.VL > 0.5){
-		float prSum = L.x + R.x;		
-
-		prVL = max(L.x, R.x);
-		prVL = (prVL == 0.0) ? 1.0 : prSum/prVL;
-	
-		fVL  = (prVL*c + L.x*l + R.x*r)/(prVL + prSum);
-		prVL = C.x;
-	}
-
-
-	if(params.CB > 0.5){	
-		vec3 u = TEXt0( 0.,-1.).xyz;
-		vec3 d = TEXt0( 0., 1.).xyz;
-
-		float eqCL = float(eq(c,l));
-		float eqCR = float(eq(c,r));
-		float eqCU = float(eq(c,u));
-		float eqCD = float(eq(c,d));
-
-		float prU = or_(U.y, eqCU);
-		float prD = or_(D.y, eqCD);
-		float prL = or_(L.y, eqCL);
-		float prR = or_(R.y, eqCR);
-
-
-		float prSum = prU  + prD  + prL  + prR;
-
-		prCB = max(prL, max(prR, max(prU,prD)));
-		prCB = (prCB == 0.0) ? 1.0 : prSum/prCB; 
-		
-		//standard formula: C/2 + (L + R + D + U)/8
-		fCB = (prCB*c + prU*u + prD*d + prL*l + prR*r)/(prCB + prSum);
-
-
-		float UL = TEX(-1.,-1.).y;	vec3 ul = TEXt0(-1.,-1.).xyz;
-		float UR = TEX( 1.,-1.).y;	vec3 ur = TEXt0( 1.,-1.).xyz;
-		float DL = TEX(-1., 1.).y;	vec3 dl = TEXt0(-1., 1.).xyz;
-		float DR = TEX( 1., 1.).y;	vec3 dr = TEXt0( 1., 1.).xyz;
-
-		// Checkerboard Smoothing
-		prCB = or_(C.y, and_(L.y, eqCL), and_(R.y, eqCR), and_(U.y, eqCU), and_(D.y, eqCD), and_(UL, float(eq(c,ul))), and_(UR, float(eq(c,ur))), and_(DL, float(eq(c,dl))), and_(DR, float(eq(c,dr))));
-	}
-
-	if(params.DEBUG > 0.5)
-		FragColor = vec4(prVL, prCB, 0.0, 0.0);
-		
-	vec4 final = (prCB >= prVL) ? vec4(mix(c, fCB, prCB), 1.0) : vec4(mix(c, fVL, prVL), 1.0);
-	FragColor = (params.linear_gamma > 0.5) ? pow(final, vec4(1.0 / 2.2)) : final;
-}
diff --git a/dithering/shaders/ps1dither/PS1-Undither-AntiBayer.slang b/dithering/shaders/ps1dither/PS1-Undither-AntiBayer.slang
deleted file mode 100644
index 672f0f5c97..0000000000
--- a/dithering/shaders/ps1dither/PS1-Undither-AntiBayer.slang
+++ /dev/null
@@ -1,62 +0,0 @@
-#version 450
-
-// PS1 Undither AntiBayer
-// by torridgristle
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-// PlayStation dithering pattern. The offset is selected based on the
-// pixel position in VRAM, by blocks of 4x4 pixels. The value is added
-// to the 8bit color components before they're truncated to 5 bits.
-//"const int dither_pattern[16] ="
-//"  int[16](-4,  0, -3,  1,"
-//"           2, -2,  3, -1,"
-//"          -3,  1, -4,  0,"
-//"           3, -1,  2, -2);" "\n"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 OriginPass  = texture(Source, vTexCoord).xyz;
-
-    float PatternLUT[16] = float[](-4.0,  0.0, -3.0,  1.0,
-                                    2.0, -2.0,  3.0, -1.0,
-                                   -3.0,  1.0, -4.0,  0.0,
-                                    3.0, -1.0,  2.0, -2.0);
-    
-    float PatternX = ceil(((mod(vTexCoord.x * params.SourceSize.x,4.00001)-0.5)/3.0)*3.0);
-    float PatternY = ceil(((mod(vTexCoord.y * params.SourceSize.y,4.00001)-0.5)/3.0)*3.0);
-    float Pattern = PatternLUT[int(PatternX+(PatternY*4))];
-    
-    vec3 Result = OriginPass;
-    //Result = vec3(Pattern)/8.0 + 0.5;
-    Result = (Result * 255.0 - Pattern - round(Pattern*0.25)*2.0) / 255.0;
-
-    FragColor = vec4(Result,1.0);
-}
\ No newline at end of file
diff --git a/dithering/shaders/ps1dither/PS1-Undither-BoxBlur.slang b/dithering/shaders/ps1dither/PS1-Undither-BoxBlur.slang
deleted file mode 100644
index 8788f7f906..0000000000
--- a/dithering/shaders/ps1dither/PS1-Undither-BoxBlur.slang
+++ /dev/null
@@ -1,66 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 OriginPass  = texture(Source, vTexCoord).xyz;//No blending
-
-    //Blend 4 pixels together by sampling between them with linear interpolation
-    vec2 SquareBlend = (vTexCoord * params.SourceSize.xy - 0.5) * params.SourceSize.zw;
-    //Blend 2 horizontal pixels together the same way as before
-    vec2 HorizoBlend = (vTexCoord * params.SourceSize.xy - vec2(0.5,0.0)) * params.SourceSize.zw;
-    vec3 SquarePass  = texture(Source, SquareBlend).xyz;
-    vec3 HorizoPass  = texture(Source, HorizoBlend).xyz;
-    
-    //Edge Detection for SquareBlend
-    vec3 SquareEdge = texture(Source, (SquareBlend * params.SourceSize.xy + vec2( 0.0, 1.0)) * params.SourceSize.zw).xyz + 
-                      texture(Source, (SquareBlend * params.SourceSize.xy + vec2( 1.0, 0.0)) * params.SourceSize.zw).xyz +
-                      texture(Source, (SquareBlend * params.SourceSize.xy + vec2( 1.0, 1.0)) * params.SourceSize.zw).xyz;
-    SquareEdge      = abs((SquareEdge / 3.0) - SquarePass);
-    //Try to adjust white / black range so that edges are black and non-edges are white
-    float SquareEdgeMask = 1.0-pow(1.0-pow(1.0-max(SquareEdge.x,max(SquareEdge.y,SquareEdge.z)),30.0),2.0);
-    
-    //Edge Detection for HorizoBlend
-    vec3 HorizoEdge = texture(Source, (HorizoBlend * params.SourceSize.xy + vec2( 0.0, 1.0)) * params.SourceSize.zw).xyz + 
-                      texture(Source, (HorizoBlend * params.SourceSize.xy + vec2( 1.0, 0.0)) * params.SourceSize.zw).xyz +
-                      texture(Source, (HorizoBlend * params.SourceSize.xy + vec2( 1.0, 1.0)) * params.SourceSize.zw).xyz;
-    HorizoEdge      = abs((HorizoEdge / 3.0) - HorizoPass);
-    //Try to adjust white / black range so that edges are black and non-edges are white
-    float HorizoEdgeMask = 1.0-pow(1.0-pow(1.0-max(HorizoEdge.x,max(HorizoEdge.y,HorizoEdge.z)),10.0),2.0);
-    
-    //If SquarePass has a detected edge, use HorizoPass
-    vec3 Result = mix(HorizoPass,SquarePass,SquareEdgeMask);
-    //If HorizoPass has a detected edge, use OriginPass
-    Result      = mix(OriginPass,Result,HorizoEdgeMask);
-
-    //It's complete
-    FragColor = vec4(Result,1.0);
-}
\ No newline at end of file
diff --git a/dithering/shaders/ps1dither/PS1-Undither-Comparison-MkII.slang b/dithering/shaders/ps1dither/PS1-Undither-Comparison-MkII.slang
deleted file mode 100644
index 9257058749..0000000000
--- a/dithering/shaders/ps1dither/PS1-Undither-Comparison-MkII.slang
+++ /dev/null
@@ -1,61 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 Sample1 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2( 0.0, 0.0)) * params.SourceSize.zw).xyz;
-    vec3 Sample2 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2( 1.0, 1.0)) * params.SourceSize.zw).xyz;
-    vec3 Sample3 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2( 1.0, 0.0)) * params.SourceSize.zw).xyz;
-    vec3 Sample4 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2( 0.0, 1.0)) * params.SourceSize.zw).xyz;
-    
-    vec3 Average = (Sample1+Sample2+Sample3+Sample4)*0.25;
-    float Brightness = 1.0-pow(1.0-max(max(Average.x,Average.y),Average.z),2.0);
-    
-    vec3 Sample2Diff = abs(Sample2-Sample1);
-    float Sample2DiffMax = max(max(Sample2Diff.x,Sample2Diff.y),Sample2Diff.z);
-    vec3 Sample3Diff = abs(Sample3-Sample1);
-    float Sample3DiffMax = max(max(Sample3Diff.x,Sample3Diff.y),Sample3Diff.z);
-    vec3 Sample4Diff = abs(Sample4-Sample1);
-    float Sample4DiffMax = max(max(Sample4Diff.x,Sample4Diff.y),Sample4Diff.z);
-    
-    float DiffLimit = (Brightness * 4.0 + 2.0) / 32.0;
-    
-    Sample2 = mix(Sample1,Sample2,vec3(Sample2DiffMax < DiffLimit));
-    Sample3 = mix(Sample1,Sample3,vec3(Sample3DiffMax < DiffLimit));
-    Sample4 = mix(Sample1,Sample4,vec3(Sample4DiffMax < DiffLimit));
-    
-    vec3 Mixing = Sample1 + Sample2 + Sample3 + Sample4;
-    Mixing *= 0.25;
-    
-    vec3 Result = vec3(Mixing);
-    
-    FragColor = vec4(Result,1.0);
-}
\ No newline at end of file
diff --git a/dithering/shaders/ps1dither/PS1-Undither-Comparison.slang b/dithering/shaders/ps1dither/PS1-Undither-Comparison.slang
deleted file mode 100644
index 6d3ae2b9f6..0000000000
--- a/dithering/shaders/ps1dither/PS1-Undither-Comparison.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 OriginPass  = texture(Source, vTexCoord).xyz;
-
-    //Get blended textures by offsetting between 4 pixels.
-    vec3 SquarePass1 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2( 0.5, 0.5)) * params.SourceSize.zw).xyz;
-    vec3 SquarePass2 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2(-0.5,-0.5)) * params.SourceSize.zw).xyz;
-    vec3 SquarePass3 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2(-0.5, 0.5)) * params.SourceSize.zw).xyz;
-    vec3 SquarePass4 = texture(Source, (vTexCoord * params.SourceSize.xy + vec2( 0.5,-0.5)) * params.SourceSize.zw).xyz;
-    
-    //Which SquarePass is closest to the OriginPass?
-    vec3 SquarePass1Diff = abs(SquarePass1 - OriginPass);
-    vec3 SquarePass2Diff = abs(SquarePass2 - OriginPass);
-    vec3 SquarePass3Diff = abs(SquarePass3 - OriginPass);
-    vec3 SquarePass4Diff = abs(SquarePass4 - OriginPass);
-    float SquarePass1DiffAvg = (SquarePass1Diff.x + SquarePass1Diff.y + SquarePass1Diff.z) / 3.0;
-    float SquarePass2DiffAvg = (SquarePass2Diff.x + SquarePass2Diff.y + SquarePass2Diff.z) / 3.0;
-    float SquarePass3DiffAvg = (SquarePass3Diff.x + SquarePass3Diff.y + SquarePass3Diff.z) / 3.0;
-    float SquarePass4DiffAvg = (SquarePass4Diff.x + SquarePass4Diff.y + SquarePass4Diff.z) / 3.0;
-    float SquarePassDiffAvgMin = min(SquarePass1DiffAvg,min(SquarePass2DiffAvg,min(SquarePass3DiffAvg,SquarePass4DiffAvg)));
-    
-    vec3 SquarePass =
-    float(SquarePassDiffAvgMin == SquarePass1DiffAvg) * float(SquarePass1DiffAvg != SquarePass2DiffAvg) * float(SquarePass1DiffAvg != SquarePass3DiffAvg) * float(SquarePass1DiffAvg != SquarePass4DiffAvg) * SquarePass1 +
-    float(SquarePassDiffAvgMin == SquarePass2DiffAvg) * float(SquarePass2DiffAvg != SquarePass3DiffAvg) * float(SquarePass2DiffAvg != SquarePass4DiffAvg) * SquarePass2 +
-    float(SquarePassDiffAvgMin == SquarePass3DiffAvg) * float(SquarePass3DiffAvg != SquarePass4DiffAvg) * SquarePass3 +
-    float(SquarePassDiffAvgMin == SquarePass4DiffAvg) * SquarePass4;
-    
-    
-    //How different is the blended texture from the original texture?
-    //The difference between the least different and most different SquarePasses returns edges.
-    vec3 SquareCompareMin = min(SquarePass1Diff,min(SquarePass2Diff,min(SquarePass3Diff,SquarePass4Diff)));
-    vec3 SquareCompareMax = max(SquarePass1Diff,max(SquarePass2Diff,max(SquarePass3Diff,SquarePass4Diff)));
-    vec3 SquareCompareBoth = abs(SquareCompareMin - SquareCompareMax);
-    
-    float SquareCompare = max(SquareCompareBoth.x,max(SquareCompareBoth.y,SquareCompareBoth.z));
-    
-    //Turn a range of the comparison result into a mask. 2.5 just happens to work well, it's not set in stone or anything.
-    float SquareMask = 1.0-pow(1.0-min(max(SquareCompare*2.5,0.0),1.0),2.0);
-    
-    //Blend it all together
-    vec3 Result = mix(SquarePass,OriginPass,SquareMask);
-    
-    //Result = vec3(SquareMask);
-    
-    FragColor = vec4(Result,1.0);
-}
\ No newline at end of file
diff --git a/dithering/shaders/sgenpt-mix/linearize.slang b/dithering/shaders/sgenpt-mix/linearize.slang
deleted file mode 100644
index 4ae10059f7..0000000000
--- a/dithering/shaders/sgenpt-mix/linearize.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SGPT_BLEND_OPTION;
-	float UseGamma;
-} params;
-
-#pragma parameter SGPT_BLEND_OPTION    "SGENPT-MIX: [ OFF | CB | VL | BOTH ]" 3.0  0.0 3.0  1.0
-#pragma parameter UseGamma           "    Gamma Slider"                       1.0  0.0 1.0  0.1
-
-#define UseGamma     params.UseGamma
-#define LinInputGamma   (UseGamma+1.0)
-
-#define GAMMA_IN(color)     pow(color, vec3(LinInputGamma, LinInputGamma, LinInputGamma))
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(GAMMA_IN(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/downsample/mixed-res-4x-crt-hyllian.slangp b/downsample/mixed-res-4x-crt-hyllian.slangp
deleted file mode 100644
index d6a1c4c865..0000000000
--- a/downsample/mixed-res-4x-crt-hyllian.slangp
+++ /dev/null
@@ -1,94 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "shaders/mixed-res/multiLUT-modified.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-
-SamplerLUT1 = "../reshade/shaders/LUT/grade-composite.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "../reshade/shaders/LUT/grade-rgb.png"
-SamplerLUT2_linear = true
-
-shader1 = "shaders/mixed-res/coder.slang"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "shaders/mixed-res/hires-tagger.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.25
-
-shader4 = "shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type4 = source
-scale4 = 1.0 
-
-shader5 = "../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-
-shader7 = "../crt/shaders/hyllian/crt-hyllian-pass0.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_border"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "viewport"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../crt/shaders/hyllian/crt-hyllian-pass1.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type_x8 = "source"
-scale_x8 = "1.000000"
-scale_type_y8 = "viewport"
-scale_y8 = "1.000000"
-
-shader9 =  "shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-LUT_selector_param = "2.000000"
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-B_HL = "0.0"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-
-HFILTER_PROFILE = "1.000000"
-BEAM_MIN_WIDTH = "0.860000"
-BEAM_MAX_WIDTH = "1.000000"
-SCANLINES_STRENGTH = "0.720000"
-BRIGHTBOOST = "1.500000"
-PHOSPHOR_LAYOUT = "2.000000"
-MASK_INTENSITY = "0.650000"
-CURVATURE = "0.000000"
-WARP_X = "0.000000"
-WARP_Y = "0.025000"
-CORNER_SIZE = "0.011000"
-
-textures = "SamplerLUT1;SamplerLUT2"
-
diff --git a/downsample/mixed-res-4x-jinc2.slangp b/downsample/mixed-res-4x-jinc2.slangp
deleted file mode 100644
index 696eb97fbb..0000000000
--- a/downsample/mixed-res-4x-jinc2.slangp
+++ /dev/null
@@ -1,76 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../interpolation/shaders/jinc2.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = "viewport"
-scale7 = "1.000000"
-
-shader8 = "../deblur/shaders/deblur-luma.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 =  "shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
-
diff --git a/downsample/mixed-res/2x/mixed-res-bicubic.slangp b/downsample/mixed-res/2x/mixed-res-bicubic.slangp
deleted file mode 100644
index ab8f1a94a9..0000000000
--- a/downsample/mixed-res/2x/mixed-res-bicubic.slangp
+++ /dev/null
@@ -1,78 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-
-shader7 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear7 = true
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = viewport
-scale7 = 1.0
-
-shader8 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 =  "../../shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-B = "0.333333"
-C = "0.500000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/2x/mixed-res-bilinear.slangp b/downsample/mixed-res/2x/mixed-res-bilinear.slangp
deleted file mode 100644
index 384b7d1b8c..0000000000
--- a/downsample/mixed-res/2x/mixed-res-bilinear.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
-filter_linear7 = true
-wrap_mode7 = "clamp_to_edge"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = "../../../stock.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "viewport"
-scale8 = "1.000000"
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "4.000000"
-DEBLUR = "1.750000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/2x/mixed-res-jinc2.slangp b/downsample/mixed-res/2x/mixed-res-jinc2.slangp
deleted file mode 100644
index 702b3f8031..0000000000
--- a/downsample/mixed-res/2x/mixed-res-jinc2.slangp
+++ /dev/null
@@ -1,74 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/jinc2.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = "viewport"
-scale7 = "1.000000"
-
-shader8 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 =  "../../shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
-
diff --git a/downsample/mixed-res/2x/mixed-res-lanczos3.slangp b/downsample/mixed-res/2x/mixed-res-lanczos3.slangp
deleted file mode 100644
index 2183e71eda..0000000000
--- a/downsample/mixed-res/2x/mixed-res-lanczos3.slangp
+++ /dev/null
@@ -1,82 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/lanczos3-x.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "viewport"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/lanczos3-y.slang"
-filter_linear8 = false
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp b/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp
deleted file mode 100644
index aadc02a704..0000000000
--- a/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp
+++ /dev/null
@@ -1,123 +0,0 @@
-shaders = "16"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang"
-filter_linear7 = false
-wrap_mode7 = "clamp_to_edge"
-alias7 = "PassOutput0"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 =  "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang"
-filter_linear8 =  false
-wrap_mode8 =  "clamp_to_edge"
-srgb_framebuffer8 =  "true"
-scale_type8 =  source
-scale_x8 =  1.0
-scale_y8 =  2.0
-
-shader9 =  "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_edge"
-srgb_framebuffer9 =  "true"
-scale_type9 =  source
-scale_x9 =  2.0
-scale_y9 =  1.0
-
-shader10 =  "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang"
-filter_linear10 =  false
-alias10 = "PassOutput3"
-wrap_mode10 =  "clamp_to_edge"
-srgb_framebuffer10 =  "true"
-scale_type10 =  source
-scale_x10 =  1.0
-scale_y10 =  1.0
-
-shader11 =  "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang"
-filter_linear11 =  false
-srgb_framebuffer11 =  "true"
-scale_type11 =  source
-scale_x11 =  1.0
-scale_y11 =  1.0
-wrap_mode11 =  "clamp_to_edge"
-
-shader12 =  "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang"
-filter_linear12 =  false
-srgb_framebuffer12 =  "true"
-scale_type12 =  source
-scale_x12 =  1.0
-scale_y12 =  1.0
-
-shader13 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear13 = true
-wrap_mode13 = "clamp_to_edge"
-srgb_framebuffer13 = "true"
-scale_type13 = viewport
-scale13 = 1.0
-
-shader14 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_edge"
-srgb_framebuffer14 = "true"
-scale_type14 = "source"
-scale14 = "1.000000"
-
-shader15 =  "../../shaders/mixed-res/output.slang"
-filter_linear15 =  false
-wrap_mode15 =  "clamp_to_border"
-scale_type15 =  "source"
-scale15 =  "1.000000"
-
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-B = "0.333333"
-C = "0.500000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp b/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp
deleted file mode 100644
index 5267c89f03..0000000000
--- a/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../anti-aliasing/shaders/reverse-aa.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = "source"
-scale7 = "2.000000"
-
-shader8 = "../../../interpolation/shaders/b-spline-4-taps.slang"
-filter_linear8 = true
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/2x/mixed-res-spline16.slangp b/downsample/mixed-res/2x/mixed-res-spline16.slangp
deleted file mode 100644
index 74990db100..0000000000
--- a/downsample/mixed-res/2x/mixed-res-spline16.slangp
+++ /dev/null
@@ -1,82 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/spline16-x.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "viewport"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/spline16-y.slang"
-filter_linear8 = false
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp
deleted file mode 100644
index 0fdfc874a6..0000000000
--- a/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp
+++ /dev/null
@@ -1,110 +0,0 @@
-shaders = "12"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-alias1 = "HiresSource"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear2 = true
-scale_type2 = source
-scale2 = 0.5
-
-shader3 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear3 = true
-alias3 = "BlurSource"
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
-filter_linear4 = true
-alias4 = "XbrSource"
-wrap_mode4 = "clamp_to_edge"
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear5 = "false"
-wrap_mode5 = "clamp_to_edge"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear6 = "false"
-wrap_mode6 = "clamp_to_edge"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_x6 = "2.000000"
-scale_type_y6 = "source"
-scale_y6 = "2.000000"
-
-shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_edge"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear8 = true
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-mipmap_input10 =  "false"
-alias10 =  ""
-float_framebuffer10 =  "false"
-srgb_framebuffer10 =  "false"
-scale_type_x10 =  "source"
-scale_x10 =  "1.000000"
-scale_type_y10 =  "source"
-scale_y10 =  "1.000000"
-
-shader11 = "../../../film/shaders/film-grain.slang"
-filter_linear11 = false
-wrap_mode11 = "clamp_to_border"
-scale_type11 = source
-scale11 = 1.0
-
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "5.000000"
-B = "0.330000"
-C = "0.330000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
-GRAIN_AMOUNT = "0.050000"
-GRAIN_SIZE = "2.500000"
diff --git a/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp
deleted file mode 100644
index 4283bac5d3..0000000000
--- a/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp
+++ /dev/null
@@ -1,126 +0,0 @@
-shaders = "12"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.5
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../film/shaders/film-grain.slang"
-filter_linear5 = false
-alias5 = "XbrSource"
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-
-shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear6 = "false"
-wrap_mode6 = "clamp_to_edge"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_x6 = "1.000000"
-scale_type_y6 = "source"
-scale_y6 = "1.000000"
-
-shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_edge"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_x7 = "2.000000"
-scale_type_y7 = "source"
-scale_y7 = "2.000000"
-
-shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "false"
-srgb_framebuffer8 = "true"
-scale_type_x8 = "source"
-scale_x8 = "1.000000"
-scale_type_y8 = "source"
-scale_y8 = "1.000000"
-
-shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear9 = true
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = viewport
-scale9 = 1.0
-
-shader10 = "../../../deblur/shaders/deblur.slang"
-filter_linear10 = "true"
-wrap_mode10 = "clamp_to_edge"
-srgb_framebuffer10 = "true"
-scale_type10 = "source"
-scale10 = "1.000000"
-
-shader11 =  "../../shaders/mixed-res/output.slang"
-filter_linear11 =  false
-wrap_mode11 =  "clamp_to_border"
-mipmap_input11 =  "false"
-alias11 =  ""
-float_framebuffer11 =  "false"
-srgb_framebuffer11 =  "false"
-scale_type_x11 =  "source"
-scale_x11 =  "1.000000"
-scale_type_y11 =  "source"
-scale_y11 =  "1.000000"
-
-
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "5.000000"
-B = "0.330000"
-C = "0.500000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/2x/mixed-res-super-xbr.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr.slangp
deleted file mode 100644
index 775c6bde9a..0000000000
--- a/downsample/mixed-res/2x/mixed-res-super-xbr.slangp
+++ /dev/null
@@ -1,109 +0,0 @@
-shaders = "14"
-
-shader0 = "../../shaders/mixed-res/multiLUT-modified.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/coder.slang"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear2 = "true"
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear3 = "true"
-alias3 = "HiresSource"
-wrap_mode3 = "clamp_to_edge"
-srgb_framebuffer3 = true
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.5
-
-shader5 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear5 = true
-alias5 = "BlurSource"
-scale_type5 = source
-scale5 = 1.0 
-
-shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear6 = false
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear7 = false
-alias7 = "XbrSource"
-wrap_mode7 = "clamp_to_border"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "2.000000"
-
-shader10 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear10 = "false"
-wrap_mode10 = "clamp_to_edge"
-srgb_framebuffer10 = "true"
-scale_type10 = "source"
-scale10 = "1.000000"
-
-shader11 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear11 = true
-wrap_mode11 = "clamp_to_edge"
-srgb_framebuffer11 = "true"
-scale_type11 = viewport
-scale11 = 1.0
-
-shader12 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear12 = "false"
-wrap_mode12 = "clamp_to_edge"
-srgb_framebuffer12 = "true"
-scale_type12 = "source"
-scale12 = "1.000000"
-
-shader13 =  "../../shaders/mixed-res/output.slang"
-filter_linear13 =  true
-wrap_mode13 =  "clamp_to_border"
-scale_type13 =  "source"
-scale13 =  "1.000000"
-
-textures = "SamplerLUT1;SamplerLUT2"
-SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png"
-SamplerLUT2_linear = true
-
-LUT_selector_param = "2.000000"
-IR_SCALE = "2.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-XBR_EDGE_STR_P0 = "2.500000"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "2.500000"
-B = "0.330000"
-C = "0.500000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-bicubic.slangp b/downsample/mixed-res/3x/mixed-res-bicubic.slangp
deleted file mode 100644
index 8e1217a86e..0000000000
--- a/downsample/mixed-res/3x/mixed-res-bicubic.slangp
+++ /dev/null
@@ -1,78 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-
-shader7 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear7 = true
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = viewport
-scale7 = 1.0
-
-shader8 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 =  "../../shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-B = "0.333333"
-C = "0.500000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-bilinear.slangp b/downsample/mixed-res/3x/mixed-res-bilinear.slangp
deleted file mode 100644
index 2d23cde061..0000000000
--- a/downsample/mixed-res/3x/mixed-res-bilinear.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
-filter_linear7 = true
-wrap_mode7 = "clamp_to_edge"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = "../../../stock.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "viewport"
-scale8 = "1.000000"
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "4.000000"
-DEBLUR = "1.750000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-jinc2.slangp b/downsample/mixed-res/3x/mixed-res-jinc2.slangp
deleted file mode 100644
index 7a7d34bf35..0000000000
--- a/downsample/mixed-res/3x/mixed-res-jinc2.slangp
+++ /dev/null
@@ -1,74 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/jinc2.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = "viewport"
-scale7 = "1.000000"
-
-shader8 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 =  "../../shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
-
diff --git a/downsample/mixed-res/3x/mixed-res-lanczos3.slangp b/downsample/mixed-res/3x/mixed-res-lanczos3.slangp
deleted file mode 100644
index de369423d0..0000000000
--- a/downsample/mixed-res/3x/mixed-res-lanczos3.slangp
+++ /dev/null
@@ -1,82 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/lanczos3-x.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "viewport"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/lanczos3-y.slang"
-filter_linear8 = false
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp b/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp
deleted file mode 100644
index fc5934a7e5..0000000000
--- a/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp
+++ /dev/null
@@ -1,123 +0,0 @@
-shaders = "16"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang"
-filter_linear7 = false
-wrap_mode7 = "clamp_to_edge"
-alias7 = "PassOutput0"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 =  "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang"
-filter_linear8 =  false
-wrap_mode8 =  "clamp_to_edge"
-srgb_framebuffer8 =  "true"
-scale_type8 =  source
-scale_x8 =  1.0
-scale_y8 =  2.0
-
-shader9 =  "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_edge"
-srgb_framebuffer9 =  "true"
-scale_type9 =  source
-scale_x9 =  2.0
-scale_y9 =  1.0
-
-shader10 =  "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang"
-filter_linear10 =  false
-alias10 = "PassOutput3"
-wrap_mode10 =  "clamp_to_edge"
-srgb_framebuffer10 =  "true"
-scale_type10 =  source
-scale_x10 =  1.0
-scale_y10 =  1.0
-
-shader11 =  "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang"
-filter_linear11 =  false
-srgb_framebuffer11 =  "true"
-scale_type11 =  source
-scale_x11 =  1.0
-scale_y11 =  1.0
-wrap_mode11 =  "clamp_to_edge"
-
-shader12 =  "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang"
-filter_linear12 =  false
-srgb_framebuffer12 =  "true"
-scale_type12 =  source
-scale_x12 =  1.0
-scale_y12 =  1.0
-
-shader13 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear13 = true
-wrap_mode13 = "clamp_to_edge"
-srgb_framebuffer13 = "true"
-scale_type13 = viewport
-scale13 = 1.0
-
-shader14 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_edge"
-srgb_framebuffer14 = "true"
-scale_type14 = "source"
-scale14 = "1.000000"
-
-shader15 =  "../../shaders/mixed-res/output.slang"
-filter_linear15 =  false
-wrap_mode15 =  "clamp_to_border"
-scale_type15 =  "source"
-scale15 =  "1.000000"
-
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-B = "0.333333"
-C = "0.500000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp b/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp
deleted file mode 100644
index e6e223d93e..0000000000
--- a/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../anti-aliasing/shaders/reverse-aa.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = "source"
-scale7 = "2.000000"
-
-shader8 = "../../../interpolation/shaders/b-spline-4-taps.slang"
-filter_linear8 = true
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-spline16.slangp b/downsample/mixed-res/3x/mixed-res-spline16.slangp
deleted file mode 100644
index e591694611..0000000000
--- a/downsample/mixed-res/3x/mixed-res-spline16.slangp
+++ /dev/null
@@ -1,82 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/spline16-x.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "viewport"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/spline16-y.slang"
-filter_linear8 = false
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-super-xbr-film-full.slangp b/downsample/mixed-res/3x/mixed-res-super-xbr-film-full.slangp
deleted file mode 100644
index 6ddbfe0cbd..0000000000
--- a/downsample/mixed-res/3x/mixed-res-super-xbr-film-full.slangp
+++ /dev/null
@@ -1,110 +0,0 @@
-shaders = "12"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-alias1 = "HiresSource"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear2 = true
-scale_type2 = source
-scale2 = 0.333333
-
-shader3 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear3 = true
-alias3 = "BlurSource"
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
-filter_linear4 = true
-alias4 = "XbrSource"
-wrap_mode4 = "clamp_to_edge"
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear5 = "false"
-wrap_mode5 = "clamp_to_edge"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear6 = "false"
-wrap_mode6 = "clamp_to_edge"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_x6 = "2.000000"
-scale_type_y6 = "source"
-scale_y6 = "2.000000"
-
-shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_edge"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear8 = true
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-mipmap_input10 =  "false"
-alias10 =  ""
-float_framebuffer10 =  "false"
-srgb_framebuffer10 =  "false"
-scale_type_x10 =  "source"
-scale_x10 =  "1.000000"
-scale_type_y10 =  "source"
-scale_y10 =  "1.000000"
-
-shader11 = "../../../film/shaders/film-grain.slang"
-filter_linear11 = false
-wrap_mode11 = "clamp_to_border"
-scale_type11 = source
-scale11 = 1.0
-
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "5.000000"
-B = "0.330000"
-C = "0.330000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
-GRAIN_AMOUNT = "0.050000"
-GRAIN_SIZE = "2.500000"
diff --git a/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp b/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp
deleted file mode 100644
index 943a469c74..0000000000
--- a/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp
+++ /dev/null
@@ -1,126 +0,0 @@
-shaders = "12"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.333333
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../film/shaders/film-grain.slang"
-filter_linear5 = false
-alias5 = "XbrSource"
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-
-shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear6 = "false"
-wrap_mode6 = "clamp_to_edge"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_x6 = "1.000000"
-scale_type_y6 = "source"
-scale_y6 = "1.000000"
-
-shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_edge"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_x7 = "2.000000"
-scale_type_y7 = "source"
-scale_y7 = "2.000000"
-
-shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "false"
-srgb_framebuffer8 = "true"
-scale_type_x8 = "source"
-scale_x8 = "1.000000"
-scale_type_y8 = "source"
-scale_y8 = "1.000000"
-
-shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear9 = true
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = viewport
-scale9 = 1.0
-
-shader10 = "../../../deblur/shaders/deblur.slang"
-filter_linear10 = "true"
-wrap_mode10 = "clamp_to_edge"
-srgb_framebuffer10 = "true"
-scale_type10 = "source"
-scale10 = "1.000000"
-
-shader11 =  "../../shaders/mixed-res/output.slang"
-filter_linear11 =  false
-wrap_mode11 =  "clamp_to_border"
-mipmap_input11 =  "false"
-alias11 =  ""
-float_framebuffer11 =  "false"
-srgb_framebuffer11 =  "false"
-scale_type_x11 =  "source"
-scale_x11 =  "1.000000"
-scale_type_y11 =  "source"
-scale_y11 =  "1.000000"
-
-
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "5.000000"
-B = "0.330000"
-C = "0.500000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/3x/mixed-res-super-xbr.slangp b/downsample/mixed-res/3x/mixed-res-super-xbr.slangp
deleted file mode 100644
index 2de291c338..0000000000
--- a/downsample/mixed-res/3x/mixed-res-super-xbr.slangp
+++ /dev/null
@@ -1,109 +0,0 @@
-shaders = "14"
-
-shader0 = "../../shaders/mixed-res/multiLUT-modified.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/coder.slang"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear2 = "true"
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear3 = "true"
-alias3 = "HiresSource"
-wrap_mode3 = "clamp_to_edge"
-srgb_framebuffer3 = true
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.333333
-
-shader5 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear5 = true
-alias5 = "BlurSource"
-scale_type5 = source
-scale5 = 1.0 
-
-shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear6 = false
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear7 = false
-alias7 = "XbrSource"
-wrap_mode7 = "clamp_to_border"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "2.000000"
-
-shader10 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear10 = "false"
-wrap_mode10 = "clamp_to_edge"
-srgb_framebuffer10 = "true"
-scale_type10 = "source"
-scale10 = "1.000000"
-
-shader11 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear11 = true
-wrap_mode11 = "clamp_to_edge"
-srgb_framebuffer11 = "true"
-scale_type11 = viewport
-scale11 = 1.0
-
-shader12 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear12 = "false"
-wrap_mode12 = "clamp_to_edge"
-srgb_framebuffer12 = "true"
-scale_type12 = "source"
-scale12 = "1.000000"
-
-shader13 =  "../../shaders/mixed-res/output.slang"
-filter_linear13 =  true
-wrap_mode13 =  "clamp_to_border"
-scale_type13 =  "source"
-scale13 =  "1.000000"
-
-textures = "SamplerLUT1;SamplerLUT2"
-SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png"
-SamplerLUT2_linear = true
-
-LUT_selector_param = "2.000000"
-IR_SCALE = "3.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-XBR_EDGE_STR_P0 = "2.500000"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "2.500000"
-B = "0.330000"
-C = "0.500000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-bicubic.slangp b/downsample/mixed-res/4x/mixed-res-bicubic.slangp
deleted file mode 100644
index d655b02243..0000000000
--- a/downsample/mixed-res/4x/mixed-res-bicubic.slangp
+++ /dev/null
@@ -1,80 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-
-shader7 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear7 = true
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = viewport
-scale7 = 1.0
-
-shader8 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 =  "../../shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-B = "0.333333"
-C = "0.500000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-bilinear.slangp b/downsample/mixed-res/4x/mixed-res-bilinear.slangp
deleted file mode 100644
index 3506e7ea9a..0000000000
--- a/downsample/mixed-res/4x/mixed-res-bilinear.slangp
+++ /dev/null
@@ -1,83 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
-filter_linear7 = true
-wrap_mode7 = "clamp_to_edge"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = "../../../stock.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "viewport"
-scale8 = "1.000000"
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "4.000000"
-DEBLUR = "1.750000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-jinc2.slangp b/downsample/mixed-res/4x/mixed-res-jinc2.slangp
deleted file mode 100644
index 0e4857eb6a..0000000000
--- a/downsample/mixed-res/4x/mixed-res-jinc2.slangp
+++ /dev/null
@@ -1,76 +0,0 @@
-shaders = "10"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/jinc2.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = "viewport"
-scale7 = "1.000000"
-
-shader8 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 =  "../../shaders/mixed-res/output.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_border"
-scale_type9 =  "source"
-scale9 =  "1.000000"
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
-
diff --git a/downsample/mixed-res/4x/mixed-res-lanczos3.slangp b/downsample/mixed-res/4x/mixed-res-lanczos3.slangp
deleted file mode 100644
index 269d01afc1..0000000000
--- a/downsample/mixed-res/4x/mixed-res-lanczos3.slangp
+++ /dev/null
@@ -1,84 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/lanczos3-x.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "viewport"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/lanczos3-y.slang"
-filter_linear8 = false
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp b/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp
deleted file mode 100644
index d42b985232..0000000000
--- a/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp
+++ /dev/null
@@ -1,125 +0,0 @@
-shaders = "16"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang"
-filter_linear7 = false
-wrap_mode7 = "clamp_to_edge"
-alias7 = "PassOutput0"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 =  "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang"
-filter_linear8 =  false
-wrap_mode8 =  "clamp_to_edge"
-srgb_framebuffer8 =  "true"
-scale_type8 =  source
-scale_x8 =  1.0
-scale_y8 =  2.0
-
-shader9 =  "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang"
-filter_linear9 =  false
-wrap_mode9 =  "clamp_to_edge"
-srgb_framebuffer9 =  "true"
-scale_type9 =  source
-scale_x9 =  2.0
-scale_y9 =  1.0
-
-shader10 =  "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang"
-filter_linear10 =  false
-alias10 = "PassOutput3"
-wrap_mode10 =  "clamp_to_edge"
-srgb_framebuffer10 =  "true"
-scale_type10 =  source
-scale_x10 =  1.0
-scale_y10 =  1.0
-
-shader11 =  "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang"
-filter_linear11 =  false
-srgb_framebuffer11 =  "true"
-scale_type11 =  source
-scale_x11 =  1.0
-scale_y11 =  1.0
-wrap_mode11 =  "clamp_to_edge"
-
-shader12 =  "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang"
-filter_linear12 =  false
-srgb_framebuffer12 =  "true"
-scale_type12 =  source
-scale_x12 =  1.0
-scale_y12 =  1.0
-
-shader13 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear13 = true
-wrap_mode13 = "clamp_to_edge"
-srgb_framebuffer13 = "true"
-scale_type13 = viewport
-scale13 = 1.0
-
-shader14 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear14 = "false"
-wrap_mode14 = "clamp_to_edge"
-srgb_framebuffer14 = "true"
-scale_type14 = "source"
-scale14 = "1.000000"
-
-shader15 =  "../../shaders/mixed-res/output.slang"
-filter_linear15 =  false
-wrap_mode15 =  "clamp_to_border"
-scale_type15 =  "source"
-scale15 =  "1.000000"
-
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-B = "0.333333"
-C = "0.500000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp b/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp
deleted file mode 100644
index f3f5d8ee80..0000000000
--- a/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp
+++ /dev/null
@@ -1,83 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../anti-aliasing/shaders/reverse-aa.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type7 = "source"
-scale7 = "2.000000"
-
-shader8 = "../../../interpolation/shaders/b-spline-4-taps.slang"
-filter_linear8 = true
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-spline16.slangp b/downsample/mixed-res/4x/mixed-res-spline16.slangp
deleted file mode 100644
index b11056e961..0000000000
--- a/downsample/mixed-res/4x/mixed-res-spline16.slangp
+++ /dev/null
@@ -1,84 +0,0 @@
-shaders = "11"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-alias6 = "XbrSource"
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../interpolation/shaders/spline16-x.slang"
-wrap_mode7 = "clamp_to_edge"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "viewport"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/spline16-y.slang"
-filter_linear8 = false
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-super-xbr-film-full.slangp b/downsample/mixed-res/4x/mixed-res-super-xbr-film-full.slangp
deleted file mode 100644
index 7a385f54a5..0000000000
--- a/downsample/mixed-res/4x/mixed-res-super-xbr-film-full.slangp
+++ /dev/null
@@ -1,110 +0,0 @@
-shaders = "12"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-alias1 = "HiresSource"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear2 = true
-scale_type2 = source
-scale2 = 0.25
-
-shader3 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear3 = true
-alias3 = "BlurSource"
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
-filter_linear4 = true
-alias4 = "XbrSource"
-wrap_mode4 = "clamp_to_edge"
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear5 = "false"
-wrap_mode5 = "clamp_to_edge"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear6 = "false"
-wrap_mode6 = "clamp_to_edge"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_x6 = "2.000000"
-scale_type_y6 = "source"
-scale_y6 = "2.000000"
-
-shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_edge"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear8 = true
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = viewport
-scale8 = 1.0
-
-shader9 = "../../../deblur/shaders/deblur.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 =  "../../shaders/mixed-res/output.slang"
-filter_linear10 =  false
-wrap_mode10 =  "clamp_to_border"
-mipmap_input10 =  "false"
-alias10 =  ""
-float_framebuffer10 =  "false"
-srgb_framebuffer10 =  "false"
-scale_type_x10 =  "source"
-scale_x10 =  "1.000000"
-scale_type_y10 =  "source"
-scale_y10 =  "1.000000"
-
-shader11 = "../../../film/shaders/film-grain.slang"
-filter_linear11 = false
-wrap_mode11 = "clamp_to_border"
-scale_type11 = source
-scale11 = 1.0
-
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "5.000000"
-B = "0.330000"
-C = "0.330000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
-GRAIN_AMOUNT = "0.050000"
-GRAIN_SIZE = "2.500000"
diff --git a/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp b/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp
deleted file mode 100644
index 193a1b4b47..0000000000
--- a/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp
+++ /dev/null
@@ -1,128 +0,0 @@
-shaders = "12"
-
-shader0 = "../../shaders/mixed-res/coder.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear1 = "true"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-wrap_mode2 = "clamp_to_edge"
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type_x3 = source
-scale_x3 = 0.25
-scale_type_y3 = source
-scale_y3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type_x4 = source
-scale_x4 = 1.0 
-scale_type_y4 = source
-scale_y4 = 1.0
-
-shader5 = "../../../film/shaders/film-grain.slang"
-filter_linear5 = false
-alias5 = "XbrSource"
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-
-shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear6 = "false"
-wrap_mode6 = "clamp_to_edge"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_x6 = "1.000000"
-scale_type_y6 = "source"
-scale_y6 = "1.000000"
-
-shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_edge"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "true"
-scale_type_x7 = "source"
-scale_x7 = "2.000000"
-scale_type_y7 = "source"
-scale_y7 = "2.000000"
-
-shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "false"
-srgb_framebuffer8 = "true"
-scale_type_x8 = "source"
-scale_x8 = "1.000000"
-scale_type_y8 = "source"
-scale_y8 = "1.000000"
-
-shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear9 = true
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = viewport
-scale9 = 1.0
-
-shader10 = "../../../deblur/shaders/deblur.slang"
-filter_linear10 = "true"
-wrap_mode10 = "clamp_to_edge"
-srgb_framebuffer10 = "true"
-scale_type10 = "source"
-scale10 = "1.000000"
-
-shader11 =  "../../shaders/mixed-res/output.slang"
-filter_linear11 =  false
-wrap_mode11 =  "clamp_to_border"
-mipmap_input11 =  "false"
-alias11 =  ""
-float_framebuffer11 =  "false"
-srgb_framebuffer11 =  "false"
-scale_type_x11 =  "source"
-scale_x11 =  "1.000000"
-scale_type_y11 =  "source"
-scale_y11 =  "1.000000"
-
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "5.000000"
-B = "0.330000"
-C = "0.500000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/4x/mixed-res-super-xbr.slangp b/downsample/mixed-res/4x/mixed-res-super-xbr.slangp
deleted file mode 100644
index 752743a875..0000000000
--- a/downsample/mixed-res/4x/mixed-res-super-xbr.slangp
+++ /dev/null
@@ -1,109 +0,0 @@
-shaders = "14"
-
-shader0 = "../../shaders/mixed-res/multiLUT-modified.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../../shaders/mixed-res/coder.slang"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear2 = "true"
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang"
-filter_linear3 = "true"
-alias3 = "HiresSource"
-wrap_mode3 = "clamp_to_edge"
-srgb_framebuffer3 = true
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear4 = true
-scale_type4 = source
-scale4 = 0.25
-
-shader5 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear5 = true
-alias5 = "BlurSource"
-scale_type5 = source
-scale5 = 1.0 
-
-shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear6 = false
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear7 = false
-alias7 = "XbrSource"
-wrap_mode7 = "clamp_to_border"
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-srgb_framebuffer8 = "true"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-srgb_framebuffer9 = "true"
-scale_type9 = "source"
-scale9 = "2.000000"
-
-shader10 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear10 = "false"
-wrap_mode10 = "clamp_to_edge"
-srgb_framebuffer10 = "true"
-scale_type10 = "source"
-scale10 = "1.000000"
-
-shader11 = "../../../interpolation/shaders/bicubic-5-taps.slang"
-filter_linear11 = true
-wrap_mode11 = "clamp_to_edge"
-srgb_framebuffer11 = "true"
-scale_type11 = viewport
-scale11 = 1.0
-
-shader12 = "../../../deblur/shaders/deblur-luma.slang"
-filter_linear12 = "false"
-wrap_mode12 = "clamp_to_edge"
-srgb_framebuffer12 = "true"
-scale_type12 = "source"
-scale12 = "1.000000"
-
-shader13 =  "../../shaders/mixed-res/output.slang"
-filter_linear13 =  true
-wrap_mode13 =  "clamp_to_border"
-scale_type13 =  "source"
-scale13 =  "1.000000"
-
-textures = "SamplerLUT1;SamplerLUT2"
-SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png"
-SamplerLUT2_linear = true
-
-LUT_selector_param = "2.000000"
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-XBR_EDGE_STR_P0 = "2.500000"
-XBR_WEIGHT = "1.000000"
-XBR_EDGE_STR_P1 = "2.500000"
-B = "0.330000"
-C = "0.500000"
-CS_SHARPNESS = "0.200000"
-OFFSET = "3.000000"
-DEBLUR = "3.000000"
-SMART = "1.000000"
diff --git a/downsample/mixed-res/hooks/README.md b/downsample/mixed-res/hooks/README.md
deleted file mode 100644
index 474186969e..0000000000
--- a/downsample/mixed-res/hooks/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Mixed-Res hooks
-
-These two presets allow almost any crt shader to be used with a game emulated at 4x  internal resolution.
-
-How to use:
-
-1. Load a crt preset;
-2. Disable any curvature feature;
-3. Prepend "mixed-res-4x-prepend.slangp" preset;
-4. Append "mixed-res-4x-append.slangp" preset;
-5. Change any param you desire and save your preset for future usage.
-
-Obs: curvature or any other warp features won't work with this method.
diff --git a/downsample/mixed-res/hooks/mixed-res-4x-append.slangp b/downsample/mixed-res/hooks/mixed-res-4x-append.slangp
deleted file mode 100644
index e52bffa80e..0000000000
--- a/downsample/mixed-res/hooks/mixed-res-4x-append.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-shaders = "1"
-
-shader0 =  "../../shaders/mixed-res/output.slang"
-filter_linear0 =  false
-wrap_mode0 =  "clamp_to_border"
-scale_type0 =  "source"
-scale0 =  "1.000000"
-
-B_HL = "0.0" 
diff --git a/downsample/mixed-res/hooks/mixed-res-4x-prepend.slangp b/downsample/mixed-res/hooks/mixed-res-4x-prepend.slangp
deleted file mode 100644
index 8bd3ab709f..0000000000
--- a/downsample/mixed-res/hooks/mixed-res-4x-prepend.slangp
+++ /dev/null
@@ -1,59 +0,0 @@
-shaders = "7"
-feedback_pass = "0"
-
-shader0 = "../../shaders/mixed-res/multiLUT-modified.slang"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-
-SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png"
-SamplerLUT2_linear = true
-
-shader1 = "../../shaders/mixed-res/coder.slang"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../../shaders/mixed-res/hires-tagger.slang"
-filter_linear2 = "true"
-alias2 = "HiresSource"
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../../shaders/mixed-res/blur-gauss-h.slang"
-filter_linear3 = true
-scale_type3 = source
-scale3 = 0.25
-
-shader4 = "../../shaders/mixed-res/blur-gauss-v.slang"
-filter_linear4 = true
-alias4 = "BlurSource"
-scale_type4 = source
-scale4 = 1.0 
-
-shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang"
-filter_linear5 = false
-wrap_mode5 = "clamp_to_border"
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = "../../../denoisers/shaders/bilateral-vertical.slang"
-filter_linear6 = false
-wrap_mode6 = "clamp_to_border"
-scale_type6 = source
-scale6 = 1.0
-
-
-LUT_selector_param = "2.000000"
-
-IR_SCALE = "4.0"
-B_TRESH = "0.30"
-B_HL = "0.0"
-FRANGE = "2.000000"
-FBSMOOTH = "0.150000"
-FSIGMA = "1.000000"
-
-
-textures = "SamplerLUT1;SamplerLUT2"
-
diff --git a/downsample/shaders/mixed-res/blur-gauss-h.slang b/downsample/shaders/mixed-res/blur-gauss-h.slang
deleted file mode 100644
index f20e641eed..0000000000
--- a/downsample/shaders/mixed-res/blur-gauss-h.slang
+++ /dev/null
@@ -1,58 +0,0 @@
-#version 450
-
-// Implementation based on the article "Efficient Gaussian blur with linear sampling"
-// http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
-/* A version for MasterEffect Reborn, a standalone version, and a custom shader version for SweetFX can be 
-   found at http://reshade.me/forum/shader-presentation/27-gaussian-blur-bloom-unsharpmask */
- /*-----------------------------------------------------------.
-/                  Gaussian Blur settings                     /
-'-----------------------------------------------------------*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define HW 1.00
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 texcoord  = vTexCoord;
-	vec2 PIXEL_SIZE = params.SourceSize.zw;
-
-	float sampleOffsets[5] = { 0.0, 1.4347826, 3.3478260, 5.2608695, 7.1739130 };
-	float sampleWeights[5] = { 0.16818994, 0.27276957, 0.11690125, 0.024067905, 0.0021112196 };
-
-	vec4 color = texture(Source, texcoord);
-
-	color.a = color.a * sampleWeights[0];
-	for(int i = 1; i < 5; ++i) {
-		color.a += texture(Source, texcoord + vec2(sampleOffsets[i]*HW * PIXEL_SIZE.x, 0.0)).a * sampleWeights[i];
-		color.a += texture(Source, texcoord - vec2(sampleOffsets[i]*HW * PIXEL_SIZE.x, 0.0)).a * sampleWeights[i];
-	}
-   FragColor = vec4(color);
-}
diff --git a/downsample/shaders/mixed-res/blur-gauss-v.slang b/downsample/shaders/mixed-res/blur-gauss-v.slang
deleted file mode 100644
index 8d3cf55146..0000000000
--- a/downsample/shaders/mixed-res/blur-gauss-v.slang
+++ /dev/null
@@ -1,59 +0,0 @@
-#version 450
-
-// Implementation based on the article "Efficient Gaussian blur with linear sampling"
-// http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
-/* A version for MasterEffect Reborn, a standalone version, and a custom shader version for SweetFX can be 
-   found at http://reshade.me/forum/shader-presentation/27-gaussian-blur-bloom-unsharpmask */
- /*-----------------------------------------------------------.
-/                  Gaussian Blur settings                     /
-'-----------------------------------------------------------*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define VW 1.00
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 texcoord  = vTexCoord;
-	vec2 PIXEL_SIZE = params.SourceSize.zw;
-
-	float sampleOffsets[5] = { 0.0, 1.4347826, 3.3478260, 5.2608695, 7.1739130 };
-	float sampleWeights[5] = { 0.16818994, 0.27276957, 0.11690125, 0.024067905, 0.0021112196 };
-
-
-	vec4 color = texture(Source, texcoord);
-
-	color.a = color.a * sampleWeights[0];
-	for(int i = 1; i < 5; ++i) {
-		color.a += texture(Source, texcoord + vec2(0.0, sampleOffsets[i]*VW * PIXEL_SIZE.y)).a * sampleWeights[i];
-		color.a += texture(Source, texcoord - vec2(0.0, sampleOffsets[i]*VW * PIXEL_SIZE.y)).a * sampleWeights[i];
-	}
-   FragColor = vec4(color);
-}
diff --git a/downsample/shaders/mixed-res/coder.slang b/downsample/shaders/mixed-res/coder.slang
deleted file mode 100644
index 4b5da7c91f..0000000000
--- a/downsample/shaders/mixed-res/coder.slang
+++ /dev/null
@@ -1,44 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-const vec3 coder = vec3(0.299, 0.587, 0.114);
-//const vec3 coder = vec3(65536.,255.,1.);
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec4 color = texture(Source, vTexCoord);
-
-    color.a = dot(color.rgb, coder);
-
-    FragColor = color;
-}
diff --git a/downsample/shaders/mixed-res/multiLUT-modified.slang b/downsample/shaders/mixed-res/multiLUT-modified.slang
deleted file mode 100644
index e571eaceb0..0000000000
--- a/downsample/shaders/mixed-res/multiLUT-modified.slang
+++ /dev/null
@@ -1,81 +0,0 @@
-#version 450
-
-// A version of the LUT shader that loads 2 LUTs.
-// Can turn LUT off too.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float LUT_selector_param;
-} params;
-
-#pragma parameter LUT_selector_param "LUT [ Off | LUT1 | LUT2 ]" 1.0 0.0 2.0 1.0
-int LUT_selector = int(params.LUT_selector_param);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D SamplerLUT1;
-layout(set = 0, binding = 4) uniform sampler2D SamplerLUT2;
-
-// This shouldn't be necessary but it seems some undefined values can
-// creep in and each GPU vendor handles that differently. This keeps
-// all values within a safe range
-vec4 mixfix(vec4 a, vec4 b, float c)
-{
-	return (a.z < 1.0) ? mix(a, b, c) : a;
-}
-
-void main()
-{
-	vec4 imgColor = texture(Source, vTexCoord.xy);
-
-	if (LUT_selector == 0.0) {
-		FragColor = imgColor;
-	}
-	else {
-
-	float LUT_Size = mix(textureSize(SamplerLUT1, 0).y, textureSize(SamplerLUT2, 0).y, params.LUT_selector_param - 1.0);
-	vec4 color1, color2 = vec4(0.,0.,0.,0.);
-	float red, green, blue1, blue2, mixer = 0.0;
-	
-	red = ( imgColor.r * (LUT_Size - 1.0) + 0.4999 ) / (LUT_Size * LUT_Size);
-	green = ( imgColor.g * (LUT_Size - 1.0) + 0.4999 ) / LUT_Size;
-	blue1 = (floor( imgColor.b  * (LUT_Size - 1.0) ) / LUT_Size) + red;
-	blue2 = (ceil( imgColor.b  * (LUT_Size - 1.0) ) / LUT_Size) + red;
-	mixer = clamp(max((imgColor.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-	
-	if(LUT_selector == 1)
-	{
-   	color1 = texture( SamplerLUT1, vec2( blue1, green ));
-   	color2 = texture( SamplerLUT1, vec2( blue2, green )); 
-	}
-	else
-	{
-		color1 = texture( SamplerLUT2, vec2( blue1, green ));
-		color2 = texture( SamplerLUT2, vec2( blue2, green ));
-	}
-	FragColor = mixfix(color1, color2, mixer);
-	}
-
-}
diff --git a/downsample/shaders/mixed-res/output.slang b/downsample/shaders/mixed-res/output.slang
deleted file mode 100644
index d766373bb4..0000000000
--- a/downsample/shaders/mixed-res/output.slang
+++ /dev/null
@@ -1,58 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float B_VIEW;
-	float B_TRESH;
-	float B_HL;
-} params;
-
-#pragma parameter B_VIEW "SHOW HIRES DETECTION" 0.0 0.0 1.0 1.0
-#pragma parameter B_TRESH "DETECTION THRESHOLD" 0.3 0.0 1.0 0.02
-#pragma parameter B_HL "HI-LOW MIXER" 1.0 0.0 1.0 0.1
-
-#define B_VIEW params.B_VIEW
-#define B_TRESH params.B_TRESH
-#define B_HL params.B_HL
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-const vec3 coder = vec3(0.299, 0.587, 0.114);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D HiresSource;
-layout(set = 0, binding = 4) uniform sampler2D BlurSource;
-
-void main()
-{
-    vec3 c_lowres = texture(Source, vTexCoord).rgb;
-    vec3 c_hires  = texture(HiresSource, vTexCoord).rgb;
-    float    tag  = texture(BlurSource, vTexCoord).a;
-
-    c_hires  = mix(c_lowres, c_hires, clamp(0.5*tag+B_HL, 0.0, 1.0));
-
-    vec3 color = mix(c_lowres, mix(c_hires, vec3(0.0, 0.0, dot(c_hires, coder)), B_VIEW), smoothstep(0.0, B_TRESH, tag));
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/downsample/shaders/mixed-res/support/fxaa-plus-alpha.slang b/downsample/shaders/mixed-res/support/fxaa-plus-alpha.slang
deleted file mode 100644
index 4ff5744cc0..0000000000
--- a/downsample/shaders/mixed-res/support/fxaa-plus-alpha.slang
+++ /dev/null
@@ -1,271 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/**
- * @license
- * Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
- *
- * TO  THE MAXIMUM  EXTENT PERMITTED  BY APPLICABLE  LAW, THIS SOFTWARE  IS PROVIDED
- * *AS IS*  AND NVIDIA AND  ITS SUPPLIERS DISCLAIM  ALL WARRANTIES,  EITHER  EXPRESS
- * OR IMPLIED, INCLUDING, BUT NOT LIMITED  TO, NONINFRINGEMENT,IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL  NVIDIA 
- * OR ITS SUPPLIERS BE  LIABLE  FOR  ANY  DIRECT, SPECIAL,  INCIDENTAL,  INDIRECT,  OR  
- * CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION,  DAMAGES FOR LOSS 
- * OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY 
- * OTHER PECUNIARY LOSS) ARISING OUT OF THE  USE OF OR INABILITY  TO USE THIS SOFTWARE, 
- * EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
-FXAA_PRESET - Choose compile-in knob preset 0-5.
-------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD - The minimum amount of local contrast required 
-                      to apply algorithm.
-                      1.0/3.0  - too little
-                      1.0/4.0  - good start
-                      1.0/8.0  - applies to more edges
-                      1.0/16.0 - overkill
-------------------------------------------------------------------------------
-FXAA_EDGE_THRESHOLD_MIN - Trims the algorithm from processing darks.
-                          Perf optimization.
-                          1.0/32.0 - visible limit (smaller isn't visible)
-                          1.0/16.0 - good compromise
-                          1.0/12.0 - upper limit (seeing artifacts)
-------------------------------------------------------------------------------
-FXAA_SEARCH_STEPS - Maximum number of search steps for end of span.
-------------------------------------------------------------------------------
-FXAA_SEARCH_THRESHOLD - Controls when to stop searching.
-                        1.0/4.0 - seems to be the best quality wise
-------------------------------------------------------------------------------
-FXAA_SUBPIX_TRIM - Controls sub-pixel aliasing removal.
-                   1.0/2.0 - low removal
-                   1.0/3.0 - medium removal
-                   1.0/4.0 - default removal
-                   1.0/8.0 - high removal
-                   0.0 - complete removal
-------------------------------------------------------------------------------
-FXAA_SUBPIX_CAP - Insures fine detail is not completely removed.
-                  This is important for the transition of sub-pixel detail,
-                  like fences and wires.
-                  3.0/4.0 - default (medium amount of filtering)
-                  7.0/8.0 - high amount of filtering
-                  1.0 - no capping of sub-pixel aliasing removal
-*/
-
-#ifndef FXAA_PRESET
-    #define FXAA_PRESET 5
-#endif
-#if (FXAA_PRESET == 3)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/16.0)
-    #define FXAA_SEARCH_STEPS        16
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 4)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        24
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-#if (FXAA_PRESET == 5)
-    #define FXAA_EDGE_THRESHOLD      (1.0/8.0)
-    #define FXAA_EDGE_THRESHOLD_MIN  (1.0/24.0)
-    #define FXAA_SEARCH_STEPS        32
-    #define FXAA_SEARCH_THRESHOLD    (1.0/4.0)
-    #define FXAA_SUBPIX_CAP          (3.0/4.0)
-    #define FXAA_SUBPIX_TRIM         (1.0/4.0)
-#endif
-
-#define FXAA_SUBPIX_TRIM_SCALE (1.0/(1.0 - FXAA_SUBPIX_TRIM))
-
-// Return the luma, the estimation of luminance from rgb inputs.
-// This approximates luma using one FMA instruction,
-// skipping normalization and tossing out blue.
-// FxaaLuma() will range 0.0 to 2.963210702.
-float FxaaLuma(vec3 rgb) {
-    return rgb.y * (0.587/0.299) + rgb.x;
-}
-
-vec3 FxaaLerp3(vec3 a, vec3 b, float amountOfA) {
-    return (vec3(-amountOfA) * b) + ((a * vec3(amountOfA)) + b);
-}
-
-vec4 FxaaTexOff(sampler2D tex, vec2 pos, ivec2 off, vec2 rcpFrame) {
-    float x = pos.x + float(off.x) * rcpFrame.x;
-    float y = pos.y + float(off.y) * rcpFrame.y;
-    return texture(tex, vec2(x, y));
-}
-
-// pos is the output of FxaaVertexShader interpolated across screen.
-// xy -> actual texture position {0.0 to 1.0}
-// rcpFrame should be a uniform equal to  {1.0/frameWidth, 1.0/frameHeight}
-vec3 FxaaPixelShader(vec2 pos, sampler2D tex, vec2 rcpFrame)
-{
-    vec3 rgbN = FxaaTexOff(tex, pos.xy, ivec2( 0,-1), rcpFrame).xyz;
-    vec3 rgbW = FxaaTexOff(tex, pos.xy, ivec2(-1, 0), rcpFrame).xyz;
-    vec3 rgbM = FxaaTexOff(tex, pos.xy, ivec2( 0, 0), rcpFrame).xyz;
-    vec3 rgbE = FxaaTexOff(tex, pos.xy, ivec2( 1, 0), rcpFrame).xyz;
-    vec3 rgbS = FxaaTexOff(tex, pos.xy, ivec2( 0, 1), rcpFrame).xyz;
-    
-    float lumaN = FxaaLuma(rgbN);
-    float lumaW = FxaaLuma(rgbW);
-    float lumaM = FxaaLuma(rgbM);
-    float lumaE = FxaaLuma(rgbE);
-    float lumaS = FxaaLuma(rgbS);
-    float rangeMin = min(lumaM, min(min(lumaN, lumaW), min(lumaS, lumaE)));
-    float rangeMax = max(lumaM, max(max(lumaN, lumaW), max(lumaS, lumaE)));
-    
-    float range = rangeMax - rangeMin;
-    if(range < max(FXAA_EDGE_THRESHOLD_MIN, rangeMax * FXAA_EDGE_THRESHOLD))
-    {
-        return rgbM;
-    }
-    
-    vec3 rgbL = rgbN + rgbW + rgbM + rgbE + rgbS;
-    
-    float lumaL = (lumaN + lumaW + lumaE + lumaS) * 0.25;
-    float rangeL = abs(lumaL - lumaM);
-    float blendL = max(0.0, (rangeL / range) - FXAA_SUBPIX_TRIM) * FXAA_SUBPIX_TRIM_SCALE; 
-    blendL = min(FXAA_SUBPIX_CAP, blendL);
-    
-    vec3 rgbNW = FxaaTexOff(tex, pos.xy, ivec2(-1,-1), rcpFrame).xyz;
-    vec3 rgbNE = FxaaTexOff(tex, pos.xy, ivec2( 1,-1), rcpFrame).xyz;
-    vec3 rgbSW = FxaaTexOff(tex, pos.xy, ivec2(-1, 1), rcpFrame).xyz;
-    vec3 rgbSE = FxaaTexOff(tex, pos.xy, ivec2( 1, 1), rcpFrame).xyz;
-    rgbL += (rgbNW + rgbNE + rgbSW + rgbSE);
-    rgbL *= vec3(1.0/9.0);
-    
-    float lumaNW = FxaaLuma(rgbNW);
-    float lumaNE = FxaaLuma(rgbNE);
-    float lumaSW = FxaaLuma(rgbSW);
-    float lumaSE = FxaaLuma(rgbSE);
-    
-    float edgeVert = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaN) + (0.25 * lumaNE)) +
-        abs((0.50 * lumaW ) + (-1.0 * lumaM) + (0.50 * lumaE )) +
-        abs((0.25 * lumaSW) + (-0.5 * lumaS) + (0.25 * lumaSE));
-    float edgeHorz = 
-        abs((0.25 * lumaNW) + (-0.5 * lumaW) + (0.25 * lumaSW)) +
-        abs((0.50 * lumaN ) + (-1.0 * lumaM) + (0.50 * lumaS )) +
-        abs((0.25 * lumaNE) + (-0.5 * lumaE) + (0.25 * lumaSE));
-        
-    bool horzSpan = edgeHorz >= edgeVert;
-    float lengthSign = horzSpan ? -rcpFrame.y : -rcpFrame.x;
-    
-    if(!horzSpan)
-    {
-        lumaN = lumaW;
-        lumaS = lumaE;
-    }
-    
-    float gradientN = abs(lumaN - lumaM);
-    float gradientS = abs(lumaS - lumaM);
-    lumaN = (lumaN + lumaM) * 0.5;
-    lumaS = (lumaS + lumaM) * 0.5;
-    
-    if (gradientN < gradientS)
-    {
-        lumaN = lumaS;
-        lumaN = lumaS;
-        gradientN = gradientS;
-        lengthSign *= -1.0;
-    }
-    
-    vec2 posN;
-    posN.x = pos.x + (horzSpan ? 0.0 : lengthSign * 0.5);
-    posN.y = pos.y + (horzSpan ? lengthSign * 0.5 : 0.0);
-    
-    gradientN *= FXAA_SEARCH_THRESHOLD;
-    
-    vec2 posP = posN;
-    vec2 offNP = horzSpan ? vec2(rcpFrame.x, 0.0) : vec2(0.0, rcpFrame.y); 
-    float lumaEndN = lumaN;
-    float lumaEndP = lumaN;
-    bool doneN = false;
-    bool doneP = false;
-    posN += offNP * vec2(-1.0, -1.0);
-    posP += offNP * vec2( 1.0,  1.0);
-    
-    for(int i = 0; i < FXAA_SEARCH_STEPS; i++) {
-        if(!doneN)
-        {
-            lumaEndN = FxaaLuma(texture(tex, posN.xy).xyz);
-        }
-        if(!doneP)
-        {
-            lumaEndP = FxaaLuma(texture(tex, posP.xy).xyz);
-        }
-        
-        doneN = doneN || (abs(lumaEndN - lumaN) >= gradientN);
-        doneP = doneP || (abs(lumaEndP - lumaN) >= gradientN);
-        
-        if(doneN && doneP)
-        {
-            break;
-        }
-        if(!doneN)
-        {
-            posN -= offNP;
-        }
-        if(!doneP)
-        {
-            posP += offNP;
-        }
-    }
-    
-    float dstN = horzSpan ? pos.x - posN.x : pos.y - posN.y;
-    float dstP = horzSpan ? posP.x - pos.x : posP.y - pos.y;
-    bool directionN = dstN < dstP;
-    lumaEndN = directionN ? lumaEndN : lumaEndP;
-    
-    if(((lumaM - lumaN) < 0.0) == ((lumaEndN - lumaN) < 0.0))
-    {
-        lengthSign = 0.0;
-    }
- 
-
-    float spanLength = (dstP + dstN);
-    dstN = directionN ? dstN : dstP;
-    float subPixelOffset = (0.5 + (dstN * (-1.0/spanLength))) * lengthSign;
-    vec3 rgbF = texture(tex, vec2(
-        pos.x + (horzSpan ? 0.0 : subPixelOffset),
-        pos.y + (horzSpan ? subPixelOffset : 0.0))).xyz;
-    return FxaaLerp3(rgbL, rgbF, blendL); 
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(FxaaPixelShader(vTexCoord, Source, vec2(params.SourceSize.z, params.SourceSize.w)), texture(Source, vTexCoord).a);
-}
diff --git a/edge-smoothing/cleanEdge/cleanEdge-scale.slangp b/edge-smoothing/cleanEdge/cleanEdge-scale.slangp
deleted file mode 100644
index 2c13f41a8a..0000000000
--- a/edge-smoothing/cleanEdge/cleanEdge-scale.slangp
+++ /dev/null
@@ -1,7 +0,0 @@
-shaders = 1
-
-shader0 = shaders/cleanEdge-scale.slang
-filter_linear0 = false
-#scale_type0 = source
-scale_type0 = viewport
-scale0 = 1.0
diff --git a/edge-smoothing/cleanEdge/shaders/cleanEdge-scale.slang b/edge-smoothing/cleanEdge/shaders/cleanEdge-scale.slang
deleted file mode 100644
index ee435e862e..0000000000
--- a/edge-smoothing/cleanEdge/shaders/cleanEdge-scale.slang
+++ /dev/null
@@ -1,36 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float simthresh, linewidth, ce_mode;
-} params;
-
-#pragma parameter linewidth "Line Width" 1.0 0.01 2.0 0.1
-float lineWidth = params.linewidth;
-
-// Disable most of these settings, since they're not needed for scale mode
-// +/-3.14 = 180 degrees; +/-6.28 = 360 degrees
-//#pragma parameter ce_rotation "Rotation" 0.0 -6.28 6.28 0.01
-const float ROTATION = 0.0;
-
-//#pragma parameter ce_zoom "Zoom" 1.0 0.0 2.0 0.01
-const float ZOOM = 1.0;
-//#pragma parameter ce_x_off "X Offset" 0.0 -1.0 1.0 0.002
-const float X_OFF = 0.0;
-//#pragma parameter ce_y_off "Y Offset" 0.0 -1.0 1.0 0.002
-const float Y_OFF = 0.0;
-
-//how close two colors should be to be considered "similar".
-// can group shapes of visually similar colors, but creates
-// some artifacting and should be kept as low as possible.
-#pragma parameter simthresh "Similarity Threshold" 0.0 0.0 1.0 0.01
-float similarThreshold = params.simthresh;
-
-#pragma parameter ce_mode "cleanEdge Effect Toggle (debug)" 1.0 0.0 1.0 1.0
-bool mode = bool(params.ce_mode);
-
-#include "../../../include/cleanEdge.inc"
diff --git a/edge-smoothing/ddt/3-point.slangp b/edge-smoothing/ddt/3-point.slangp
deleted file mode 100644
index ba892f5b7d..0000000000
--- a/edge-smoothing/ddt/3-point.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/3-point.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/edge-smoothing/ddt/cut.slangp b/edge-smoothing/ddt/cut.slangp
deleted file mode 100644
index d372d17614..0000000000
--- a/edge-smoothing/ddt/cut.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/cut.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/edge-smoothing/ddt/ddt-jinc-linear.slangp b/edge-smoothing/ddt/ddt-jinc-linear.slangp
deleted file mode 100644
index bdf9256357..0000000000
--- a/edge-smoothing/ddt/ddt-jinc-linear.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = "3"
-
-shader0 = ../xbr/shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = shaders/ddt-jinc.slang
-scale_type1 = "viewport"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = ../xbr/shaders/support/delinearize.slang
-scale_type2 = "source"
-filter_linear2 = "false"
diff --git a/edge-smoothing/ddt/shaders/3-point.slang b/edge-smoothing/ddt/shaders/3-point.slang
deleted file mode 100644
index ddf43e0bab..0000000000
--- a/edge-smoothing/ddt/shaders/3-point.slang
+++ /dev/null
@@ -1,78 +0,0 @@
-#version 450
-
-/*
-   N64 3-point Shader
-
-   Implemented by Hyllian - 2024
-*/
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-vec3 three_point(vec2 fp, vec3 A, vec3 B, vec3 C)
-{
-    return (A + fp.x*(B-A) + fp.y*(C-A));
-}
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec2 loc;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord * 1.0001;
-   
-    vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-    float dx = ps.x;
-    float dy = ps.y;
-
-    t1.xy = vec2( dx,  0); // F
-    t1.zw = vec2(  0, dy); // H
-    loc = vTexCoord*params.SourceSize.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec2 loc;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec2 tc = (floor(loc-vec2(0.5,0.5))+vec2(0.5,0.5));
-
-    vec2 fp = loc - tc;
-
-    tc = tc/params.SourceSize.xy;
-
-    vec2 dx = vec2(1.0, 0.0)/params.SourceSize.xy;
-    vec2 dy = vec2(0.0, 1.0)/params.SourceSize.xy;
-
-    vec3 E  = texture(Source, tc          ).rgb;
-    vec3 F  = texture(Source, tc + dx     ).rgb;
-    vec3 H  = texture(Source, tc      + dy).rgb;
-    vec3 I  = texture(Source, tc + dx + dy).rgb;
-
-    //  E  F 
-    //  H  I 
-
-    vec3 res = mix(three_point(fp, E, F, H), three_point(1-fp, I, H, F), step(1.0, fp.x+fp.y));
-
-    FragColor = vec4(res, 1.0);
-}
diff --git a/edge-smoothing/eagle/2xsai-fix-pixel-shift.slangp b/edge-smoothing/eagle/2xsai-fix-pixel-shift.slangp
deleted file mode 100644
index 90cefa5c61..0000000000
--- a/edge-smoothing/eagle/2xsai-fix-pixel-shift.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-shaders = "2"
-shader0 = "shaders/2xsai.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "2.000000"
-scale_type_y0 = "source"
-scale_y0 = "2.000000"
-shader1 = "../nnedi3/shaders/jinc2-cshift-rgb.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-scale_type1 = viewport
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-JINC2_WINDOW_SINC = "0.500000"
-JINC2_SINC = "0.880000"
-JINC2_AR_STRENGTH = "0.000000"
diff --git a/edge-smoothing/eagle/2xsai.slangp b/edge-smoothing/eagle/2xsai.slangp
deleted file mode 100644
index 37cb9cad41..0000000000
--- a/edge-smoothing/eagle/2xsai.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = 3
-
-shader0 = shaders/2xsai.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 2.0
-scale_y0 = 2.0
-
-shader1 = ../../interpolation/shaders/bicubic-x.slang
-filter_linear1 = false
-scale_type_x1 = viewport
-scale_type_y1 = source
-scale1 = 1.0
-
-shader2 = ../../interpolation/shaders/bicubic-y.slang
-filter_linear2 = false
-scale_type2 = viewport
-
diff --git a/edge-smoothing/eagle/shaders/2xsai.slang b/edge-smoothing/eagle/shaders/2xsai.slang
deleted file mode 100644
index 78d1a4e21c..0000000000
--- a/edge-smoothing/eagle/shaders/2xsai.slang
+++ /dev/null
@@ -1,163 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-const vec3 dt = vec3(65536.0,256.0,1.0);
-
-
-float GET_RESULT(float A, float B, float C, float D)
-{
-    return (sign(abs(A-C)+abs(A-D)) - sign(abs(B-C)+abs(B-D))); 
-}
-
-
-float reduce(vec3 color)
-{ 
-    return dot(color,dt);
-}
-
-
-#pragma stage vertex
-layout(location = 0) in  vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-/* Default Vertex shader */
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 1) in  vec2 FragCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-void main()
-{
-    vec2 OGL2Size    = params.SourceSize.xy;
-    vec2 OGL2InvSize = params.SourceSize.zw;
-
-    // Calculating texel coordinates
-
-    vec2 OGL2Pos = vTexCoord.xy*OGL2Size.xy;
-    vec2 fp = fract(OGL2Pos);
-    vec2 g1 = vec2( OGL2InvSize.x,OGL2InvSize.y);
-    vec2 g2 = vec2(-OGL2InvSize.x,OGL2InvSize.y);
-
-
-    if ((fp.x >= 0.50) && (fp.y < 0.50)) g2*=-1.0;
-
-    vec2 pC4 = floor(OGL2Pos)/OGL2Size.xy + 0.5*OGL2InvSize;
-
-    vec2 pC8 = pC4 + g1;
-    vec2 pC0 = pC4 - g1;
-
-    vec2 p04 = pC4 - 0.5*g1;
-    vec2 pC3 = p04 + 0.5*g2;
-    vec2 pC1 = pC3 - g2;
-    vec2 pC5 = pC1 + g1;
-    vec2 pC7 = pC3 + g1;
-
-
-    // Reading the texels
-
-    vec3 C0 = texture(Source,pC0   ).xyz; 
-    vec3 C1 = texture(Source,pC1   ).xyz;
-    vec3 C2 = texture(Source,pC4-g2).xyz;
-    vec3 C3 = texture(Source,pC3   ).xyz;
-    vec3 C4 = texture(Source,pC4   ).xyz;
-    vec3 C5 = texture(Source,pC5   ).xyz;
-    vec3 D4 = texture(Source,pC8-g2).xyz;
-    vec3 C6 = texture(Source,pC4+g2).xyz;
-    vec3 C7 = texture(Source,pC7   ).xyz;
-    vec3 C8 = texture(Source,pC8   ).xyz;
-    vec3 D5 = texture(Source,pC5+g1).xyz;
-    vec3 D0 = texture(Source,pC7+g2).xyz;
-    vec3 D1 = texture(Source,pC8+g2).xyz;
-    vec3 D2 = texture(Source,pC7+g1).xyz;
-    vec3 p10,p11;
-
-    float c0 = reduce(C0);float c1 = reduce(C1);
-    float c2 = reduce(C2);float c3 = reduce(C3);
-    float c4 = reduce(C4);float c5 = reduce(C5);
-    float c6 = reduce(C6);float c7 = reduce(C7);
-    float c8 = reduce(C8);float d0 = reduce(D0);
-    float d1 = reduce(D1);float d2 = reduce(D2);
-    float d4 = reduce(D4);float d5 = reduce(D5);
-
-
-    /*                2xSaI code                  */
-    /*  Copied from the Dosbox source code        */
-    /*  Copyright (C) 2002-2007  The DOSBox Team  */
-    /*  License: GNU-GPL                          */
-    /*  Adapted by guest(r) on 20.4 and 9.5. 2007 */
-
-    if (c4 == c8) {
-        if (c5 != c7) {
-            if (((c4 == c3)&&(c7 == d2))||((c4 == c5)&&(c4 == c6)&&(c3 != c7)&&(c7 == d0))) {
-                    p10 = C4;
-            } else {
-                    p10 = 0.5*(C4+C7);
-            }
-            p11 = C4;
-        } else {
-            if (c4 == c5) {
-                    p10 = C4;
-                    p11 = C4;
-            } else {
-                float r;
-                r  = GET_RESULT(c4,c5,c3,c1);
-                r -= GET_RESULT(c5,c4,d4,c2);
-                r -= GET_RESULT(c5,c4,c6,d1);
-                r += GET_RESULT(c4,c5,d5,d2);
-                if (r > 0.0) p11 = C4;
-                else if (r < 0.0) p11 = C5;
-                else p11 = 0.25*(C4+C5+C7+C8);
-                p10 = 0.5*(C4+C7);
-            }
-        }
-    } else
-        if (c5 == c7) {
-            if (((c7 == c6)&&(c4 == c2))||((c7 == c3)&&(c7 == c8)&&(c4 != c6)&&(c4 == c0))) {
-                    p10 = C7;
-            } else {
-                    p10 = 0.5*(C4+C7);
-            }
-            p11 = C5;
-        } else {
-            p11 = 0.25*(C4+C5+C7+C8);
-
-            if ((c4 == c5)&&(c4 == c6)&&(c3 != c7)&&(c7 == d0)) {
-                    p10 = C4;
-            } else if ((c7 == c3)&&(c7 == c8)&&(c4 != c6)&&(c4 == c0)) {
-                       p10 = C7;
-            } else {
-                p10 = 0.5*(C4+C7);
-        } 
-    }
-
-    // Distributing the final products 
-
-    vec3 color; 
-    
-    if (fp.x >= 0.5 && fp.y >= 0.5) color = p11; else
-    if (fp.x <  0.5 && fp.y <  0.5) color =  C4; else color = p10; 
-
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/eagle/shaders/super-2xsai.slang b/edge-smoothing/eagle/shaders/super-2xsai.slang
deleted file mode 100644
index 90b00d6bf3..0000000000
--- a/edge-smoothing/eagle/shaders/super-2xsai.slang
+++ /dev/null
@@ -1,161 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-
-const vec3 dt = vec3(65536.0,256.0,1.0);
-
-
-float GET_RESULT(float A, float B, float C, float D)
-{
-    return (sign(abs(A-C)+abs(A-D)) - sign(abs(B-C)+abs(B-D))); 
-}
-
-
-float reduce(vec3 color)
-{ 
-    return dot(color,dt);
-}
-
-#pragma stage vertex
-layout(location = 0) in  vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-/* Default Vertex shader */
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 1) in  vec2 FragCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-void main()
-{
-    vec2 OGL2Size    = params.SourceSize.xy;
-    vec2 OGL2InvSize = params.SourceSize.zw;
-
-    // Calculating texel coordinates
-
-    vec2 OGL2Pos = vTexCoord*OGL2Size.xy;
-    vec2 fp  = fract(OGL2Pos);
-    vec2 dx  = vec2(OGL2InvSize.x,0.0);
-    vec2 dy  = vec2(0.0,OGL2InvSize.y);
-    vec2 g1  = vec2( OGL2InvSize.x,OGL2InvSize.y);
-    vec2 g2  = vec2(-OGL2InvSize.x,OGL2InvSize.y);
-
-    vec2 pC4 = floor(OGL2Pos)/OGL2Size.xy + 0.5*OGL2InvSize;
-    vec2 pC8 = pC4 + g1;
-
-    // Reading the texels
-
-    vec3 C0 = texture(Source,pC4-g1).xyz; 
-    vec3 C1 = texture(Source,pC4-dy).xyz;
-    vec3 C2 = texture(Source,pC4-g2).xyz;
-    vec3 D3 = texture(Source,pC4-g2+dx).xyz;
-    vec3 C3 = texture(Source,pC4-dx).xyz;
-    vec3 C4 = texture(Source,pC4).xyz;
-    vec3 C5 = texture(Source,pC4+dx).xyz;
-    vec3 D4 = texture(Source,pC8-g2).xyz;
-    vec3 C6 = texture(Source,pC4+g2).xyz;
-    vec3 C7 = texture(Source,pC4+dy).xyz;
-    vec3 C8 = texture(Source,pC8).xyz;
-    vec3 D5 = texture(Source,pC8+dx).xyz;
-    vec3 D0 = texture(Source,pC4+g2+dy).xyz;
-    vec3 D1 = texture(Source,pC8+g2).xyz;
-    vec3 D2 = texture(Source,pC8+dy).xyz;
-    vec3 D6 = texture(Source,pC8+g1).xyz;
-
-    vec3 p00,p10,p01,p11;
-
-    float c0 = reduce(C0);float c1 = reduce(C1);
-    float c2 = reduce(C2);float c3 = reduce(C3);
-    float c4 = reduce(C4);float c5 = reduce(C5);
-    float c6 = reduce(C6);float c7 = reduce(C7);
-    float c8 = reduce(C8);float d0 = reduce(D0);
-    float d1 = reduce(D1);float d2 = reduce(D2);
-    float d3 = reduce(D3);float d4 = reduce(D4);
-    float d5 = reduce(D5);float d6 = reduce(D6);
-
-    /*              Super2xSaI code               */
-    /*  Copied from the Dosbox source code        */
-    /*  Copyright (C) 2002-2007  The DOSBox Team  */
-    /*  License: GNU-GPL                          */
-    /*  Adapted by guest(r) on 16.4.2007          */
-
-   
-   if (c7 == c5 && c4 != c8) {
-            p11 = p01 = C7;
-    } else if (c4 == c8 && c7 != c5) {
-            p11 = p01 = C4;
-    } else if (c4 == c8 && c7 == c5) {
-            float r;
-            r = GET_RESULT(c5,c4,c6,d1);
-            r+= GET_RESULT(c5,c4,c3,c1);
-            r+= GET_RESULT(c5,c4,d2,d5);
-            r+= GET_RESULT(c5,c4,c2,d4);
-
-            if (r > 0.0)
-                    p11 = p01 = C5;
-            else if (r < 0.0)
-                    p11 = p01 = C4;
-            else {
-                    p11 = p01 = 0.5*(C4+C5);
-            }
-    } else {
-            if (c5 == c8 && c8 == d1 && c7 != d2 && c8 != d0)
-                    p11 = 0.25*(3.0*C8+C7);
-            else if (c4 == c7 && c7 == d2 && d1 != c8 && c7 != d6)
-                    p11 = 0.25*(3.0*C7+C8);
-            else
-                    p11 = 0.5*(C7+C8);
-
-            if (c5 == c8 && c5 == c1 && c4 != c2 && c5 != c0)
-                    p01 = 0.25*(3.0*C5+C4);
-            else if (c4 == c7 && c4 == c2 && c1 != c5 && c4 != d3)
-                    p01 = 0.25*(3.0*C4+C5);
-            else
-                    p01 = 0.5*(C4+C5);
-    }
-
-    if (c4 == c8 && c7 != c5 && c3 == c4 && c4 != d2)
-            p10 = 0.5*(C7+C4);
-    else if (c4 == c6 && c5 == c4 && c3 != c7 && c4 != d0)
-            p10 = 0.5*(C7+C4);
-    else
-            p10 = C7;
-
-    if (c7 == c5 && c4 != c8 && c6 == c7 && c7 != c2)
-            p00 = 0.5*(C7+C4);
-    else if (c3 == c7 && c8 == c7 && c6 != c4 && c7 != c0)
-            p00 = 0.5*(C7+C4);
-    else
-            p00 = C4;
-
-    // Distributing the final products    
-
-    vec3 color = 0.0.xxx;
-
-    if (fp.x < 0.50)
-    { if (fp.y < 0.50) color = p00; else color = p10;}
-    else
-    { if (fp.y < 0.50) color = p01; else color = p11;}
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/eagle/shaders/supereagle.slang b/edge-smoothing/eagle/shaders/supereagle.slang
deleted file mode 100644
index e00d3fb52b..0000000000
--- a/edge-smoothing/eagle/shaders/supereagle.slang
+++ /dev/null
@@ -1,183 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-vec3 dtt = vec3(65536.0,255.0,1.0);
-
-float reduce(vec3 color)
-{
-	return dot(color, dtt);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-layout(location = 5) out vec4 t5;
-layout(location = 6) out vec4 t6;
-layout(location = 7) out vec4 t7;
-layout(location = 8) out vec4 t8;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   
-   float dx = global.SourceSize.z;
-   float dy = global.SourceSize.w;
-   t1.xy = vTexCoord + vec2(-dx,-dy);
-   t1.zw = vTexCoord + vec2(-dx,  0);
-   t2.xy = vTexCoord + vec2(+dx,-dy);
-   t2.zw = vTexCoord + vec2(+dx+dx,-dy);
-   t3.xy = vTexCoord + vec2(-dx,  0);
-   t3.zw = vTexCoord + vec2(+dx,  0);
-   t4.xy = vTexCoord + vec2(+dx+dx,  0);
-   t4.zw = vTexCoord + vec2(-dx,+dy);
-   t5.xy = vTexCoord + vec2(  0,+dy);
-   t5.zw = vTexCoord + vec2(+dx,+dy);
-   t6.xy = vTexCoord + vec2(+dx+dx,+dy);
-   t6.zw = vTexCoord + vec2(-dx,+dy+dy);
-   t7.xy = vTexCoord + vec2(  0,+dy+dy);
-   t7.zw = vTexCoord + vec2(+dx,+dy+dy);
-   t8.xy = vTexCoord + vec2(+dx+dx,+dy+dy);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 5) in vec4 t5;
-layout(location = 6) in vec4 t6;
-layout(location = 7) in vec4 t7;
-layout(location = 8) in vec4 t8;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-/*  GET_RESULT function                            */
-/*  Copyright (c) 1999-2001 by Derek Liauw Kie Fa  */
-/*  License: GNU-GPL                               */
-
-int GET_RESULT(float A, float B, float C, float D)
-{
-   int x = 0; int y = 0; int r = 0;
-   if (A == C) x+=1; else if (B == C) y+=1;
-   if (A == D) x+=1; else if (B == D) y+=1;
-   if (x <= 1) r+=1; 
-   if (y <= 1) r-=1;
-   return r;
-} 
-
-void main()
-{
-   vec2 fp = fract(vTexCoord * global.SourceSize.xy);
-
-   // Reading the texels
-
-   vec3 C0 = texture(Source, t1.xy).xyz; 
-   vec3 C1 = texture(Source, t1.zw).xyz;
-   vec3 C2 = texture(Source, t2.xy).xyz;
-   vec3 D3 = texture(Source, t2.zw).xyz;
-   vec3 C3 = texture(Source, t3.xy).xyz;
-   vec3 C4 = texture(Source, vTexCoord).xyz;
-   vec3 C5 = texture(Source, t3.zw).xyz;
-   vec3 D4 = texture(Source, t4.xy).xyz;
-   vec3 C6 = texture(Source, t4.zw).xyz;
-   vec3 C7 = texture(Source, t5.xy).xyz;
-   vec3 C8 = texture(Source, t5.zw).xyz;
-   vec3 D5 = texture(Source, t6.xy).xyz;
-   vec3 D0 = texture(Source, t6.zw).xyz;
-   vec3 D1 = texture(Source, t7.xy).xyz;
-   vec3 D2 = texture(Source, t7.zw).xyz;
-   vec3 D6 = texture(Source, t8.xy).xyz;
-
-   vec3 p00,p10,p01,p11;
-
-   // reducing vec3 to float	
-   float c0 = reduce(C0);float c1 = reduce(C1);
-   float c2 = reduce(C2);float c3 = reduce(C3);
-   float c4 = reduce(C4);float c5 = reduce(C5);
-   float c6 = reduce(C6);float c7 = reduce(C7);
-   float c8 = reduce(C8);float d0 = reduce(D0);
-   float d1 = reduce(D1);float d2 = reduce(D2);
-   float d3 = reduce(D3);float d4 = reduce(D4);
-   float d5 = reduce(D5);float d6 = reduce(D6);
-   
-/*              SuperEagle code               */
-/*  Copied from the Dosbox source code        */
-/*  Copyright (C) 2002-2007  The DOSBox Team  */
-/*  License: GNU-GPL                          */
-/*  Adapted by guest(r) on 16.4.2007          */
-
-   if (c4 != c8) {
-      if (c7 == c5) {
-         p01 = p10 = C7;
-         if ((c6 == c7) || (c5 == c2)) {
-            p00 = 0.25*(3.0*C7+C4);
-         } else {
-            p00 = 0.5*(C4+C5);
-         }
-
-         if ((c5 == d4) || (c7 == d1)) {
-            p11 = 0.25*(3.0*C7+C8);
-         } else {
-            p11 = 0.5*(C7+C8);
-         }
-      } else {
-         p11 = 0.125*(6.0*C8+C7+C5);
-         p00 = 0.125*(6.0*C4+C7+C5);
-
-         p10 = 0.125*(6.0*C7+C4+C8);
-         p01 = 0.125*(6.0*C5+C4+C8);
-      }
-   } else {
-      if (c7 != c5) {
-         p11 = p00 = C4;
-
-         if ((c1 == c4) || (c8 == d5)) {
-            p01 = 0.25*(3.0*C4+C5);
-         } else {
-            p01 = 0.5*(C4+C5);
-         }
-
-         if ((c8 == d2) || (c3 == c4)) {
-            p10 = 0.25*(3.0*C4+C7);
-         } else {
-            p10 = 0.5*(C7+C8);
-         }
-      } else {
-         int r = 0;
-         r += GET_RESULT(c5,c4,c6,d1);
-         r += GET_RESULT(c5,c4,c3,c1);
-         r += GET_RESULT(c5,c4,d2,d5);
-         r += GET_RESULT(c5,c4,c2,d4);
-
-         if (r > 0) {
-            p01 = p10 = C7;
-            p00 = p11 = 0.5*(C4+C5);
-         } else if (r < 0) {
-            p11 = p00 = C4;
-            p01 = p10 = 0.5*(C4+C5);
-         } else {
-            p11 = p00 = C4;
-            p01 = p10 = C7;
-         }
-      }
-   }
-   
-// Distributing the four products
-   p10 = (fp.x < 0.50) ? (fp.y < 0.50 ? p00 : p10) : (fp.y < 0.50 ? p01: p11);
-  
-   FragColor = vec4(p10, 1.0);
-}
\ No newline at end of file
diff --git a/edge-smoothing/eagle/super-2xsai-fix-pixel-shift.slangp b/edge-smoothing/eagle/super-2xsai-fix-pixel-shift.slangp
deleted file mode 100644
index 8a4a90179e..0000000000
--- a/edge-smoothing/eagle/super-2xsai-fix-pixel-shift.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-shaders = "2"
-shader0 = "shaders/super-2xsai.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "2.000000"
-scale_type_y0 = "source"
-scale_y0 = "2.000000"
-shader1 = "../nnedi3/shaders/jinc2-cshift-rgb.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type1 = viewport
-JINC2_WINDOW_SINC = "0.500000"
-JINC2_SINC = "0.880000"
-JINC2_AR_STRENGTH = "0.000000"
diff --git a/edge-smoothing/eagle/super-2xsai.slangp b/edge-smoothing/eagle/super-2xsai.slangp
deleted file mode 100644
index 5ce4ea56be..0000000000
--- a/edge-smoothing/eagle/super-2xsai.slangp
+++ /dev/null
@@ -1,17 +0,0 @@
-shaders = 3
-
-shader0 = shaders/super-2xsai.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 2.0
-scale_y0 = 2.0
-
-shader1 = ../../interpolation/shaders/bicubic-x.slang
-filter_linear1 = false
-scale_type_x1 = viewport
-scale_type_y1 = source
-scale1 = 1.0
-
-shader2 = ../../interpolation/shaders/bicubic-y.slang
-filter_linear2 = false
-scale_type2 = viewport
diff --git a/edge-smoothing/eagle/supereagle.slangp b/edge-smoothing/eagle/supereagle.slangp
deleted file mode 100644
index de1dbb0897..0000000000
--- a/edge-smoothing/eagle/supereagle.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = "shaders/supereagle.slang"
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/edge-smoothing/fsr/smaa+fsr.slangp b/edge-smoothing/fsr/smaa+fsr.slangp
deleted file mode 100644
index aad4ac34c6..0000000000
--- a/edge-smoothing/fsr/smaa+fsr.slangp
+++ /dev/null
@@ -1,50 +0,0 @@
-shaders = 6
-
-shader0 = ../../stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-alias0 = SMAA_Input
-
-shader1 = ../../anti-aliasing/shaders/smaa/smaa-pass0.slang
-filter_linear1 = true
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = ../../anti-aliasing/shaders/smaa/smaa-pass1.slang
-filter_linear2 = true
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = ../../anti-aliasing/shaders/smaa/smaa-pass2.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 1.0
-
-textures = "areaTex;searchTex"
-areaTex = ../../anti-aliasing/shaders/smaa/AreaTex.png
-searchTex = ../../anti-aliasing/shaders/smaa/SearchTex.png
-
-shader4 = shaders/fsr-pass0.slang
-filter_linear4 = true
-scale_type4 = viewport
-scale4 = 1.0
-wrap_mode4 = clamp_to_edge
-
-shader5 = shaders/fsr-pass1.slang
-filter_linear5 = true
-scale_type5 = source
-scale5 = 1.0
-wrap_mode5 = clamp_to_edge
-
-parameters = "SMAA_EDT;SMAA_THRESHOLD;SMAA_MAX_SEARCH_STEPS;SMAA_MAX_SEARCH_STEPS_DIAG;SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR;SMAA_CORNER_ROUNDING;FSR_SHARPENING;FSR_FILMGRAIN;FSR_GRAINCOLOR;FSR_GRAINPDF"
-SMAA_EDT = 1.0
-SMAA_THRESHOLD = 0.05
-SMAA_MAX_SEARCH_STEPS = 40
-SMAA_MAX_SEARCH_STEPS_DIAG = 20
-SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR = 2.5
-SMAA_CORNER_ROUNDING = 50.0
-FSR_SHARPENING = 0.1
-FSR_FILMGRAIN = 0.3
-FSR_GRAINCOLOR = 1.0
-FSR_GRAINPDF = 0.3
diff --git a/edge-smoothing/hqx/hq2x-halphon.slangp b/edge-smoothing/hqx/hq2x-halphon.slangp
deleted file mode 100644
index fd38f3a994..0000000000
--- a/edge-smoothing/hqx/hq2x-halphon.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 3
-
-shader0 = ../../stock.slang
-alias0 = hqx_refpass
-
-shader1 = shaders/hq2x-halphon.slang
-shader2 = ../../stock.slang
-
-filter_linear1 = false
-scale_type1 = source
-scale1 = 2.0
diff --git a/edge-smoothing/hqx/hq2x.slangp b/edge-smoothing/hqx/hq2x.slangp
deleted file mode 100644
index 6efc4f0883..0000000000
--- a/edge-smoothing/hqx/hq2x.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = 5
-
-shader0 = ../../stock.slang
-alias0 = hqx_refpass
-shader1 = shaders/pass1.slang
-shader2 = shaders/hq2x.slang
-
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-filter_linear2 = false
-scale_type2 = source
-scale2 = 2.0
-
-shader3 = ../../interpolation/shaders/bicubic-x.slang
-filter_linear3 = false
-scale_type_x3 = viewport
-scale_type_y3 = source
-scale3 = 1.0
-
-shader4 = ../../interpolation/shaders/bicubic-y.slang
-filter_linear4 = false
-
-textures = LUT
-LUT = resources/hq2x.png
-LUT_linear = false
diff --git a/edge-smoothing/hqx/hq3x.slangp b/edge-smoothing/hqx/hq3x.slangp
deleted file mode 100644
index 345037fe0a..0000000000
--- a/edge-smoothing/hqx/hq3x.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = 5
-
-shader0 = ../../stock.slang
-alias0 = hqx_refpass
-shader1 = shaders/pass1.slang
-shader2 = shaders/hq3x.slang
-
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-filter_linear2 = false
-scale_type2 = source
-scale2 = 3.0
-
-shader3 = ../../interpolation/shaders/b-spline-x.slang
-filter_linear3 = false
-scale_type_x3 = viewport
-scale_type_y3 = source
-scale3 = 1.0
-
-shader4 = ../../interpolation/shaders/b-spline-y.slang
-filter_linear4 = false
-
-
-textures = LUT
-LUT = resources/hq3x.png
-LUT_linear = false
diff --git a/edge-smoothing/hqx/hq4x.slangp b/edge-smoothing/hqx/hq4x.slangp
deleted file mode 100644
index 6357cc1c13..0000000000
--- a/edge-smoothing/hqx/hq4x.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = 5
-
-shader0 = ../../stock.slang
-alias0 = hqx_refpass
-shader1 = shaders/pass1.slang
-shader2 = shaders/hq4x.slang
-
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-filter_linear2 = false
-scale_type2 = source
-scale2 = 4.0
-
-shader3 = ../../interpolation/shaders/b-spline-x.slang
-filter_linear3 = false
-scale_type_x3 = viewport
-scale_type_y3 = source
-scale3 = 1.0
-
-shader4 = ../../interpolation/shaders/b-spline-y.slang
-filter_linear4 = false
-
-textures = LUT
-LUT = resources/hq4x.png
-LUT_linear = false
diff --git a/edge-smoothing/scalefx/scalefx+rAA.slangp b/edge-smoothing/scalefx/scalefx+rAA.slangp
deleted file mode 100644
index 39eb0478fd..0000000000
--- a/edge-smoothing/scalefx/scalefx+rAA.slangp
+++ /dev/null
@@ -1,47 +0,0 @@
-shaders = 9
-
-shader0 = ../../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-
-shader6 = ../../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = ../../interpolation/shaders/bicubic.slang
-filter_linear8 = false
-scale_type0 = viewport
diff --git a/edge-smoothing/scalefx/scalefx-9x.slangp b/edge-smoothing/scalefx/scalefx-9x.slangp
deleted file mode 100644
index a83dd7a4f2..0000000000
--- a/edge-smoothing/scalefx/scalefx-9x.slangp
+++ /dev/null
@@ -1,52 +0,0 @@
-shaders = 9
-
-shader0 = ../../stock.slang
-alias0 = scalefx_old_refpass
-
-shader1 = shaders/old/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = sfxp0
-
-shader2 = shaders/old/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-alias2 = sfxp1
-
-shader3 = shaders/old/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = sfxp2
-
-shader4 = shaders/old/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 3.0
-alias4 = sfxp3
-
-shader5 = shaders/old/scalefx-pass0.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-alias5 = sfxp4
-
-shader6 = shaders/old/scalefx-pass1.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = sfxp5
-
-shader7 = shaders/old/scalefx-pass2.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = sfxp6
-
-shader8 = shaders/old/scalefx-pass7.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 3.0
-alias8 = sfxp7
diff --git a/edge-smoothing/scalefx/scalefx-hybrid.slangp b/edge-smoothing/scalefx/scalefx-hybrid.slangp
deleted file mode 100644
index 1e83cb8454..0000000000
--- a/edge-smoothing/scalefx/scalefx-hybrid.slangp
+++ /dev/null
@@ -1,36 +0,0 @@
-shaders = 6
-
-shader0 = ../../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = shaders/scalefx-pass4-hybrid.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-
-parameters = "SFX_SAA"
-SFX_SAA = "0.0"
diff --git a/edge-smoothing/scalefx/scalefx.slangp b/edge-smoothing/scalefx/scalefx.slangp
deleted file mode 100644
index 2e4fc423fe..0000000000
--- a/edge-smoothing/scalefx/scalefx.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-shaders = 6
-
-shader0 = ../../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
diff --git a/edge-smoothing/scalefx/shaders/old/scalefx-9x.slangp b/edge-smoothing/scalefx/shaders/old/scalefx-9x.slangp
deleted file mode 100644
index f4c5d583e6..0000000000
--- a/edge-smoothing/scalefx/shaders/old/scalefx-9x.slangp
+++ /dev/null
@@ -1,52 +0,0 @@
-shaders = 9
-
-shader0 = ../../../../stock.slang
-alias0 = scalefx_old_refpass
-
-shader1 = scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = sfxp0
-
-shader2 = scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-alias2 = sfxp1
-
-shader3 = scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = sfxp2
-
-shader4 = scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 3.0
-alias4 = sfxp3
-
-shader5 = scalefx-pass0.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-alias5 = sfxp4
-
-shader6 = scalefx-pass1.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = sfxp5
-
-shader7 = scalefx-pass2.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = sfxp6
-
-shader8 = scalefx-pass7.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 3.0
-alias8 = sfxp7
diff --git a/edge-smoothing/scalefx/shaders/old/scalefx.slangp b/edge-smoothing/scalefx/shaders/old/scalefx.slangp
deleted file mode 100644
index 6dd9a7967d..0000000000
--- a/edge-smoothing/scalefx/shaders/old/scalefx.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-shaders = 5
-
-shader0 = ../../../../stock.slang
-alias0 = scalefx_old_refpass
-
-shader1 = scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 3.0
diff --git a/edge-smoothing/scalehq/2xScaleHQ.slangp b/edge-smoothing/scalehq/2xScaleHQ.slangp
deleted file mode 100644
index 8922d5a99b..0000000000
--- a/edge-smoothing/scalehq/2xScaleHQ.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = 3
-
-shader0 = shaders/2xScaleHQ.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 2.0
-scale_y0 = 2.0
-
-shader1 = ../../interpolation/shaders/bicubic-x.slang
-filter_linear1 = false
-scale_type_x1 = viewport
-scale_type_y1 = source
-scale1 = 1.0
-
-shader2 = ../../interpolation/shaders/bicubic-y.slang
-filter_linear2 = false
-scale_type2 = viewport
-
diff --git a/edge-smoothing/scalehq/4xScaleHQ.slangp b/edge-smoothing/scalehq/4xScaleHQ.slangp
deleted file mode 100644
index 6e42762d74..0000000000
--- a/edge-smoothing/scalehq/4xScaleHQ.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = 3
-
-shader0 = shaders/4xScaleHQ.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 4.0
-scale_y0 = 4.0
-
-shader1 = ../../interpolation/shaders/bicubic-x.slang
-filter_linear1 = false
-scale_type_x1 = viewport
-scale_type_y1 = source
-scale1 = 1.0
-
-shader2 = ../../interpolation/shaders/bicubic-y.slang
-filter_linear2 = false
-scale_type2 = viewport
-
diff --git a/edge-smoothing/scalehq/shaders/2xScaleHQ.slang b/edge-smoothing/scalehq/shaders/2xScaleHQ.slang
deleted file mode 100644
index 2944b4b5bf..0000000000
--- a/edge-smoothing/scalehq/shaders/2xScaleHQ.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-vec3 dt = vec3(1.0);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   float x = 0.5 * global.SourceSize.z;
-   float y = 0.5 * global.SourceSize.w;
-   vec2 dg1 = vec2( x, y);
-   vec2 dg2 = vec2(-x, y);
-   vec2 dx = vec2(x, 0.0);
-   vec2 dy = vec2(0.0, y);
-   t1 = vec4(vTexCoord - dg1, vTexCoord - dy);
-   t2 = vec4(vTexCoord - dg2, vTexCoord + dx);
-   t3 = vec4(vTexCoord + dg1, vTexCoord + dy);
-   t4 = vec4(vTexCoord + dg2, vTexCoord - dx);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-float mx = 0.325;      // start smoothing wt.
-float k = -0.250;      // wt. decrease factor
-float max_w = 0.25;    // max filter weigth
-float min_w =-0.05;    // min filter weigth
-float lum_add = 0.25;  // affects smoothing
-
-void main()
-{
-   vec3 c00 = texture(Source, t1.xy).xyz; 
-   vec3 c10 = texture(Source, t1.zw).xyz; 
-   vec3 c20 = texture(Source, t2.xy).xyz; 
-   vec3 c01 = texture(Source, t4.zw).xyz; 
-   vec3 c11 = texture(Source, vTexCoord).xyz; 
-   vec3 c21 = texture(Source, t2.zw).xyz; 
-   vec3 c02 = texture(Source, t4.xy).xyz; 
-   vec3 c12 = texture(Source, t3.zw).xyz; 
-   vec3 c22 = texture(Source, t3.xy).xyz; 
-
-   float md1 = dot(abs(c00 - c22), dt);
-   float md2 = dot(abs(c02 - c20), dt);
-
-   float w1 = dot(abs(c22 - c11), dt) * md2;
-   float w2 = dot(abs(c02 - c11), dt) * md1;
-   float w3 = dot(abs(c00 - c11), dt) * md2;
-   float w4 = dot(abs(c20 - c11), dt) * md1;
-
-   float t1 = w1 + w3;
-   float t2 = w2 + w4;
-   float ww = max(t1, t2) + 0.0001;
-
-   c11 = (w1 * c00 + w2 * c20 + w3 * c22 + w4 * c02 + ww * c11) / (t1 + t2 + ww);
-
-   float lc1 = k / (0.12 * dot(c10 + c12 + c11, dt) + lum_add);
-   float lc2 = k / (0.12 * dot(c01 + c21 + c11, dt) + lum_add);
-
-   w1 = clamp(lc1 * dot(abs(c11 - c10), dt) + mx, min_w, max_w);
-   w2 = clamp(lc2 * dot(abs(c11 - c21), dt) + mx, min_w, max_w);
-   w3 = clamp(lc1 * dot(abs(c11 - c12), dt) + mx, min_w, max_w);
-   w4 = clamp(lc2 * dot(abs(c11 - c01), dt) + mx, min_w, max_w);
-   FragColor = vec4(w1 * c10 + w2 * c21 + w3 * c12 + w4 * c01 + (1.0 - w1 - w2 - w3 - w4) * c11, 1.0);
-}
\ No newline at end of file
diff --git a/edge-smoothing/scalenx/epx.slangp b/edge-smoothing/scalenx/epx.slangp
deleted file mode 100644
index b614892dd0..0000000000
--- a/edge-smoothing/scalenx/epx.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = shaders/epx.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 2.0
-
-shader1 = ../../interpolation/shaders/bicubic.slang
-filter_linear1 = false
-scale_type1 = viewport
diff --git a/edge-smoothing/scalenx/scale2xSFX.slangp b/edge-smoothing/scalenx/scale2xSFX.slangp
deleted file mode 100644
index 89f83f8175..0000000000
--- a/edge-smoothing/scalenx/scale2xSFX.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 2
-
-shader0 = shaders/scale2xSFX.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 2.0
-scale_y0 = 2.0
-
-shader1 = ../../interpolation/shaders/bicubic.slang
-filter_linear1 = false
-scale_type1 = viewport
diff --git a/edge-smoothing/scalenx/shaders/epx.slang b/edge-smoothing/scalenx/shaders/epx.slang
deleted file mode 100644
index 2affb611ed..0000000000
--- a/edge-smoothing/scalenx/shaders/epx.slang
+++ /dev/null
@@ -1,88 +0,0 @@
-#version 450
-
-// EPX (Eric's Pixel Scaler)
-// based on the description from Wikipedia:
-// https://en.wikipedia.org/wiki/Pixel-art_scaling_algorithms#EPX/Scale2%C3%97/AdvMAME2%C3%97
-// adapted for slang by hunterk
-// license GPL, I think
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-bool same(vec3 B, vec3 A0){
-   return all(equal(B, A0));
-}
-
-bool notsame(vec3 B, vec3 A0){
-   return any(notEqual(B, A0));
-}
-
-// sample with coordinate offsets
-#define TEX(c,d) texture(Source, vTexCoord.xy + vec2(c,d) * params.SourceSize.zw).rgb
-
-void main()
-{
-// The algorithm looks at the current pixel and the 4 surrounding cardinal pixels  
-// ___|_A_|___  
-// _C_|_P_|_B_
-//    | D |  
-
-// Our current pixel, P
-   vec3 P = TEX( 0., 0.);
-
-// Input pixels
-   vec3 A = TEX( 0., 1.);
-   vec3 B = TEX( 1., 0.);
-   vec3 D = TEX( 0.,-1.);
-   vec3 C = TEX(-1., 0.);
-   
-// Output: 2x2 grid. Default to the current pixel color (Nearest magnification)
-// ___one_|_two___
-//  three | four
-   vec3 one   = P;
-   vec3 two   = P;
-   vec3 three = P;
-   vec3 four  = P;
-
-// EPX algorithm rules:   
-// IF C==A AND C!=D AND A!=B => 1=A
-// IF A==B AND A!=C AND B!=D => 2=B
-// IF D==C AND D!=B AND C!=A => 3=C
-// IF B==D AND B!=A AND D!=C => 4=D
-
-   one   = (same(C, D) && notsame(C, A) && notsame(C, B)) ? C : P;
-   two   = (same(D, B) && notsame(D, C) && notsame(D, A)) ? D : P;
-   three = (same(A, C) && notsame(A, B) && notsame(A, D)) ? A : P;
-   four  = (same(B, A) && notsame(B, D) && notsame(B, C)) ? B : P;
-
-   vec2 px = fract(vTexCoord * params.SourceSize.xy);
-// split the texels into 4 and assign one of our output pixels to each
-   FragColor.rgb = (px.x < 0.5) ? (px.y < 0.5 ? one : three) : (px.y < 0.5 ? two : four);
-   FragColor.a = 1.0;
-}
diff --git a/edge-smoothing/scalenx/shaders/scale2xSFX.slang b/edge-smoothing/scalenx/shaders/scale2xSFX.slang
deleted file mode 100644
index 96a88a7242..0000000000
--- a/edge-smoothing/scalenx/shaders/scale2xSFX.slang
+++ /dev/null
@@ -1,169 +0,0 @@
-#version 450
-
-/*
-	Scale2xSFX
-	by Sp00kyFox, 2015
-
-Filter:	Nearest
-Scale:	2x
-
-Scale2SFX improves upon the original Scale2x (aka EPX) by avoiding the occurence of artifacts.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float YTR;
-	float UTR;
-	float VTR;
-} params;
-
-#pragma parameter YTR "SCALE2xSFX Y Threshold" 48.0 0.0 255.0 1.0
-#pragma parameter UTR "SCALE2xSFX U Threshold"  7.0 0.0 255.0 1.0
-#pragma parameter VTR "SCALE2xSFX V Threshold"  6.0 0.0 255.0 1.0
-
-#define YTR params.YTR
-#define UTR params.UTR
-#define VTR params.VTR
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define saturate(c) clamp(c, 0.0, 1.0)
-#define lerp(a,b,c) mix(a,b,c)
-#define mul(a,b) (b*a)
-#define fmod(c,d) mod(c,d)
-#define frac(c) fract(c)
-#define tex2D(c,d) texture(c,d)
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define int2 ivec2
-#define int3 ivec3
-#define int4 ivec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float2x2 mat2x2
-#define float3x3 mat3x3
-#define float4x4 mat4x4
-#define float4x3 mat4x3
-
-#define decal Source
-
-const float3x3 YUV  = float3x3(0.299, -0.168736, 0.5, 0.587, -0.331264, -0.418688, 0.114, 0.5, -0.081312);	// transponed
-float3 thresh = float3(YTR, UTR, VTR)/255.0;
-
-bool eq(float3 A, float3 B){
-	return (A==B);
-}
-
-bool neq(float3 A, float3 B){
-	return (A!=B);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-layout(location = 5) out vec4 t5;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texCoord = TexCoord;
-   
-   	float2 ps = float2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-	t1 = texCoord.xxxy + float4(-dx,  0, dx,-dy);	// A, B, C
-	t2 = texCoord.xxxy + float4(-dx,  0, dx,  0);	// D, E, F
-	t3 = texCoord.xxxy + float4(-dx,  0, dx, dy);	// G, H, I
-	t4 = texCoord.xyxy + float4(    0,-2*dy,-2*dx,    0);	// J, K
-	t5 = texCoord.xyxy + float4( 2*dx,    0,    0, 2*dy);	// L, M
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 5) in vec4 t5;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	// subpixel determination
-	float2 fp = floor(2.0 * frac(texCoord*params.SourceSize.xy));
-
-	/*
-		    J
-		  A B C		E0 E1
-		K D E F L	E2 E3
-		  G H I
-		    M
-	*/
-
-	// reading the texels & colorspace conversion
-	float3 b = tex2D(decal, t1.yw).xyz;
-	float3 d = tex2D(decal, t2.xw).xyz;
-	float3 e = tex2D(decal, t2.yw).xyz;
-	float3 f = tex2D(decal, t2.zw).xyz;
-	float3 h = tex2D(decal, t3.yw).xyz;
-
-	float4x3 tmp = mul(float4x3(b,d,e,f), YUV);
-	float3 B = tmp[0], D = tmp[1], E = tmp[2], F = tmp[3], H = mul(h, YUV);
-
-	float3 A = tex2D(decal, t1.xw).xyz;
-	float3 C = tex2D(decal, t1.zw).xyz;
-	float3 G = tex2D(decal, t3.xw).xyz;
-	float3 I = tex2D(decal, t3.zw).xyz;
-
-	tmp = mul(float4x3(A,C,G,I), YUV);
-	A = tmp[0], C = tmp[1], G = tmp[2], I = tmp[3];
-
-	float3 J = tex2D(decal, t4.xy).xyz;
-	float3 K = tex2D(decal, t4.zw).xyz;
-	float3 L = tex2D(decal, t5.xy).xyz;
-	float3 M = tex2D(decal, t5.zw).xyz;
-
-	tmp = mul(float4x3(J,K,L,M), YUV);
-	J = tmp[0], K = tmp[1], L = tmp[2], M = tmp[3];
-
-
-
-	// parent condition
-	bool par0 = neq(B,F) && neq(D,H);
-	bool par1 = neq(B,D) && neq(F,H);
-
-	// equality checks
-	bool AE = eq(A,E), CE = eq(C,E), EG = eq(E,G), EI = eq(E,I);
-
-	// artifact prevention
-	bool art0 = CE || EG;
-	bool art1 = AE || EI;
-
-
-
-	// rules
-	float3 E0 = eq(B,D) && par0 && (!AE || art0 || eq(A,J) || eq(A,K)) ? 0.5*(b+d) : e;
-	float3 E1 = eq(B,F) && par1 && (!CE || art1 || eq(C,J) || eq(C,L)) ? 0.5*(b+f) : e;
-	float3 E2 = eq(D,H) && par1 && (!EG || art1 || eq(G,K) || eq(G,M)) ? 0.5*(h+d) : e;
-	float3 E3 = eq(F,H) && par0 && (!EI || art0 || eq(I,L) || eq(I,M)) ? 0.5*(h+f) : e;
-
-	// subpixel output
-	FragColor = vec4(fp.y == 0 ? (fp.x == 0 ? E0 : E1) : (fp.x == 0 ? E2 : E3), 1.0);
-}
\ No newline at end of file
diff --git a/edge-smoothing/scalenx/shaders/scale3xSFX.slang b/edge-smoothing/scalenx/shaders/scale3xSFX.slang
deleted file mode 100644
index 7e4521e150..0000000000
--- a/edge-smoothing/scalenx/shaders/scale3xSFX.slang
+++ /dev/null
@@ -1,168 +0,0 @@
-#version 450
-
-/*
-	Scale3xSFX
-	by Sp00kyFox, 2015
-
-Filter:	Nearest
-Scale:	3x
-
-Scale3SFX improves upon the original Scale3x by avoiding the occurence of artifacts and smoothing out 45° edges.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float YTR;
-	float UTR;
-	float VTR;
-} params;
-
-#pragma parameter YTR "SCALE3xSFX Y Threshold" 48.0 0.0 255.0 1.0
-#pragma parameter UTR "SCALE3xSFX U Threshold"  7.0 0.0 255.0 1.0
-#pragma parameter VTR "SCALE3xSFX V Threshold"  6.0 0.0 255.0 1.0
-
-#define YTR params.YTR
-#define UTR params.UTR
-#define VTR params.VTR
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define saturate(c) clamp(c, 0.0, 1.0)
-#define lerp(a,b,c) mix(a,b,c)
-#define mul(a,b) (b*a)
-#define fmod(c,d) mod(c,d)
-#define frac(c) fract(c)
-#define tex2D(c,d) texture(c,d)
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define int2 ivec2
-#define int3 ivec3
-#define int4 ivec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float2x2 mat2x2
-#define float3x3 mat3x3
-#define float4x4 mat4x4
-#define float4x3 mat4x3
-
-#define decal Source
-
-const float3x3 YUV  = float3x3(0.299, -0.168736, 0.5, 0.587, -0.331264, -0.418688, 0.114, 0.5, -0.081312);	// transponed
-float3 thresh = float3(YTR, UTR, VTR)/255.0;
-
-bool3 eq(float3 A, float3 B){
-	return lessThanEqual(abs(A-B) , thresh);
-}
-
-bool3 neq(float3 A, float3 B){
-	return greaterThan(abs(A-B) , thresh);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-layout(location = 5) out vec4 t5;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texCoord = TexCoord;
-   
-   	float2 ps = float2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-	t1 = texCoord.xxxy + float4(-dx,  0, dx,-dy);	// A, B, C
-	t2 = texCoord.xxxy + float4(-dx,  0, dx,  0);	// D, E, F
-	t3 = texCoord.xxxy + float4(-dx,  0, dx, dy);	// G, H, I
-	t4 = texCoord.xyxy + float4(    0,-2*dy,-2*dx,    0);	// J, K
-	t5 = texCoord.xyxy + float4( 2*dx,    0,    0, 2*dy);	// L, M
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 5) in vec4 t5;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	// subpixel determination
-	float2 fp = floor(2.0 * frac(texCoord*params.SourceSize.xy));
-
-	/*
-		    J
-		  A B C		E0 E1
-		K D E F L	E2 E3
-		  G H I
-		    M
-	*/
-
-	// reading the texels & colorspace conversion
-	float3 b = tex2D(decal, t1.yw).xyz;
-	float3 d = tex2D(decal, t2.xw).xyz;
-	float3 e = tex2D(decal, t2.yw).xyz;
-	float3 f = tex2D(decal, t2.zw).xyz;
-	float3 h = tex2D(decal, t3.yw).xyz;
-
-	float4x3 tmp = mul(float4x3(b,d,e,f), YUV);
-	float3 B = tmp[0], D = tmp[1], E = tmp[2], F = tmp[3], H = mul(h, YUV);
-
-	float3 A = tex2D(decal, t1.xw).xyz;
-	float3 C = tex2D(decal, t1.zw).xyz;
-	float3 G = tex2D(decal, t3.xw).xyz;
-	float3 I = tex2D(decal, t3.zw).xyz;
-
-	tmp = mul(float4x3(A,C,G,I), YUV);
-	A = tmp[0], C = tmp[1], G = tmp[2], I = tmp[3];
-
-	float3 J = tex2D(decal, t4.xy).xyz;
-	float3 K = tex2D(decal, t4.zw).xyz;
-	float3 L = tex2D(decal, t5.xy).xyz;
-	float3 M = tex2D(decal, t5.zw).xyz;
-
-	tmp = mul(float4x3(J,K,L,M), YUV);
-	J = tmp[0], K = tmp[1], L = tmp[2], M = tmp[3];
-
-	// parent condition
-	bool par0 = neq(B,F) == bool3(true) && neq(D,H) == bool3(true);
-	bool par1 = neq(B,D) == bool3(true) && neq(F,H) == bool3(true);
-
-	// equality checks
-	bool AE = eq(A,E) == bool3(true);
-	bool CE = eq(C,E) == bool3(true);
-	bool EG = eq(E,G) == bool3(true);
-	bool EI = eq(E,I) == bool3(true);
-
-	// artifact prevention
-	bool art0 = CE || EG;
-	bool art1 = AE || EI;
-
-	// rules
-	float3 E0 = eq(B,D) == bool3(true) && par0 == true && (AE == false || art0 == true || eq(A,J) == bool3(true) || eq(A,K) == bool3(true)) ? 0.5*(b+d) : e;
-	float3 E1 = eq(B,F) == bool3(true) && par1 == true && (CE == false || art1 == true || eq(C,J) == bool3(true) || eq(C,L) == bool3(true)) ? 0.5*(b+f) : e;
-	float3 E2 = eq(D,H) == bool3(true) && par1 == true && (EG == false || art1 == true || eq(G,K) == bool3(true) || eq(G,M) == bool3(true)) ? 0.5*(h+d) : e;
-	float3 E3 = eq(F,H) == bool3(true) && par0 == true && (EI == false || art0 == true || eq(I,L) == bool3(true) || eq(I,M) == bool3(true)) ? 0.5*(h+f) : e;
-
-	// subpixel output
-	FragColor = vec4(fp.y == 0 ? (fp.x == 0 ? E0 : E1) : (fp.x == 0 ? E2 : E3), 1.0);
-}
\ No newline at end of file
diff --git a/edge-smoothing/xbr/README.md b/edge-smoothing/xbr/README.md
deleted file mode 100644
index ae0a09d0d1..0000000000
--- a/edge-smoothing/xbr/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-xBR Shaders
-=======
-These shaders uses the xBR algorithm to scale. xBR (scale by rules) works by detecting edges and interpolating pixels along them. It has some empyrical rules developed to detect the edges in many directions. There are many versions implemented and they differs basically by the number of directions considered and the way interpolations are done.
-
-
-xbr-lvl2.cg
---------------
-
-It can detect four edge directions, which shows as better rounded objects on screen. The interpolation blends pixel colors, so that the final image is smoother than the noblend versions. It works well in any integer scale factor.
-
-Recommended sampling: `Point`
-Recommended scale factors: `Integer multiples`
-
-xbr-lvl2-sharp.cg
---------------
-
-It can detect four edge directions, which shows as better rounded objects on screen. The interpolation blends pixel colors, so that the final image is smooth. This is a sharper version than the standard. It works well in any integer scale factor.
-
-Recommended sampling: `Point`
-Recommended scale factors: `Integer multiples`
-
-
-xbr-lvl3.cg
---------------
-
-It can detect six edge directions, which shows as even better rounded objects on screen than the lvl2. The interpolation blends pixel colors, so that the final image is smooth. It works well in any integer scale factor.
-
-Recommended sampling: `Point`
-Recommended scale factors: `Integer multiples`
-
-xbr-lvl3-sharp.cg
---------------
-
-It can detect six edge directions, which shows as even better rounded objects on screen than the lvl2. The interpolation blends pixel colors, so that the final image is smooth. This is a sharper version than the standard. It works well in any integer scale factor.
-
-Recommended sampling: `Point`
-Recommended scale factors: `Integer multiples`
-
-super-xbr.cg
---------------
-
-Super-xBR uses parts of the xBR algorithm and combines with other linear interpolation ones. It is intended for games with smooth color gradients. Compared to the hybrid ones, Super-xBR provides a much better image, without discontinuities.
-
-Recommended sampling: `Point`
-Recommended scale factors: `Integer multiples`
-
-super-xbr-fast.cg
---------------
-
-It's a faster version of Super-xBR.
-
-Recommended sampling: `Point`
-Recommended scale factors: `Integer multiples`
-
-Other Presets folder
---------------
-
-This folder contains other presets for historical purposes.
diff --git a/edge-smoothing/xbr/other presets/2xBR-lv1-multipass.slangp b/edge-smoothing/xbr/other presets/2xBR-lv1-multipass.slangp
deleted file mode 100644
index adf475e5c6..0000000000
--- a/edge-smoothing/xbr/other presets/2xBR-lv1-multipass.slangp	
+++ /dev/null
@@ -1,17 +0,0 @@
-shaders = 4
-
-shader0 = ../../../stock.slang
-alias0 = xBR_lv1_mp_refpass
-
-shader1 = "shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang"
-filter_linear1 = false
-scale_type1 = source
-
-shader2 = "shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang"
-filter_linear2 = false
-scale_type2 = source
-scale2 = 2.0
-
-shader3 = ../../../interpolation/shaders/bicubic.slang
-filter_linear3 = false
-scale_type3 = viewport
diff --git a/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang b/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang
deleted file mode 100644
index 474b229e9e..0000000000
--- a/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang	
+++ /dev/null
@@ -1,167 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-layout(location = 5) out vec4 t5;
-layout(location = 6) out vec4 t6;
-layout(location = 7) out vec4 t7;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   //     A1 B1 C1
-   //  A0  A  B  C C4
-   //  D0  D  E  F F4
-   //  G0  G  H  I I4
-   //     G5 H5 I5
-   
-   float dx = global.SourceSize.z;
-   float dy = global.SourceSize.w;
-   
-   vTexCoord = TexCoord;
-   t1 = vTexCoord.xxxy + vec4(    -dx,   0,  dx, -2.0*dy);  //  A1 B1 C1
-   t2 = vTexCoord.xxxy + vec4(    -dx,   0,  dx,     -dy);  //   A  B  C
-   t3 = vTexCoord.xxxy + vec4(    -dx,   0,  dx,       0);  //   D  E  F
-   t4 = vTexCoord.xxxy + vec4(    -dx,   0,  dx,      dy);  //   G  H  I
-   t5 = vTexCoord.xxxy + vec4(    -dx,   0,  dx,  2.0*dy);  //  G5 H5 I5
-   t6 = vTexCoord.xyyy + vec4(-2.0*dx, -dy,   0,      dy);  //  A0 D0 G0
-   t7 = vTexCoord.xyyy + vec4( 2.0*dx, -dy,   0,      dy);  //  C4 F4 I4 
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 5) in vec4 t5;
-layout(location = 6) in vec4 t6;
-layout(location = 7) in vec4 t7;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-float threshold = 15.0;
-
-float y_weight = 48.0;
-float u_weight = 7.0;
-float v_weight = 6.0;
-
-mat3 yuv          = mat3(0.299, 0.587, 0.114, -0.169, -0.331, 0.499, 0.499, -0.418, -0.0813);
-mat3 yuv_weighted = mat3(y_weight * yuv[0], u_weight * yuv[1], v_weight * yuv[2]);
-vec4 bin          = vec4(1.0f, 2.0f, 4.0f, 8.0f);
-vec4 maximo       = vec4(255.0f, 255.0f, 255.0f, 255.0f);
-
-bvec4 _and_(bvec4 A, bvec4 B) {
-   return bvec4(A.x && B.x, A.y && B.y, A.z && B.z, A.w && B.w);
-}
-
-bvec4 _or_(bvec4 A, bvec4 B) {
-   return bvec4(A.x || B.x, A.y || B.y, A.z || B.z, A.w || B.w);
-}
-
-vec4 df(vec4 A, vec4 B) {
-   return vec4(abs(A - B));
-}
-
-bvec4 close(vec4 A, vec4 B) {
-   return (lessThan(df(A, B), vec4(threshold)));
-}
-
-vec4 weighted_distance(vec4 a, vec4 b, vec4 c, vec4 d, vec4 e, vec4 f, vec4 g, vec4 h) {
-   return (df(a, b) + df(a, c) + df(d, e) + df(d, f) + 4.0 * df(g, h));
-}
-
-vec4 remapTo01(vec4 v, vec4 high) {
-   return (v/high);
-}
-
-void main()
-{
-   bvec4 edr, px; // px = pixel, edr = edge detection rule
-   bvec4 interp_restriction_lv1;
-
-   vec3 A1 = texture(Source, t1.xw).rgb;
-   vec3 B1 = texture(Source, t1.yw).rgb;
-   vec3 C1 = texture(Source, t1.zw).rgb;
-
-   vec3 A  = texture(Source, t2.xw).rgb;
-   vec3 B  = texture(Source, t2.yw).rgb;
-   vec3 C  = texture(Source, t2.zw).rgb;
-
-   vec3 D  = texture(Source, t3.xw).rgb;
-   vec3 E  = texture(Source, t3.yw).rgb;
-   vec3 F  = texture(Source, t3.zw).rgb;
-
-   vec3 G  = texture(Source, t4.xw).rgb;
-   vec3 H  = texture(Source, t4.yw).rgb;
-   vec3 I  = texture(Source, t4.zw).rgb;
-
-   vec3 G5 = texture(Source, t5.xw).rgb;
-   vec3 H5 = texture(Source, t5.yw).rgb;
-   vec3 I5 = texture(Source, t5.zw).rgb;
-
-   vec3 A0 = texture(Source, t6.xy).rgb;
-   vec3 D0 = texture(Source, t6.xz).rgb;
-   vec3 G0 = texture(Source, t6.xw).rgb;
-
-   vec3 C4 = texture(Source, t7.xy).rgb;
-   vec3 F4 = texture(Source, t7.xz).rgb;
-   vec3 I4 = texture(Source, t7.xw).rgb;
-
-   vec4 bdhf = yuv_weighted[0]*mat4x3( B,  D,  H,  F);
-   vec4 cagi = yuv_weighted[0]*mat4x3( C,  A,  G,  I);
-   vec4 e    = yuv_weighted[0]*mat4x3( E,  E,  E,  E);
-   vec4 i4   = yuv_weighted[0]*mat4x3(I4, C4, A0, G0);
-   vec4 i5   = yuv_weighted[0]*mat4x3(I5, C1, A1, G5);
-   vec4 h5x  = yuv_weighted[0]*mat4x3(H5, F4, B1, D0);
-
-   vec4 b = bdhf.xzzx;
-   vec4 d = bdhf.yyww;
-   vec4 h = bdhf.zxxz;
-   vec4 f = bdhf.wwyy;
-   vec4 c = cagi.xwzy;
-   vec4 a = cagi.yzwx;
-   vec4 g = cagi.zyxw;
-   vec4 i = cagi.wxyz;
-
-   vec4 f4 = h5x.yyww;
-   vec4 h5 = h5x.xzzx;
-
-   bvec4 r1 = _and_( notEqual(  e,  f ), notEqual( e,  h ) );
-   bvec4 r2 = _and_( not(close( f,  b)), not(close(f,  c)) );
-   bvec4 r3 = _and_( not(close( h,  d)), not(close(h,  g)) );
-   bvec4 r4 = _and_( not(close( f, f4)), not(close(f, i4)) );
-   bvec4 r5 = _and_( not(close( h, h5)), not(close(h, i5)) );
-   bvec4 r6 = _and_( close(e, i),  _or_(r4, r5) );
-   bvec4 r7 =  _or_( close(e, g), close( e,  c) );
-
-   interp_restriction_lv1 = _and_( r1, _or_( _or_( _or_(r2, r3), r6 ), r7 ) );
-
-   edr = _and_( lessThan(weighted_distance(e, c, g, i, h5, f4, h, f), weighted_distance(h, d, i5, f, i4, b, e, i)), interp_restriction_lv1 );
-
-   px  = lessThanEqual(df(e, f), df(e, h));
-
-   vec4 info = bin*mat4x4(
-                          edr.x, px.x, 0.0, 0.0,
-                          edr.y, px.y, 0.0, 0.0,
-                          edr.z, px.z, 0.0, 0.0,
-                          edr.w, px.w, 0.0, 0.0
-                          );
-   FragColor = vec4(remapTo01(info, maximo));
-}
\ No newline at end of file
diff --git a/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang b/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang
deleted file mode 100644
index 14aea5224b..0000000000
--- a/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang	
+++ /dev/null
@@ -1,84 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 xBR_lv1_mp_refpassSize;
-   vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   //     A1 B1 C1
-   //  A0  A  B  C C4
-   //  D0  D  E  F F4
-   //  G0  G  H  I I4
-   //     G5 H5 I5
-
-   float dx = global.SourceSize.z;
-   float dy = global.SourceSize.w;
-   
-   vTexCoord = TexCoord;
-   t1 = vec4(dx, 0, 0, dy);  // F H
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D xBR_lv1_mp_refpass;
-
-mat4x2 sym_vectors  = mat4x2(1,  1,   1, -1,   -1, -1,   -1,  1);
-
-float remapFrom01(float v, float high)
-{
-   return (high*v + 0.5);
-}
-
-vec2 unpack_info(float i)
-{
-   vec2 info;
-   info.x = round(modf(i/2.0f, i));
-   info.y = i;
-
-   return info;
-}
-
-void main()
-{
-//get original texture coordinates relative to the current pass
-   vec2 OriginalCoord = floor(global.xBR_lv1_mp_refpassSize.xy * vTexCoord);
-   OriginalCoord = (OriginalCoord + 0.5) * global.xBR_lv1_mp_refpassSize.zw;
-   
-   float px, edr; // px = pixel to blend, edr = edge detection rule
-
-   vec2 pos = fract(vTexCoord*global.SourceSize.xy)-vec2(0.5, 0.5); // pos = pixel position
-   vec2 dir = sign(pos); // dir = pixel direction
-
-   vec2 g1  = dir*t1.xy;
-   vec2 g2  = dir*t1.zw;
-
-   vec3 F   = texture(xBR_lv1_mp_refpass, OriginalCoord +g1).rgb;
-   vec3 H   = texture(xBR_lv1_mp_refpass, OriginalCoord +g2).rgb;
-   vec3 E   = texture(xBR_lv1_mp_refpass, OriginalCoord    ).rgb;
-
-   vec4 icomp = round(clamp(dir*sym_vectors, vec4(0.0), vec4(1.0))); // choose info component
-   float  info  = remapFrom01(dot(texture(Source, vTexCoord), icomp), 255.0f); // retrieve 1st pass info
-   vec2 flags = unpack_info(info); // retrieve 1st pass flags
-
-   edr = flags.x;
-   px  = flags.y;
-
-   vec3 color = mix(E, mix(H, F, px), edr*0.5); // interpolate if there's edge
-   
-   FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/xbr/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang b/edge-smoothing/xbr/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang
deleted file mode 100644
index 6719b49597..0000000000
--- a/edge-smoothing/xbr/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang	
+++ /dev/null
@@ -1,353 +0,0 @@
-#version 450
-
-/*
-   Hyllian's 2xBR v3.8c+ReverseAA (squared) Shader - Dithering preserved
-  
-   Copyright (C) 2011/2012 Hyllian/Jararaca - sergiogdb@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-
-/*
- *  ReverseAA part of the code
- *
- *  Copyright (c) 2012, Christoph Feck <christoph@maxiom.de>
- *  All Rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *    * Redistributions of source code must retain the above copyright notice,
- *      this list of conditions and the following disclaimer.
- *
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define mul(a,b) (b*a)
-
-const float coef           = 2.0;
-const vec4 eq_threshold  = vec4(15.0, 15.0, 15.0, 15.0);
-const float y_weight        = 48.0;
-const float u_weight        = 7.0;
-const float v_weight        = 6.0;
-const mat3x3 yuv          = mat3x3(0.299, 0.587, 0.114, -0.169, -0.331, 0.499, 0.499, -0.418, -0.0813);
-const mat3x3 yuv_weighted = mat3x3(y_weight*yuv[0], u_weight*yuv[1], v_weight*yuv[2]);
-const vec4 delta         = vec4(0.5, 0.5, 0.5, 0.5);
-const float sharpness      = 0.65;
-
-        // Constants used with gamma correction.
-        #define InputGamma 2.4
-        #define OutputGamma 2.2
-
-        #define GAMMA_IN(color) pow(color, vec3(InputGamma, InputGamma, InputGamma))
-        #define GAMMA_OUT(color) pow(color, vec3(1.0 / OutputGamma, 1.0 / OutputGamma, 1.0 / OutputGamma))
-
-
-float lum(vec3 A, vec3 B)
-{
-    return abs(dot(A-B, yuv_weighted[0]));
-}
-
-vec4 df(vec4 A, vec4 B)
-{
-    return vec4(abs(A-B));
-}
-
-bvec4 eq(vec4 A, vec4 B)
-{
-    return lessThan(df(A, B) , vec4(15.0, 15.0, 15.0, 15.0));
-}
-
-bvec4 eq2(vec4 A, vec4 B)
-{
-    return lessThan(df(A, B) , vec4(2.0, 2.0, 2.0, 2.0));
-}
-
-bvec4 eq3(vec4 A, vec4 B)
-{
-    return lessThan(df(A, B) , vec4(5.0, 5.0, 5.0, 5.0));
-}
-
-
-vec4 weighted_distance(vec4 a, vec4 b, vec4 c, vec4 d, vec4 e, vec4 f, vec4 g, vec4 h)
-{
-    return (df(a,b) + df(a,c) + df(d,e) + df(d,f) + 4.0*df(g,h));
-}
-
-bvec4 and(bvec4 A, bvec4 B)
-{
-	return bvec4(A.x && B.x, A.y && B.y, A.z && B.z, A.w && B.w);
-}
-
-bvec4 or(bvec4 A, bvec4 B)
-{
-	return bvec4(A.x || B.x, A.y || B.y, A.z || B.z, A.w || B.w);
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-layout(location = 5) out vec4 t5;
-layout(location = 6) out vec4 t6;
-layout(location = 7) out vec4 t7;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0004;
-   
-    vec2 ps = vec2(1.0/ params.SourceSize.x, 1.0/ params.SourceSize.y);
-    float dx = ps.x;
-    float dy = ps.y;
-
-    //    A1 B1 C1
-    // A0  A  B  C C4
-    // D0  D  E  F F4
-    // G0  G  H  I I4
-    //    G5 H5 I5
-
-    t1 = vTexCoord.xxxy + vec4( -dx, 0, dx,-2.0*dy); // A1 B1 C1
-    t2 = vTexCoord.xxxy + vec4( -dx, 0, dx,    -dy); //  A  B  C
-    t3 = vTexCoord.xxxy + vec4( -dx, 0, dx,      0); //  D  E  F
-    t4 = vTexCoord.xxxy + vec4( -dx, 0, dx,     dy); //  G  H  I
-    t5 = vTexCoord.xxxy + vec4( -dx, 0, dx, 2.0*dy); // G5 H5 I5
-    t6 = vTexCoord.xyyy + vec4(-2.0*dx,-dy, 0,  dy); // A0 D0 G0
-    t7 = vTexCoord.xyyy + vec4( 2.0*dx,-dy, 0,  dy); // C4 F4 I4
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 5) in vec4 t5;
-layout(location = 6) in vec4 t6;
-layout(location = 7) in vec4 t7;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    bvec4 edr, edr_left, edr_up, px; // px = pixel, edr = edge detection rule
-    bvec4 interp_restriction_lv1, interp_restriction_lv2_left, interp_restriction_lv2_up;
-    bvec4 nc, nc30, nc60, nc45; // new_color
-    vec4 fx, fx_left, fx_up, final_fx; // inequations of straight lines.
-
-    vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-    vec3 A1 = texture(Source, t1.xw).rgb;
-    vec3 B1 = texture(Source, t1.yw).rgb;
-    vec3 C1 = texture(Source, t1.zw).rgb;
-
-    vec3 A  = texture(Source, t2.xw).rgb;
-    vec3 B  = texture(Source, t2.yw).rgb;
-    vec3 C  = texture(Source, t2.zw).rgb;
-
-    vec3 D  = texture(Source, t3.xw).rgb;
-    vec3 E  = texture(Source, t3.yw).rgb;
-    vec3 F  = texture(Source, t3.zw).rgb;
-
-    vec3 G  = texture(Source, t4.xw).rgb;
-    vec3 H  = texture(Source, t4.yw).rgb;
-    vec3 I  = texture(Source, t4.zw).rgb;
-
-    vec3 G5 = texture(Source, t5.xw).rgb;
-    vec3 H5 = texture(Source, t5.yw).rgb;
-    vec3 I5 = texture(Source, t5.zw).rgb;
-
-    vec3 A0 = texture(Source, t6.xy).rgb;
-    vec3 D0 = texture(Source, t6.xz).rgb;
-    vec3 G0 = texture(Source, t6.xw).rgb;
-
-    vec3 C4 = texture(Source, t7.xy).rgb;
-    vec3 F4 = texture(Source, t7.xz).rgb;
-    vec3 I4 = texture(Source, t7.xw).rgb;
-
-    vec4 b = mul( mat4x3(B, D, H, F), yuv_weighted[0] );
-    vec4 c = mul( mat4x3(C, A, G, I), yuv_weighted[0] );
-    vec4 e = mul( mat4x3(E, E, E, E), yuv_weighted[0] );
-    vec4 a = c.yzwx;
-    vec4 d = b.yzwx;
-    vec4 f = b.wxyz;
-    vec4 g = c.zwxy;
-    vec4 h = b.zwxy;
-    vec4 i = c.wxyz;
-
-    vec4 i4 = mul( mat4x3(I4, C1, A0, G5), yuv_weighted[0] );
-    vec4 i5 = mul( mat4x3(I5, C4, A1, G0), yuv_weighted[0] );
-    vec4 h5 = mul( mat4x3(H5, F4, B1, D0), yuv_weighted[0] );
-    vec4 f4 = h5.yzwx;
-
-
-    vec4 Ao = vec4( 1.0, -1.0, -1.0, 1.0 );
-    vec4 Bo = vec4( 1.0,  1.0, -1.0,-1.0 );
-    vec4 Co = vec4( 1.5,  0.5, -0.5, 0.5 );
-    vec4 Ax = vec4( 1.0, -1.0, -1.0, 1.0 );
-    vec4 Bx = vec4( 0.5,  2.0, -0.5,-2.0 );
-    vec4 Cx = vec4( 1.0,  1.0, -0.5, 0.0 );
-    vec4 Ay = vec4( 1.0, -1.0, -1.0, 1.0 );
-    vec4 By = vec4( 2.0,  0.5, -2.0,-0.5 );
-    vec4 Cy = vec4( 2.0,  0.0, -1.0, 0.5 );
-
-    // These inequations define the line below which interpolation occurs.
-    fx      = (Ao*fp.y+Bo*fp.x);
-    fx_left = (Ax*fp.y+Bx*fp.x);
-    fx_up   = (Ay*fp.y+By*fp.x);
-	
-	//this is the only way I can keep these comparisons straight '-_-
-	bvec4 block1 = and(not(eq(h,h5)) , not(eq(h,i5)));
-	bvec4 block2 = and(not(eq(f,f4)) , not(eq(f,i4)));
-	bvec4 block3 = and(not(eq(h, d)) , not(eq(h, g)));
-	bvec4 block4 = and(not(eq(f, b)) , not(eq(f, c)));
-	bvec4 block5 = and(eq(e, i) , or(block2 , block1));
-	
-	bvec4 block_comp = or(block4 , or(block3 , or(block5 , or(eq(e,g) , eq(e,c)))));
-
-    interp_restriction_lv1      = and(notEqual(e,f) , and(notEqual(e,h) , block_comp));
-    interp_restriction_lv2_left = and(notEqual(e,g) , notEqual(d,g));
-    interp_restriction_lv2_up   = and(notEqual(e,c) , notEqual(b,c));
-
-    vec4 fx45 = smoothstep(Co - delta, Co + delta, fx);
-    vec4 fx30 = smoothstep(Cx - delta, Cx + delta, fx_left);
-    vec4 fx60 = smoothstep(Cy - delta, Cy + delta, fx_up);
-
-
-    edr      = and(lessThan((weighted_distance( e, c, g, i, h5, f4, h, f) + 3.5) , weighted_distance( h, d, i5, f, i4, b, e, i)) , interp_restriction_lv1);
-    edr_left = and(lessThanEqual((coef*df(f,g)) , df(h,c)) , interp_restriction_lv2_left);
-    edr_up   = and(greaterThanEqual(df(f,g) , (coef*df(h,c))) , interp_restriction_lv2_up);
-
-    nc45 = and( edr ,                bvec4(fx45));
-    nc30 = and( edr , and(edr_left , bvec4(fx30)));
-    nc60 = and( edr , and(edr_up   , bvec4(fx60)));
-
-    px = lessThanEqual(df(e,f) , df(e,h));
-
-    vec3 res = E;
-
-
-    vec3 n1, n2, n3, n4, s, aa, bb, cc, dd;
-
-
-    n1 = B1; n2 = B; s = E; n3 = H; n4 = H5;
-    aa = n2-n1; bb = s-n2; cc = n3-s; dd = n4-n3;
-
-    vec3 t = (7. * (bb + cc) - 3. * (aa + dd)) / 16.;
-
-    vec3 m;
-	m.x = (s.x < 0.5) ? 2.*s.x : 2.*(1.0-s.x);
-	m.y = (s.y < 0.5) ? 2.*s.y : 2.*(1.0-s.y);
-	m.z = (s.z < 0.5) ? 2.*s.z : 2.*(1.0-s.z);
-
-        m = min(m, sharpness*abs(bb));
-        m = min(m, sharpness*abs(cc));
-
-    t = clamp(t, -m, m);
-
-  
-    vec3 s1 = (2.*fp.y-1)*t + s;
-
-    n1 = D0; n2 = D; s = s1; n3 = F; n4 = F4;
-    aa = n2-n1; bb = s-n2; cc = n3-s; dd = n4-n3;
-
-    t = (7. * (bb + cc) - 3. * (aa + dd)) / 16.;
-
-	m.x = (s.x < 0.5) ? 2.*s.x : 2.*(1.0-s.x);
-	m.y = (s.y < 0.5) ? 2.*s.y : 2.*(1.0-s.y);
-	m.z = (s.z < 0.5) ? 2.*s.z : 2.*(1.0-s.z);
-
-        m = min(m, sharpness*abs(bb));
-        m = min(m, sharpness*abs(cc));
-
-    t = clamp(t, -m, m);
-
-    vec3 s0 = (2.*fp.x-1)*t + s;
-
-
-    nc = or(nc30 , or(nc60 , nc45));
-
-    float blend = 0.0;
-    vec3 pix;
-
-    vec4 r1 = mix(e, f, edr);
-
-    bool yeseq3=false;
-    bvec4 yes;
-
-    if ( all(eq3(r1,e)) )
-    {
-        yeseq3 = true;
-        pix = res = s0;
-    }
-    else
-    {
-        pix = res = E;
-    }
-
-    yes = and(bvec4(yeseq3) , eq2(e, mix(f, h, px)));
-
-	vec4 final45 = vec4(nc45) * fx45;
-	vec4 final30 = vec4(nc30) * fx30;
-	vec4 final60 = vec4(nc60) * fx60;
-
-    vec4 maximo = max(max(final30, final60), final45);
-
-         if (nc.x) {pix = px.x ? F : H; blend = maximo.x; if (yes.x)  pix = res = s0; else res=E;}
-    else if (nc.y) {pix = px.y ? B : F; blend = maximo.y; if (yes.y)  pix = res = s0; else res=E;}
-    else if (nc.z) {pix = px.z ? D : B; blend = maximo.z; if (yes.z)  pix = res = s0; else res=E;}
-    else if (nc.w) {pix = px.w ? H : D; blend = maximo.w; if (yes.w)  pix = res = s0; else res=E;}
-
-    res = GAMMA_IN(res);
-    pix = GAMMA_IN(pix);
-
-    res = mix(res, pix, blend);
-
-   FragColor = vec4(clamp( GAMMA_OUT(res), 0.0, 1.0 ), 1.0);
-}
\ No newline at end of file
diff --git a/edge-smoothing/xbr/other presets/super-2xbr-3d-2p.slangp b/edge-smoothing/xbr/other presets/super-2xbr-3d-2p.slangp
deleted file mode 100644
index a20f1ff6a0..0000000000
--- a/edge-smoothing/xbr/other presets/super-2xbr-3d-2p.slangp	
+++ /dev/null
@@ -1,23 +0,0 @@
-shaders = "4"
-
-shader0 = ../../../stock.slang
-alias0 = super2xbr3d_refpass
-
-shader1 = "shaders/super-xbr/super-2xbr-3d-pass0.slang"
-filter_linear1 = false
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "shaders/super-xbr/super-2xbr-3d-pass1.slang"
-filter_linear2 = false
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/super-xbr/custom-jinc2-sharper.slang"
-filter_linear3 = false
-scale_type3 = viewport
-
diff --git a/edge-smoothing/xbr/other presets/super-2xbr-3d-3p-smoother.slangp b/edge-smoothing/xbr/other presets/super-2xbr-3d-3p-smoother.slangp
deleted file mode 100644
index 3cb2907581..0000000000
--- a/edge-smoothing/xbr/other presets/super-2xbr-3d-3p-smoother.slangp	
+++ /dev/null
@@ -1,30 +0,0 @@
-shaders = "5"
-
-shader0 = ../../../stock.slang
-alias0 = super2xbr3d_refpass
-
-shader1 = "shaders/super-xbr/super-2xbr-3d-pass0.slang"
-filter_linear1 = false
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "shaders/super-xbr/super-2xbr-3d-pass1.slang"
-filter_linear2 = false
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/super-xbr/super-2xbr-3d-pass2.slang"
-filter_linear3 = false
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "shaders/super-xbr/custom-jinc2-sharper.slang"
-filter_linear4 = false
-scale_type4 = viewport
-
diff --git a/edge-smoothing/xbr/other presets/super-4xbr-3d-4p.slangp b/edge-smoothing/xbr/other presets/super-4xbr-3d-4p.slangp
deleted file mode 100644
index e37f9bd61b..0000000000
--- a/edge-smoothing/xbr/other presets/super-4xbr-3d-4p.slangp	
+++ /dev/null
@@ -1,37 +0,0 @@
-shaders = "6"
-
-shader0 = ../../../stock.slang
-alias0 = super4xbr3d_refpass
-
-shader1 = "shaders/super-xbr/super-4xbr-3d-pass0.slang"
-filter_linear1 = false
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "shaders/super-xbr/super-4xbr-3d-pass1.slang"
-filter_linear2 = false
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/super-xbr/super-4xbr-3d-pass2.slang"
-filter_linear3 = false
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "shaders/super-xbr/super-4xbr-3d-pass3.slang"
-filter_linear4 = false
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-
-shader5 = "shaders/super-xbr/custom-jinc2-sharper.slang"
-filter_linear5 = false
-scale_type5 = viewport
-
diff --git a/edge-smoothing/xbr/other presets/super-4xbr-3d-6p-smoother.slangp b/edge-smoothing/xbr/other presets/super-4xbr-3d-6p-smoother.slangp
deleted file mode 100644
index 198fc255c0..0000000000
--- a/edge-smoothing/xbr/other presets/super-4xbr-3d-6p-smoother.slangp	
+++ /dev/null
@@ -1,51 +0,0 @@
-shaders = "8"
-
-shader0 = ../../../stock.slang
-alias0 = super4xbr3d_refpass
-
-shader1 = "shaders/super-xbr/super-4xbr-3d-pass0.slang"
-filter_linear1 = false
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "shaders/super-xbr/super-4xbr-3d-pass1.slang"
-filter_linear2 = false
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/super-xbr/super-4xbr-3d-pass1f.slang"
-filter_linear3 = false
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "shaders/super-xbr/super-4xbr-3d-pass2.slang"
-filter_linear4 = false
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-
-shader5 = "shaders/super-xbr/super-4xbr-3d-pass3.slang"
-filter_linear5 = false
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-
-shader6 = "shaders/super-xbr/super-4xbr-3d-pass3f.slang"
-filter_linear6 = false
-scale_type_x6 = "source"
-scale_x6 = "1.000000"
-scale_type_y6 = "source"
-scale_y6 = "1.000000"
-
-shader7 = "../shaders/support/stock.slang"
-filter_linear7 = true
-scale_type7 = viewport
-
diff --git a/edge-smoothing/xbr/other presets/super-8xbr-3d-6p.slangp b/edge-smoothing/xbr/other presets/super-8xbr-3d-6p.slangp
deleted file mode 100644
index 03fdeb118d..0000000000
--- a/edge-smoothing/xbr/other presets/super-8xbr-3d-6p.slangp	
+++ /dev/null
@@ -1,51 +0,0 @@
-shaders = "8"
-
-shader0 = ../../../stock.slang
-alias0 = super8xbr3d_refpass
-
-shader1 = "shaders/super-xbr/super-8xbr-3d-pass0.slang"
-filter_linear1 = false
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "shaders/super-xbr/super-8xbr-3d-pass1.slang"
-filter_linear2 = false
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/super-xbr/super-8xbr-3d-pass2.slang"
-filter_linear3 = false
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "shaders/super-xbr/super-8xbr-3d-pass3.slang"
-filter_linear4 = false
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-
-shader5 = "shaders/super-xbr/super-8xbr-3d-pass4.slang"
-filter_linear5 = false
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-
-shader6 = "shaders/super-xbr/super-8xbr-3d-pass5.slang"
-filter_linear6 = false
-scale_type_x6 = "source"
-scale_x6 = "1.000000"
-scale_type_y6 = "source"
-scale_y6 = "1.000000"
-
-shader7 = "shaders/super-xbr/custom-jinc2-sharper.slang"
-filter_linear7 = false
-scale_type7 = viewport
-
diff --git a/edge-smoothing/xbr/other presets/xbr-hybrid.slangp b/edge-smoothing/xbr/other presets/xbr-hybrid.slangp
deleted file mode 100644
index 01d7e60066..0000000000
--- a/edge-smoothing/xbr/other presets/xbr-hybrid.slangp	
+++ /dev/null
@@ -1,14 +0,0 @@
-shaders = 3
-shader0 = shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang
-shader1 = shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang
-shader2 = ../shaders/support/stock.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = true
-scale_type0 = source
-scale_type1 = source
-scale_type2 = viewport
-scale0 = 2.0
-scale1 = 2.0
-
diff --git a/edge-smoothing/xbr/other presets/xbr-lv2-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-lv2-multipass.slangp
deleted file mode 100644
index 0b9d25d2b0..0000000000
--- a/edge-smoothing/xbr/other presets/xbr-lv2-multipass.slangp	
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = "3"
-
-shader0 = ../shaders/support/stock.slang
-scale_type0 = source
-scale0 = 1.0
-alias0 = XbrSource
-
-shader1 = ../shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = ../shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang
-scale_type2 = viewport
-
-filter_linear0 = "false"
-filter_linear1 = "false"
-filter_linear2 = "false"
-
diff --git a/edge-smoothing/xbr/other presets/xbr-lv3-9x-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-lv3-9x-multipass.slangp
deleted file mode 100644
index 4811eb2f49..0000000000
--- a/edge-smoothing/xbr/other presets/xbr-lv3-9x-multipass.slangp	
+++ /dev/null
@@ -1,52 +0,0 @@
-shaders = "8"
-
-shader0 = ../shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = ../shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = ../shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "3.000000"
-alias2 = xbr3x
-
-shader3 = ../shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-filter_linear3 = "false"
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = ../shaders/xbr-lv3-multipass/xbr-lv3-pass1b.slang
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "3.000000"
-
-shader5 = ../shaders/support/b-spline-x.slang
-filter_linear5 = false
-scale_type_x5 = viewport
-scale_type_y5 = source
-scale5 = 1.0
-
-shader6 = ../shaders/support/b-spline-y.slang
-filter_linear6 = false
-scale_type6 = viewport
-scale6 = 1.0
-
-
-shader7 = ../shaders/support/delinearize.slang
-scale_type7 = "source"
-scale7 = "1.000000"
-filter_linear7 = "false"
-
-
-parameters = "SMALL_DETAILS;KA;XBR_EQ_THRESHOLD"
-
-SMALL_DETAILS = "1.0"
-KA = "0.35"
-XBR_EQ_THRESHOLD = "0.22"
diff --git a/edge-smoothing/xbr/other presets/xbr-lv3-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-lv3-multipass.slangp
deleted file mode 100644
index dcd61c4e26..0000000000
--- a/edge-smoothing/xbr/other presets/xbr-lv3-multipass.slangp	
+++ /dev/null
@@ -1,30 +0,0 @@
-shaders = "5"
-
-shader0 = ../shaders/support/stock.slang
-scale_type0 = source
-scale0 = 1.0
-alias0 = XbrSource
-
-shader1 = ../shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = ../shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-scale_type2 = "source"
-scale2 = "3.000000"
-
-shader3 = ../shaders/support/b-spline-x.slang
-filter_linear3 = false
-scale_type_x3 = viewport
-scale_type_y3 = source
-scale3 = 1.0
-
-shader4 = ../shaders/support/b-spline-y.slang
-filter_linear4 = false
-scale_type4 = viewport
-scale4 = 1.0
-
-filter_linear0 = "false"
-filter_linear1 = "false"
-filter_linear2 = "false"
-
diff --git a/edge-smoothing/xbr/other presets/xbr-mlv4-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-mlv4-multipass.slangp
deleted file mode 100644
index 80c704c815..0000000000
--- a/edge-smoothing/xbr/other presets/xbr-mlv4-multipass.slangp	
+++ /dev/null
@@ -1,38 +0,0 @@
-shaders = "5"
-
-shader0 = ../shaders/support/stock.slang
-scale_type0 = "source"
-scale0 = 1.0
-alias0 = REF
-
-shader1 = ../shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-alias1 = "PASS1"
-
-shader2 = ../shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-alias2 = "PASS2"
-
-shader3 = ../shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang
-filter_linear3 = "false"
-float_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "2.000000"
-scale_type_y3 = "source"
-scale_y3 = "2.000000"
-alias3 = "PASS3"
-
-shader4 = ../shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang
-filter_linear4 = "false"
-float_framebuffer4 = "false"
-scale_type4 = viewport
diff --git a/edge-smoothing/xbr/shaders/support/b-spline-x.slang b/edge-smoothing/xbr/shaders/support/b-spline-x.slang
deleted file mode 100644
index fd34157b42..0000000000
--- a/edge-smoothing/xbr/shaders/support/b-spline-x.slang
+++ /dev/null
@@ -1,92 +0,0 @@
-#version 450
-
-/*
-   b-spline-x Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// B-Spline bicubic parameters
-const float  B =  1.0; 
-const float  C =  0.0;
-
-const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                        (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                       -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                   (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0004 - vec2(0.5, 0.0)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( -dx, 0.0,    0.0, 0.0); 
-	t2 = vTexCoord.xyxy + vec4(  dx, 0.0, 2.0*dx, 0.0);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Px    = vec4(fp.x*fp.x*fp.x, fp.x*fp.x, fp.x, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Px;
-
-   FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/b-spline-y.slang b/edge-smoothing/xbr/shaders/support/b-spline-y.slang
deleted file mode 100644
index a59c112fec..0000000000
--- a/edge-smoothing/xbr/shaders/support/b-spline-y.slang
+++ /dev/null
@@ -1,92 +0,0 @@
-#version 450
-
-/*
-   b-spline-y Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// B-Spline bicubic parameters
-const float  B =  1.0; 
-const float  C =  0.0;
-
-const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                        (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                       -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                   (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0004 - vec2(0.0, 0.5)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( 0.0, -dy, 0.0,    0.0); 
-	t2 = vTexCoord.xyxy + vec4( 0.0,  dy, 0.0, 2.0*dy);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Py    = vec4(fp.y*fp.y*fp.y, fp.y*fp.y, fp.y, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Py;
-
-  FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/bicubic-x.slang b/edge-smoothing/xbr/shaders/support/bicubic-x.slang
deleted file mode 100644
index 3cd71ca760..0000000000
--- a/edge-smoothing/xbr/shaders/support/bicubic-x.slang
+++ /dev/null
@@ -1,107 +0,0 @@
-#version 450
-
-/*
-   bicubic-x Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float B_ANTI_RINGING;
-} params;
-
-#pragma parameter B_ANTI_RINGING "Bicubic Anti-Ringing [ OFF | ON ]" 1.0 0.0 1.0 1.0
-
-#define B_ANTI_RINGING params.B_ANTI_RINGING
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// Classic Mitchell-Netravali bicubic parameters
-const float  B =  1.0/3.0; 
-const float  C =  1.0/3.0;
-
-const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                        (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                       -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                   (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0001 - vec2(0.5, 0.0)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( -dx, 0.0,    0.0, 0.0); 
-	t2 = vTexCoord.xyxy + vec4(  dx, 0.0, 2.0*dx, 0.0);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Px    = vec4(fp.x*fp.x*fp.x, fp.x*fp.x, fp.x, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Px;
-
-    // Anti-ringing
-    if (B_ANTI_RINGING == 1.0)
-    {
-        vec3 aux = color;
-        vec3 min_sample = min(min(C0, C1), min(C2, C3));
-        vec3 max_sample = max(max(C0, C1), max(C2, C3));
-        color = clamp(color, min_sample, max_sample);
-        color = mix(aux, color, step(0.0, (C0-C1)*(C2-C3)));
-    }
-
-   FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/bicubic-y.slang b/edge-smoothing/xbr/shaders/support/bicubic-y.slang
deleted file mode 100644
index b48e503c45..0000000000
--- a/edge-smoothing/xbr/shaders/support/bicubic-y.slang
+++ /dev/null
@@ -1,107 +0,0 @@
-#version 450
-
-/*
-   bicubic-y Shader
-
-   Copyright (C) 2011-2022 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float B_ANTI_RINGING;
-} params;
-
-#pragma parameter B_ANTI_RINGING "Bicubic Anti-Ringing [ OFF | ON ]" 1.0 0.0 1.0 1.0
-
-#define B_ANTI_RINGING params.B_ANTI_RINGING
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// Classic Mitchell-Netravali bicubic parameters
-const float  B =  1.0/3.0; 
-const float  C =  1.0/3.0;
-
-const mat4 INV  = mat4(            (-B - 6.0*C)/6.0,         (3.0*B + 12.0*C)/6.0,     (-3.0*B - 6.0*C)/6.0,             B/6.0,
-                                        (12.0 - 9.0*B - 6.0*C)/6.0, (-18.0 + 12.0*B + 6.0*C)/6.0,                      0.0, (6.0 - 2.0*B)/6.0,
-                                       -(12.0 - 9.0*B - 6.0*C)/6.0, (18.0 - 15.0*B - 12.0*C)/6.0,      (3.0*B + 6.0*C)/6.0,             B/6.0,
-                                                   (B + 6.0*C)/6.0,                           -C,                      0.0,               0.0);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   
-   vec2 ps = vec2(params.SourceSize.z, params.SourceSize.w);
-	float dx = ps.x;
-	float dy = ps.y;
-
-        vTexCoord = TexCoord * 1.0001 - vec2(0.0, 0.5)*ps;
-
-	t1 = vTexCoord.xyxy + vec4( 0.0, -dy, 0.0,    0.0); 
-	t2 = vTexCoord.xyxy + vec4( 0.0,  dy, 0.0, 2.0*dy);
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-  vec2 fp = fract(vTexCoord*params.SourceSize.xy);
-
-  vec3 C0 = texture(Source, t1.xy).xyz;
-  vec3 C1 = texture(Source, t1.zw).xyz;
-  vec3 C2 = texture(Source, t2.xy).xyz;
-  vec3 C3 = texture(Source, t2.zw).xyz;
-
-  vec4 Py    = vec4(fp.y*fp.y*fp.y, fp.y*fp.y, fp.y, 1.0) * INV;
-  vec3 color = mat4x3(C0, C1, C2, C3) * Py;
-
-    // Anti-ringing
-    if (B_ANTI_RINGING == 1.0)
-    {
-        vec3 aux = color;
-        vec3 min_sample = min(min(C0, C1), min(C2, C3));
-        vec3 max_sample = max(max(C0, C1), max(C2, C3));
-        color = clamp(color, min_sample, max_sample);
-        color = mix(aux, color, step(0.0, (C0-C1)*(C2-C3)));
-    }
-
-  FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/delinearize.slang b/edge-smoothing/xbr/shaders/support/delinearize.slang
deleted file mode 100644
index 583a975325..0000000000
--- a/edge-smoothing/xbr/shaders/support/delinearize.slang
+++ /dev/null
@@ -1,42 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float OutputGamma;
-} params;
-
-#pragma parameter OutputGamma "OUTPUT GAMMA" 1.0 1.0 3.0 0.05
-
-#define OutputGamma params.OutputGamma
-#define GAMMA_OUT(color)    pow(color, vec3(1.0 / OutputGamma, 1.0 / OutputGamma, 1.0 / OutputGamma))
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-//   FragColor = pow(vec4(texture(Source, vTexCoord).rgb, 1.0), vec4(1.0 / 2.2));
-   FragColor = vec4(GAMMA_OUT(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/linearize.slang b/edge-smoothing/xbr/shaders/support/linearize.slang
deleted file mode 100644
index a892e372f5..0000000000
--- a/edge-smoothing/xbr/shaders/support/linearize.slang
+++ /dev/null
@@ -1,43 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float InputGamma;
-} params;
-
-#pragma parameter InputGamma "INPUT GAMMA" 1.0 1.0 3.0 0.05
-
-#define InputGamma params.InputGamma
-
-#define GAMMA_IN(color)     pow(color, vec3(InputGamma, InputGamma, InputGamma))
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-//   FragColor = pow(vec4(texture(Source, vTexCoord).rgb, 1.0), vec4(2.2));
-   FragColor = vec4(GAMMA_IN(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/spline16-x.slang b/edge-smoothing/xbr/shaders/support/spline16-x.slang
deleted file mode 100644
index 5aca76247c..0000000000
--- a/edge-smoothing/xbr/shaders/support/spline16-x.slang
+++ /dev/null
@@ -1,140 +0,0 @@
-#version 450
-
-/*
-	Spline16 - PassX - by Hyllian 2022
-
-	Adapted from bicubic source shaders below.
-
-	Spline36 math sources: https://www.panotools.org/dersch/interpolator/interpolator.html
-*/
-
-
-
-/*
-   Copyright (C) 2010 Team XBMC
-   http://www.xbmc.org
-   Copyright (C) 2011 Stefanos A.
-   http://www.opentk.com
-
-This Program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This Program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XBMC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-http://www.gnu.org/copyleft/gpl.html
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float S16_ANTI_RINGING;
-} params;
-
-#pragma parameter S16_ANTI_RINGING "Spline16 Anti-Ringing [ OFF | ON ]" 1.0 0.0 1.0 1.0
-
-#define S16_ANTI_RINGING params.S16_ANTI_RINGING
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord  + vec2(0.0001, 0.0001);;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-float weight(float x)
-{
-	x = abs(x);
-
-	if (x < 1.0)
-	{
-		return
-			(
-			 ((x - 9.0 / 5.0) * x - 1.0 / 5.0 ) * x + 1.0
-			);
-	}
-	else if ((x >= 1.0) && (x < 2.0))
-	{
-		return
-			(
-			 (( -1.0 / 3.0 * (x - 1) + 4.0 / 5.0 ) * (x - 1) - 7.0 / 15.0 ) * (x - 1)
-			);
-	}
-	else
-	{
-		return 0.0;
-	}
-}
-
-vec4 weight4(float x)
-{
-	return vec4(
-			weight(x - 2.0),
-			weight(x - 1.0),
-			weight(x),
-			weight(x + 1.0)
-		   );
-}
-
-	
-
-void main()
-{
-    vec2 ps = params.SourceSize.zw;
-    vec2 pos = vTexCoord.xy + ps * vec2(0.5, 0.0);
-    vec2 fp = fract(pos / ps);
-
-    vec2 xystart = (-1.5 - fp) * ps + pos;
-
-    float ypos = xystart.y  + ps.y * 2.0;
-
-    vec3 C0 = texture(Source, vec2(xystart.x             , ypos)).rgb;
-    vec3 C1 = texture(Source, vec2(xystart.x + ps.x      , ypos)).rgb;
-    vec3 C2 = texture(Source, vec2(xystart.x + ps.x * 2.0, ypos)).rgb;
-    vec3 C3 = texture(Source, vec2(xystart.x + ps.x * 3.0, ypos)).rgb;
-
-    vec4 w = weight4(1.0 - fp.x);
-
-    float sum   = dot(  w, vec4(1));
-    w   /= sum;
-
-    vec3 color = mat4x3( C0, C1, C2, C3 ) * w;
-
-    // Anti-ringing
-    if (S16_ANTI_RINGING == 1.0)
-    {
-        vec3 aux = color;
-        vec3 min_sample = min(min(C0, C1), min(C2, C3));
-        vec3 max_sample = max(max(C0, C1), max(C2, C3));
-        color = clamp(color, min_sample, max_sample);
-        color = mix(aux, color, step(0.0, (C0-C1)*(C2-C3)));
-    }
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/spline16-y.slang b/edge-smoothing/xbr/shaders/support/spline16-y.slang
deleted file mode 100644
index 254760822f..0000000000
--- a/edge-smoothing/xbr/shaders/support/spline16-y.slang
+++ /dev/null
@@ -1,140 +0,0 @@
-#version 450
-
-/*
-	Spline16 - PassY - by Hyllian 2022
-
-	Adapted from bicubic source shaders below.
-
-	Spline36 math sources: https://www.panotools.org/dersch/interpolator/interpolator.html
-*/
-
-
-
-/*
-   Copyright (C) 2010 Team XBMC
-   http://www.xbmc.org
-   Copyright (C) 2011 Stefanos A.
-   http://www.opentk.com
-
-This Program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This Program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XBMC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-http://www.gnu.org/copyleft/gpl.html
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float S16_ANTI_RINGING;
-} params;
-
-#pragma parameter S16_ANTI_RINGING "Spline16 Anti-Ringing [ OFF | ON ]" 1.0 0.0 1.0 1.0
-
-#define S16_ANTI_RINGING params.S16_ANTI_RINGING
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord  + vec2(0.0001, 0.0001);;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-float weight(float x)
-{
-	x = abs(x);
-
-	if (x < 1.0)
-	{
-		return
-			(
-			 ((x - 9.0 / 5.0) * x - 1.0 / 5.0 ) * x + 1.0
-			);
-	}
-	else if ((x >= 1.0) && (x < 2.0))
-	{
-		return
-			(
-			 (( -1.0 / 3.0 * (x - 1) + 4.0 / 5.0 ) * (x - 1) - 7.0 / 15.0 ) * (x - 1)
-			);
-	}
-	else
-	{
-		return 0.0;
-	}
-}
-
-vec4 weight4(float x)
-{
-	return vec4(
-			weight(x - 2.0),
-			weight(x - 1.0),
-			weight(x),
-			weight(x + 1.0)
-		    );
-}
-
-	
-
-void main()
-{
-    vec2 ps = params.SourceSize.zw;
-    vec2 pos = vTexCoord.xy + ps * vec2(0.0, 0.5);
-    vec2 fp = fract(pos / ps);
-
-    vec2 xystart = (-1.5 - fp) * ps + pos;
-
-    float xpos = xystart.x  + ps.x * 2.0;
-
-    vec3 C0 = texture(Source, vec2(xpos, xystart.y             )).rgb;
-    vec3 C1 = texture(Source, vec2(xpos, xystart.y + ps.y      )).rgb;
-    vec3 C2 = texture(Source, vec2(xpos, xystart.y + ps.y * 2.0)).rgb;
-    vec3 C3 = texture(Source, vec2(xpos, xystart.y + ps.y * 3.0)).rgb;
-
-    vec4 w = weight4(1.0 - fp.y);
-
-    float sum   = dot(  w, vec4(1));
-    w   /= sum;
-
-    vec3 color = mat4x3( C0, C1, C2, C3 ) * w;
-
-    // Anti-ringing
-    if (S16_ANTI_RINGING == 1.0)
-    {
-        vec3 aux = color;
-        vec3 min_sample = min(min(C0, C1), min(C2, C3));
-        vec3 max_sample = max(max(C0, C1), max(C2, C3));
-        color = clamp(color, min_sample, max_sample);
-        color = mix(aux, color, step(0.0, (C0-C1)*(C2-C3)));
-    }
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/edge-smoothing/xbr/shaders/support/stock.slang b/edge-smoothing/xbr/shaders/support/stock.slang
deleted file mode 100644
index bf3cf6b7e8..0000000000
--- a/edge-smoothing/xbr/shaders/support/stock.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(texture(Source, vTexCoord).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang
deleted file mode 100644
index 5f3c0169e1..0000000000
--- a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang
+++ /dev/null
@@ -1,315 +0,0 @@
-#version 450
-
-/*
-
-   Hyllian's xBR MultiLevel4 Shader - Pass1
-   
-   Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// compatibility macros
-#define mul(a,b) (b*a)
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float3x3 mat3x3
-#define float4x3 mat4x3
-#define texture_size params.SourceSize
-#define video_size params.SourceSize
-#define output_size params.OutputSize
-
-#define round(X) floor((X)+0.5)
-#define TEX(dx,dy) texture(Source, vTexCoord+float2((dx),(dy))*t1).rgb
-
-const float cf2             = 2.0;
-const float cf3             = 4.0;
-const float cf4             = 4.0;
-const float4 eq_thresholdold= float4(15.0, 15.0, 15.0, 15.0);
-const float4 eq_threshold   = float4( 2.0,  2.0,  2.0,  2.0);
-const float4 eq_threshold3  = float4(25.0, 25.0, 25.0, 25.0);
-const float3 Yuv_weight     = float3(4.0, 1.0, 2.0);
-const float3x3 yuv          = float3x3(0.299, 0.587, 0.114, -0.169, -0.331, 0.499, 0.499, -0.418, -0.0813);
-const float3x3 yuvT         = float3x3(0.299, -0.169,  0.499,
-                                              0.587, -0.331, -0.418,
-                                              0.114,  0.499, -0.0813); 
-const float3x3 yuv_weighted = float3x3(Yuv_weight.x*yuv[0], Yuv_weight.y*yuv[1], Yuv_weight.z*yuv[2]);
-const float4 maximo         = float4(255.0, 255.0, 255.0, 255.0);
-
-float4 df(float4 A, float4 B)
-{
-	return float4(abs(A-B));
-}
-
-bool4 rd(float4 A, float4 B, float4 C, float4 D)
-{
-    return greaterThan((df(C,D)/(df(A,B)+0.000000001)) , vec4(2.,2.,2.,2.));
-}
-
-bool4 id(float4 A, float4 B, float4 C, float4 D)
-{
-    return greaterThan(df(C,D) , df(A,B));
-}
-
-float4 remapTo01(float4 v, float4 high)
-{
-	return (v/high);
-}
-
-bool4 eq(float4 A, float4 B)
-{
-	return lessThan(df(A, B) , eq_threshold);
-}
-
-bool4 eq3(float4 A, float4 B)
-{
-	return lessThan(df(A, B) , eq_threshold3);
-}
-
-float4 weighted_distance(float4 a, float4 b, float4 c, float4 d, float4 e, float4 f, float4 g, float4 h)
-{
-	return (df(a,b) + df(a,c) + df(d,e) + df(d,f) + 4.0*df(g,h));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 t1;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0004;
-
-	float2 ps = float2(1.0/texture_size.x, 1.0/texture_size.y);
-	float dx = ps.x;
-	float dy = ps.y;
-
-	//      A3 B3 C3
-	//      A1 B1 C1
-	//A2 A0  A  B  C C4 C6
-	//D2 D0  D  E  F F4 F6
-	//G2 G0  G  H  I I4 I6
-	//      G5 H5 I5
-	//      G7 H7 I7
-	
-	t1       = float2(dx, dy);  // F  H
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 t1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	bool4 edr0, edr, edr_left, edr_up, edr3_left, edr3_up, edr4_left, edr4_up; // edr = edge detection rule
-	bool4 interp_restriction_lv1, interp_restriction_lv2_left, interp_restriction_lv2_up;
-	bool4 interp_restriction_lv3_left, interp_restriction_lv3_up;
-	bool4 interp_restriction_lv4_left, interp_restriction_lv4_up;
-
-	float3 A3=TEX(-1,-3);	float3 B3=TEX( 0,-3);	float3 C3=TEX( 1,-3);	
-	float3 A1=TEX(-1,-2);	float3 B1=TEX( 0,-2);	float3 C1=TEX( 1,-2);
-	float3 A2=TEX(-3,-1);	float3 A0=TEX(-2,-1);	float3 A =TEX(-1,-1);
-	float3 B =TEX( 0,-1);	float3 C =TEX( 1,-1);	float3 C4=TEX( 2,-1);	float3 C6=TEX( 3,-1);
-	float3 D2=TEX(-3, 0);	float3 D0=TEX(-2, 0);	float3 D =TEX(-1, 0);	float3 E =TEX( 0, 0);
-	float3 F =TEX( 1, 0);	float3 F4=TEX( 2, 0);	float3 F6=TEX( 3, 0);
-	float3 G2=TEX(-3, 1);	float3 G0=TEX(-2, 1);	float3 G =TEX(-1, 1);	float3 H =TEX( 0, 1);
-	float3 I =TEX( 1, 1);	float3 I4=TEX( 2, 1);	float3 I6=TEX( 3, 1);
-	float3 G5=TEX(-1, 2);	float3 H5=TEX( 0, 2);	float3 I5=TEX( 1, 2);
-	float3 G7=TEX(-1, 3);	float3 H7=TEX( 0, 3);	float3 I7=TEX( 1, 3);
-
-	float4x3 bdhf = mul( float4x3(B, D, H, F), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 b = mul( bdhf,  Yuv_weight);
-
-	bdhf = mul( float4x3(C, A, G, I), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 c = mul( bdhf,  Yuv_weight);
-
-	bdhf = mul( float4x3(E, E, E, E), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 e = mul( bdhf,  Yuv_weight);
-
-	float4 d = b.yzwx;
-	float4 f = b.wxyz;
-	float4 g = c.zwxy;
-	float4 h = b.zwxy;
-	float4 i = c.wxyz;
-
-	bdhf = mul( float4x3(I4, C1, A0, G5), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 i4 = mul( bdhf,  Yuv_weight);
-
-	bdhf = mul( float4x3(I5, C4, A1, G0), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 i5 = mul( bdhf,  Yuv_weight);
-
-	bdhf = mul( float4x3(H5, F4, B1, D0), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 h5 = mul( bdhf,  Yuv_weight);
-
-	float4 f4 = h5.yzwx;
-
-	float4 c1 = i4.yzwx;
-	float4 g0 = i5.wxyz;
-	float4 b1 = h5.zwxy;
-	float4 d0 = h5.wxyz;
-
-	bdhf = mul( float4x3(I6, C3, A2, G7), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 i6 = mul( bdhf,  Yuv_weight);
-
-	bdhf = mul( float4x3(I7, C6, A3, G2), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 i7 = mul( bdhf,  Yuv_weight);
-
-	bdhf = mul( float4x3(H7, F6, B3, D2), yuvT );
-	bdhf = float4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3]));
-	float4 h7 = mul( bdhf,  Yuv_weight);
-
-	float4 f6 = h7.yzwx;
-
-	float4 c3 = i6.yzwx;
-	float4 g2 = i7.wxyz;
-	float4 b3 = h7.zwxy;
-	float4 d2 = h7.wxyz;
-	
-//	interp_restriction_lv1        = (e  !=f    &&  e  !=h  );
-	interp_restriction_lv1.x      = (e.x!=f.x  &&  e.x!=h.x);
-	interp_restriction_lv1.y      = (e.y!=f.y  &&  e.y!=h.y);
-	interp_restriction_lv1.z      = (e.z!=f.z  &&  e.z!=h.z);
-	interp_restriction_lv1.w      = (e.w!=f.w  &&  e.w!=h.w);
-
-//	interp_restriction_lv2_left   = (e  !=g    &&  d  !=g    && (eq(e, d)   || eq(h, g)  ));	
-	interp_restriction_lv2_left.x = (e.x!=g.x  &&  d.x!=g.x  && (eq(e, d).x || eq(h, g).x));
-	interp_restriction_lv2_left.y = (e.y!=g.y  &&  d.y!=g.y  && (eq(e, d).y || eq(h, g).y));
-	interp_restriction_lv2_left.z = (e.z!=g.z  &&  d.z!=g.z  && (eq(e, d).z || eq(h, g).z));
-	interp_restriction_lv2_left.w = (e.w!=g.w  &&  d.w!=g.w  && (eq(e, d).w || eq(h, g).w));
-
-//	interp_restriction_lv2_up     = (e  !=c    &&  b  !=c    && (eq(e, b)   || eq(f, c)  ));	
-	interp_restriction_lv2_up.x   = (e.x!=c.x  &&  b.x!=c.x  && (eq(e, b).x || eq(f, c).x));
-	interp_restriction_lv2_up.y   = (e.y!=c.y  &&  b.y!=c.y  && (eq(e, b).y || eq(f, c).y));
-	interp_restriction_lv2_up.z   = (e.z!=c.z  &&  b.z!=c.z  && (eq(e, b).z || eq(f, c).z));
-	interp_restriction_lv2_up.w   = (e.w!=c.w  &&  b.w!=c.w  && (eq(e, b).w || eq(f, c).w));
-
-//	interp_restriction_lv3_left   = (e  !=g0   && d0  !=g0   && (eq(d,d0)   || eq(g,g0)  ));	
-	interp_restriction_lv3_left.x = (e.x!=g0.x && d0.x!=g0.x && (eq(d,d0).x || eq(g,g0).x));
-	interp_restriction_lv3_left.y = (e.y!=g0.y && d0.y!=g0.y && (eq(d,d0).y || eq(g,g0).y));
-	interp_restriction_lv3_left.z = (e.z!=g0.z && d0.z!=g0.z && (eq(d,d0).z || eq(g,g0).z));
-	interp_restriction_lv3_left.w = (e.w!=g0.w && d0.w!=g0.w && (eq(d,d0).w || eq(g,g0).w));
-
-//	interp_restriction_lv3_up     = (e  !=c1   && b1  !=c1   && (eq(b,b1)   || eq(c,c1)  ));	
-	interp_restriction_lv3_up.x   = (e.x!=c1.x && b1.x!=c1.x && (eq(b,b1).x || eq(c,c1).x));
-	interp_restriction_lv3_up.y   = (e.y!=c1.y && b1.y!=c1.y && (eq(b,b1).y || eq(c,c1).y));
-	interp_restriction_lv3_up.z   = (e.z!=c1.z && b1.z!=c1.z && (eq(b,b1).z || eq(c,c1).z));
-	interp_restriction_lv3_up.w   = (e.w!=c1.w && b1.w!=c1.w && (eq(b,b1).w || eq(c,c1).w));
-
-//	interp_restriction_lv4_left   = (e  !=g2   && d2  !=g2   && (eq(d0,d2)   || eq(g0,g2)  ));	
-	interp_restriction_lv4_left.x = (e.x!=g2.x && d2.x!=g2.x && (eq(d0,d2).x || eq(g0,g2).x));
-	interp_restriction_lv4_left.y = (e.y!=g2.y && d2.y!=g2.y && (eq(d0,d2).y || eq(g0,g2).y));
-	interp_restriction_lv4_left.z = (e.z!=g2.z && d2.z!=g2.z && (eq(d0,d2).z || eq(g0,g2).z));
-	interp_restriction_lv4_left.w = (e.w!=g2.w && d2.w!=g2.w && (eq(d0,d2).w || eq(g0,g2).w));
-
-//	interp_restriction_lv4_up     = (e  !=c3   && b3  !=c3   && (eq(b1,b3)   || eq(c1,c3)  ));	
-	interp_restriction_lv4_up.x   = (e.x!=c3.x && b3.x!=c3.x && (eq(b1,b3).x || eq(c1,c3).x));
-	interp_restriction_lv4_up.y   = (e.y!=c3.y && b3.y!=c3.y && (eq(b1,b3).y || eq(c1,c3).y));
-	interp_restriction_lv4_up.z   = (e.z!=c3.z && b3.z!=c3.z && (eq(b1,b3).z || eq(c1,c3).z));
-	interp_restriction_lv4_up.w   = (e.w!=c3.w && b3.w!=c3.w && (eq(b1,b3).w || eq(c1,c3).w));
-
-	float4 wd1 = weighted_distance( e, c, g, i, h5, f4, h, f);
-	float4 wd2 = weighted_distance( h, d, i5, f, i4, b, e, i);
-
-//	edr0        = (wd1   <= wd2  ) && interp_restriction_lv1;
-	edr0.x      = (wd1.x <= wd2.x) && interp_restriction_lv1.x;
-	edr0.y      = (wd1.y <= wd2.y) && interp_restriction_lv1.y;
-	edr0.z      = (wd1.z <= wd2.z) && interp_restriction_lv1.z;
-	edr0.w      = (wd1.w <= wd2.w) && interp_restriction_lv1.w;
-
-//	edr         = (wd1   <  wd2  ) && interp_restriction_lv1   && ( !eq(f,b)   && !id(f,c,f,b)   || !eq(h,d)   && !id(h,g,h,d)   || eq(e,g)   || eq(e,c)   );	
-	edr.x       = (wd1.x <  wd2.x) && interp_restriction_lv1.x && ( !eq(f,b).x && !id(f,c,f,b).x || !eq(h,d).x && !id(h,g,h,d).x || eq(e,g).x || eq(e,c).x );
-	edr.y       = (wd1.y <  wd2.y) && interp_restriction_lv1.y && ( !eq(f,b).y && !id(f,c,f,b).y || !eq(h,d).y && !id(h,g,h,d).y || eq(e,g).y || eq(e,c).y );
-	edr.z       = (wd1.z <  wd2.z) && interp_restriction_lv1.z && ( !eq(f,b).z && !id(f,c,f,b).z || !eq(h,d).z && !id(h,g,h,d).z || eq(e,g).z || eq(e,c).z );
-	edr.w       = (wd1.w <  wd2.w) && interp_restriction_lv1.w && ( !eq(f,b).w && !id(f,c,f,b).w || !eq(h,d).w && !id(h,g,h,d).w || eq(e,g).w || eq(e,c).w );
-
-//	edr_left    = ((cf2*df(f,g)  )  <= df(h,c)  )  && interp_restriction_lv2_left   && edr;	
-	edr_left.x  = ((cf2*df(f,g).x)  <= df(h,c).x)  && interp_restriction_lv2_left.x && edr.x;
-	edr_left.y  = ((cf2*df(f,g).y)  <= df(h,c).y)  && interp_restriction_lv2_left.y && edr.y;
-	edr_left.z  = ((cf2*df(f,g).z)  <= df(h,c).z)  && interp_restriction_lv2_left.z && edr.z;
-	edr_left.w  = ((cf2*df(f,g).w)  <= df(h,c).w)  && interp_restriction_lv2_left.w && edr.w;
-
-//	edr_up      = (df(f,g)    >= (cf2*df(h,c)  ))  && interp_restriction_lv2_up     && edr;	
-	edr_up.x    = (df(f,g).x  >= (cf2*df(h,c).x))  && interp_restriction_lv2_up.x   && edr.x;
-	edr_up.y    = (df(f,g).y  >= (cf2*df(h,c).y))  && interp_restriction_lv2_up.y   && edr.y;
-	edr_up.z    = (df(f,g).z  >= (cf2*df(h,c).z))  && interp_restriction_lv2_up.z   && edr.z;
-	edr_up.w    = (df(f,g).w  >= (cf2*df(h,c).w))  && interp_restriction_lv2_up.w   && edr.w;
-
-//	edr3_left   = ((cf3*df(f,g0)  ) <= df(h,c1)  ) && interp_restriction_lv3_left   && edr_left;	
-	edr3_left.x = ((cf3*df(f,g0).x) <= df(h,c1).x) && interp_restriction_lv3_left.x && edr_left.x;
-	edr3_left.y = ((cf3*df(f,g0).y) <= df(h,c1).y) && interp_restriction_lv3_left.y && edr_left.y;
-	edr3_left.w = ((cf3*df(f,g0).w) <= df(h,c1).w) && interp_restriction_lv3_left.w && edr_left.w;
-	edr3_left.z = ((cf3*df(f,g0).z) <= df(h,c1).z) && interp_restriction_lv3_left.z && edr_left.z;
-
-//	edr3_up     = (df(f,g0)   >= (cf3*df(h,c1)  )) && interp_restriction_lv3_up     && edr_up;	
-	edr3_up.x   = (df(f,g0).x >= (cf3*df(h,c1).x)) && interp_restriction_lv3_up.x   && edr_up.x;
-	edr3_up.y   = (df(f,g0).y >= (cf3*df(h,c1).y)) && interp_restriction_lv3_up.y   && edr_up.y;
-	edr3_up.w   = (df(f,g0).w >= (cf3*df(h,c1).w)) && interp_restriction_lv3_up.w   && edr_up.w;
-	edr3_up.z   = (df(f,g0).z >= (cf3*df(h,c1).z)) && interp_restriction_lv3_up.z   && edr_up.z;
-
-//	edr4_left   = ((cf4*df(f,g2)  ) <= df(h,c3)  ) && interp_restriction_lv4_left   && edr3_left;	
-	edr4_left.x = ((cf4*df(f,g2).x) <= df(h,c3).x) && interp_restriction_lv4_left.x && edr3_left.x;
-	edr4_left.y = ((cf4*df(f,g2).y) <= df(h,c3).y) && interp_restriction_lv4_left.y && edr3_left.y;
-	edr4_left.z = ((cf4*df(f,g2).z) <= df(h,c3).z) && interp_restriction_lv4_left.z && edr3_left.z;
-	edr4_left.w = ((cf4*df(f,g2).w) <= df(h,c3).w) && interp_restriction_lv4_left.w && edr3_left.w;
-
-//	edr4_up     = (df(f,g2)   >= (cf4*df(h,c3)  )) && interp_restriction_lv4_up     && edr3_up;		
-	edr4_up.x   = (df(f,g2).x >= (cf4*df(h,c3).x)) && interp_restriction_lv4_up.x   && edr3_up.x;
-	edr4_up.y   = (df(f,g2).y >= (cf4*df(h,c3).y)) && interp_restriction_lv4_up.y   && edr3_up.y;
-	edr4_up.z   = (df(f,g2).z >= (cf4*df(h,c3).z)) && interp_restriction_lv4_up.z   && edr3_up.z;
-	edr4_up.w   = (df(f,g2).w >= (cf4*df(h,c3).w)) && interp_restriction_lv4_up.w   && edr3_up.w;
-
-	vec4 info;
-//	info   = (edr4_left   && !edr4_up  ) ? float4(8.0) : ((edr4_up   && !edr4_left  ) ? float4(7.0) : ((edr3_left   && !edr3_up  ) ? float4(6.0) : ((edr3_up   && !edr3_left  ) ? float4(5.0) : ((edr_left   && !edr_up  ) ? float4(4.0) : ((edr_up   && !edr_left  ) ? float4(3.0) : (edr   ? float4(2.0) : (edr0   ? float4(1.0) : float4(0.0))))))));
-	info.x = (edr4_left.x && !edr4_up.x) ?  float(8.0) : ((edr4_up.x && !edr4_left.x) ?  float(7.0) : ((edr3_left.x && !edr3_up.x) ?  float(6.0) : ((edr3_up.x && !edr3_left.x) ?  float(5.0) : ((edr_left.x && !edr_up.x) ?  float(4.0) : ((edr_up.x && !edr_left.x) ?  float(3.0) : (edr.x ?  float(2.0) : (edr0.x ?  float(1.0) :  float(0.0))))))));
-	info.y = (edr4_left.y && !edr4_up.y) ?  float(8.0) : ((edr4_up.y && !edr4_left.y) ?  float(7.0) : ((edr3_left.y && !edr3_up.y) ?  float(6.0) : ((edr3_up.y && !edr3_left.y) ?  float(5.0) : ((edr_left.y && !edr_up.y) ?  float(4.0) : ((edr_up.y && !edr_left.y) ?  float(3.0) : (edr.y ?  float(2.0) : (edr0.y ?  float(1.0) :  float(0.0))))))));
-	info.z = (edr4_left.z && !edr4_up.z) ?  float(8.0) : ((edr4_up.z && !edr4_left.z) ?  float(7.0) : ((edr3_left.z && !edr3_up.z) ?  float(6.0) : ((edr3_up.z && !edr3_left.z) ?  float(5.0) : ((edr_left.z && !edr_up.z) ?  float(4.0) : ((edr_up.z && !edr_left.z) ?  float(3.0) : (edr.z ?  float(2.0) : (edr0.z ?  float(1.0) :  float(0.0))))))));
-	info.w = (edr4_left.w && !edr4_up.w) ?  float(8.0) : ((edr4_up.w && !edr4_left.w) ?  float(7.0) : ((edr3_left.w && !edr3_up.w) ?  float(6.0) : ((edr3_up.w && !edr3_left.w) ?  float(5.0) : ((edr_left.w && !edr_up.w) ?  float(4.0) : ((edr_up.w && !edr_left.w) ?  float(3.0) : (edr.w ?  float(2.0) : (edr0.w ?  float(1.0) :  float(0.0))))))));
-
-	FragColor = float4(remapTo01(info, maximo));
-}
diff --git a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang
deleted file mode 100644
index 4d077cbd5b..0000000000
--- a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang
+++ /dev/null
@@ -1,304 +0,0 @@
-#version 450
-
-/*
-
-   Hyllian's xBR MultiLevel4 Shader - Pass2
-   
-   Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// compatibility macros
-#define mul(a,b) (b*a)
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float3x3 mat3x3
-#define float4x3 mat4x3
-#define texture_size params.SourceSize
-#define video_size param.SourceSize
-#define output_size params.OutputSize
-
-#define round(X) floor((X)+0.5)
-
-const float cf2             = 2.0;
-const float cf3             = 4.0;
-const float cf4             = 4.0;
-const float4 eq_threshold   = float4(15.0, 15.0, 15.0, 15.0);
-const float4 eq_threshold2  = float4( 5.0,  5.0,  5.0,  5.0);
-const float4 eq_threshold3  = float4(25.0, 25.0, 25.0, 25.0);
-const float y_weight        = 48.0;
-const float u_weight        = 7.0;
-const float v_weight        = 6.0;
-const float3x3 yuv          = float3x3(0.299, 0.587, 0.114, -0.169, -0.331, 0.499, 0.499, -0.418, -0.0813);
-const float3x3 yuv_weighted = float3x3(y_weight*yuv[0], u_weight*yuv[1], v_weight*yuv[2]);
-const float4 maximo         = float4(255.0, 255.0, 255.0, 255.0);
-
-float4 df(float4 A, float4 B)
-{
-	return float4(abs(A-B));
-}
-
-bool4 rd(float4 A, float4 B, float4 C, float4 D)
-{
-    return greaterThan((df(C,D)/(df(A,B)+0.000000001)) , vec4(2.,2.,2.,2.));
-}
-
-bool4 id(float4 A, float4 B, float4 C, float4 D)
-{
-    return greaterThan(df(C,D) , df(A,B));
-}
-
-float4 remapTo01(float4 v, float4 high)
-{
-	return (v/high);
-}
-
-float4 remapFrom01(float4 v, float4 high)
-{
-	return round(high*v);
-}
-
-
-bool4 eq(float4 A, float4 B)
-{
-	return lessThan(df(A, B) , eq_threshold);
-}
-
-bool4 eq2(float4 A, float4 B)
-{
-	return lessThan(df(A, B) , eq_threshold2);
-}
-
-bool4 eq3(float4 A, float4 B)
-{
-	return lessThan(df(A, B) , eq_threshold3);
-}
-
-float4 weighted_distance(float4 a, float4 b, float4 c, float4 d, float4 e, float4 f, float4 g, float4 h)
-{
-	return (df(a,b) + df(a,c) + df(d,e) + df(d,f) + 4.0*df(g,h));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out vec4 t2;
-layout(location = 3) out vec4 t3;
-layout(location = 4) out vec4 t4;
-layout(location = 5) out vec4 t5;
-layout(location = 6) out vec4 t6;
-layout(location = 7) out vec4 t7;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0004;
-   
-	float2 ps = float2(1.0/texture_size.x, 1.0/texture_size.y);
-	float dx = ps.x;
-	float dy = ps.y;
-
-	//    A1 B1 C1
-	// A0  A  B  C C4
-	// D0  D  E  F F4
-	// G0  G  H  I I4
-	//    G5 H5 I5
-
-	t1 = vTexCoord.xxxy + float4( -dx, 0., dx,-2.0*dy); // A1 B1 C1
-	t2 = vTexCoord.xxxy + float4( -dx, 0., dx,    -dy); //  A  B  C
-	t3 = vTexCoord.xxxy + float4( -dx, 0., dx,      0.); //  D  E  F
-	t4 = vTexCoord.xxxy + float4( -dx, 0., dx,     dy); //  G  H  I
-	t5 = vTexCoord.xxxy + float4( -dx, 0., dx, 2.0*dy); // G5 H5 I5
-	t6 = vTexCoord.xyyy + float4(-2.0*dx,-dy, 0.,  dy); // A0 D0 G0
-	t7 = vTexCoord.xyyy + float4( 2.0*dx,-dy, 0.,  dy); // C4 F4 I4
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in vec4 t2;
-layout(location = 3) in vec4 t3;
-layout(location = 4) in vec4 t4;
-layout(location = 5) in vec4 t5;
-layout(location = 6) in vec4 t6;
-layout(location = 7) in vec4 t7;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D REF;
-
-void main()
-{
-	vec4 PA  = texture(Source, t2.xw);
-	vec4 PB  = texture(Source, t2.yw);
-	vec4 PC  = texture(Source, t2.zw);
-
-	vec4 PD  = texture(Source, t3.xw);
-	vec4 PE  = texture(Source, t3.yw);
-	vec4 PF  = texture(Source, t3.zw);
-
-	vec4 PG  = texture(Source, t4.xw);
-	vec4 PH  = texture(Source, t4.yw);
-	vec4 PI  = texture(Source, t4.zw);
-	
-	vec3 A1 = texture(REF, t1.xw).rgb;
-	vec3 B1 = texture(REF, t1.yw).rgb;
-	vec3 C1 = texture(REF, t1.zw).rgb;
-
-	vec3 A  = texture(REF, t2.xw).rgb;
-	vec3 B  = texture(REF, t2.yw).rgb;
-	vec3 C  = texture(REF, t2.zw).rgb;
-
-	vec3 D  = texture(REF, t3.xw).rgb;
-	vec3 E  = texture(REF, t3.yw).rgb;
-	vec3 F  = texture(REF, t3.zw).rgb;
-
-	vec3 G  = texture(REF, t4.xw).rgb;
-	vec3 H  = texture(REF, t4.yw).rgb;
-	vec3 I  = texture(REF, t4.zw).rgb;
-
-	vec3 G5 = texture(REF, t5.xw).rgb;
-	vec3 H5 = texture(REF, t5.yw).rgb;
-	vec3 I5 = texture(REF, t5.zw).rgb;
-
-	vec3 A0 = texture(REF, t6.xy).rgb;
-	vec3 D0 = texture(REF, t6.xz).rgb;
-	vec3 G0 = texture(REF, t6.xw).rgb;
-
-	vec3 C4 = texture(REF, t7.xy).rgb;
-	vec3 F4 = texture(REF, t7.xz).rgb;
-	vec3 I4 = texture(REF, t7.xw).rgb;
-	
-	float4 b = mul( float4x3(B, D, H, F), yuv_weighted[0] );
-	float4 c = mul( float4x3(C, A, G, I), yuv_weighted[0] );
-	float4 e = mul( float4x3(E, E, E, E), yuv_weighted[0] );
-	float4 d = b.yzwx;
-	float4 f = b.wxyz;
-	float4 g = c.zwxy;
-	float4 h = b.zwxy;
-	float4 i = c.wxyz;
-
-	float4 i4 = mul( float4x3(I4, C1, A0, G5), yuv_weighted[0] );
-	float4 i5 = mul( float4x3(I5, C4, A1, G0), yuv_weighted[0] );
-	float4 h5 = mul( float4x3(H5, F4, B1, D0), yuv_weighted[0] );
-	float4 f4 = h5.yzwx;
-
-	float4 pe = remapFrom01(PE, maximo);
-	float4 pf = remapFrom01(PF, maximo);
-	float4 ph = remapFrom01(PH, maximo);
-	float4 pb = remapFrom01(PB, maximo);
-	float4 pd = remapFrom01(PD, maximo);
-
-	float4 f2 = float4(pf.z, pb.w, pd.x, ph.y);
-	float4 h2 = float4(ph.z, pf.w, pb.x, pd.y);
-	float4 f1 = float4(pf.y, pb.z, pd.w, ph.x);
-	float4 h3 = float4(ph.w, pf.x, pb.y, pd.z);
-
-	bool4 nbrs;	
-//	bool4 nbrs = ((pe.yzwx > 1.0) || (pe.wxyz > 1.0)) ? bool4(true) : bool4(false);
-	nbrs.x =     ((pe.y    > 1.0) || (pe.w    > 1.0));
-	nbrs.y =     ((pe.z    > 1.0) || (pe.x    > 1.0));
-	nbrs.z =     ((pe.w    > 1.0) || (pe.y    > 1.0));
-	nbrs.w =     ((pe.x    > 1.0) || (pe.z    > 1.0));
-
-	bool4 jag1;	
-//	bool4 jag1 = ((f2   > 1.0) || (h2   > 1.0)) ? bool4(true) : bool4(false);
-	jag1.x =     ((f2.x > 1.0) || (h2.x > 1.0));
-	jag1.y =     ((f2.y > 1.0) || (h2.y > 1.0));
-	jag1.z =     ((f2.z > 1.0) || (h2.z > 1.0));
-	jag1.w =     ((f2.w > 1.0) || (h2.w > 1.0));
-
-	bool4 jag2;	
-//	bool4 jag2 = ((f2   > 2.0) || (h2   > 2.0)) ? bool4(true) : bool4(false);
-	jag2.x =     ((f2.x > 2.0) || (h2.x > 2.0));
-	jag2.y =     ((f2.y > 2.0) || (h2.y > 2.0));
-	jag2.z =     ((f2.z > 2.0) || (h2.z > 2.0));
-	jag2.w =     ((f2.w > 2.0) || (h2.w > 2.0));
-
-	bool4 jag3;	
-//	bool4 jag3 = ((f2   > 4.0) || (h2   > 4.0)) ? bool4(true) : bool4(false);
-	jag3.x =     ((f2.x > 4.0) || (h2.x > 4.0));
-	jag3.y =     ((f2.y > 4.0) || (h2.y > 4.0));
-	jag3.z =     ((f2.z > 4.0) || (h2.z > 4.0));
-	jag3.w =     ((f2.w > 4.0) || (h2.w > 4.0));
-	
-//	pe =   (pe   == 7.0 || pe   == 8.0) ? ((jag3  ) ? pe   : (pe   - float(2.0))) : pe;
-	pe.x = (pe.x == 7.0 || pe.x == 8.0) ? ((jag3.x) ? pe.x : (pe.x - float(2.0))) : pe.x;
-	pe.y = (pe.y == 7.0 || pe.y == 8.0) ? ((jag3.y) ? pe.y : (pe.y - float(2.0))) : pe.y;
-	pe.z = (pe.z == 7.0 || pe.z == 8.0) ? ((jag3.z) ? pe.z : (pe.z - float(2.0))) : pe.z;
-	pe.w = (pe.w == 7.0 || pe.w == 8.0) ? ((jag3.w) ? pe.w : (pe.w - float(2.0))) : pe.w;
-	
-//	pe =   (pe   == 5.0 || pe   == 6.0) ? ((jag2  ) ? pe   : (pe   - float(2.0))) : pe;
-	pe.x = (pe.x == 5.0 || pe.x == 6.0) ? ((jag2.x) ? pe.x : (pe.x - float(2.0))) : pe.x;
-	pe.y = (pe.y == 5.0 || pe.y == 6.0) ? ((jag2.y) ? pe.y : (pe.y - float(2.0))) : pe.y;
-	pe.z = (pe.z == 5.0 || pe.z == 6.0) ? ((jag2.z) ? pe.z : (pe.z - float(2.0))) : pe.z;
-	pe.w = (pe.w == 5.0 || pe.w == 6.0) ? ((jag2.w) ? pe.w : (pe.w - float(2.0))) : pe.w;
-
-	bool4 jag91;	
-//	bool4 jag91 = ((id(h,i,e,h)   || id(i4,i,f4,i4)  ) && (f2   > 1.0) && (f1   > 1.0));
-	jag91.x =     ((id(h,i,e,h).x || id(i4,i,f4,i4).x) && (f2.x > 1.0) && (f1.x > 1.0));
-	jag91.y =     ((id(h,i,e,h).y || id(i4,i,f4,i4).y) && (f2.y > 1.0) && (f1.y > 1.0));
-	jag91.z =     ((id(h,i,e,h).z || id(i4,i,f4,i4).z) && (f2.z > 1.0) && (f1.z > 1.0));
-	jag91.w =     ((id(h,i,e,h).w || id(i4,i,f4,i4).w) && (f2.w > 1.0) && (f1.w > 1.0));
-
-	bool4 jag92;
-//	bool4 jag92 = ((id(f,i,e,f)   || id(i5,i,h5,i5)  ) && (h2   > 1.0) && (h3   > 1.0));
-	jag92.x =     ((id(f,i,e,f).x || id(i5,i,h5,i5).x) && (h2.x > 1.0) && (h3.x > 1.0));
-	jag92.y =     ((id(f,i,e,f).y || id(i5,i,h5,i5).y) && (h2.y > 1.0) && (h3.y > 1.0));
-	jag92.z =     ((id(f,i,e,f).z || id(i5,i,h5,i5).z) && (h2.z > 1.0) && (h3.z > 1.0));
-	jag92.w =     ((id(f,i,e,f).w || id(i5,i,h5,i5).w) && (h2.w > 1.0) && (h3.w > 1.0));
-	
-	bvec4 jag93 = ( rd(h,g,e,g));
-	bvec4 jag94 = ( rd(f,c,e,c));
-
-	bool4 jag9;
-//	bool4 jag9  = (!(jag91   && jag93   || jag92   && jag94  ));
-	jag9.x =      (!(jag91.x && jag93.x || jag92.x && jag94.x));
-	jag9.y =      (!(jag91.y && jag93.y || jag92.y && jag94.y));
-	jag9.z =      (!(jag91.z && jag93.z || jag92.z && jag94.z));
-	jag9.w =      (!(jag91.w && jag93.w || jag92.w && jag94.w));
-
-//	pe   = ((pe   == 0.0) || (!nbrs   || jag1  ) && jag9  ) ? pe   : float4(1.0);
-	pe.x = ((pe.x == 0.0) || (!nbrs.x || jag1.x) && jag9.x) ? pe.x :  float(1.0);
-	pe.y = ((pe.y == 0.0) || (!nbrs.y || jag1.y) && jag9.y) ? pe.y :  float(1.0);
-	pe.z = ((pe.z == 0.0) || (!nbrs.z || jag1.z) && jag9.z) ? pe.z :  float(1.0);
-	pe.w = ((pe.w == 0.0) || (!nbrs.w || jag1.w) && jag9.w) ? pe.w :  float(1.0);
-	
-	FragColor = vec4(remapTo01(pe, maximo));
-}
diff --git a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang
deleted file mode 100644
index 63e893ccc5..0000000000
--- a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang
+++ /dev/null
@@ -1,259 +0,0 @@
-#version 450
-
-/*
-
-   Hyllian's xBR MultiLevel4 Shader - Pass3
-   
-   Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 REFSize;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// compatibility macros
-#define mul(a,b) (b*a)
-#define saturate(c) clamp(c, 0.0, 1.0)
-#define frac(x) (fract(x))
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float3x3 mat3x3
-#define float4x3 mat4x3
-#define float2x4 mat2x4
-#define texture_size params.SourceSize
-#define video_size params.SourceSize
-#define output_size params.OutputSize
-
-#define round(X) floor((X)+0.5)
-
-const float coef            = 2.0;
-const float cf              = 4.0;
-const float eq_threshold    = 15.0;
-const float y_weight        = 48.0;
-const float u_weight        = 7.0;
-const float v_weight        = 6.0;
-const float3x3 yuv          = float3x3(0.299, 0.587, 0.114, -0.169, -0.331, 0.499, 0.499, -0.418, -0.0813);
-const float3x3 yuv_weighted = float3x3(y_weight*yuv[0], u_weight*yuv[1], v_weight*yuv[2]);
-const float4 maximo         = float4(255.0, 255.0, 255.0, 255.0);
-const float4 low            = float4(-64.0, -64.0, -64.0, -64.0);
-const float4 high           = float4( 64.0,  64.0,  64.0,  64.0);
-
-
-const float2x4 sym_vectors  = float2x4(1.,  1.,   -1., -1.,    1., -1.,   -1.,  1.);
-
-// Bx, Ay, C
-const float3 lines[13] = float3[](
-   float3(4.0, 4.0, 4.0),  //  0  NL
-   float3(4.0, 4.0, 3.0),  //  1  LV0
-   float3(4.0, 4.0, 2.0),  //  2  LV1
-   float3(8.0, 4.0, 2.0),  //  3  LV2u
-   float3(4.0, 8.0, 2.0),  //  4  LV2l
-  float3(12.0, 4.0, 2.0),  //  5  LV3u
-   float3(4.0,12.0, 2.0),  //  6  LV3l
-  float3(16.0, 4.0, 2.0),  //  7  LV4u
-   float3(4.0,16.0, 2.0),  //  8  LV4l
-
-  float3(12.0, 4.0, 6.0),  //  9  LV3u
-   float3(4.0,12.0, 6.0),  // 10  LV3l
-  float3(16.0, 4.0, 6.0),  // 11  LV4u
-   float3(4.0,16.0, 6.0)  // 12  LV4l
-);
-
-float4 remapTo01(float4 v, float4 low, float4 high)
-{
-	return saturate((v - low)/(high-low));
-}
-
-float remapFrom01(float v, float high)
-{
-	return round(high*v);
-}
-
-float df(float A, float B)
-{
-	return abs(A-B);
-}
-
-bool eq(float A, float B)
-{
-	return (df(A, B) < eq_threshold);
-}
-
-float weighted_distance(float a, float b, float c, float d, float e, float f, float g, float h)
-{
-	return (df(a,b) + df(a,c) + df(d,e) + df(d,f) + 4.0*df(g,h));
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0004;
-	float2 ps = float2(1.0/params.REFSize.x, 1.0/params.REFSize.y);
-	float dx = ps.x;
-	float dy = ps.y;
-
-	//      A3 B3 C3
-	//      A1 B1 C1
-	//A2 A0  A  B  C C4 C6
-	//D2 D0  D  E  F F4 F6
-	//G2 G0  G  H  I I4 I6
-	//      G5 H5 I5
-	//      G7 H7 I7
-
-	t1       = float4(dx, 0., 0., dy);  // F  H
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D REF;
-
-void main()
-{
-	float px;
-
-	float2 pos = frac(vTexCoord*params.REFSize.xy)-float2(0.5, 0.5); // pos = pixel position
-	float2 dir = sign(pos); // dir = pixel direction
-
-	float2 g1 = dir*( saturate(-dir.y*dir.x)*t1.zw + saturate( dir.y*dir.x)*t1.xy);
-	float2 g2 = dir*( saturate( dir.y*dir.x)*t1.zw + saturate(-dir.y*dir.x)*t1.xy);
-
-	float3 E   = texture(REF, vTexCoord    ).rgb;
-	float3 F   = texture(REF, vTexCoord +g1).rgb;
-	float3 H   = texture(REF, vTexCoord +g2).rgb;
-	float3 I   = texture(REF, vTexCoord +g1+g2).rgb;
-	float3 F4  = texture(REF, vTexCoord +2.0*g1).rgb;
-	float3 H5  = texture(REF, vTexCoord +2.0*g2).rgb;
-
-	float e = dot(E, yuv_weighted[0]);
-	float f = dot(F, yuv_weighted[0]);
-	float h = dot(H, yuv_weighted[0]);
-	float i = dot(I, yuv_weighted[0]);
-	float f4= dot(F4, yuv_weighted[0]);
-	float h5= dot(H5, yuv_weighted[0]);
-
-	float4 icomp    = round(saturate(mul(dir, sym_vectors))); // choose info component
-
-	float  infoE    = remapFrom01(dot(texture(Source, vTexCoord   ), icomp), 255.0); // retrieve 1st pass info
-	float  infoF    = remapFrom01(dot(texture(Source, vTexCoord+g1), icomp), 255.0); // 1st pass info from neighbor r
-	float  infoH    = remapFrom01(dot(texture(Source, vTexCoord+g2), icomp), 255.0); // 1st pass info from neighbor d
-
-	float4 lparam;
-	float2 addr;
-
-	if (infoF == 8.0)
-	{
-		lparam.xyz = lines[12];
-		px = float(df(f,f4) <= df(f,i));
-		addr.x = 2.*px + saturate(1.0-px);
-		addr.y = saturate(1.0-px);
-	}
-	else if (infoH == 7.0)
-	{
-		lparam.xyz = lines[11];
-		px = float(df(h,h5) <= df(h,i));
-		addr.x = saturate(1.0-px);
-		addr.y = 2.*px + saturate(1.0-px);
-	}
-	else if (infoF == 6.0)
-	{
-		lparam.xyz = lines[10];
-		px = float(df(f,f4) <= df(f,i));
-		addr.x = 2.*px + saturate(1.0-px);
-		addr.y = saturate(1.0-px);
-	}
-	else if (infoH == 5.0)
-	{
-		lparam.xyz = lines[9];
-		px = float(df(h,h5) <= df(h,i));
-		addr.x = saturate(1.0-px);
-		addr.y = 2.*px + saturate(1.0-px);
-	}
-	else
-	{
-		px = float(df(e,f) <= df(e,h));
-		addr.x = px;
-		addr.y = saturate(1.0-px);
-
-		lparam.xyz = (infoE == 8.0) ? lines[8] : ((infoE == 7.0) ? lines[7] : ((infoE == 6.0) ? lines[6] : ((infoE == 5.0) ? lines[5] : ((infoE == 4.0) ? lines[4] : ((infoE == 3.0) ? lines[3] : ((infoE == 2.0) ? lines[2] : ((infoE == 1.0) ? lines[1] : lines[0])))))));
-	}
-
-	bool inv = (dir.x*dir.y) < 0.0 ? true : false;
-
-	// Rotate address from relative to absolute.
-	addr = addr*dir.yx;
-	addr = inv ? addr.yx : addr;
-
-	// Rotate straight line equation from relative to absolute.
-	lparam.xy = lparam.xy*dir.yx;
-	lparam.xy = inv ? lparam.yx : lparam.xy;
-
-	addr.x+=2.0;
-	addr.y+=2.0;
-
-	lparam.w = addr.x*8.0 + addr.y;
-
-    FragColor = float4(remapTo01(lparam, low, high));
-}
-
-/*
-19 1
-9  1
-4  0
-2  0
-1  1
-0  0
-
-0 0000   ND
-1 0001   EDR0
-2 0010   EDR
-3 0011   EDRU
-4 0100   EDRL
-5 0101   EDRU3
-6 0110   EDRL3
-
-0   1 2 3 4
--2 -1 0 1 2
-
-*/
diff --git a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang
deleted file mode 100644
index 6a0bb58959..0000000000
--- a/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang
+++ /dev/null
@@ -1,205 +0,0 @@
-#version 450
-
-/*
-
-   Hyllian's xBR MultiLevel4 Shader - Pass4
-   
-   Copyright (C) 2011-2015 Hyllian - sergiogdb@gmail.com
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 REFSize;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// compatibility macros
-#define mul(a,b) (b*a)
-#define lerp(a,b,c) mix(a,b,c)
-#define saturate(c) clamp(c, 0.0, 1.0)
-#define frac(x) (fract(x))
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float3x3 mat3x3
-#define float4x3 mat4x3
-#define float2x4 mat2x4
-#define texture_size params.SourceSize
-#define video_size params.SourceSize
-#define output_size params.OutputSize
-
-#define round(X) floor((X)+0.5)
-
-const float3 bin            = float3( 4.0,  2.0,  1.0);
-const float4 low            = float4(-64.0, -64.0, -64.0, -64.0);
-const float4 high           = float4( 64.0,  64.0,  64.0,  64.0);
-
-const float2x4 sym_vectors  = float2x4(1.,  1.,   -1., -1.,    1., -1.,   -1.,  1.);
-
-float4 remapFrom01(float4 v, float4 low, float4 high)
-{
-	return round(lerp(low, high, v));
-}
-
-float c_df(float3 c1, float3 c2)
-{
-	float3 df = abs(c1 - c2);
-	return df.r + df.g + df.b;
-}
-
-
-float4 unpack_info(float i)
-{
-	float4 info;
-	info.x = round(modf(i/2.0, i));
-	info.y = round(modf(i/2.0, i));
-	info.z = round(modf(i/2.0, i));
-	info.w = i;
-
-	return info;
-}
-
-
-float df(float A, float B)
-{
-	return abs(A-B);
-}
-
-#define GET_PIXEL(PARAM, PIXEL)\
-	info = PARAM;\
-	ay.z = round(  modf( info/1.9999, info )  );\
-	ay.y = round(  modf( info/1.9999, info )  );\
-	ay.x = round(  modf( info/1.9999, info )  );\
-	ax.z = round(  modf( info/1.9999, info )  );\
-	ax.y = round(  modf( info/1.9999, info )  );\
-	ax.x = round(  info  );\
-	iq.x = dot( ax, bin ) - 1.9999;\
-	iq.y = dot( ay, bin ) - 1.9999;\
-	PIXEL = texture( REF, vTexCoord + iq.x*t1.xy + iq.y*t1.zw ).xyz;\
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 t1;
-layout(location = 2) out float scale_factor;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-	float2 ps = float2(1.0/params.REFSize.x, 1.0/params.REFSize.y);
-	float dx = ps.x;
-	float dy = ps.y;
-
-	//      A3 B3 C3
-	//      A1 B1 C1
-	//A2 A0  A  B  C C4 C6
-	//D2 D0  D  E  F F4 F6
-	//G2 G0  G  H  I I4 I6
-	//      G5 H5 I5
-	//      G7 H7 I7
-
-	t1           = float4(dx, 0., 0., dy);  // F  H
-	scale_factor = output_size.x/params.REFSize.x;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 t1;
-layout(location = 2) in float scale_factor;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D REF;
-
-void main()
-{
-	float2 fp = frac( vTexCoord*params.REFSize.xy ) - float2( 0.5, 0.5 ); // pos = pixel position
-
-	float2 pxcoord = floor(vTexCoord*params.REFSize.xy)/params.REFSize.xy;
-
-	float4 UL = texture(Source, pxcoord + 0.25*t1.xy + 0.25*t1.zw );
-	float4 UR = texture(Source, pxcoord + 0.75*t1.xy + 0.25*t1.zw );
-	float4 DL = texture(Source, pxcoord + 0.25*t1.xy + 0.75*t1.zw );
-	float4 DR = texture(Source, pxcoord + 0.75*t1.xy + 0.75*t1.zw );
-
-	float4 ulparam = remapFrom01( UL, low, high ); // retrieve 1st pass info
-	float4 urparam = remapFrom01( UR, low, high ); // retrieve 1st pass info
-	float4 dlparam = remapFrom01( DL, low, high ); // retrieve 1st pass info
-	float4 drparam = remapFrom01( DR, low, high ); // retrieve 1st pass info
-
-	float3 E = texture( REF, vTexCoord ).xyz;
-
-	float3 ax, ay, PX, PY, PZ, PW;
-	float info;
-	float2 iq;
-
-#ifdef DEBUG
-	PX = unpack_info(ulparam.w).xyz;
-	PY = unpack_info(urparam.w).xyz;
-	PZ = unpack_info(dlparam.w).xyz;
-	PW = unpack_info(drparam.w).xyz;
-#else	
-	GET_PIXEL(ulparam.w, PX);
-	GET_PIXEL(urparam.w, PY);
-	GET_PIXEL(dlparam.w, PZ);
-	GET_PIXEL(drparam.w, PW);
-#endif
-
-	float3 fp1 = float3( fp, -1. );
-
-	float3 color;
-	float4 fx;
-
-	float4 inc   = float4(abs(ulparam.x/ulparam.y), abs(urparam.x/urparam.y), abs(dlparam.x/dlparam.y), abs(drparam.x/drparam.y));
-	float4 level = max(inc, 1.0/inc);
-
-	fx.x    = saturate( dot( fp1, ulparam.xyz ) * scale_factor/( 8. * level.x ) + 0.5 );
-	fx.y    = saturate( dot( fp1, urparam.xyz ) * scale_factor/( 8. * level.y ) + 0.5 );
-	fx.z    = saturate( dot( fp1, dlparam.xyz ) * scale_factor/( 8. * level.z ) + 0.5 );
-	fx.w    = saturate( dot( fp1, drparam.xyz ) * scale_factor/( 8. * level.w ) + 0.5 );
-
-	float3 c1, c2, c3, c4;
-
-	c1 = lerp( E, PX, fx.x );
-	c2 = lerp( E, PY, fx.y );
-	c3 = lerp( E, PZ, fx.z );
-	c4 = lerp( E, PW, fx.w );
-
-	color = c1;
-	color = ( (c_df(c2, E) > c_df(color, E)) ) ? c2 : color;
-	color = ( (c_df(c3, E) > c_df(color, E)) ) ? c3 : color;
-	color = ( (c_df(c4, E) > c_df(color, E)) ) ? c4 : color;
-
-    FragColor = float4( color, 1.0 );
-}
diff --git a/edge-smoothing/xbr/super-xbr-fast.slangp b/edge-smoothing/xbr/super-xbr-fast.slangp
deleted file mode 100644
index 222acda487..0000000000
--- a/edge-smoothing/xbr/super-xbr-fast.slangp
+++ /dev/null
@@ -1,40 +0,0 @@
-shaders = "6"
-
-shader0 = "shaders/support/linearize.slang"
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = "source"
-scale0 = "1.000000"
-alias0 = XbrSource
-
-shader1 = "shaders/super-xbr/super-xbr-fast-pass0.slang"
-filter_linear1 = false
-wrap_mode1 = clamp_to_edge
-srgb_framebuffer1 = true
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "shaders/super-xbr/super-xbr-fast-pass1.slang"
-filter_linear2 = false
-wrap_mode2 = clamp_to_edge
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "2.000000"
-
-shader3 = "shaders/super-xbr/super-xbr-fast-pass2.slang"
-filter_linear3 = false
-wrap_mode3 = clamp_to_edge
-srgb_framebuffer3 = true
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = "shaders/super-xbr/custom-jinc2-sharper.slang"
-filter_linear4 = false
-wrap_mode4 = clamp_to_edge
-srgb_framebuffer4 = true
-scale_type4 = "viewport"
-scale4 = "1.000000"
-
-shader5 = "shaders/support/delinearize.slang"
-filter_linear5 = false
-
diff --git a/edge-smoothing/xbr/super-xbr.slangp b/edge-smoothing/xbr/super-xbr.slangp
deleted file mode 100644
index 9eeb6d5ed7..0000000000
--- a/edge-smoothing/xbr/super-xbr.slangp
+++ /dev/null
@@ -1,40 +0,0 @@
-shaders = "6"
-
-shader0 = "shaders/support/linearize.slang"
-filter_linear0 = false
-srgb_framebuffer0 = true
-scale_type0 = "source"
-scale0 = "1.000000"
-alias0 = XbrSource
-
-shader1 = "shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear1 = false
-wrap_mode1 = clamp_to_edge
-srgb_framebuffer1 = true
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear2 = false
-wrap_mode2 = clamp_to_edge
-srgb_framebuffer2 = true
-scale_type2 = "source"
-scale2 = "2.000000"
-
-shader3 = "shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear3 = false
-wrap_mode3 = clamp_to_edge
-srgb_framebuffer3 = true
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = "shaders/super-xbr/custom-jinc2-sharper.slang"
-filter_linear4 = false
-wrap_mode4 = clamp_to_edge
-srgb_framebuffer4 = true
-scale_type4 = "viewport"
-scale4 = "1.000000"
-
-shader5 = "shaders/support/delinearize.slang"
-filter_linear5 = false
-
diff --git a/edge-smoothing/xbr/xbr-lv2-sharp.slangp b/edge-smoothing/xbr/xbr-lv2-sharp.slangp
deleted file mode 100644
index 9e137afa1d..0000000000
--- a/edge-smoothing/xbr/xbr-lv2-sharp.slangp
+++ /dev/null
@@ -1,43 +0,0 @@
-shaders = "6"
-
-shader0 = shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang
-scale_type2 = "source"
-scale2 = "4.000000"
-filter_linear2 = "false"
-
-
-shader3 = shaders/support/b-spline-x.slang
-filter_linear3 = false
-scale_type_x3 = viewport
-scale_type_y3 = source
-scale3 = 1.0
-
-shader4 = shaders/support/b-spline-y.slang
-filter_linear4 = false
-scale_type4 = viewport
-scale4 = 1.0
-
-
-shader5 = shaders/support/delinearize.slang
-scale_type5 = "source"
-scale5 = "1.000000"
-filter_linear5 = "false"
-
-
-parameters = "SMALL_DETAILS;WP4;KA"
-
-SMALL_DETAILS = "1.0"
-WP4 = "0.8"
-KA = "0.35"
-
diff --git a/edge-smoothing/xbr/xbr-lv2.slangp b/edge-smoothing/xbr/xbr-lv2.slangp
deleted file mode 100644
index d01d415547..0000000000
--- a/edge-smoothing/xbr/xbr-lv2.slangp
+++ /dev/null
@@ -1,43 +0,0 @@
-shaders = "6"
-
-shader0 = shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang
-scale_type2 = "source"
-scale2 = "3.000000"
-filter_linear2 = "false"
-
-
-shader3 = shaders/support/b-spline-x.slang
-filter_linear3 = false
-scale_type_x3 = viewport
-scale_type_y3 = source
-scale3 = 1.0
-
-shader4 = shaders/support/b-spline-y.slang
-filter_linear4 = false
-scale_type4 = viewport
-scale4 = 1.0
-
-
-shader5 = shaders/support/delinearize.slang
-scale_type5 = "source"
-scale5 = "1.000000"
-filter_linear5 = "false"
-
-
-parameters = "SMALL_DETAILS;WP4;KA"
-
-SMALL_DETAILS = "1.0"
-WP4 = "0.8"
-KA = "0.35"
-
diff --git a/edge-smoothing/xbr/xbr-lv3-sharp.slangp b/edge-smoothing/xbr/xbr-lv3-sharp.slangp
deleted file mode 100644
index cbfe6982ca..0000000000
--- a/edge-smoothing/xbr/xbr-lv3-sharp.slangp
+++ /dev/null
@@ -1,52 +0,0 @@
-shaders = "8"
-
-shader0 = shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "3.000000"
-alias2 = xbr3x
-
-shader3 = shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-filter_linear3 = "false"
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = shaders/xbr-lv3-multipass/xbr-lv3-pass1b.slang
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "3.000000"
-
-shader5 = shaders/support/b-spline-x.slang
-filter_linear5 = false
-scale_type_x5 = viewport
-scale_type_y5 = source
-scale5 = 1.0
-
-shader6 = shaders/support/b-spline-y.slang
-filter_linear6 = false
-scale_type6 = viewport
-scale6 = 1.0
-
-
-shader7 = shaders/support/delinearize.slang
-scale_type7 = "source"
-scale7 = "1.000000"
-filter_linear7 = "false"
-
-
-parameters = "SMALL_DETAILS;KA;XBR_EQ_THRESHOLD"
-
-SMALL_DETAILS = "1.0"
-KA = "0.35"
-XBR_EQ_THRESHOLD = "0.22"
diff --git a/edge-smoothing/xbr/xbr-lv3.slangp b/edge-smoothing/xbr/xbr-lv3.slangp
deleted file mode 100644
index 623d3e22b0..0000000000
--- a/edge-smoothing/xbr/xbr-lv3.slangp
+++ /dev/null
@@ -1,43 +0,0 @@
-shaders = "6"
-
-shader0 = shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-scale_type2 = "source"
-scale2 = "3.000000"
-filter_linear2 = "false"
-
-
-shader3 = shaders/support/b-spline-x.slang
-filter_linear3 = false
-scale_type_x3 = viewport
-scale_type_y3 = source
-scale3 = 1.0
-
-shader4 = shaders/support/b-spline-y.slang
-filter_linear4 = false
-scale_type4 = viewport
-scale4 = 1.0
-
-
-shader5 = shaders/support/delinearize.slang
-scale_type5 = "source"
-scale5 = "1.000000"
-filter_linear5 = "false"
-
-
-parameters = "SMALL_DETAILS;WP4;KA"
-
-SMALL_DETAILS = "1.0"
-WP4 = "0.8"
-KA = "0.22"
-
diff --git a/edge-smoothing/xbrz/4xbrz-linear.slangp b/edge-smoothing/xbrz/4xbrz-linear.slangp
deleted file mode 100644
index 13f4d4a348..0000000000
--- a/edge-smoothing/xbrz/4xbrz-linear.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = shaders/4xbrz.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 4.0
-
-shader1 = ../../stock.slang
-filter_linear1 = true
-scale_type1 = viewport
diff --git a/edge-smoothing/xbrz/5xbrz-linear.slangp b/edge-smoothing/xbrz/5xbrz-linear.slangp
deleted file mode 100644
index 82efbcc32b..0000000000
--- a/edge-smoothing/xbrz/5xbrz-linear.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = shaders/5xbrz.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 5.0
-
-shader1 = ../../stock.slang
-filter_linear1 = true
-scale_type1 = viewport
diff --git a/edge-smoothing/xbrz/6xbrz-linear.slangp b/edge-smoothing/xbrz/6xbrz-linear.slangp
deleted file mode 100644
index c0f3a1d7fe..0000000000
--- a/edge-smoothing/xbrz/6xbrz-linear.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = shaders/6xbrz.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 6.0
-
-shader1 = ../../stock.slang
-filter_linear1 = true
-scale_type1 = viewport
diff --git a/edge-smoothing/xbrz/xbrz-freescale-multipass.slangp b/edge-smoothing/xbrz/xbrz-freescale-multipass.slangp
deleted file mode 100644
index ef4abdbc71..0000000000
--- a/edge-smoothing/xbrz/xbrz-freescale-multipass.slangp
+++ /dev/null
@@ -1,14 +0,0 @@
-shaders = 3
-
-shader0 = ../../stock.slang
-alias0 = xbrz_fs_refpass
-
-shader1 = shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.slang
-filter_linear2 = false
-scale_type2 = viewport
-scale2 = 1.0
diff --git a/edge-smoothing/xsal/4xsal-level2-hq.slangp b/edge-smoothing/xsal/4xsal-level2-hq.slangp
deleted file mode 100644
index 5d3f374d8b..0000000000
--- a/edge-smoothing/xsal/4xsal-level2-hq.slangp
+++ /dev/null
@@ -1,15 +0,0 @@
-shaders = 3
-
-shader0 = shaders/2xsal-level2-hq.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 4.0
-
-shader1 = shaders/2xsal-level2-pass2.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = ../../stock.slang
-filter_linear2 = true
-scale_type2 = viewport
diff --git a/edge-smoothing/xsal/4xsal-level2.slangp b/edge-smoothing/xsal/4xsal-level2.slangp
deleted file mode 100644
index 6b858e075e..0000000000
--- a/edge-smoothing/xsal/4xsal-level2.slangp
+++ /dev/null
@@ -1,15 +0,0 @@
-shaders = 3
-
-shader0 = shaders/2xsal-level2.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 4.0
-
-shader1 = shaders/2xsal-level2-pass2.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = ../../stock.slang
-filter_linear2 = true
-scale_type2 = viewport
diff --git a/edge-smoothing/xsoft/4xsoft.slangp b/edge-smoothing/xsoft/4xsoft.slangp
deleted file mode 100644
index 86a27b0e59..0000000000
--- a/edge-smoothing/xsoft/4xsoft.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-shaders = 4
-
-shader0 = ../../stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 2.0
-scale_y0 = 2.0
-
-shader1 = shaders/4xsoft.slang
-filter_linear1 = false
-scale_type1 = source
-scale_x1 = 2.0
-scale_y1 = 2.0
-
-shader2 = ../../interpolation/shaders/b-spline-x.slang
-filter_linear2 = false
-scale_type_x2 = viewport
-scale_type_y2 = source
-scale2 = 1.0
-
-shader3 = ../../interpolation/shaders/b-spline-y.slang
-filter_linear3 = false
-scale_type3 = viewport
diff --git a/edge-smoothing/xsoft/4xsoftSdB.slangp b/edge-smoothing/xsoft/4xsoftSdB.slangp
deleted file mode 100644
index 371f104ff7..0000000000
--- a/edge-smoothing/xsoft/4xsoftSdB.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-shaders = 4
-
-shader0 = ../../stock.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 2.0
-scale_y0 = 2.0
-
-shader1 = shaders/4xsoftSdB.slang
-filter_linear1 = false
-scale_type1 = source
-scale_x1 = 2.0
-scale_y1 = 2.0
-
-shader2 = ../../interpolation/shaders/b-spline-x.slang
-filter_linear2 = false
-scale_type_x2 = viewport
-scale_type_y2 = source
-scale2 = 1.0
-
-shader3 = ../../interpolation/shaders/b-spline-y.slang
-filter_linear3 = false
-scale_type3 = viewport
diff --git a/film/resources/film_noise1.png b/film/resources/film_noise1.png
deleted file mode 100644
index 9167e9956b..0000000000
Binary files a/film/resources/film_noise1.png and /dev/null differ
diff --git a/film/shaders/film_noise.slang b/film/shaders/film_noise.slang
deleted file mode 100644
index a78e8f606f..0000000000
--- a/film/shaders/film_noise.slang
+++ /dev/null
@@ -1,152 +0,0 @@
-#version 450
-
-// film noise
-// by hunterk
-// license: public domain
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float x_off_r, y_off_r, x_off_g, y_off_g, x_off_b, y_off_b, grain_str,
-	   hotspot, vignette, noise_toggle, jitter, vig_flicker, vig_amt, technicolor;
-} params;
-
-#pragma parameter jitter "Jitter Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter noise_toggle "Film Scratches" 1.0 0.0 1.0 1.0
-#pragma parameter hotspot "Hotspot Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter vignette "Vignette Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter vig_flicker "Vignette Flicker Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter technicolor "Color Shift Intensity" 0.5 0.0 1.0 0.01
-#pragma parameter x_off_r "X Offset Red" 0.12 -1.0 1.0 0.01
-#pragma parameter y_off_r "Y Offset Red" 0.07 -1.0 1.0 0.01
-#pragma parameter x_off_g "X Offset Green" -0.06 -1.0 1.0 0.01
-#pragma parameter y_off_g "Y Offset Green" -0.08 -1.0 1.0 0.01
-#pragma parameter x_off_b "X Offset Blue" -0.11 -1.0 1.0 0.01
-#pragma parameter y_off_b "Y Offset Blue" 0.09 -1.0 1.0 0.01
-#pragma parameter grain_str "Grain Strength" 24.0 0.0 60.0 1.0
-#pragma parameter vig_amt "Vignette Amount" 0.15 0.0 1.0 0.01
-
-#define x_off_r params.x_off_r
-#define x_off_g params.x_off_g
-#define x_off_b params.x_off_b
-#define y_off_r params.y_off_r
-#define y_off_g params.y_off_g
-#define y_off_b params.y_off_b
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-float hash( float n ){
-   return fract(sin(n)*43758.5453123);
-}
-
-// global timer
-float time = mod(params.FrameCount, 4268.);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 centerCoord;
-layout(location = 2) out vec2 noiseCoord;
-layout(location = 3) out float hash_num1;
-layout(location = 4) out float hash_num2;
-layout(location = 5) out float hash_num3;
-layout(location = 6) out float frame_hash;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   
-// move the image to center-origin for consistent deconvergence effects
-   centerCoord = TexCoord - 0.5;
-// jitter on the y-axis
-   centerCoord.y += 0.003 * hash(sin(mod(time, 403.))) * params.jitter;
-   
-// calculate some magic pseudo-random numbers in the vertex for performance reasons
-   hash_num1 = sin(hash(mod(time, 147.0)));
-   hash_num2 = hash(cos(mod(time, 292.0)));
-   hash_num3 = cos(hash(mod(time, 361.0)));
-   frame_hash = hash(time);
-   
-// flip the x/y axes pseudo-randomly to give the noise texture some variety
-   noiseCoord.x = (hash_num1 > 0.15) ? vTexCoord.x : 1.0 - vTexCoord.x;
-   noiseCoord.y = ((hash_num1 + hash_num2 - 0.5) > 0.66) ? vTexCoord.y : 1.0 - vTexCoord.y;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 centerCoord;
-layout(location = 2) in vec2 noiseCoord;
-layout(location = 3) in float hash_num1;
-layout(location = 4) in float hash_num2;
-layout(location = 5) in float hash_num3;
-layout(location = 6) in float frame_hash;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D noise1;
-
-//https://www.shadertoy.com/view/4sXSWs strength= 16.0
-float filmGrain(vec2 uv, float strength, float timer ){       
-   float x = (uv.x + 4.0 ) * (uv.y + 4.0 ) * ((mod(timer, 800.0) + 10.0) * 10.0);
-   return (mod((mod(x, 13.0) + 1.0) * (mod(x, 123.0) + 1.0), 0.01)-0.005) * strength;
-}
-
-const vec3 redfilter = vec3(1.0, 0.0, 0.0);
-const vec3 bluegreenfilter = vec3(0.0, 1.0, 0.7);
-
-void main()
-{
-// a simple calculation for the vignette/hotspot effects
-	vec2 middle = centerCoord;
-	float len = length(middle) / 1.25;
-	float vig = smoothstep(0.0, 1.0 - params.vig_amt, len);
-
-// create the noise/scratching effects from a LUT of actual film noise
-	vec4 film_noise1 = texture(noise1, noiseCoord.xx + (hash_num1 + hash_num3 - 0.85));
-	vec4 film_noise2 = texture(noise1, noiseCoord.xy + (hash_num1 + hash_num2 - 0.85));
-
-// set up color channel offsets / deconvergence
-	vec2 red_coord = (centerCoord + 0.01 * vec2(x_off_r, y_off_r)) + 0.5;
-	vec3 red_light = texture(Source, red_coord).rgb;
-	vec2 green_coord = (centerCoord + 0.01 * vec2(x_off_g, y_off_g)) + 0.5;
-	vec3 green_light = texture(Source, green_coord).rgb;
-	vec2 blue_coord = (centerCoord + 0.01 * vec2(x_off_r, y_off_r)) + 0.5;
-	vec3 blue_light = texture(Source, blue_coord).rgb;
-
-// composite the color channels
-	vec3 film = vec3(red_light.r, green_light.g, blue_light.b);
-	
-// technicolor effect from aybe:
-// https://github.com/aybe/RetroArch-shaders/blob/master/shaders/technicolor1.cg
-	vec3 redrecord = film * redfilter;
-	vec3 bluegreenrecord = film * bluegreenfilter;
-	vec3 rednegative = vec3(redrecord.r);
-	vec3 bluegreennegative = vec3((bluegreenrecord.g + bluegreenrecord.b) / 2.0);
-	vec3 redoutput = rednegative * redfilter;
-	vec3 bluegreenoutput = bluegreennegative * bluegreenfilter;
-	vec3 result = redoutput + bluegreenoutput;
-	film = mix(film, result, vec3(params.technicolor));
-
-// apply film grain
-	film += filmGrain(vTexCoord.xy, params.grain_str, time / 10.);
-
-// apply vignetting and hotspot and vary the size a bit pseudo-randomly
-   float vig_mod = 1.0 + 0.1 * hash_num3 * params.vig_flicker;
-	film *= mix(1.0, 1.0 - vig, params.vignette * vig_mod); // Vignette
-	film += ((1.0 - vig) * 0.2) * params.hotspot * vig_mod; // Hotspot
-
-// Apply noise/scratching effects (or not) pseudo-randomly
-	if (frame_hash > 0.99 && params.noise_toggle > 0.5)
-		FragColor = vec4(mix(film, film_noise1.rgb, film_noise1.a), 1.0);
-	else if (frame_hash < 0.01 && params.noise_toggle > 0.5)
-		FragColor = vec4(mix(film, film_noise2.rgb, film_noise2.a), 1.0);
-	else
-		FragColor = vec4(film, 1.0);
-}
diff --git a/film/technicolor.slangp b/film/technicolor.slangp
deleted file mode 100644
index 5f1f33e61d..0000000000
--- a/film/technicolor.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-shaders = 2
-
-shader0 = ../reshade/shaders/LUT/LUT.slang
-shader1 = shaders/film_noise.slang
-scale_type1 = viewport
-
-textures = "SamplerLUT;noise1;
-
-SamplerLUT = ../reshade/shaders/LUT/cmyk-16.png
-noise1 = resources/film_noise1.png
-SamplerLUT_linear = true
-noise1_linear = true
diff --git a/handheld/agb001.slangp b/handheld/agb001.slangp
deleted file mode 100644
index 04207e9606..0000000000
--- a/handheld/agb001.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = shaders/mgba/agb001.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 4.0
-
-shader1 = ../stock.slang
-filter_linear1 = true
-scale_type1 = viewport
diff --git a/handheld/bandlimit-pixel-gba-color.slangp b/handheld/bandlimit-pixel-gba-color.slangp
deleted file mode 100644
index 4f4ef53bdf..0000000000
--- a/handheld/bandlimit-pixel-gba-color.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 3
-shader0 = shaders/color/gba-color.slang
-shader1 = ../linear/linearize.slang
-shader2 = ../pixel-art-scaling/shaders/bandlimit-pixel.slang
-
-filter_linear1 = false 
-scale_type1 = source
-scale1 = 1.0
-srgb_framebuffer1 = true
-
-filter_linear2 = true
diff --git a/handheld/console-border/gb-dmg-alt.slangp b/handheld/console-border/gb-dmg-alt.slangp
deleted file mode 100644
index 493ce4a1e8..0000000000
--- a/handheld/console-border/gb-dmg-alt.slangp
+++ /dev/null
@@ -1,46 +0,0 @@
-shaders = 6
-shader0 = shader-files/gb-pass0.slang
-shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang
-shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang
-shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang
-shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang
-shader5 = shader-files/gb-pass-5.slang
-
-scale_type0 = viewport
-scale0 = 1
-
-scale_type1 = source
-scale1 = 1
-
-scale_type2 = source
-scale2 = 1
-
-scale_type3 = source
-scale3 = 1
-
-scale_type4 = source
-scale4 = 1
-
-scale_type5 = source
-scale5 = 1
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = false
-filter_linear4 = false
-filter_linear5 = true
-
-textures = COLOR_PALETTE;BACKGROUND;BORDER
-COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png
-COLOR_PALETTE_linear = false
-BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png
-BACKGROUND_linear = true
-BORDER = resources/dmg-border-square-4x.png
-BORDER_linear = true
-
-parameters = "video_scale;grey_balance;response_time;blending_mode"
-video_scale = "4.0"
-grey_balance = 3.0
-response_time = 0.444
-blending_mode = 0.0
diff --git a/handheld/console-border/gb-light-alt.slangp b/handheld/console-border/gb-light-alt.slangp
deleted file mode 100644
index cbc058fae6..0000000000
--- a/handheld/console-border/gb-light-alt.slangp
+++ /dev/null
@@ -1,47 +0,0 @@
-shaders = 6
-shader0 = shader-files/gb-pass0.slang
-shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang
-shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang
-shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang
-shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang
-shader5 = shader-files/gb-pass-5.slang
-
-scale_type0 = viewport
-scale0 = 1
-
-scale_type1 = source
-scale1 = 1
-
-scale_type2 = source
-scale2 = 1
-
-scale_type3 = source
-scale3 = 1
-
-scale_type4 = source
-scale4 = 1
-
-scale_type5 = source
-scale5 = 1
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = false
-filter_linear4 = false
-filter_linear5 = true
-
-textures = COLOR_PALETTE;BACKGROUND;BORDER
-COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png
-COLOR_PALETTE_linear = false
-BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png
-BACKGROUND_linear = true
-BORDER = resources/pocket-border-square-4x.png
-BORDER_linear = true
-
-parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode"
-video_scale = "4.0"
-screen_light = "1.4"
-grey_balance = 3.0
-response_time = 0.444
-blending_mode = 0.0
diff --git a/handheld/console-border/gb-pocket-alt.slangp b/handheld/console-border/gb-pocket-alt.slangp
deleted file mode 100644
index 19624c924f..0000000000
--- a/handheld/console-border/gb-pocket-alt.slangp
+++ /dev/null
@@ -1,46 +0,0 @@
-shaders = 6
-shader0 = shader-files/gb-pass0.slang
-shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang
-shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang
-shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang
-shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang
-shader5 = shader-files/gb-pass-5.slang
-
-scale_type0 = viewport
-scale0 = 1
-
-scale_type1 = source
-scale1 = 1
-
-scale_type2 = source
-scale2 = 1
-
-scale_type3 = source
-scale3 = 1
-
-scale_type4 = source
-scale4 = 1
-
-scale_type5 = source
-scale5 = 1
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = false
-filter_linear4 = false
-filter_linear5 = true
-
-textures = COLOR_PALETTE;BACKGROUND;BORDER
-COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png
-COLOR_PALETTE_linear = false
-BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png
-BACKGROUND_linear = true
-BORDER = resources/pocket-border-square-4x.png
-BORDER_linear = true
-
-parameters = "video_scale;grey_balance;response_time;blending_mode"
-video_scale = "4.0"
-grey_balance = 3.0
-response_time = 0.444
-blending_mode = 0.0
diff --git a/handheld/console-border/gb-pocket.slangp b/handheld/console-border/gb-pocket.slangp
deleted file mode 100644
index 453e709628..0000000000
--- a/handheld/console-border/gb-pocket.slangp
+++ /dev/null
@@ -1,53 +0,0 @@
-shaders = 6
-
-shader0 = shader-files/gb-pass0.slang
-filter_linear0 = false
-scale_type0 = viewport
-scale0 = 1.0
-alias0 = "PASS0"
-
-shader1 = shader-files/gb-pass1.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = "PASS1"
-
-shader2 = shader-files/gb-pass2.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-alias2 = "PASS2"
-
-shader3 = shader-files/gb-pass3.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = "PASS3"
-
-shader4 = shader-files/gb-pass4.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-alias4 = "PASS4"
-
-shader5 = shader-files/gb-pass-5.slang
-filter_linear5 = true
-
-parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity"
-video_scale = "4.0"
-baseline_alpha = "0.03"
-grey_balance = "3.5"
-adjacent_texel_alpha_blending = "0.6"
-contrast = "0.85"
-screen_light = "0.9"
-pixel_opacity = "0.95"
-shadow_opacity = "0.9"
-shadow_offset_x = "-2.0"
-
-textures = COLOR_PALETTE;BACKGROUND;BORDER
-COLOR_PALETTE = resources/pocket-palette.png
-COLOR_PALETTE_linear = false
-BACKGROUND = resources/pocket-background.png
-BACKGROUND_linear = true
-BORDER = resources/pocket-border-square-4x.png
-BORDER_linear = true
diff --git a/handheld/console-border/gba-agb001-color-motionblur.slangp b/handheld/console-border/gba-agb001-color-motionblur.slangp
deleted file mode 100644
index 1880d8619d..0000000000
--- a/handheld/console-border/gba-agb001-color-motionblur.slangp
+++ /dev/null
@@ -1,20 +0,0 @@
-shaders = 4
-
-shader0 = ../../motionblur/shaders/response-time.slang
-filter_linear0 = false
-
-shader1 = ../shaders/mgba/agb001.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 4.0
-
-shader2 = ../shaders/color/gba-color.slang
-filter_linear2 = false
-
-shader3 = shader-files/border-auto-scale.slang
-filter_linear3 = true
-
-textures = BORDER
-
-BORDER = resources/gba-border-square-4x.png
-BORDER_linear = true
diff --git a/handheld/console-border/gba-ags001-color-motionblur.slangp b/handheld/console-border/gba-ags001-color-motionblur.slangp
deleted file mode 100644
index 2f82fcc382..0000000000
--- a/handheld/console-border/gba-ags001-color-motionblur.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-shaders = 5
-
-shader0 = ../../motionblur/shaders/response-time.slang
-filter_linear0 = false
-
-shader1 = ../shaders/mgba/ags001.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 4.0
-
-shader2 = ../shaders/color/gba-color.slang
-filter_linear2 = false
-
-shader3 = ../shaders/mgba/ags001-light.slang
-filter_linear3 = false
-
-shader4 = shader-files/border-auto-scale.slang
-filter_linear4 = true
-
-textures = BORDER
-
-BORDER = resources/gba-border-square-4x.png
-BORDER_linear = true
diff --git a/handheld/console-border/gba-lcd-grid-v2.slangp b/handheld/console-border/gba-lcd-grid-v2.slangp
deleted file mode 100644
index 2661bba917..0000000000
--- a/handheld/console-border/gba-lcd-grid-v2.slangp
+++ /dev/null
@@ -1,35 +0,0 @@
-shaders = 4
-shader0 = ../../motionblur/shaders/response-time.slang
-shader1 = shader-files/lcd-cgwg/lcd-grid-v2.slang
-shader2 = ../shaders/color/gba-color.slang
-shader3 = shader-files/gb-pass-5.slang
-
-scale_type1 = viewport
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = true
-
-textures = BORDER
-
-BORDER = resources/gba-border-square-4x.png
-BORDER_linear = true
-
-parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR;darken_screen"
-video_scale = 4.0
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.6"
-blacklevel = "0"
-ambient = "0"
-BGR = "1"
-darken_screen = "0"
diff --git a/handheld/console-border/gba.slangp b/handheld/console-border/gba.slangp
deleted file mode 100644
index fd918bd72f..0000000000
--- a/handheld/console-border/gba.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-shaders = "4"
-
-shader0 = "../../motionblur/shaders/feedback.slang"
-filter_linear0 = false
-
-shader1 = "../shaders/color/gba-color.slang"
-filter_linear1 = false
-
-shader2 = "shader-files/lcd-cgwg/lcd-grid.slang"
-filter_linear2 = "false"
-scale_type2 = "viewport"
-
-shader3 = "shader-files/gb-pass-5.slang"
-filter_linear3 = "true"
-
-parameters = "video_scale;GRID_STRENGTH;mixfactor"
-video_scale = 4.0
-GRID_STRENGTH = "0.150000"
-mixfactor = "0.50"
-
-textures = "BORDER"
-BORDER = "resources/gba-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/gbc-lcd-grid-v2.slangp b/handheld/console-border/gbc-lcd-grid-v2.slangp
deleted file mode 100644
index 4089f6f43f..0000000000
--- a/handheld/console-border/gbc-lcd-grid-v2.slangp
+++ /dev/null
@@ -1,35 +0,0 @@
-shaders = 4
-shader0 = ../../motionblur/shaders/response-time.slang
-shader1 = shader-files/lcd-cgwg/lcd-grid-v2.slang
-shader2 = ../shaders/color/gbc-color.slang
-shader3 = shader-files/gb-pass-5.slang
-
-scale_type1 = viewport
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = true
-
-textures = BORDER
-
-BORDER = resources/color-border-square-4x.png
-BORDER_linear = true
-
-parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR;lighten_screen"
-video_scale = 4.0
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "1.6"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
-lighten_screen = "0"
diff --git a/handheld/console-border/gbc.slangp b/handheld/console-border/gbc.slangp
deleted file mode 100644
index a124330277..0000000000
--- a/handheld/console-border/gbc.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-shaders = "4"
-
-shader0 = "../../motionblur/shaders/feedback.slang"
-filter_linear0 = false
-
-shader1 = "../shaders/color/gbc-color.slang"
-filter_linear1 = false
-
-shader2 = "shader-files/lcd-cgwg/lcd-grid.slang"
-filter_linear2 = "false"
-scale_type2 = "viewport"
-
-shader3 = "shader-files/gb-pass-5.slang"
-filter_linear3 = "true"
-
-parameters = "video_scale;GRID_STRENGTH;mixfactor"
-video_scale = 4.0
-GRID_STRENGTH = "0.150000"
-mixfactor = "0.50"
-
-textures = "BORDER"
-BORDER = "resources/color-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/gg.slangp b/handheld/console-border/gg.slangp
deleted file mode 100644
index 3da1921ac4..0000000000
--- a/handheld/console-border/gg.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-shaders = "2"
-
-shader0 = "shader-files/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-scale_type0 = viewport
-
-shader1 = "shader-files/gb-pass-5.slang"
-filter_linear1 = "true"
-
-parameters = "video_scale;PAR;GRID_STRENGTH"
-video_scale = 4.0
-PAR = 1.2
-GRID_STRENGTH = "0.050000"
-
-textures = "BORDER"
-BORDER = "resources/gg-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
\ No newline at end of file
diff --git a/handheld/console-border/ngpc.slangp b/handheld/console-border/ngpc.slangp
deleted file mode 100644
index a83e7f8458..0000000000
--- a/handheld/console-border/ngpc.slangp
+++ /dev/null
@@ -1,17 +0,0 @@
-shaders = "2"
-
-shader0 = "shader-files/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-
-shader1 = "shader-files/gb-pass-5.slang"
-filter_linear1 = "true"
-
-parameters = "video_scale"
-video_scale = 4.0
-
-textures = "BORDER"
-BORDER = "resources/ngpc-border-square-4x.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "false"
diff --git a/handheld/console-border/psp.slangp b/handheld/console-border/psp.slangp
deleted file mode 100644
index 23153e3587..0000000000
--- a/handheld/console-border/psp.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-shaders = "2"
-
-shader0 = "shader-files/lcd-cgwg/lcd-grid.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-
-shader1 = "shader-files/gb-pass-5.slang"
-filter_linear1 = "true"
-
-parameters = "video_scale;border_texture_scale;GRID_STRENGTH"
-video_scale = 4.0
-border_texture_scale = 2.4
-GRID_STRENGTH = 0.15
-
-textures = "BORDER"
-BORDER = "resources/psp border.png"
-BORDER_linear = "true"
-BORDER_wrap_mode = "clamp_to_border"
-BORDER_mipmap = "true"
\ No newline at end of file
diff --git a/handheld/console-border/shader-files/border-auto-scale.slang b/handheld/console-border/shader-files/border-auto-scale.slang
deleted file mode 100644
index dbd9ae64f6..0000000000
--- a/handheld/console-border/shader-files/border-auto-scale.slang
+++ /dev/null
@@ -1,52 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	float border_texture_scale;
-	float border_brightness;
-} params;
-
-#pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005
-#pragma parameter bogus_scale_instructions "[SCREEN SIZE]: In previous menu->Change lcd-grid scale->Apply" 0.0 0.0 1.0 1.0
-#pragma parameter border_brightness "Border Brightness" 1.0 0.0 1.0 0.01
-
-vec2 middle	= vec2(0.5, 0.5);
-vec2 screen_ratio = params.OutputSize.xy * params.SourceSize.zw;
-vec2 border_scale = vec2(3200, 1600) * (params.SourceSize.y / params.OriginalSize.y) / params.border_texture_scale;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 tex_border;
-
-void main()
-{
-	gl_Position	=	global.MVP * Position;
-
-	vec2 diff	=	TexCoord.xy - middle;
-	vTexCoord	=	middle + diff * screen_ratio;
-	tex_border	=	middle + diff * params.OutputSize.xy / border_scale;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 tex_border;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D BORDER;
-
-void main()
-{
-	vec4 frame	=	texture(Source, vTexCoord).rgba;
-	vec4 border	=	texture(BORDER, tex_border).rgba;
-	FragColor	=	vec4(mix(frame, border * params.border_brightness, border.a));
-}
diff --git a/handheld/console-border/shader-files/border.slang b/handheld/console-border/shader-files/border.slang
deleted file mode 100644
index c4391a572a..0000000000
--- a/handheld/console-border/shader-files/border.slang
+++ /dev/null
@@ -1,70 +0,0 @@
-#version 450
-
-// Created by inigo quilez - iq/2014
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-// modified for slang border shader by hunterk
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 OriginalSize;
-	vec4 SourceSize;
-	uint FrameCount;
-	float box_scale;
-	float location_x;
-	float location_y;
-	float in_res_x;
-	float in_res_y;
-	float border_on_top;
-	float border_zoom_x;
-	float border_zoom_y;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma parameter box_scale "Image Scale" 4.0 1.0 10.0 1.0
-#pragma parameter location_x "Viewport X Pos." 0.5 0.0 1.0 0.05
-#pragma parameter location_y "Viewport Y Pos." 0.5 0.0 1.0 0.05
-#pragma parameter in_res_x "Viewport Size X" 320.0 100.0 600.0 1.0
-#pragma parameter in_res_y "Viewport Size Y" 240.0 64.0 512.0 1.0
-#pragma parameter border_on_top "Show Viewport" 1.0 0.0 1.0 1.0
-#pragma parameter border_zoom_x "Border Zoom X" 1.0 0.0 4.0 0.01
-#pragma parameter border_zoom_y "Border Zoom Y" 1.0 0.0 4.0 0.01
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 screen_coord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vec2 corrected_size = vec2(params.in_res_x, params.in_res_y);
-   vec2 scale = (params.OutputSize.xy / corrected_size) / params.box_scale;
-   vec2 middle = vec2(params.location_x, params.location_y);
-   vec2 diff = TexCoord.xy - middle;
-   screen_coord = middle + diff * scale;
-   middle = vec2(0.4999, 0.4999);
-   vTexCoord = middle + diff * vec2(params.border_zoom_x, params.border_zoom_y);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 screen_coord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D BORDER;
-
-void main()
-{
-vec4 screen = texture(Source, screen_coord); //the main video screen
-vec4 background = vec4(texture(BORDER, vTexCoord)); //put your background function's output here
-if ( screen_coord.x < 0.9999 && screen_coord.x > 0.0001 && screen_coord.y < 0.9999 && screen_coord.y > 0.0001 && params.border_on_top > 0.5 )
-background.a *= 0.0;
-   FragColor = vec4(mix(screen, background, background.a));
-}
\ No newline at end of file
diff --git a/handheld/console-border/shader-files/gb-pass-5.slang b/handheld/console-border/shader-files/gb-pass-5.slang
deleted file mode 100644
index 536617bb54..0000000000
--- a/handheld/console-border/shader-files/gb-pass-5.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	float video_scale;
-	float border_texture_scale;
-	float border_brightness;
-} params;
-
-#pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0
-#pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005
-#pragma parameter border_brightness "Border Brightness" 1.0 0.0 1.0 0.01
-
-vec2 middle	= vec2(0.5, 0.5);
-vec2 border_scale = vec2(3200, 1600) * params.video_scale / params.border_texture_scale;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 tex_border;
-
-void main()
-{
-	gl_Position	=	global.MVP * Position;
-
-	vTexCoord	=	TexCoord.xy;
-	
-	vec2 diff	=	TexCoord.xy - middle;
-	tex_border	=	middle + diff * params.OutputSize.xy / border_scale;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 tex_border;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D BORDER;
-
-void main()
-{
-	vec4 frame	=	texture(Source, vTexCoord).rgba;
-	vec4 border	=	texture(BORDER, tex_border).rgba;
-	FragColor	=	vec4(mix(frame, border * params.border_brightness, border.a));
-}
diff --git a/handheld/console-border/shader-files/gb-pass4.slang b/handheld/console-border/shader-files/gb-pass4.slang
deleted file mode 100644
index 0155a99d5c..0000000000
--- a/handheld/console-border/shader-files/gb-pass4.slang
+++ /dev/null
@@ -1,161 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 OriginalSize;
-	vec4 SourceSize;
-	vec4 PassOutputSize1;
-	float contrast;
-	float screen_light;
-	float pixel_opacity;
-	float bg_smoothing;
-	float shadow_opacity;
-	float shadow_offset_x;
-	float shadow_offset_y;
-	float screen_offset_x;
-	float screen_offset_y;
-} registers;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-////////////////////////////////////////////////////////////////////////////////
-// Config                                                                     //
-////////////////////////////////////////////////////////////////////////////////
-
-// Useful to fine-tune the colors.
-// Higher values make the "black" color closer to black - [0, 1] [DEFAULT: 0.95]
-#pragma parameter contrast "Contrast" 0.70 0.0 1.0 0.05
-
-// Controls the ambient light of the screen. 
-// Lower values darken the screen - [0, 2] [DEFAULT: 1.00]
-#pragma parameter screen_light "Ambient Screen Light" 0.85 0.0 2.0 0.05
-
-// Controls the opacity of the dot-matrix pixels. 
-// Lower values make pixels more transparent - [0, 1] [DEFAULT: 1.00]
-#pragma parameter pixel_opacity "Pixel Opacity" 0.9 0.01 1.0 0.01
-
-// Higher values suppress changes in background color directly beneath
-// the foreground to improve image clarity - [0, 1] [DEFAULT: 0.75]
-#pragma parameter bg_smoothing "Background Smooth" 0.0 0.0 1.0 0.05
-
-// How strongly shadows affect the background
-// Higher values darken the shadows - [0, 1] [DEFAULT: 0.55]
-#pragma parameter shadow_opacity "Shadow Opacity" 0.90 0.01 1.0 0.01
-
-// How far the shadow should be shifted to the
-// right in pixels - [-infinity, infinity] [DEFAULT: 1.0]
-#pragma parameter shadow_offset_x "Shadow Offset Horiz" -1.5 -5.0 5.0 0.5
-
-// How far the shadow should be shifted
-// down in pixels - [-infinity, infinity] [DEFAULT: 1.5]
-#pragma parameter shadow_offset_y "Shadow Offset Vert" 1.5 -5.0 5.0 0.5
-
-// Screen offset - [-infinity, infinity] [DEFAULT: 0]
-#pragma parameter screen_offset_x "Screen Offset Horiz" 0.0 -5.0 5.0 0.5
-
-// Screen offset - [-infinity, infinity] [DEFAULT: 0]
-#pragma parameter screen_offset_y "Screen Offset Vert" 0.0 -5.0 5.0 0.5      
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// Gameboy Classic Shader v0.2.2                                         //
-//                                                                       //
-// Copyright (C) 2013 Harlequin : unknown92835@gmail.com                 //
-//                                                                       //
-// This program is free software: you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with this program.  If not, see <http://www.gnu.org/licenses/>. //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 texel;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-
-    texel = registers.SourceSize.zw;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Fragment definitions                                                       //
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 texel;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-layout(set = 0, binding = 2) uniform sampler2D PassOutput1;
-layout(set = 0, binding = 3) uniform sampler2D BACKGROUND;
-layout(set = 0, binding = 4) uniform sampler2D COLOR_PALETTE;
-
-#define bg_color texture(COLOR_PALETTE, vec2(0.25, 0.5)) 
-
-// Sample the background color from the palette
-#define shadow_alpha (registers.contrast * registers.shadow_opacity)
-
-// Offset for the shadow
-#define shadow_offset vec2(registers.shadow_offset_x * texel.x, registers.shadow_offset_y * texel.y)    
-
-// Offset for the entire screen
-#define screen_offset vec2(registers.screen_offset_x * texel.x, registers.screen_offset_y * texel.y)   
-
-////////////////////////////////////////////////////////////////////////////////
-// Fragment shader                                                            //
-////////////////////////////////////////////////////////////////////////////////
-
-void main()
-{
-    vec2 tex = floor(registers.PassOutputSize1.xy * vTexCoord);
-    tex = (tex + 0.5) * registers.PassOutputSize1.zw;
-    
-    // Sample all the relevant textures
-    vec4 foreground = texture(PassOutput1, tex - screen_offset);
-    vec4 background = texture(BACKGROUND, vTexCoord);
-    vec4 shadows    = texture(Source, vTexCoord - (shadow_offset + screen_offset));
-    vec4 background_color = bg_color;
-
-    // Foreground and background are blended with the background color
-    foreground *= 1.0;
-	
-    background -= (background - 0.5) * registers.bg_smoothing * float(foreground.a > 0.0);	//suppress drastic background color changes under the foreground to improve clarity
-
-    // Allows for highlights,
-    // background = bg_color when the background color is 0.5 gray
-    background.rgb = clamp(
-        vec3( 
-            bg_color.r + mix(-1.0, 1.0, background.r), 
-            bg_color.g + mix(-1.0, 1.0, background.g), 
-            bg_color.b + mix(-1.0, 1.0, background.b)
-        ), 
-        0.0, 1.0
-    );
-
-    // Shadows are alpha blended with the background
-    vec4 out_color = (shadows * shadows.a * shadow_alpha) + (background * (1.0 - shadows.a * shadow_alpha));  
-
-    // Foreground is alpha blended with the shadowed background
-    out_color = (foreground * foreground.a * (1.0 - foreground.a * foreground.a * registers.contrast))
-		+ (out_color * (registers.screen_light - foreground.a * registers.contrast * registers.pixel_opacity));
-    
-    FragColor = out_color;
-}
diff --git a/handheld/console-border/shader-files/lcd-cgwg/lcd-grid-v2.slang b/handheld/console-border/shader-files/lcd-cgwg/lcd-grid-v2.slang
deleted file mode 100644
index 5232e628c2..0000000000
--- a/handheld/console-border/shader-files/lcd-cgwg/lcd-grid-v2.slang
+++ /dev/null
@@ -1,147 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float RSUBPIX_R;
-    float RSUBPIX_G;
-    float RSUBPIX_B;
-    float GSUBPIX_R;
-    float GSUBPIX_G;
-    float GSUBPIX_B;
-    float BSUBPIX_R;
-    float BSUBPIX_G;
-    float BSUBPIX_B;
-    float gain;
-    float gamma;
-    float blacklevel;
-    float ambient;
-    float BGR;
-    float video_scale, PAR;
-} params;
-
-#pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0
-#pragma parameter PAR "Pixel Aspect Ratio" 1.0 0.0 20.0 0.01
-#pragma parameter RSUBPIX_R  "Colour of R subpixel: R" 1.0 0.0 1.0 0.01
-#pragma parameter RSUBPIX_G  "Colour of R subpixel: G" 0.0 0.0 1.0 0.01
-#pragma parameter RSUBPIX_B  "Colour of R subpixel: B" 0.0 0.0 1.0 0.01
-#pragma parameter GSUBPIX_R  "Colour of G subpixel: R" 0.0 0.0 1.0 0.01
-#pragma parameter GSUBPIX_G  "Colour of G subpixel: G" 1.0 0.0 1.0 0.01
-#pragma parameter GSUBPIX_B  "Colour of G subpixel: B" 0.0 0.0 1.0 0.01
-#pragma parameter BSUBPIX_R  "Colour of B subpixel: R" 0.0 0.0 1.0 0.01
-#pragma parameter BSUBPIX_G  "Colour of B subpixel: G" 0.0 0.0 1.0 0.01
-#pragma parameter BSUBPIX_B  "Colour of B subpixel: B" 1.0 0.0 1.0 0.01
-#pragma parameter gain       "Gain"                    1.0 0.5 2.0 0.05
-#pragma parameter gamma      "LCD Gamma"               3.0 0.5 5.0 0.1
-#pragma parameter blacklevel "Black level"            0.05 0.0 0.5 0.01
-#pragma parameter ambient    "Ambient"                 0.0 0.0 0.5 0.01
-#pragma parameter BGR        "BGR"                     0 0 1 1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#define outgamma 2.2
-
-#define fetch_offset(coord, offset) (pow(vec3(params.gain) * texelFetchOffset(Source, (coord), 0, (offset)).rgb + vec3(params.blacklevel), vec3(params.gamma)) + vec3(params.ambient))
-
-vec2 middle	= vec2(0.5, 0.5);
-vec2 screen_scale = params.video_scale * vec2(params.PAR, 1.0);
-vec2 screen_ratio = global.OutputSize.xy * global.SourceSize.zw / screen_scale;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vec2 diff	= TexCoord.xy - middle;
-	vTexCoord	= middle + diff * screen_ratio;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-// integral of (1 - x^2 - x^4 + x^6)^2
-float coeffs_x[7] = float[](1.0, -2.0/3.0, -1.0/5.0, 4.0/7.0, -1.0/9.0, -2.0/11.0, 1.0/13.0);
-// integral of (1 - 2x^4 + x^6)^2
-float coeffs_y[7] = float[](1.0,      0.0, -4.0/5.0, 2.0/7.0,  4.0/9.0, -4.0/11.0, 1.0/13.0);
-
-float intsmear_func(float z, float coeffs[7])
-{
-    float z2 = z*z;
-    float zn = z;
-    float ret = 0.0;
-    for (int i = 0; i < 7; i++) {
-        ret += zn*coeffs[i];
-        zn *= z2;
-    }
-    return ret;
-}
-
-float intsmear(float x, float dx, float d, float coeffs[7])
-{
-    float zl = clamp((x-dx*0.5)/d,-1.0,1.0);
-    float zh = clamp((x+dx*0.5)/d,-1.0,1.0);
-    return d * ( intsmear_func(zh,coeffs) - intsmear_func(zl,coeffs) )/dx;
-}
-
-void main()
-{
-    if(abs(vTexCoord.x - 0.5) < 0.5 && abs(vTexCoord.y - 0.5) < 0.5)
-    {
-        vec2 texelSize = global.SourceSize.zw;
-        /* float2 range = IN.video_size / (IN.output_size * IN.texture_size); */
-        vec2 range = global.SourceSize.zw / screen_scale;
-
-        vec3 cred   = pow(vec3(params.RSUBPIX_R, params.RSUBPIX_G, params.RSUBPIX_B), vec3(outgamma));
-        vec3 cgreen = pow(vec3(params.GSUBPIX_R, params.GSUBPIX_G, params.GSUBPIX_B), vec3(outgamma));
-        vec3 cblue  = pow(vec3(params.BSUBPIX_R, params.BSUBPIX_G, params.BSUBPIX_B), vec3(outgamma));
-
-        ivec2 tli = ivec2(floor(vTexCoord/texelSize-vec2(0.4999)));
-
-        vec3 lcol, rcol;
-        float subpix = (vTexCoord.x/texelSize.x - 0.4999 - float(tli.x))*3.0;
-        float rsubpix = range.x/texelSize.x * 3.0;
-
-        lcol = vec3(intsmear(subpix+1.0, rsubpix, 1.5, coeffs_x),
-                    intsmear(subpix    , rsubpix, 1.5, coeffs_x),
-                    intsmear(subpix-1.0, rsubpix, 1.5, coeffs_x));
-        rcol = vec3(intsmear(subpix-2.0, rsubpix, 1.5, coeffs_x),
-                    intsmear(subpix-3.0, rsubpix, 1.5, coeffs_x),
-                    intsmear(subpix-4.0, rsubpix, 1.5, coeffs_x));
-
-        if (params.BGR > 0.5) {
-            lcol.rgb = lcol.bgr;
-            rcol.rgb = rcol.bgr;
-        }
-
-        float tcol, bcol;
-        subpix = vTexCoord.y/texelSize.y - 0.4999 - float(tli.y);
-        rsubpix = range.y/texelSize.y;
-        tcol = intsmear(subpix    ,rsubpix, 0.63, coeffs_y);
-        bcol = intsmear(subpix-1.0,rsubpix, 0.63, coeffs_y);
-
-        vec3 topLeftColor     = fetch_offset(tli, ivec2(0,0)) * lcol * vec3(tcol);
-        vec3 bottomRightColor = fetch_offset(tli, ivec2(1,1)) * rcol * vec3(bcol);
-        vec3 bottomLeftColor  = fetch_offset(tli, ivec2(0,1)) * lcol * vec3(bcol);
-        vec3 topRightColor    = fetch_offset(tli, ivec2(1,0)) * rcol * vec3(tcol);
-
-        vec3 averageColor = topLeftColor + bottomRightColor + bottomLeftColor + topRightColor;
-
-        averageColor = mat3(cred, cgreen, cblue) * averageColor;
-
-        FragColor = vec4(pow(averageColor, vec3(1.0/outgamma)),0.0);
-    }
-    else
-    {
-        FragColor = vec4(0.0);
-    }
-}
diff --git a/handheld/console-border/shader-files/lcd-cgwg/lcd-grid.slang b/handheld/console-border/shader-files/lcd-cgwg/lcd-grid.slang
deleted file mode 100644
index 43db41cc69..0000000000
--- a/handheld/console-border/shader-files/lcd-cgwg/lcd-grid.slang
+++ /dev/null
@@ -1,104 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float video_scale, PAR, GRID_STRENGTH, gamma;
-} global;
-
-#pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0
-#pragma parameter PAR "Pixel Aspect Ratio" 1.0 0.0 20.0 0.01
-#pragma parameter GRID_STRENGTH "LCD Grid Strength" 0.05 0.0 1.0 0.01
-#pragma parameter gamma "LCD Input Gamma" 2.2 1.0 5.0 0.1
-
-#define round(x) floor( (x) + 0.5 )
-#define TEX2D(c) pow(texture(Source, (c)), vec4(global.gamma))
-
-vec2 middle	= vec2(0.5, 0.5);
-vec2 screen_scale = global.video_scale * vec2(global.PAR, 1.0);
-vec2 screen_ratio = global.OutputSize.xy * global.SourceSize.zw / screen_scale;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-  gl_Position = global.MVP * Position;
-  vec2 diff	=	TexCoord.xy - middle;
-	vTexCoord	=	(middle + diff * screen_ratio) * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-float intsmear_func(float z)
-{
-  float z2 = z*z;
-  float z4 = z2*z2;
-  float z8 = z4*z4;
-  return z - 2.0/3.0*z*z2 - 1.0/5.0*z*z4 + 4.0/7.0*z*z2*z4 - 1.0/9.0*z*z8
-    - 2.0/11.0*z*z2*z8 + 1.0/13.0*z*z4*z8;
-}
-
-float intsmear(float x, float dx)
-{
-  const float d = 1.5;
-  float zl = clamp((x-dx)/d,-1.0,1.0);
-  float zh = clamp((x+dx)/d,-1.0,1.0);
-  return d * ( intsmear_func(zh) - intsmear_func(zl) )/(2.0*dx);
-}
-
-void main()
-{
-  if(abs(vTexCoord.x - 0.5) < 0.5 && abs(vTexCoord.y - 0.5) < 0.5)
-  {
-    vec2 texelSize = global.SourceSize.zw;
-    vec2 subtexelSize = texelSize / vec2(3.0,1.0);
-    vec2 range;
-    range = global.SourceSize.zw / screen_scale;
-    
-    float left   = vTexCoord.x - texelSize.x*0.5;
-    float top    = vTexCoord.y + range.y;
-    float right  = vTexCoord.x + texelSize.x*0.5;
-    float bottom = vTexCoord.y - range.y;
-    
-    vec4 lcol, rcol;
-    float subpix = mod(vTexCoord.x/subtexelSize.x+1.5,3.0);
-    float rsubpix = range.x/subtexelSize.x;
-    lcol = vec4(intsmear(subpix+1.0,rsubpix),intsmear(subpix    ,rsubpix),
-          intsmear(subpix-1.0,rsubpix),0.0);
-    rcol = vec4(intsmear(subpix-2.0,rsubpix),intsmear(subpix-3.0,rsubpix),
-          intsmear(subpix-4.0,rsubpix),0.0);
-          
-    vec4 topLeftColor     = TEX2D((floor(vec2(left, top)     / texelSize) + 0.5) * texelSize) * lcol;
-    vec4 bottomRightColor = TEX2D((floor(vec2(right, bottom) / texelSize) + 0.5) * texelSize) * rcol;
-    vec4 bottomLeftColor  = TEX2D((floor(vec2(left, bottom)  / texelSize) + 0.5) * texelSize) * lcol;
-    vec4 topRightColor    = TEX2D((floor(vec2(right, top)    / texelSize) + 0.5) * texelSize) * rcol;
-    
-    vec2 border = round(vTexCoord.st/subtexelSize);
-    vec2 bordert = clamp((border+vec2(0.0,+global.GRID_STRENGTH)) * subtexelSize,
-            vec2(left, bottom), vec2(right, top));
-    vec2 borderb = clamp((border+vec2(0.0,-global.GRID_STRENGTH)) * subtexelSize,
-            vec2(left, bottom), vec2(right, top));
-    float totalArea = 2.0 * range.y;  
-
-    vec4 averageColor;
-    averageColor  = ((top - bordert.y)    / totalArea) * topLeftColor;
-    averageColor += ((borderb.y - bottom) / totalArea) * bottomRightColor;
-    averageColor += ((borderb.y - bottom) / totalArea) * bottomLeftColor;
-    averageColor += ((top - bordert.y)    / totalArea) * topRightColor;
-    
-    FragColor = pow(averageColor,vec4(1.0/global.gamma));
-  }
-  else
-  {
-    FragColor = vec4(0.0);
-  }
-}
diff --git a/handheld/ds-hybrid-sabr.slangp b/handheld/ds-hybrid-sabr.slangp
deleted file mode 100644
index 84bb7dd89b..0000000000
--- a/handheld/ds-hybrid-sabr.slangp
+++ /dev/null
@@ -1,17 +0,0 @@
-# This shader requires 16:9 aspect ratio
-# and integer scaling OFF
-
-shaders = 3
-
-shader0 = ../stock.slang
-alias0 = ds_hybrid_view_refpass
-
-shader1 = ../edge-smoothing/sabr/shaders/sabr-v3.0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 2.0
-alias1 = Ref
-
-shader2 = shaders/ds-hybrid-view.slang
-filter_linear2 = true
-scale_type0 = viewport
diff --git a/handheld/ds-hybrid-scalefx.slangp b/handheld/ds-hybrid-scalefx.slangp
deleted file mode 100644
index c3a72a8de9..0000000000
--- a/handheld/ds-hybrid-scalefx.slangp
+++ /dev/null
@@ -1,41 +0,0 @@
-# This shader requires 16:9 aspect ratio
-# and integer scaling OFF
-
-shaders = 7
-
-shader0 = ../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-alias5 = ds_hybrid_view_refpass
-
-shader6 = shaders/ds-hybrid-view.slang
-filter_linear6 = true
-scale_type0 = viewport
diff --git a/handheld/gb-palette-dmg.slangp b/handheld/gb-palette-dmg.slangp
deleted file mode 100644
index b939721fc2..0000000000
--- a/handheld/gb-palette-dmg.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-shaders = 1
-shader0 = shaders/gb-palette/gb-palette.slang
-
-scale_type0 = source
-filter_linear0 = false
-
-textures = COLOR_PALETTE
-COLOR_PALETTE = shaders/gb-palette/resources/palette-dmg.png
-COLOR_PALETTE_linear = false
diff --git a/handheld/gb-palette-light.slangp b/handheld/gb-palette-light.slangp
deleted file mode 100644
index 73a30187d7..0000000000
--- a/handheld/gb-palette-light.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-shaders = 1
-shader0 = shaders/gb-palette/gb-palette.slang
-
-scale_type0 = source
-filter_linear0 = false
-
-textures = COLOR_PALETTE
-COLOR_PALETTE = shaders/gb-palette/resources/palette-light.png
-COLOR_PALETTE_linear = false
diff --git a/handheld/gb-palette-pocket.slangp b/handheld/gb-palette-pocket.slangp
deleted file mode 100644
index 1793aa3fee..0000000000
--- a/handheld/gb-palette-pocket.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-shaders = 1
-shader0 = shaders/gb-palette/gb-palette.slang
-
-scale_type0 = source
-filter_linear0 = false
-
-textures = COLOR_PALETTE
-COLOR_PALETTE = shaders/gb-palette/resources/palette-pocket.png
-COLOR_PALETTE_linear = false
diff --git a/handheld/lcd-grid-v2-gba-color-motionblur.slangp b/handheld/lcd-grid-v2-gba-color-motionblur.slangp
deleted file mode 100644
index 6e4cb9991f..0000000000
--- a/handheld/lcd-grid-v2-gba-color-motionblur.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-shaders = "3"
-
-shader0 = "../motionblur/shaders/response-time.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear1 = "false"
-scale_type1 = "viewport"
-scale1 = "1.0"
-
-shader2 = "shaders/color/gba-color.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR;darken_screen"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.6"
-blacklevel = "0"
-ambient = "0"
-BGR = "1"
-darken_screen = "0"
diff --git a/handheld/lcd-grid-v2-gba-color.slangp b/handheld/lcd-grid-v2-gba-color.slangp
deleted file mode 100644
index 7ba4cd5d1c..0000000000
--- a/handheld/lcd-grid-v2-gba-color.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = "2"
-
-shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-shader1 = "shaders/color/gba-color.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR;darken_screen"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.6"
-blacklevel = "0"
-ambient = "0"
-BGR = "1"
-darken_screen = "0"
diff --git a/handheld/lcd-grid-v2-gbc-color-motionblur.slangp b/handheld/lcd-grid-v2-gbc-color-motionblur.slangp
deleted file mode 100644
index 3c1a56cd8d..0000000000
--- a/handheld/lcd-grid-v2-gbc-color-motionblur.slangp
+++ /dev/null
@@ -1,33 +0,0 @@
-shaders = "3"
-
-shader0 = "../motionblur/shaders/response-time.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear1 = "false"
-scale_type1 = "viewport"
-scale1 = "1.0"
-
-shader2 = "shaders/color/gbc-color.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR;lighten_screen"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "1.6"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
-lighten_screen = "0"
diff --git a/handheld/lcd-grid-v2-gbc-color.slangp b/handheld/lcd-grid-v2-gbc-color.slangp
deleted file mode 100644
index 4adfc9a96b..0000000000
--- a/handheld/lcd-grid-v2-gbc-color.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = "2"
-
-shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-shader1 = "shaders/color/gbc-color.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR;lighten_screen"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "1.6"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
-lighten_screen = "0"
diff --git a/handheld/lcd-grid-v2-nds-color-motionblur.slangp b/handheld/lcd-grid-v2-nds-color-motionblur.slangp
deleted file mode 100644
index bdb55c0d51..0000000000
--- a/handheld/lcd-grid-v2-nds-color-motionblur.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-shaders = "3"
-
-shader0 = "../motionblur/shaders/response-time.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear1 = "false"
-scale_type1 = "viewport"
-scale1 = "1.0"
-
-shader2 = "shaders/color/nds-color.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-nds-color.slangp b/handheld/lcd-grid-v2-nds-color.slangp
deleted file mode 100644
index 1cbb4e26a3..0000000000
--- a/handheld/lcd-grid-v2-nds-color.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = "2"
-
-shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-shader1 = "shaders/color/nds-color.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-palm-color-motionblur.slangp b/handheld/lcd-grid-v2-palm-color-motionblur.slangp
deleted file mode 100644
index a695817db7..0000000000
--- a/handheld/lcd-grid-v2-palm-color-motionblur.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-shaders = "3"
-
-shader0 = "../motionblur/shaders/response-time.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear1 = "false"
-scale_type1 = "viewport"
-scale1 = "1.0"
-
-shader2 = "shaders/color/palm-color.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-palm-color.slangp b/handheld/lcd-grid-v2-palm-color.slangp
deleted file mode 100644
index 897eb335e5..0000000000
--- a/handheld/lcd-grid-v2-palm-color.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = "2"
-
-shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-shader1 = "shaders/color/palm-color.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-psp-color-motionblur.slangp b/handheld/lcd-grid-v2-psp-color-motionblur.slangp
deleted file mode 100644
index 6e0e6e23ab..0000000000
--- a/handheld/lcd-grid-v2-psp-color-motionblur.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-shaders = "3"
-
-shader0 = "../motionblur/shaders/response-time.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear1 = "false"
-scale_type1 = "viewport"
-scale1 = "1.0"
-
-shader2 = "shaders/color/psp-color.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-psp-color.slangp b/handheld/lcd-grid-v2-psp-color.slangp
deleted file mode 100644
index afcd5e73a5..0000000000
--- a/handheld/lcd-grid-v2-psp-color.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = "2"
-
-shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-shader1 = "shaders/color/psp-color.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-sp101-color-motionblur.slangp b/handheld/lcd-grid-v2-sp101-color-motionblur.slangp
deleted file mode 100644
index ea99b0e704..0000000000
--- a/handheld/lcd-grid-v2-sp101-color-motionblur.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-shaders = "3"
-
-shader0 = "../motionblur/shaders/response-time.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear1 = "false"
-scale_type1 = "viewport"
-scale1 = "1.0"
-
-shader2 = "shaders/color/sp101-color.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-sp101-color.slangp b/handheld/lcd-grid-v2-sp101-color.slangp
deleted file mode 100644
index 2699768c4a..0000000000
--- a/handheld/lcd-grid-v2-sp101-color.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = "2"
-
-shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-shader1 = "shaders/color/sp101-color.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-vba-color-motionblur.slangp b/handheld/lcd-grid-v2-vba-color-motionblur.slangp
deleted file mode 100644
index 4987ad918c..0000000000
--- a/handheld/lcd-grid-v2-vba-color-motionblur.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-shaders = "3"
-
-shader0 = "../motionblur/shaders/response-time.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear1 = "false"
-scale_type1 = "viewport"
-scale1 = "1.0"
-
-shader2 = "shaders/color/vba-color.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2-vba-color.slangp b/handheld/lcd-grid-v2-vba-color.slangp
deleted file mode 100644
index 401c09764f..0000000000
--- a/handheld/lcd-grid-v2-vba-color.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = "2"
-
-shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang"
-filter_linear0 = "false"
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-shader1 = "shaders/color/vba-color.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "1"
-RSUBPIX_G = "0"
-RSUBPIX_B = "0"
-GSUBPIX_R = "0"
-GSUBPIX_G = "1"
-GSUBPIX_B = "0"
-BSUBPIX_R = "0"
-BSUBPIX_G = "0"
-BSUBPIX_B = "1"
-gain = "1"
-gamma = "2.2"
-blacklevel = "0"
-ambient = "0"
-BGR = "0"
diff --git a/handheld/lcd-grid-v2.slangp b/handheld/lcd-grid-v2.slangp
deleted file mode 100644
index 1d187d78eb..0000000000
--- a/handheld/lcd-grid-v2.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-shaders = 1
-
-shader0 = shaders/lcd-cgwg/lcd-grid-v2.slang
-filter_linear0 = false
-scale_type0 = "viewport"
-scale0 = "1.0"
-
-parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR"
-RSUBPIX_R = "0.750000"
-RSUBPIX_G = "0.000000"
-RSUBPIX_B = "0.000000"
-GSUBPIX_R = "0.000000"
-GSUBPIX_G = "0.750000"
-GSUBPIX_B = "0.000000"
-BSUBPIX_R = "0.000000"
-BSUBPIX_G = "0.000000"
-BSUBPIX_B = "0.750000"
-gain = "1.500000"
-gamma = "2.200000"
-blacklevel = "0.000000"
-ambient = "0.000000"
-BGR = "0.000000"
diff --git a/handheld/lcd-grid.slangp b/handheld/lcd-grid.slangp
deleted file mode 100644
index 92a58e45e4..0000000000
--- a/handheld/lcd-grid.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/lcd-cgwg/lcd-grid.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/handheld/lcd3x.slangp b/handheld/lcd3x.slangp
deleted file mode 100644
index 91a71e439c..0000000000
--- a/handheld/lcd3x.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/lcd3x.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/handheld/shaders/gb-palette/gb-palette.slang b/handheld/shaders/gb-palette/gb-palette.slang
deleted file mode 100644
index 2d266cb545..0000000000
--- a/handheld/shaders/gb-palette/gb-palette.slang
+++ /dev/null
@@ -1,47 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D COLOR_PALETTE;
-
-void main()
-{
-     //sample the input textures
-
-     vec4 out_color = texture(Source, vTexCoord.xy);
-
-     //input grayscale values:
-     //0.000 black - 0.333 medium gray - 0.667 light gray - 1.000 white
-     //multiply grayscale value by 3 to obtain int value in range [0, 3], acts as index for arrays storing custom palette UV coordinates and alpha value
-
-     vec2 palette_coordinate = vec2(0.5, (abs(1 - out_color.r) * 0.75) + 0.125);	//directly map input grayscale value to color palette y coordinate
-     out_color = vec4(texture(COLOR_PALETTE, palette_coordinate).rgb, ceil(abs(1.0 - out_color.r)));	//sample color from palette, alpha = 1 if color is not transparent
-
-     FragColor = out_color;
-}
diff --git a/handheld/shaders/gb-palette/resources/palette-dmg.png b/handheld/shaders/gb-palette/resources/palette-dmg.png
deleted file mode 100644
index c1de3ca582..0000000000
Binary files a/handheld/shaders/gb-palette/resources/palette-dmg.png and /dev/null differ
diff --git a/handheld/shaders/gb-palette/resources/palette-light.png b/handheld/shaders/gb-palette/resources/palette-light.png
deleted file mode 100644
index a63328954c..0000000000
Binary files a/handheld/shaders/gb-palette/resources/palette-light.png and /dev/null differ
diff --git a/handheld/shaders/gb-palette/resources/palette-pocket.png b/handheld/shaders/gb-palette/resources/palette-pocket.png
deleted file mode 100644
index 78a9e9b2cb..0000000000
Binary files a/handheld/shaders/gb-palette/resources/palette-pocket.png and /dev/null differ
diff --git a/handheld/shaders/lcd-cgwg/lcd-grid-v2.slang b/handheld/shaders/lcd-cgwg/lcd-grid-v2.slang
deleted file mode 100644
index add43b1cbd..0000000000
--- a/handheld/shaders/lcd-cgwg/lcd-grid-v2.slang
+++ /dev/null
@@ -1,132 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float RSUBPIX_R;
-    float RSUBPIX_G;
-    float RSUBPIX_B;
-    float GSUBPIX_R;
-    float GSUBPIX_G;
-    float GSUBPIX_B;
-    float BSUBPIX_R;
-    float BSUBPIX_G;
-    float BSUBPIX_B;
-    float gain;
-    float gamma;
-    float blacklevel;
-    float ambient;
-    float BGR;
-} params;
-
-#pragma parameter RSUBPIX_R  "Colour of R subpixel: R" 1.0 0.0 1.0 0.01
-#pragma parameter RSUBPIX_G  "Colour of R subpixel: G" 0.0 0.0 1.0 0.01
-#pragma parameter RSUBPIX_B  "Colour of R subpixel: B" 0.0 0.0 1.0 0.01
-#pragma parameter GSUBPIX_R  "Colour of G subpixel: R" 0.0 0.0 1.0 0.01
-#pragma parameter GSUBPIX_G  "Colour of G subpixel: G" 1.0 0.0 1.0 0.01
-#pragma parameter GSUBPIX_B  "Colour of G subpixel: B" 0.0 0.0 1.0 0.01
-#pragma parameter BSUBPIX_R  "Colour of B subpixel: R" 0.0 0.0 1.0 0.01
-#pragma parameter BSUBPIX_G  "Colour of B subpixel: G" 0.0 0.0 1.0 0.01
-#pragma parameter BSUBPIX_B  "Colour of B subpixel: B" 1.0 0.0 1.0 0.01
-#pragma parameter gain       "Gain"                    1.0 0.5 2.0 0.05
-#pragma parameter gamma      "LCD Gamma"               3.0 0.5 5.0 0.1
-#pragma parameter blacklevel "Black level"            0.05 0.0 0.5 0.01
-#pragma parameter ambient    "Ambient"                 0.0 0.0 0.5 0.01
-#pragma parameter BGR        "BGR"                     0 0 1 1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#define outgamma 2.2
-
-#define fetch_offset(coord, offset) (pow(vec3(params.gain) * texelFetchOffset(Source, (coord), 0, (offset)).rgb + vec3(params.blacklevel), vec3(params.gamma)) + vec3(params.ambient))
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-// integral of (1 - x^2 - x^4 + x^6)^2
-float coeffs_x[7] = float[](1.0, -2.0/3.0, -1.0/5.0, 4.0/7.0, -1.0/9.0, -2.0/11.0, 1.0/13.0);
-// integral of (1 - 2x^4 + x^6)^2
-float coeffs_y[7] = float[](1.0,      0.0, -4.0/5.0, 2.0/7.0,  4.0/9.0, -4.0/11.0, 1.0/13.0);
-
-float intsmear_func(float z, float coeffs[7])
-{
-    float z2 = z*z;
-    float zn = z;
-    float ret = 0.0;
-    for (int i = 0; i < 7; i++) {
-        ret += zn*coeffs[i];
-        zn *= z2;
-    }
-    return ret;
-}
-
-float intsmear(float x, float dx, float d, float coeffs[7])
-{
-    float zl = clamp((x-dx*0.5)/d,-1.0,1.0);
-    float zh = clamp((x+dx*0.5)/d,-1.0,1.0);
-    return d * ( intsmear_func(zh,coeffs) - intsmear_func(zl,coeffs) )/dx;
-}
-
-void main()
-{
-    vec2 texelSize = global.SourceSize.zw;
-    /* float2 range = IN.video_size / (IN.output_size * IN.texture_size); */
-    vec2 range = global.OutputSize.zw;
-
-    vec3 cred   = pow(vec3(params.RSUBPIX_R, params.RSUBPIX_G, params.RSUBPIX_B), vec3(outgamma));
-    vec3 cgreen = pow(vec3(params.GSUBPIX_R, params.GSUBPIX_G, params.GSUBPIX_B), vec3(outgamma));
-    vec3 cblue  = pow(vec3(params.BSUBPIX_R, params.BSUBPIX_G, params.BSUBPIX_B), vec3(outgamma));
-
-    ivec2 tli = ivec2(floor(vTexCoord/texelSize-vec2(0.4999)));
-
-    vec3 lcol, rcol;
-    float subpix = (vTexCoord.x/texelSize.x - 0.4999 - float(tli.x))*3.0;
-    float rsubpix = range.x/texelSize.x * 3.0;
-
-    lcol = vec3(intsmear(subpix+1.0, rsubpix, 1.5, coeffs_x),
-                intsmear(subpix    , rsubpix, 1.5, coeffs_x),
-                intsmear(subpix-1.0, rsubpix, 1.5, coeffs_x));
-    rcol = vec3(intsmear(subpix-2.0, rsubpix, 1.5, coeffs_x),
-                intsmear(subpix-3.0, rsubpix, 1.5, coeffs_x),
-                intsmear(subpix-4.0, rsubpix, 1.5, coeffs_x));
-
-    if (params.BGR > 0.5) {
-        lcol.rgb = lcol.bgr;
-        rcol.rgb = rcol.bgr;
-    }
-
-    float tcol, bcol;
-    subpix = vTexCoord.y/texelSize.y - 0.4999 - float(tli.y);
-    rsubpix = range.y/texelSize.y;
-    tcol = intsmear(subpix    ,rsubpix, 0.63, coeffs_y);
-    bcol = intsmear(subpix-1.0,rsubpix, 0.63, coeffs_y);
-
-    vec3 topLeftColor     = fetch_offset(tli, ivec2(0,0)) * lcol * vec3(tcol);
-    vec3 bottomRightColor = fetch_offset(tli, ivec2(1,1)) * rcol * vec3(bcol);
-    vec3 bottomLeftColor  = fetch_offset(tli, ivec2(0,1)) * lcol * vec3(bcol);
-    vec3 topRightColor    = fetch_offset(tli, ivec2(1,0)) * rcol * vec3(tcol);
-
-    vec3 averageColor = topLeftColor + bottomRightColor + bottomLeftColor + topRightColor;
-
-    averageColor = mat3(cred, cgreen, cblue) * averageColor;
-
-    FragColor = vec4(pow(averageColor, vec3(1.0/outgamma)),0.0);
-}
diff --git a/handheld/shaders/lcd-cgwg/lcd-grid.slang b/handheld/shaders/lcd-cgwg/lcd-grid.slang
deleted file mode 100644
index 75afbbccaf..0000000000
--- a/handheld/shaders/lcd-cgwg/lcd-grid.slang
+++ /dev/null
@@ -1,90 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float GRID_STRENGTH, gamma;
-} global;
-
-#pragma parameter GRID_STRENGTH "LCD Grid Strength" 0.05 0.0 1.0 0.01
-#pragma parameter gamma "LCD Input Gamma" 2.2 1.0 5.0 0.1
-
-#define round(x) floor( (x) + 0.5 )
-#define TEX2D(c) pow(texture(Source, (c)), vec4(global.gamma))
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-float intsmear_func(float z)
-{
-  float z2 = z*z;
-  float z4 = z2*z2;
-  float z8 = z4*z4;
-  return z - 2.0/3.0*z*z2 - 1.0/5.0*z*z4 + 4.0/7.0*z*z2*z4 - 1.0/9.0*z*z8
-    - 2.0/11.0*z*z2*z8 + 1.0/13.0*z*z4*z8;
-}
-
-float intsmear(float x, float dx)
-{
-  const float d = 1.5;
-  float zl = clamp((x-dx)/d,-1.0,1.0);
-  float zh = clamp((x+dx)/d,-1.0,1.0);
-  return d * ( intsmear_func(zh) - intsmear_func(zl) )/(2.0*dx);
-}
-
-void main()
-{
-  vec2 texelSize = global.SourceSize.zw;
-  vec2 subtexelSize = texelSize / vec2(3.0,1.0);
-  vec2 range;
-  range = global.SourceSize.xy / (global.OutputSize.xy * global.SourceSize.xy);
-  
-  float left   = vTexCoord.x - texelSize.x*0.5;
-  float top    = vTexCoord.y + range.y;
-  float right  = vTexCoord.x + texelSize.x*0.5;
-  float bottom = vTexCoord.y - range.y;
-  
-  vec4 lcol, rcol;
-  float subpix = mod(vTexCoord.x/subtexelSize.x+1.5,3.0);
-  float rsubpix = range.x/subtexelSize.x;
-  lcol = vec4(intsmear(subpix+1.0,rsubpix),intsmear(subpix    ,rsubpix),
-	      intsmear(subpix-1.0,rsubpix),0.0);
-  rcol = vec4(intsmear(subpix-2.0,rsubpix),intsmear(subpix-3.0,rsubpix),
-	      intsmear(subpix-4.0,rsubpix),0.0);
-			  
-  vec4 topLeftColor     = TEX2D((floor(vec2(left, top)     / texelSize) + 0.5) * texelSize) * lcol;
-  vec4 bottomRightColor = TEX2D((floor(vec2(right, bottom) / texelSize) + 0.5) * texelSize) * rcol;
-  vec4 bottomLeftColor  = TEX2D((floor(vec2(left, bottom)  / texelSize) + 0.5) * texelSize) * lcol;
-  vec4 topRightColor    = TEX2D((floor(vec2(right, top)    / texelSize) + 0.5) * texelSize) * rcol;
-  
-  vec2 border = round(vTexCoord.st/subtexelSize);
-  vec2 bordert = clamp((border+vec2(0.0,+global.GRID_STRENGTH)) * subtexelSize,
-		       vec2(left, bottom), vec2(right, top));
-  vec2 borderb = clamp((border+vec2(0.0,-global.GRID_STRENGTH)) * subtexelSize,
-		       vec2(left, bottom), vec2(right, top));
-  float totalArea = 2.0 * range.y;  
-
-   vec4 averageColor;
-  averageColor  = ((top - bordert.y)    / totalArea) * topLeftColor;
-  averageColor += ((borderb.y - bottom) / totalArea) * bottomRightColor;
-  averageColor += ((borderb.y - bottom) / totalArea) * bottomLeftColor;
-  averageColor += ((top - bordert.y)    / totalArea) * topRightColor;
-  
-   FragColor = pow(averageColor,vec4(1.0/global.gamma));
-}
diff --git a/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp b/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
deleted file mode 100644
index 10a87cc9c5..0000000000
--- a/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp
+++ /dev/null
@@ -1,72 +0,0 @@
-shaders = "5"
-feedback_pass = "0"
-
-shader0 = "../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-scale_type0 = source
-scale_x0 = 4.0
-filter_linear0 = false
-scale_y0 = 1.0
-float_framebuffer0 = true
-
-shader1 = "../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-scale_type1 = source
-scale_x1 = 0.75
-scale_y1 = 1.0
-filter_linear1 = true
-
-shader2 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.0"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = "SourceSDR"
-
-shader3 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear3 = "false"
-scale_type3 = "source"
-scale3 = "1.0"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = "SourceHDR"
-
-shader4 = "shaders/crt-sony-megatron.slang"
-filter_linear4 = "false"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-
-hcrt_hdr = "1.000000"
-hcrt_crt_screen_type = "2.000000"
-hcrt_crt_resolution = "0.000000"
-hcrt_expand_gamut = "0.000000"
-hcrt_saturation = "0.450000"
-
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_horizontal_convergence = "0.000000"
-hcrt_green_horizontal_convergence = "0.000000"
-hcrt_blue_horizontal_convergence = "-1.000000"
-
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "1.100000"
-hcrt_red_scanline_attack = "0.850000"
-hcrt_red_scanline_end = "0.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "1.100000"
-hcrt_green_scanline_attack = "0.850000"
-hcrt_green_scanline_end = "0.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "1.100000"
-hcrt_blue_scanline_attack = "0.850000"
-hcrt_blue_scanline_end = "0.000000"
-
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
diff --git a/hdr/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp b/hdr/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
deleted file mode 100644
index 8e66fa74d9..0000000000
--- a/hdr/crt-sony-megatron-bang-olufsen-mx8000-hdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.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-mx8000-sdr.slangp b/hdr/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
deleted file mode 100644
index 42da15aea7..0000000000
--- a/hdr/crt-sony-megatron-bang-olufsen-mx8000-sdr.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.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-default-hdr-NTSC.slangp b/hdr/crt-sony-megatron-default-hdr-NTSC.slangp
deleted file mode 100644
index 44e74ff8a1..0000000000
--- a/hdr/crt-sony-megatron-default-hdr-NTSC.slangp
+++ /dev/null
@@ -1,118 +0,0 @@
-shaders = "9"
-
-shader0 = "../crt/shaders/guest/advanced/stock.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "PrePass0"
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "NPass1"
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "4.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.500000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "../crt/shaders/guest/advanced/custom-fast-sharpen.slang"
-filter_linear4 = "true"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = "NtscPass"
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-
-shader5 = "shaders/crt-guest-advanced-ntsc-pass1a.slang"
-filter_linear5 = "true"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = "Pass1"
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "viewport"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-
-shader6 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear6 = "false"
-scale_type6 = "source"
-scale6 = "1.0"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = "SourceSDR"
-
-shader7 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear7 = "false"
-scale_type7 = "source"
-scale7 = "1.0"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "SourceHDR"
-
-shader8 = "shaders/crt-sony-megatron.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_border"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "false"
-srgb_framebuffer8 = "false"
-
-hcrt_colour_system = "1.000000"
-hcrt_paper_white_nits = "400.000000"
-hcrt_phosphor_set = "3.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-default-hdr.slangp b/hdr/crt-sony-megatron-default-hdr.slangp
deleted file mode 100644
index 877fe85a94..0000000000
--- a/hdr/crt-sony-megatron-default-hdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "1.000000"
-hcrt_paper_white_nits = "400.000000"
-hcrt_phosphor_set = "3.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-gba-gbi-hdr.slangp b/hdr/crt-sony-megatron-gba-gbi-hdr.slangp
deleted file mode 100644
index 812134213b..0000000000
--- a/hdr/crt-sony-megatron-gba-gbi-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron-sammy-atomiswave-hdr.slangp"
-hcrt_crt_screen_type = "0.000000"
-hcrt_crt_resolution = "0.000000"
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
deleted file mode 100644
index c71734162c..0000000000
--- a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.000000"
-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-d-series-AV-36D501-sdr.slangp b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
deleted file mode 100644
index 67fc5ebc63..0000000000
--- a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
+++ /dev/null
@@ -1,21 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_brightness = "0.200000"
-hcrt_contrast = "0.000000"
-hcrt_saturation = "0.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"
diff --git a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
deleted file mode 100644
index 631fe15add..0000000000
--- a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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-TM-H1950CG-sdr.slangp b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
deleted file mode 100644
index 958f1fabd3..0000000000
--- a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_paper_white_nits = "700.000000"
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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-sammy-atomiswave-hdr.slangp b/hdr/crt-sony-megatron-sammy-atomiswave-hdr.slangp
deleted file mode 100644
index 8f76bab8c4..0000000000
--- a/hdr/crt-sony-megatron-sammy-atomiswave-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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-sammy-atomiswave-sdr.slangp b/hdr/crt-sony-megatron-sammy-atomiswave-sdr.slangp
deleted file mode 100644
index c0f86fede4..0000000000
--- a/hdr/crt-sony-megatron-sammy-atomiswave-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.050000"
-hcrt_saturation = "0.450000"
-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-saturated-hdr.slangp b/hdr/crt-sony-megatron-saturated-hdr.slangp
deleted file mode 100644
index 8125f5492a..0000000000
--- a/hdr/crt-sony-megatron-saturated-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_contrast = "0.000000"
-hcrt_brightness = "0.000000"
-hcrt_saturation = "0.450000"
-hcrt_gamma_in = "2.220000"
-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-sega-virtua-fighter-hdr.slangp b/hdr/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
deleted file mode 100644
index b5b6dec57c..0000000000
--- a/hdr/crt-sony-megatron-sega-virtua-fighter-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp b/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
deleted file mode 100644
index 35671c01c6..0000000000
--- a/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_red_vertical_convergence = "0.200000"
-hcrt_green_vertical_convergence = "0.200000"
-hcrt_blue_vertical_convergence = "-0.230000"
-hcrt_red_horizontal_convergence = "0.400000"
-hcrt_green_horizontal_convergence = "-0.250000"
-hcrt_blue_horizontal_convergence = "-0.100000"
-hcrt_red_scanline_min = "1.0000000"
-hcrt_red_scanline_max = "2.000000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "1.000000"
-hcrt_green_scanline_max = "2.000000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "1.000000"
-hcrt_blue_scanline_max = "2.000000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "1.000000"
-hcrt_red_beam_attack = "0.0000000"
-hcrt_green_beam_sharpness = "1.000000"
-hcrt_green_beam_attack = "0.000000"
-hcrt_blue_beam_sharpness = "1.000000"
-hcrt_blue_beam_attack = "0.000000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-sony-pvm-1910-hdr.slangp b/hdr/crt-sony-megatron-sony-pvm-1910-hdr.slangp
deleted file mode 100644
index e9295860be..0000000000
--- a/hdr/crt-sony-megatron-sony-pvm-1910-hdr.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
diff --git a/hdr/crt-sony-megatron-sony-pvm-1910-sdr.slangp b/hdr/crt-sony-megatron-sony-pvm-1910-sdr.slangp
deleted file mode 100644
index 9697126244..0000000000
--- a/hdr/crt-sony-megatron-sony-pvm-1910-sdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_resolution = "0.000000"
-hcrt_colour_system = "3.000000"
-hcrt_brightness = "0.150000"
-hcrt_saturation = "0.100000"
-hcrt_red_vertical_convergence = "0.000000"
-hcrt_green_vertical_convergence = "-0.150000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.400000"
-hcrt_red_scanline_max = "0.750000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.400000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.400000"
-hcrt_blue_scanline_max = "0.750000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.400000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.400000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.400000"
-hcrt_blue_beam_attack = "0.450000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-sony-pvm-20L4-hdr.slangp b/hdr/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
deleted file mode 100644
index 2cd6d68bfa..0000000000
--- a/hdr/crt-sony-megatron-sony-pvm-20L4-hdr.slangp
+++ /dev/null
@@ -1,24 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-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"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-sony-pvm-20L4-sdr.slangp b/hdr/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
deleted file mode 100644
index ae5a9260b4..0000000000
--- a/hdr/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.000000"
-hcrt_crt_resolution = "1.000000"
-hcrt_red_vertical_convergence = "0.100000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.250000"
-hcrt_red_scanline_max = "0.400000"
-hcrt_red_scanline_attack = "0.150000"
-hcrt_green_scanline_min = "0.250000"
-hcrt_green_scanline_max = "0.400000"
-hcrt_green_scanline_attack = "0.150000"
-hcrt_blue_scanline_min = "0.250000"
-hcrt_blue_scanline_max = "0.400000"
-hcrt_blue_scanline_attack = "0.150000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "1.0000000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-sony-pvm-2730-hdr-NTSC.slangp b/hdr/crt-sony-megatron-sony-pvm-2730-hdr-NTSC.slangp
deleted file mode 100644
index e0ef9164eb..0000000000
--- a/hdr/crt-sony-megatron-sony-pvm-2730-hdr-NTSC.slangp
+++ /dev/null
@@ -1,156 +0,0 @@
-shaders = "12"
-
-shader0 = "../crt/shaders/guest/advanced/stock.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "PrePass0"
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "NPass1"
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "4.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.500000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-shader4 = "../crt/shaders/guest/advanced/custom-fast-sharpen.slang"
-filter_linear4 = "true"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = "NtscPass"
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-
-shader5 = "../crt/shaders/guest/advanced/stock.slang"
-filter_linear5 = "true"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "true"
-alias5 = "PrePass"
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-
-shader6 = "../crt/shaders/guest/advanced/stock.slang"
-filter_linear6 = "true"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "true"
-alias6 = "AvgLumPass"
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-scale_type_x6 = "source"
-scale_x6 = "1.000000"
-scale_type_y6 = "source"
-scale_y6 = "1.000000"
-
-shader7 = "../crt/shaders/guest/advanced/stock.slang"
-filter_linear7 = "true"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "LinearizePass"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-
-shader8 = "../crt/shaders/guest/advanced/crt-guest-advanced-ntsc-pass1.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_border"
-mipmap_input8 = "false"
-alias8 = "Pass1"
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "1.000000"
-scale_type_y8 = "source"
-scale_y8 = "1.000000"
-
-shader9 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear9 = "false"
-scale_type9 = "source"
-scale9 = "1.0"
-wrap_mode9 = "clamp_to_border"
-mipmap_input9 = "false"
-alias9 = "SourceSDR"
-
-shader10 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear10 = "false"
-scale_type10 = "source"
-scale10 = "1.0"
-wrap_mode10 = "clamp_to_border"
-mipmap_input10 = "false"
-alias10 = "SourceHDR"
-
-shader11 = "shaders/crt-sony-megatron.slang"
-filter_linear11 = "false"
-wrap_mode11 = "clamp_to_border"
-mipmap_input11 = "false"
-alias11 = ""
-float_framebuffer11 = "false"
-srgb_framebuffer11 = "false"
-
-hcrt_colour_system = "1.000000"
-hcrt_paper_white_nits = "400.000000"
-hcrt_phosphor_set = "3.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-2730-hdr.slangp b/hdr/crt-sony-megatron-sony-pvm-2730-hdr.slangp
deleted file mode 100644
index 28eb3cea7a..0000000000
--- a/hdr/crt-sony-megatron-sony-pvm-2730-hdr.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_colour_system = "1.000000"
-hcrt_paper_white_nits = "400.000000"
-hcrt_phosphor_set = "3.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-2730-sdr.slangp b/hdr/crt-sony-megatron-sony-pvm-2730-sdr.slangp
deleted file mode 100644
index 35c2dd7c7e..0000000000
--- a/hdr/crt-sony-megatron-sony-pvm-2730-sdr.slangp
+++ /dev/null
@@ -1,22 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "3.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-hdr.slangp b/hdr/crt-sony-megatron-toshiba-microfilter-hdr.slangp
deleted file mode 100644
index ce286a9a99..0000000000
--- a/hdr/crt-sony-megatron-toshiba-microfilter-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/hdr/crt-sony-megatron-toshiba-microfilter-sdr.slangp b/hdr/crt-sony-megatron-toshiba-microfilter-sdr.slangp
deleted file mode 100644
index 4d011496f6..0000000000
--- a/hdr/crt-sony-megatron-toshiba-microfilter-sdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
diff --git a/hdr/crt-sony-megatron-viewsonic-A90f+-hdr.slangp b/hdr/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
deleted file mode 100644
index 63c8290638..0000000000
--- a/hdr/crt-sony-megatron-viewsonic-A90f+-hdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-hdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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-A90f+-sdr.slangp b/hdr/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
deleted file mode 100644
index 53f3c803b4..0000000000
--- a/hdr/crt-sony-megatron-viewsonic-A90f+-sdr.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-#reference "shaders/crt-sony-megatron-sdr.slangp"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.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"
diff --git a/hdr/shaders/crt-sony-megatron-hdr-pass.slang b/hdr/shaders/crt-sony-megatron-hdr-pass.slang
deleted file mode 100644
index 0b75ed6dd8..0000000000
--- a/hdr/shaders/crt-sony-megatron-hdr-pass.slang
+++ /dev/null
@@ -1,108 +0,0 @@
-#version 450
-
-/* 
-A shader that tries to emulate a sony PVM type aperture grille screen but with full brightness.
-
-The novel thing about this shader is that it relies on the HDR shaders to brighten up the image so that when 
-we apply this shader which emulates the apperture grille the resulting screen isn't left too dark.  
-
-I think you need at least a DisplayHDR 600 monitor but to get close to CRT levels of brightness I think DisplayHDR 1000.
-
-Please Enable HDR in RetroArch 1.10+
-
-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.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen etc - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make and model are the make and model of the CRT you want.
-
-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
-{
-   // User Settings
-   float hcrt_hdr;
-   float hcrt_max_nits;
-   float hcrt_paper_white_nits;
-   float hcrt_expand_gamut;
-   float hcrt_colour_accurate;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} global;
-
-#include "include/parameters.h"
-
-#define HCRT_HDR                            params.hcrt_hdr
-#define HCRT_MAX_NITS                       params.hcrt_max_nits
-#define HCRT_PAPER_WHITE_NITS               params.hcrt_paper_white_nits
-#define HCRT_EXPAND_GAMUT                   params.hcrt_expand_gamut
-#define HCRT_COLOUR_ACCURATE                params.hcrt_colour_accurate
-
-#define COMPAT_TEXTURE(c, d) texture(c, d)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * vec2(1.00001);  // To resolve rounding issues when sampling
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "include/inverse_tonemap.h"
-#include "include/hdr10.h"
-
-vec3 InverseTonemapConditional(const vec3 linear)
-{
-   if(HCRT_HDR < 1.0f)
-   {
-      return linear;
-   }
-   else
-   {
-      return InverseTonemap(linear, HCRT_MAX_NITS, HCRT_PAPER_WHITE_NITS);
-   }
-}
- 
-void main()
-{
-   vec3 source = COMPAT_TEXTURE(Source, vTexCoord).rgb;
-
-   vec3 hdr_colour   = InverseTonemapConditional(source);
-
-   vec3 transformed_colour;
-
-   if((HCRT_HDR >= 1.0f) && (HCRT_COLOUR_ACCURATE < 1.0f))
-   {
-      const vec3 rec2020  = hdr_colour * k2020Gamuts[uint(HCRT_EXPAND_GAMUT)];
-      transformed_colour  = rec2020 * (HCRT_PAPER_WHITE_NITS / kMaxNitsFor2084);
-   }
-   else
-   {      
-      transformed_colour = hdr_colour;
-   }
-
-   FragColor = vec4(transformed_colour, 1.0);
-}
diff --git a/hdr/shaders/crt-sony-megatron-hdr.slangp b/hdr/shaders/crt-sony-megatron-hdr.slangp
deleted file mode 100644
index 791954d31b..0000000000
--- a/hdr/shaders/crt-sony-megatron-hdr.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-#reference "crt-sony-megatron.slangp"
-
-hcrt_hdr = "1.000000"
\ No newline at end of file
diff --git a/hdr/shaders/crt-sony-megatron-sdr.slangp b/hdr/shaders/crt-sony-megatron-sdr.slangp
deleted file mode 100644
index c0e12ba44e..0000000000
--- a/hdr/shaders/crt-sony-megatron-sdr.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-#reference "crt-sony-megatron.slangp"
-
-hcrt_hdr = "0.000000"
-
diff --git a/hdr/shaders/crt-sony-megatron-source-pass.slang b/hdr/shaders/crt-sony-megatron-source-pass.slang
deleted file mode 100644
index f6175c8f54..0000000000
--- a/hdr/shaders/crt-sony-megatron-source-pass.slang
+++ /dev/null
@@ -1,118 +0,0 @@
-#version 450
-
-/* 
-A shader that tries to emulate a sony PVM type aperture grille screen but with full brightness.
-
-The novel thing about this shader is that it relies on the HDR shaders to brighten up the image so that when 
-we apply this shader which emulates the apperture grille the resulting screen isn't left too dark.  
-
-I think you need at least a DisplayHDR 600 monitor but to get close to CRT levels of brightness I think DisplayHDR 1000.
-
-Please Enable HDR in RetroArch 1.10+
-
-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.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen etc - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make and model are the make and model of the CRT you want.
-
-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;
-   float hcrt_colour_space;
-   float hcrt_max_nits;
-   float hcrt_paper_white_nits;
-   float hcrt_lcd_resolution;
-   float hcrt_lcd_subpixel;
-   float hcrt_colour_system;
-   float hcrt_phosphor_set;
-   float hcrt_expand_gamut;
-   float hcrt_white_temperature_D65;
-   float hcrt_white_temperature_D93;
-   float hcrt_brightness;
-   float hcrt_contrast;
-   float hcrt_saturation;
-   float hcrt_gamma_in;
-   float hcrt_gamma_cutoff;
-   float hcrt_colour_accurate;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} global;
-
-#include "include/parameters.h"
-
-#define HCRT_HDR                            params.hcrt_hdr
-#define HCRT_OUTPUT_COLOUR_SPACE            params.hcrt_colour_space
-#define HCRT_CRT_COLOUR_SYSTEM              params.hcrt_colour_system
-#define HCRT_CRT_PHOSPHOR_SET               params.hcrt_phosphor_set
-#define HCRT_WHITE_TEMPERATURE_D65          params.hcrt_white_temperature_D65
-#define HCRT_WHITE_TEMPERATURE_D93          params.hcrt_white_temperature_D93
-#define HCRT_BRIGHTNESS                     params.hcrt_brightness
-#define HCRT_CONTRAST                       params.hcrt_contrast
-#define HCRT_SATURATION                     params.hcrt_saturation
-#define HCRT_GAMMA_IN                       params.hcrt_gamma_in
-#define HCRT_GAMMA_CUTOFF                   params.hcrt_gamma_cutoff
-#define HCRT_COLOUR_ACCURATE                params.hcrt_colour_accurate
-
-#define COMPAT_TEXTURE(c, d) texture(c, d)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * vec2(1.00001);  // To resolve rounding issues when sampling
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "include/colour_grade.h"
-
-void main()
-{
-   vec3 source = COMPAT_TEXTURE(Source, vTexCoord).rgb;
-
-   const vec3 colour   = ColourGrade(source);
-
-   vec3 transformed_colour;
-
-   if((HCRT_HDR < 1.0f) && (HCRT_COLOUR_ACCURATE < 1.0f))
-   {
-      if(HCRT_OUTPUT_COLOUR_SPACE == 2.0f)
-      {
-         transformed_colour = (colour * k709_to_XYZ) * kXYZ_to_DCIP3; 
-      }
-      else
-      {
-         transformed_colour = colour;
-      }
-   }
-   else
-   {
-      transformed_colour = colour;
-   }
-
-   FragColor = vec4(transformed_colour, 1.0);
-}
diff --git a/hdr/shaders/crt-sony-megatron.slang b/hdr/shaders/crt-sony-megatron.slang
deleted file mode 100644
index ea47bd067d..0000000000
--- a/hdr/shaders/crt-sony-megatron.slang
+++ /dev/null
@@ -1,1697 +0,0 @@
-#version 450
-
-/* 
-A shader that tries to emulate a sony PVM type aperture grille screen but with full brightness.
-
-The novel thing about this shader is that it relies on the HDR shaders to brighten up the image so that when 
-we apply this shader which emulates the apperture grille the resulting screen isn't left too dark.  
-
-I think you need at least a DisplayHDR 600 monitor but to get close to CRT levels of brightness I think DisplayHDR 1000.
-
-Please Enable HDR in RetroArch 1.10+
-
-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.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen etc - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make and model are the make and model of the CRT you want.
-
-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
-
-layout(push_constant) uniform Push
-{
-   // User Settings
-   float hcrt_hdr;
-   float hcrt_colour_space;
-   float hcrt_max_nits;
-   float hcrt_paper_white_nits;
-   float hcrt_expand_gamut;
-   
-   float hcrt_colour_accurate;
-
-   float hcrt_lcd_resolution;
-   float hcrt_lcd_subpixel;
-
-   float hcrt_red_vertical_convergence;
-   float hcrt_green_vertical_convergence;
-   float hcrt_blue_vertical_convergence;
-   float hcrt_red_horizontal_convergence;
-   float hcrt_green_horizontal_convergence;
-   float hcrt_blue_horizontal_convergence;
-
-   // Developer Settings
-   float hcrt_crt_screen_type;
-   float hcrt_crt_resolution;
-
-   // Vertical Settings
-   float hcrt_red_scanline_min;
-   float hcrt_red_scanline_max;
-   float hcrt_red_scanline_attack;
-   float hcrt_green_scanline_min;
-   float hcrt_green_scanline_max;
-   float hcrt_green_scanline_attack;
-   float hcrt_blue_scanline_min;
-   float hcrt_blue_scanline_max;
-   float hcrt_blue_scanline_attack;
-
-   // Horizontal Settings
-   float hcrt_red_beam_sharpness;
-   float hcrt_red_beam_attack;
-   float hcrt_green_beam_sharpness;
-   float hcrt_green_beam_attack;
-   float hcrt_blue_beam_sharpness;
-   float hcrt_blue_beam_attack;
-
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-
-   float hcrt_r709_gamma_out;
-   float hcrt_srgb_gamma_out;
-   float hcrt_p3_gamma_out;
-   float hcrt_r709_gamma_cutoff;
-   float hcrt_srgb_gamma_cutoff;
-
-   float hcrt_h_size;
-   float hcrt_v_size;
-   float hcrt_h_cent;
-   float hcrt_v_cent;
-   float hcrt_pin_phase;
-   float hcrt_pin_amp;
-} global;
-
-#include "include/parameters.h"
-
-#define HCRT_HDR                             params.hcrt_hdr
-#define HCRT_OUTPUT_COLOUR_SPACE             params.hcrt_colour_space
-#define HCRT_MAX_NITS                        params.hcrt_max_nits
-#define HCRT_PAPER_WHITE_NITS                params.hcrt_paper_white_nits
-#define HCRT_EXPAND_GAMUT                    params.hcrt_expand_gamut
-#define HCRT_R709_GAMMA_OUT                  global.hcrt_r709_gamma_out
-#define HCRT_SRGB_GAMMA_OUT                  global.hcrt_srgb_gamma_out
-#define HCRT_P3_GAMMA_OUT                    global.hcrt_p3_gamma_out
-#define HCRT_R709_GAMMA_CUTOFF               global.hcrt_r709_gamma_cutoff
-#define HCRT_SRGB_GAMMA_CUTOFF               global.hcrt_srgb_gamma_cutoff
-#define HCRT_COLOUR_ACCURATE                 params.hcrt_colour_accurate
-
-#define HCRT_LCD_RESOLUTION                  params.hcrt_lcd_resolution 
-#define HCRT_LCD_SUBPIXEL                    params.hcrt_lcd_subpixel
-#define HCRT_RED_VERTICAL_CONVERGENCE        params.hcrt_red_vertical_convergence
-#define HCRT_GREEN_VERTICAL_CONVERGENCE      params.hcrt_green_vertical_convergence
-#define HCRT_BLUE_VERTICAL_CONVERGENCE       params.hcrt_blue_vertical_convergence
-#define HCRT_RED_HORIZONTAL_CONVERGENCE      params.hcrt_red_horizontal_convergence
-#define HCRT_GREEN_HORIZONTAL_CONVERGENCE    params.hcrt_green_horizontal_convergence
-#define HCRT_BLUE_HORIZONTAL_CONVERGENCE     params.hcrt_blue_horizontal_convergence
-
-#define HCRT_CRT_SCREEN_TYPE                 params.hcrt_crt_screen_type
-#define HCRT_CRT_RESOLUTION                  params.hcrt_crt_resolution
-
-#define HCRT_RED_SCANLINE_MIN                params.hcrt_red_scanline_min
-#define HCRT_RED_SCANLINE_MAX                params.hcrt_red_scanline_max
-#define HCRT_RED_SCANLINE_ATTACK             params.hcrt_red_scanline_attack
-#define HCRT_GREEN_SCANLINE_MIN              params.hcrt_green_scanline_min
-#define HCRT_GREEN_SCANLINE_MAX              params.hcrt_green_scanline_max
-#define HCRT_GREEN_SCANLINE_ATTACK           params.hcrt_green_scanline_attack
-#define HCRT_BLUE_SCANLINE_MIN               params.hcrt_blue_scanline_min
-#define HCRT_BLUE_SCANLINE_MAX               params.hcrt_blue_scanline_max
-#define HCRT_BLUE_SCANLINE_ATTACK            params.hcrt_blue_scanline_attack
-
-#define HCRT_RED_BEAM_SHARPNESS              params.hcrt_red_beam_sharpness
-#define HCRT_RED_BEAM_ATTACK                 params.hcrt_red_beam_attack
-#define HCRT_GREEN_BEAM_SHARPNESS            params.hcrt_green_beam_sharpness
-#define HCRT_GREEN_BEAM_ATTACK               params.hcrt_green_beam_attack
-#define HCRT_BLUE_BEAM_SHARPNESS             params.hcrt_blue_beam_sharpness
-#define HCRT_BLUE_BEAM_ATTACK                params.hcrt_blue_beam_attack
-
-#define HCRT_H_SIZE                          global.hcrt_h_size
-#define HCRT_V_SIZE                          global.hcrt_v_size
-#define HCRT_H_CENT                          global.hcrt_h_cent
-#define HCRT_V_CENT                          global.hcrt_v_cent
-#define HCRT_PIN_PHASE                       global.hcrt_pin_phase
-#define HCRT_PIN_AMP                         global.hcrt_pin_amp
-
-#define COMPAT_TEXTURE(c, d) texture(c, d)
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * vec2(1.00001);  // To resolve rounding issues when sampling
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D SourceSDR;
-layout(set = 0, binding = 3) uniform sampler2D SourceHDR;
-
-
-#define kChannelMask          3
-#define kFirstChannelShift    2
-#define kSecondChannelShift   4
-#define kThirdChannelShift    6
-
-#define kRedId   0
-#define kGreenId 1
-#define kBlueId  2
-
-#define kRed     (1 | (kRedId << kFirstChannelShift))
-#define kGreen   (1 | (kGreenId << kFirstChannelShift))
-#define kBlue    (1 | (kBlueId << kFirstChannelShift))
-#define kMagenta (2 | (kRedId << kFirstChannelShift) | (kBlueId << kSecondChannelShift))
-#define kYellow  (2 | (kRedId << kFirstChannelShift) | (kGreenId << kSecondChannelShift))
-#define kCyan    (2 | (kGreenId << kFirstChannelShift) | (kBlueId << kSecondChannelShift))
-#define kWhite   (3 | (kRedId << kFirstChannelShift) | (kGreenId << kSecondChannelShift) | (kBlueId << kThirdChannelShift))
-#define kBlack   0
-
-#define kRedChannel     vec3(1.0, 0.0, 0.0)
-#define kGreenChannel   vec3(0.0, 1.0, 0.0)
-#define kBlueChannel    vec3(0.0, 0.0, 1.0)
-
-const vec3 kColourMask[3] = { kRedChannel, kGreenChannel, kBlueChannel };
-
-#define kApertureGrille    0
-#define kShadowMask        1
-#define kSlotMask          2
-#define kBlackWhiteMask    3
-
-#define kBGRAxis           3
-#define kTVLAxis           4
-#define kResolutionAxis    3
-
-// APERTURE GRILLE MASKS
-
-const float kApertureGrilleMaskSize[kResolutionAxis * kTVLAxis] = { 
-     4.0f, 2.0f, 1.0f, 1.0f ,      // 1080p:   300 TVL, 600 TVL, 800 TVL, 1000 TVL 
-     7.0f, 4.0f, 3.0f, 2.0f ,      // 4K:      300 TVL, 600 TVL, 800 TVL, 1000 TVL   
-    13.0f, 7.0f, 5.0f, 4.0f   };   // 8K:      300 TVL, 600 TVL, 800 TVL, 1000 TVL
-
-// SHADOW MASKS
-
-const float kShadowMaskSizeX[kResolutionAxis * kTVLAxis] = {   6.0f, 2.0f, 1.0f, 1.0f  ,   12.0f, 6.0f, 2.0f, 2.0f  ,   12.0f, 12.0f, 6.0f, 6.0f   }; 
-const float kShadowMaskSizeY[kResolutionAxis * kTVLAxis] = {   4.0f, 2.0f, 1.0f, 1.0f  ,    8.0f, 4.0f, 2.0f, 2.0f  ,    8.0f,  8.0f, 4.0f, 4.0f   }; 
-
-// SLOT MASKS
-
-const float kSlotMaskSizeX[kResolutionAxis * kTVLAxis] = {   4.0f, 2.0f, 1.0f, 1.0f  ,   7.0f, 4.0f, 3.0f, 2.0f  ,   7.0f, 7.0f, 5.0f, 4.0f   }; //1080p: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   4K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   8K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL
-const float kSlotMaskSizeY[kResolutionAxis * kTVLAxis] = {   4.0f, 4.0f, 1.0f, 1.0f  ,   8.0f, 6.0f, 4.0f, 4.0f  ,   6.0f, 6.0f, 4.0f, 4.0f   }; //1080p: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   4K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL   8K: 300 TVL, 600 TVL, 800 TVL, 1000 TVL
-
-
-#include "include/scanline_generation.h"
-#include "include/gamma_correct.h"
-
-#define k1080p     0
-#define k4K        1
-#define k8K        2
-
-#define k300TVL    0
-#define k600TVL    1
-#define k800TVL    2
-#define k1000TVL   3
-
-void main()
-{
-   const uint screen_type           = uint(HCRT_CRT_SCREEN_TYPE);
-   const uint crt_resolution        = uint(HCRT_CRT_RESOLUTION);
-   const uint lcd_resolution        = uint(HCRT_LCD_RESOLUTION);
-   const uint lcd_subpixel_layout   = uint(HCRT_LCD_SUBPIXEL);
-   const vec2 source_size           = global.SourceSize.xy;
-   const vec2 output_size           = global.OutputSize.xy;
-
-   vec2 tex_coord                   = vTexCoord - vec2(0.5f);
-   tex_coord                        = tex_coord * vec2(1.0f + (HCRT_PIN_PHASE * tex_coord.y), 1.0f);
-   tex_coord                        = tex_coord * vec2(HCRT_H_SIZE, HCRT_V_SIZE);
-   tex_coord                        = tex_coord + vec2(0.5f);
-   tex_coord                        = tex_coord + (vec2(HCRT_H_CENT, HCRT_V_CENT) / output_size); 
-
-   const vec2 current_position      = vTexCoord * output_size;
-
-   uint colour_mask = 0;
-
-   switch(screen_type)
-   {
-      case kApertureGrille:
-      {
-         uint mask = uint(floor(mod(current_position.x, kApertureGrilleMaskSize[(lcd_resolution * kTVLAxis) + crt_resolution])));
-
-         switch(lcd_resolution)
-         {
-            case k1080p:
-            { 
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     #define kRGBX             (kRed  << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlack << 12)  
-                     #define kRBGX             (kRed  << 0) | (kBlue  << 4) | (kGreen << 8) | (kBlack << 12)  
-                     #define kBGRX             (kBlue << 0) | (kGreen << 4) | (kRed   << 8) | (kBlack << 12)  
-                     
-                     const uint rgb_mask[kBGRAxis] = { kRGBX, kRBGX, kBGRX };
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;   
-                     
-                     #undef kRGBX           
-                     #undef kRBGX           
-                     #undef kBGRX  
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kMG               (kMagenta << 0) | (kGreen   << 6)  
-                     #define kYB               (kYellow  << 0) | (kBlue    << 6)
-                     #define kGM               (kGreen   << 0) | (kMagenta << 6)
-                     
-                     const uint rgb_mask[kBGRAxis] = { kMG, kYB, kGM };
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 6)) & 0x3F;
-
-                     #undef kMG             
-                     #undef kYB             
-                     #undef kGM
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kWhite;
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kWhite;
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k4K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  {
-                     #define kRRGGBBX          (kRed  << 0) | (kRed  << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20) | (kBlack << 24)   
-                     #define kRRBBGGX          (kRed  << 0) | (kRed  << 4) | (kBlue  << 8) | (kBlue  << 12) | (kGreen << 16) | (kGreen << 20) | (kBlack << 24)    
-                     #define kBBGGRRX          (kBlue << 0) | (kBlue << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20) | (kBlack << 24)    
-                     
-                     const uint rgb_mask[kBGRAxis] = {  kRRGGBBX, kRRBBGGX, kBBGGRRX };
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;  
-                     
-                     #undef kRRGGBBX        
-                     #undef kRRBBGGX       
-                     #undef kBBGGRRX  
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kRGBX             (kRed  << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlack << 12)  
-                     #define kRBGX             (kRed  << 0) | (kBlue  << 4) | (kGreen << 8) | (kBlack << 12)  
-                     #define kBGRX             (kBlue << 0) | (kGreen << 4) | (kRed   << 8) | (kBlack << 12)  
-                     
-                     const uint rgb_mask[kBGRAxis] = { kRGBX, kRBGX, kBGRX };
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;   
-                     
-                     #undef kRGBX           
-                     #undef kRBGX           
-                     #undef kBGRX  
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     #define kBGR              (kBlue  << 0) | (kGreen << 4) | (kRed  << 8) 
-                     #define kGBR              (kGreen << 0) | (kBlue  << 4) | (kRed  << 8)  
-                     #define kRGB              (kRed   << 0) | (kGreen << 4) | (kBlue << 8)  
-                     
-                     const uint rgb_mask[kBGRAxis] = { kBGR, kGBR, kRGB };
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;   
-
-                     #undef kRGB            
-                     #undef kGBR            
-                     #undef kBGR  
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {                     
-                     #define kMG               (kMagenta << 0) | (kGreen   << 6)  
-                     #define kYB               (kYellow  << 0) | (kBlue    << 6)
-                     #define kGM               (kGreen   << 0) | (kMagenta << 6)
-                     
-                     const uint rgb_mask[kBGRAxis] = { kMG, kYB, kGM };
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 6)) & 0x3F;
-
-                     #undef kMG             
-                     #undef kYB             
-                     #undef kGM 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k8K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     #define kMaxApertureGrilleSize       13
-                     
-                     #define kRRRRGGGGBBBBX    kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kBlack  
-                     #define kRRRRBBBBGGGGX    kRed, kRed, kRed, kRed, kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kBlack  
-                     #define kBBBBGGGGRRRRX    kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kRed, kRed, kRed, kRed, kBlack  
-                     
-                     const uint kApertureGrilleMasks8K300TVL[kBGRAxis * kMaxApertureGrilleSize] = 
-                     { 
-                        kRRRRGGGGBBBBX, kRRRRBBBBGGGGX, kBBBBGGGGRRRRX
-                     };
-
-                     colour_mask = kApertureGrilleMasks8K300TVL[(lcd_subpixel_layout * kMaxApertureGrilleSize) + mask];  
-                     
-                     #undef kMaxApertureGrilleSize 
-                     
-                     #undef kRRRRGGGGBBBBX  
-                     #undef kRRRRBBBBGGGGX  
-                     #undef kBBBBGGGGRRRRX      
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kRRGGBBX          (kRed  << 0) | (kRed  << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20) | (kBlack << 24)   
-                     #define kRRBBGGX          (kRed  << 0) | (kRed  << 4) | (kBlue  << 8) | (kBlue  << 12) | (kGreen << 16) | (kGreen << 20) | (kBlack << 24)    
-                     #define kBBGGRRX          (kBlue << 0) | (kBlue << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20) | (kBlack << 24)    
-                     
-                     const uint rgb_mask[kBGRAxis] = { kRRGGBBX, kRRBBGGX, kBBGGRRX };
-
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;  
-                     
-                     #undef kRRGGBBX        
-                     #undef kRRBBGGX       
-                     #undef kBBGGRRX 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {                     
-                     #define kRYCBX            (kRed  << 0) | (kYellow  << 6) | (kCyan   << 12) | (kBlue  << 18) | (kBlack << 24)  
-                     #define kRMCGX            (kRed  << 0) | (kMagenta << 6) | (kCyan   << 12) | (kGreen << 18) | (kBlack << 24)  
-                     #define kBCYRX            (kBlue << 0) | (kCyan    << 6) | (kYellow << 12) | (kRed   << 18) | (kBlack << 24)  
-                     
-                     const uint rgb_mask[kBGRAxis] = { kRYCBX, kRMCGX, kBCYRX  };
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 6)) & 0x3F;
-                     
-                     #undef kRYCBX          
-                     #undef kRMCGX          
-                     #undef kBCYRX   
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     #define kRGBX             (kRed  << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlack << 12)  
-                     #define kRBGX             (kRed  << 0) | (kBlue  << 4) | (kGreen << 8) | (kBlack << 12)  
-                     #define kBGRX             (kBlue << 0) | (kGreen << 4) | (kRed   << 8) | (kBlack << 12)  
-                     
-                     const uint rgb_mask[kBGRAxis] = { kRGBX, kRBGX, kBGRX };
-                     
-                     colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;   
-                     
-                     #undef kRGBX           
-                     #undef kRBGX           
-                     #undef kBGRX      
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            default:
-            {
-               break;
-            }                 
-         }
-
-         break;
-      }
-      case kShadowMask:
-      {
-         uint shadow_y = uint(floor(mod(current_position.y, kShadowMaskSizeY[(lcd_resolution * kTVLAxis) + crt_resolution])));
-
-         uint mask = uint(floor(mod(current_position.x, kShadowMaskSizeX[(lcd_resolution * kTVLAxis) + crt_resolution])));
-
-         switch(lcd_resolution)
-         {
-            case k1080p:
-            { 
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     #define kGRRBBG              (kGreen << 0) | (kRed   << 4) | (kRed   << 8) | (kBlue  << 12) | (kBlue  << 16) | (kGreen << 20)
-                     #define kBBGGRR              (kBlue  << 0) | (kBlue  << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kBRRGGB              (kBlue  << 0) | (kRed   << 4) | (kRed   << 8) | (kGreen << 12) | (kGreen << 16) | (kBlue  << 20)
-                     #define kGGBBRR              (kGreen << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlue  << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kGBBRRG              (kGreen << 0) | (kBlue  << 4) | (kBlue  << 8) | (kRed   << 12) | (kRed   << 16) | (kGreen << 20)
-                     #define kRRGGBB              (kRed   << 0) | (kRed   << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20)
-                     
-                     /*
-                        kGRRBBG
-                        kGRRBBG
-                        kBBGGRR
-                        kBBGGRR
-
-                        kBRRGGB
-                        kBRRGGB
-                        kGGBBRR
-                        kGGBBRR
-
-                        kGBBRRG
-                        kGBBRRG
-                        kRRGGBB
-                        kRRGGBB
-                     */
-
-                     const uint rgb_mask[kBGRAxis * 2] = { kGRRBBG, kBBGGRR, kBRRGGB, kGGBBRR, kGBBRRG, kRRGGBB };
-
-                     if(shadow_y < 2)
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 0] >> (mask * 4)) & 0xF;
-                     }
-                     else
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 1] >> (mask * 4)) & 0xF;
-                     }
-                     
-                     #undef kGRRBBG           
-                     #undef kBBGGRR    
-                     
-                     #undef kBRRGGB            
-                     #undef kGGBBRR      
-                     
-                     #undef kGBBRRG            
-                     #undef kRRGGBB   
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kMG                  (kMagenta << 0) | (kGreen   << 6)  
-                     #define kGM                  (kGreen   << 0) | (kMagenta << 6)  
-                     
-                     #define kYB                  (kYellow  << 0) | (kBlue    << 6)  
-                     #define kBY                  (kBlue    << 0) | (kYellow  << 6)  
-                     
-                     /*
-                        kMG
-                        kGM  
-                        
-                        kYB
-                        kBY  
-                        
-                        kGM
-                        kMG
-                     */
-
-                     const uint rgb_mask[kBGRAxis * 2] = { kMG, kGM, kYB, kBY, kGM, kMG };
-
-                     if(shadow_y < 1)
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 0] >> (mask * 6)) & 0x3F;
-                     }
-                     else
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 1] >> (mask * 6)) & 0x3F;
-                     }
-
-                     #undef kMG               
-                     #undef kGM    
-                     
-                     #undef kYB                
-                     #undef kBY   
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     colour_mask = kWhite; 
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     colour_mask = kWhite; 
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k4K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     #define kMaxShadowMaskSizeX     12
-                     #define kMaxShadowMaskSizeY     8
-                     
-                     #define kGGRRRRBBBBGG        kGreen, kGreen, kRed, kRed, kRed, kRed, kBlue, kBlue, kBlue, kBlue, kGreen, kGreen  
-                     #define kBBBBGGGGRRRR        kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kRed, kRed, kRed, kRed  
-                     
-                     #define kBBRRRRGGGGBB        kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue  
-                     #define kGGGGBBBBRRRR        kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed  
-                     
-                     #define kGGBBBBRRRRGG        kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen  
-                     #define kRRRRGGGGBBBB        kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue  
-                     
-                     /*
-                        kGGRRRRBBBBGG
-                        kGGRRRRBBBBGG
-                        kGGRRRRBBBBGG
-                        kGGRRRRBBBBGG
-                        kBBBBGGGGRRRR
-                        kBBBBGGGGRRRR
-                        kBBBBGGGGRRRR
-                        kBBBBGGGGRRRR
-
-                        kBBRRRRGGGGBB
-                        kBBRRRRGGGGBB
-                        kBBRRRRGGGGBB
-                        kBBRRRRGGGGBB
-                        kGGGGBBBBRRRR
-                        kGGGGBBBBRRRR
-                        kGGGGBBBBRRRR
-                        kGGGGBBBBRRRR
-
-                        kGGBBBBRRRRGG
-                        kGGBBBBRRRRGG
-                        kGGBBBBRRRRGG
-                        kGGBBBBRRRRGG
-                        kRRRRGGGGBBBB
-                        kRRRRGGGGBBBB
-                        kRRRRGGGGBBBB
-                        kRRRRGGGGBBBB
-                     */
-
-                     if(shadow_y < 4)
-                     {
-                        const uint rgb_mask[kBGRAxis * kMaxShadowMaskSizeX] = { kGGRRRRBBBBGG, kBBRRRRGGGGBB, kGGBBBBRRRRGG };
-                        colour_mask = rgb_mask[(lcd_subpixel_layout * kMaxShadowMaskSizeX) + mask];
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis * kMaxShadowMaskSizeX] = { kBBBBGGGGRRRR, kGGGGBBBBRRRR, kRRRRGGGGBBBB };
-                        colour_mask = rgb_mask[(lcd_subpixel_layout * kMaxShadowMaskSizeX) + mask];
-                     }
-
-                     #undef kMaxShadowMaskSizeX 
-                     #undef kMaxShadowMaskSizeY 
-                     
-                     #undef kGGRRRRBBBBGG      
-                     #undef kBBBBGGGGRRRR   
-                     
-                     #undef kBBRRRRGGGGBB     
-                     #undef kGGGGBBBBRRRR    
-                     
-                     #undef kGGBBBBRRRRGG      
-                     #undef kRRRRGGGGBBBB 
-
-                     break;
-                  }
-                  case k600TVL:
-                  {                     
-                     #define kGRRBBG              (kGreen << 0) | (kRed   << 4) | (kRed   << 8) | (kBlue  << 12) | (kBlue  << 16) | (kGreen << 20)
-                     #define kBBGGRR              (kBlue  << 0) | (kBlue  << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kBRRGGB              (kBlue  << 0) | (kRed   << 4) | (kRed   << 8) | (kGreen << 12) | (kGreen << 16) | (kBlue  << 20)
-                     #define kGGBBRR              (kGreen << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlue  << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kGBBRRG              (kGreen << 0) | (kBlue  << 4) | (kBlue  << 8) | (kRed   << 12) | (kRed   << 16) | (kGreen << 20)
-                     #define kRRGGBB              (kRed   << 0) | (kRed   << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20)
-                     
-                     /*
-                        kGRRBBG
-                        kGRRBBG
-                        kBBGGRR
-                        kBBGGRR
-
-                        kBRRGGB
-                        kBRRGGB
-                        kGGBBRR
-                        kGGBBRR
-
-                        kGBBRRG
-                        kGBBRRG
-                        kRRGGBB
-                        kRRGGBB
-                     */
-
-                     const uint rgb_mask[kBGRAxis * 2] = { kGRRBBG, kBBGGRR, kBRRGGB, kGGBBRR, kGBBRRG, kRRGGBB };
-
-                     if(shadow_y < 2)
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 0] >> (mask * 4)) & 0xF;
-                     }
-                     else
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 1] >> (mask * 4)) & 0xF;
-                     }
-                     
-                     #undef kGRRBBG           
-                     #undef kBBGGRR    
-                     
-                     #undef kBRRGGB            
-                     #undef kGGBBRR      
-                     
-                     #undef kGBBRRG            
-                     #undef kRRGGBB     
-
-                     break;
-                  }
-                  case k800TVL:
-                  {                     
-                     #define kMG                  (kMagenta << 0) | (kGreen   << 6)  
-                     #define kGM                  (kGreen   << 0) | (kMagenta << 6)  
-                     
-                     #define kYB                  (kYellow  << 0) | (kBlue    << 6)  
-                     #define kBY                  (kBlue    << 0) | (kYellow  << 6)  
-                     
-                     /*
-                        kMG
-                        kGM  
-                        
-                        kYB
-                        kBY  
-                        
-                        kGM
-                        kMG
-                     */
-
-                     const uint rgb_mask[kBGRAxis * 2] = { kMG, kGM, kYB, kBY, kGM, kMG };
-
-                     if(shadow_y < 1)
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 0] >> (mask * 6)) & 0x3F;
-                     }
-                     else
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 1] >> (mask * 6)) & 0x3F;
-                     }
-
-                     #undef kMG               
-                     #undef kGM    
-                     
-                     #undef kYB                
-                     #undef kBY  
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {                    
-                     #define kMG                  (kMagenta << 0) | (kGreen   << 6)  
-                     #define kGM                  (kGreen   << 0) | (kMagenta << 6)  
-                     
-                     #define kYB                  (kYellow  << 0) | (kBlue    << 6)  
-                     #define kBY                  (kBlue    << 0) | (kYellow  << 6)  
-                     
-                     /*
-                        kMG
-                        kGM  
-                        
-                        kYB
-                        kBY  
-                        
-                        kGM
-                        kMG
-                     */
-
-                     const uint rgb_mask[kBGRAxis * 2] = { kMG, kGM, kYB, kBY, kGM, kMG };
-
-                     if(shadow_y < 1)
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 0] >> (mask * 6)) & 0x3F;
-                     }
-                     else
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 1] >> (mask * 6)) & 0x3F;
-                     }
-
-                     #undef kMG               
-                     #undef kGM    
-                     
-                     #undef kYB                
-                     #undef kBY  
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k8K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     #define kMaxShadowMaskSizeX     12
-                     #define kMaxShadowMaskSizeY     8
-                     
-                     #define kGGRRRRBBBBGG        kGreen, kGreen, kRed, kRed, kRed, kRed, kBlue, kBlue, kBlue, kBlue, kGreen, kGreen  
-                     #define kBBBBGGGGRRRR        kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kRed, kRed, kRed, kRed  
-                     
-                     #define kBBRRRRGGGGBB        kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue  
-                     #define kGGGGBBBBRRRR        kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed  
-                     
-                     #define kGGBBBBRRRRGG        kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen  
-                     #define kRRRRGGGGBBBB        kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue  
-
-                     /*
-                         kGGRRRRBBBBGG
-                         kGGRRRRBBBBGG
-                         kGGRRRRBBBBGG
-                         kGGRRRRBBBBGG
-                         kBBBBGGGGRRRR
-                         kBBBBGGGGRRRR
-                         kBBBBGGGGRRRR
-                         kBBBBGGGGRRRR
-
-                         kBBRRRRGGGGBB
-                         kBBRRRRGGGGBB
-                         kBBRRRRGGGGBB
-                         kBBRRRRGGGGBB
-                         kGGGGBBBBRRRR
-                         kGGGGBBBBRRRR
-                         kGGGGBBBBRRRR
-                         kGGGGBBBBRRRR
-
-                         kGGBBBBRRRRGG
-                         kGGBBBBRRRRGG
-                         kGGBBBBRRRRGG
-                         kGGBBBBRRRRGG
-                         kRRRRGGGGBBBB
-                         kRRRRGGGGBBBB
-                         kRRRRGGGGBBBB
-                         kRRRRGGGGBBBB
-                     */
-
-                     if(shadow_y < 4)
-                     {
-                        const uint rgb_mask[kBGRAxis * kMaxShadowMaskSizeX] = { kGGRRRRBBBBGG, kBBRRRRGGGGBB, kGGBBBBRRRRGG };
-                        colour_mask = rgb_mask[(lcd_subpixel_layout * kMaxShadowMaskSizeX) + mask];
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis * kMaxShadowMaskSizeX] = { kBBBBGGGGRRRR, kGGGGBBBBRRRR, kRRRRGGGGBBBB };
-                        colour_mask = rgb_mask[(lcd_subpixel_layout * kMaxShadowMaskSizeX) + mask];
-                     }
-                     
-                     #undef kMaxShadowMaskSizeX 
-                     #undef kMaxShadowMaskSizeY 
-                     
-                     #undef kGGRRRRBBBBGG      
-                     #undef kBBBBGGGGRRRR      
-                     
-                     #undef kBBRRRRGGGGBB     
-                     #undef kGGGGBBBBRRRR      
-                     
-                     #undef kGGBBBBRRRRGG      
-                     #undef kRRRRGGGGBBBB 
-
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kMaxShadowMaskSizeX     12
-                     #define kMaxShadowMaskSizeY     8
-                     
-                     #define kGGRRRRBBBBGG        kGreen, kGreen, kRed, kRed, kRed, kRed, kBlue, kBlue, kBlue, kBlue, kGreen, kGreen  
-                     #define kBBBBGGGGRRRR        kBlue, kBlue, kBlue, kBlue, kGreen, kGreen, kGreen, kGreen, kRed, kRed, kRed, kRed  
-                     
-                     #define kBBRRRRGGGGBB        kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue  
-                     #define kGGGGBBBBRRRR        kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed  
-                     
-                     #define kGGBBBBRRRRGG        kGreen, kGreen, kBlue, kBlue, kBlue, kBlue, kRed, kRed, kRed, kRed, kGreen, kGreen  
-                     #define kRRRRGGGGBBBB        kRed, kRed, kRed, kRed, kGreen, kGreen, kGreen, kGreen, kBlue, kBlue, kBlue, kBlue  
-                     
-                     /*
-                         kGGRRRRBBBBGG
-                         kGGRRRRBBBBGG
-                         kGGRRRRBBBBGG
-                         kGGRRRRBBBBGG
-                         kBBBBGGGGRRRR
-                         kBBBBGGGGRRRR
-                         kBBBBGGGGRRRR
-                         kBBBBGGGGRRRR
-
-                         kBBRRRRGGGGBB
-                         kBBRRRRGGGGBB
-                         kBBRRRRGGGGBB
-                         kBBRRRRGGGGBB
-                         kGGGGBBBBRRRR
-                         kGGGGBBBBRRRR
-                         kGGGGBBBBRRRR
-                         kGGGGBBBBRRRR
-
-                         kGGBBBBRRRRGG
-                         kGGBBBBRRRRGG
-                         kGGBBBBRRRRGG
-                         kGGBBBBRRRRGG
-                         kRRRRGGGGBBBB
-                         kRRRRGGGGBBBB
-                         kRRRRGGGGBBBB
-                         kRRRRGGGGBBBB
-                     */
-
-                     if(shadow_y < 4)
-                     {
-                        const uint rgb_mask[kBGRAxis * kMaxShadowMaskSizeX] = { kGGRRRRBBBBGG, kBBRRRRGGGGBB, kGGBBBBRRRRGG };
-                        colour_mask = rgb_mask[(lcd_subpixel_layout * kMaxShadowMaskSizeX) + mask];
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis * kMaxShadowMaskSizeX] = { kBBBBGGGGRRRR, kGGGGBBBBRRRR, kRRRRGGGGBBBB };
-                        colour_mask = rgb_mask[(lcd_subpixel_layout * kMaxShadowMaskSizeX) + mask];
-                     }
-                     
-                     #undef kMaxShadowMaskSizeX 
-                     #undef kMaxShadowMaskSizeY 
-                     
-                     #undef kGGRRRRBBBBGG      
-                     #undef kBBBBGGGGRRRR      
-                     
-                     #undef kBBRRRRGGGGBB     
-                     #undef kGGGGBBBBRRRR      
-                     
-                     #undef kGGBBBBRRRRGG      
-                     #undef kRRRRGGGGBBBB
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     #define kGRRBBG              (kGreen << 0) | (kRed   << 4) | (kRed   << 8) | (kBlue  << 12) | (kBlue  << 16) | (kGreen << 20)
-                     #define kBBGGRR              (kBlue  << 0) | (kBlue  << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kBRRGGB              (kBlue  << 0) | (kRed   << 4) | (kRed   << 8) | (kGreen << 12) | (kGreen << 16) | (kBlue  << 20)
-                     #define kGGBBRR              (kGreen << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlue  << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kGBBRRG              (kGreen << 0) | (kBlue  << 4) | (kBlue  << 8) | (kRed   << 12) | (kRed   << 16) | (kGreen << 20)
-                     #define kRRGGBB              (kRed   << 0) | (kRed   << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20)
-                     
-                     /*
-                        kGRRBBG
-                        kGRRBBG
-                        kBBGGRR
-                        kBBGGRR
-
-                        kBRRGGB
-                        kBRRGGB
-                        kGGBBRR
-                        kGGBBRR
-
-                        kGBBRRG
-                        kGBBRRG
-                        kRRGGBB
-                        kRRGGBB
-                     */
-
-                     const uint rgb_mask[kBGRAxis * 2] = { kGRRBBG, kBBGGRR, kBRRGGB, kGGBBRR, kGBBRRG, kRRGGBB };
-
-                     if(shadow_y < 2)
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 0] >> (mask * 4)) & 0xF;
-                     }
-                     else
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 1] >> (mask * 4)) & 0xF;
-                     }
-                     
-                     #undef kGRRBBG           
-                     #undef kBBGGRR    
-                     
-                     #undef kBRRGGB            
-                     #undef kGGBBRR      
-                     
-                     #undef kGBBRRG            
-                     #undef kRRGGBB 
-                     
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     #define kGRRBBG              (kGreen << 0) | (kRed   << 4) | (kRed   << 8) | (kBlue  << 12) | (kBlue  << 16) | (kGreen << 20)
-                     #define kBBGGRR              (kBlue  << 0) | (kBlue  << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kBRRGGB              (kBlue  << 0) | (kRed   << 4) | (kRed   << 8) | (kGreen << 12) | (kGreen << 16) | (kBlue  << 20)
-                     #define kGGBBRR              (kGreen << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlue  << 12) | (kRed   << 16) | (kRed   << 20)
-                     
-                     #define kGBBRRG              (kGreen << 0) | (kBlue  << 4) | (kBlue  << 8) | (kRed   << 12) | (kRed   << 16) | (kGreen << 20)
-                     #define kRRGGBB              (kRed   << 0) | (kRed   << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20)
-                     
-                     /*
-                        kGRRBBG
-                        kGRRBBG
-                        kBBGGRR
-                        kBBGGRR
-
-                        kBRRGGB
-                        kBRRGGB
-                        kGGBBRR
-                        kGGBBRR
-
-                        kGBBRRG
-                        kGBBRRG
-                        kRRGGBB
-                        kRRGGBB
-                     */
-
-                     const uint rgb_mask[kBGRAxis * 2] = { kGRRBBG, kBBGGRR, kBRRGGB, kGGBBRR, kGBBRRG, kRRGGBB };
-
-                     if(shadow_y < 2)
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 0] >> (mask * 4)) & 0xF;
-                     }
-                     else
-                     {
-                         colour_mask = (rgb_mask[(lcd_subpixel_layout * 2) + 1] >> (mask * 4)) & 0xF;
-                     }
-                     
-                     #undef kGRRBBG           
-                     #undef kBBGGRR    
-                     
-                     #undef kBRRGGB            
-                     #undef kGGBBRR      
-                     
-                     #undef kGBBRRG            
-                     #undef kRRGGBB 
-                     
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            default:
-            {
-               break;
-            }                 
-         }
-
-         break;
-      }
-      case kSlotMask:
-      {
-         #define kMaxSlotSizeX      2
-
-         uint slot_x = uint(floor(mod(current_position.x / kSlotMaskSizeX[(lcd_resolution * kTVLAxis) + crt_resolution], kMaxSlotSizeX)));
-         uint slot_y = uint(floor(mod(current_position.y, kSlotMaskSizeY[(lcd_resolution * kTVLAxis) + crt_resolution])));
-         
-         uint element = (slot_y * kMaxSlotSizeX) + slot_x;
-
-         uint mask = uint(floor(mod(current_position.x, kSlotMaskSizeX[(lcd_resolution * kTVLAxis) + crt_resolution])));
-
-         switch(lcd_resolution)
-         {
-            case k1080p:
-            { 
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  {
-                     #define kRGBX             (kRed  << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlack << 12)  
-                     #define kRBGX             (kRed  << 0) | (kBlue  << 4) | (kGreen << 8) | (kBlack << 12)  
-                     #define kBGRX             (kBlue << 0) | (kGreen << 4) | (kRed   << 8) | (kBlack << 12)  
-                     
-                     /*
-                         kRGBX, kRGBX
-                         kRGBX, kXXXX
-                         kRGBX, kRGBX
-                         kXXXX, kRGBX
-
-                         kRBGX, kRBGX
-                         kRBGX, kXXXX
-                         kRBGX, kRBGX
-                         kXXXX, kRBGX  
-
-                         kBGRX, kBGRX
-                         kBGRX, kXXXX
-                         kBGRX, kBGRX
-                         kXXXX, kBGRX
-                     */
-
-                     if((element == 3) || (element == 6))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = { kRGBX, kRBGX, kBGRX };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;   
-                     }
-                     
-                     #undef kRGBX     
-                     #undef kRBGX
-                     #undef kBGRX         
-
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kMG               (kMagenta << 0) | (kGreen   << 6)  
-                     #define kYB               (kYellow  << 0) | (kBlue    << 6)
-                     #define kGM               (kGreen   << 0) | (kMagenta << 6)
-                     
-                     /*
-                        kMG, kMG
-                        kMG, kXX
-                        kMG, kMG
-                        kXX, kMG
-
-                        kYB, kYB
-                        kYB, kXX
-                        kYB, kYB
-                        kXX, kYB
-
-                        kGM, kGM
-                        kGM, kXX
-                        kGM, kGM
-                        kXX, kGM
-                     */
-
-                     if((element == 3) || (element == 6))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = { kMG, kYB, kGM };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 6)) & 0x3F;
-                     }
-                   
-                     #undef kMG     
-                     #undef kYB  
-                     #undef kGM        
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     #define kMaxSlotMaskSize   1
-                     #define kMaxSlotSizeY      4
-                     
-                     #define kX          kBlack  
-                     #define kW          kWhite  
-                     
-                     /*
-                        kW, kW
-                        kW, kX
-                        kW, kW
-                        kX, kW
-                     */
-
-                     if((element == 3) || (element == 6))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        colour_mask = kWhite;
-                     }
-                      
-                     #undef kMaxSlotMaskSize  
-                     #undef kMaxSlotSizeY     
-                     
-                     #undef kX
-                     #undef kW
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     #define kMaxSlotMaskSize   1
-                     #define kMaxSlotSizeY      4
-                     
-                     #define kX          kBlack  
-                     #define kW          kWhite  
-
-                     /*
-                        kW, kW
-                        kW, kX
-                        kW, kW
-                        kX, kW
-                     */
-
-                     if((element == 3) || (element == 6))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        colour_mask = kWhite;
-                     }
-                     
-                     #undef kMaxSlotMaskSize  
-                     #undef kMaxSlotSizeY     
-                     
-                     #undef kX  
-                     #undef kW   
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k4K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     #define kRRGGBBX          (kRed  << 0) | (kRed  << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20) | (kBlack << 24)   
-                     #define kRRBBGGX          (kRed  << 0) | (kRed  << 4) | (kBlue  << 8) | (kBlue  << 12) | (kGreen << 16) | (kGreen << 20) | (kBlack << 24)    
-                     #define kBBGGRRX          (kBlue << 0) | (kBlue << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20) | (kBlack << 24)    
-                     
-                     /*
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kXXXXXXX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kXXXXXXX, kRRGGBBX
-
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kXXXXXXX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kXXXXXXX, kRRBBGGX
-
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kXXXXXXX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kXXXXXXX, kBBGGRRX
-                     */
-
-                     if((element == 7) || (element == 14))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = {  kRRGGBBX, kRRBBGGX, kBBGGRRX };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;  
-                     }
-                     
-                     #undef kRRGGBBX  
-                     #undef kRRBBGGX  
-                     #undef kBBGGRRX 
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kRGBX             (kRed  << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlack << 12)  
-                     #define kRBGX             (kRed  << 0) | (kBlue  << 4) | (kGreen << 8) | (kBlack << 12)  
-                     #define kBGRX             (kBlue << 0) | (kGreen << 4) | (kRed   << 8) | (kBlack << 12)  
-                     
-                     /*
-                         kRGBX, kRGBX
-                         kRGBX, kXXXX
-                         kRGBX, kRGBX
-                         kXXXX, kRGBX
-
-                         kRBGX, kRBGX
-                         kRBGX, kXXXX
-                         kRBGX, kRBGX
-                         kXXXX, kRBGX  
-
-                         kBGRX, kBGRX
-                         kBGRX, kXXXX
-                         kBGRX, kBGRX
-                         kXXXX, kBGRX
-                     */
-
-                     if((element == 5) || (element == 10))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = { kRGBX, kRBGX, kBGRX };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;   
-                     }
-                     
-                     #undef kRGBX     
-                     #undef kRBGX
-                     #undef kBGRX
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     #define kBGR              (kBlue  << 0) | (kGreen << 4) | (kRed  << 8) 
-                     #define kGBR              (kGreen << 0) | (kBlue  << 4) | (kRed  << 8)  
-                     #define kRGB              (kRed   << 0) | (kGreen << 4) | (kBlue << 8)   
-                     
-                     /*
-                        kBGR, kBGR
-                        kBGR, kXXX
-                        kBGR, kBGR
-                        kXXX, kBGR
-                        
-                        kGBR, kGBR
-                        kGBR, kXXX
-                        kGBR, kGBR
-                        kXXX, kGBR
-                        
-                        kRGB, kRGB
-                        kRGB, kXXX
-                        kRGB, kRGB
-                        kXXX, kRGB
-                     */
-
-                     if((element == 3) || (element == 6))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = { kBGR, kGBR, kRGB };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;  
-                     }  
-                     
-                     #undef kBGR    
-                     #undef kGBR 
-                     #undef kRGB       
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     #define kMG               (kMagenta << 0) | (kGreen   << 6)  
-                     #define kYB               (kYellow  << 0) | (kBlue    << 6)
-                     #define kGM               (kGreen   << 0) | (kMagenta << 6)
-                     
-                     /*
-                        kMG, kMG
-                        kMG, kXX
-                        kMG, kMG
-                        kXX, kMG
-
-                        kYB, kYB
-                        kYB, kXX
-                        kYB, kYB
-                        kXX, kYB
-
-                        kGM, kGM
-                        kGM, kXX
-                        kGM, kGM
-                        kXX, kGM
-                     */
-
-                     if((element == 3) || (element == 6))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = { kMG, kYB, kGM };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 6)) & 0x3F;
-                     }
-                   
-                     #undef kMG     
-                     #undef kYB  
-                     #undef kGM        
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            case k8K:
-            {
-               switch(crt_resolution)
-               {
-                  case k300TVL:
-                  { 
-                     #define kRRGGBBX          (kRed  << 0) | (kRed  << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20) | (kBlack << 24)   
-                     #define kRRBBGGX          (kRed  << 0) | (kRed  << 4) | (kBlue  << 8) | (kBlue  << 12) | (kGreen << 16) | (kGreen << 20) | (kBlack << 24)    
-                     #define kBBGGRRX          (kBlue << 0) | (kBlue << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20) | (kBlack << 24) 
-                     
-                     /*
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kXXXXXXX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kXXXXXXX, kRRGGBBX
-                     
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kXXXXXXX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kXXXXXXX, kRRBBGGX
-                     
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kXXXXXXX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kXXXXXXX, kBBGGRRX
-                     */
-
-                     if((element == 5) || (element == 10))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = {  kRRGGBBX, kRRBBGGX, kBBGGRRX };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF; 
-                     }   
-                     
-                     #undef kRRGGBBX  
-                     #undef kRRBBGGX  
-                     #undef kBBGGRRX 
-                     
-                     break;
-                  }
-                  case k600TVL:
-                  {
-                     #define kRRGGBBX          (kRed  << 0) | (kRed  << 4) | (kGreen << 8) | (kGreen << 12) | (kBlue  << 16) | (kBlue  << 20) | (kBlack << 24)   
-                     #define kRRBBGGX          (kRed  << 0) | (kRed  << 4) | (kBlue  << 8) | (kBlue  << 12) | (kGreen << 16) | (kGreen << 20) | (kBlack << 24)    
-                     #define kBBGGRRX          (kBlue << 0) | (kBlue << 4) | (kGreen << 8) | (kGreen << 12) | (kRed   << 16) | (kRed   << 20) | (kBlack << 24) 
-                     
-                     /*
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kXXXXXXX
-                         kRRGGBBX, kRRGGBBX
-                         kRRGGBBX, kRRGGBBX
-                         kXXXXXXX, kRRGGBBX
-                     
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kXXXXXXX
-                         kRRBBGGX, kRRBBGGX
-                         kRRBBGGX, kRRBBGGX
-                         kXXXXXXX, kRRBBGGX
-                     
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kXXXXXXX
-                         kBBGGRRX, kBBGGRRX
-                         kBBGGRRX, kBBGGRRX
-                         kXXXXXXX, kBBGGRRX
-                     */
-
-                     if((element == 5) || (element == 10))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = {  kRRGGBBX, kRRBBGGX, kBBGGRRX };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF; 
-                     }
-
-                     #undef kMaxSlotMaskSize   
-                     #undef kMaxSlotSizeY 
-                     
-                     #undef kRRGGBBX  
-                     #undef kRRBBGGX  
-                     #undef kBBGGRRX 
-
-                     break;
-                  }
-                  case k800TVL:
-                  {
-                     #define kRYCBX            (kRed  << 0) | (kYellow  << 6) | (kCyan   << 12) | (kBlue  << 18) | (kBlack << 24)  
-                     #define kRMCGX            (kRed  << 0) | (kMagenta << 6) | (kCyan   << 12) | (kGreen << 18) | (kBlack << 24)  
-                     #define kBCYRX            (kBlue << 0) | (kCyan    << 6) | (kYellow << 12) | (kRed   << 18) | (kBlack << 24)  
-                     
-                     /*
-                        kRYCBX, kRYCBX
-                        kRYCBX, kXXXXX
-                        kRYCBX, kRYCBX
-                        kXXXXX, kRYCBX    
-
-                        kRMCGX, kRMCGX
-                        kRMCGX, kXXXXX
-                        kRMCGX, kRMCGX
-                        kXXXXX, kRMCGX    
-
-                        kBCYRX, kBCYRX
-                        kBCYRX, kXXXXX
-                        kBCYRX, kBCYRX
-                        kXXXXX, kBCYRX    
-                     */
-
-                     if((element == 3) || (element == 6))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = { kRYCBX, kRMCGX, kBCYRX  };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 6)) & 0x3F;
-                     }
-                     
-                     #undef kRYCBX    
-                     #undef kRMCGX
-                     #undef kBCYRX
-
-                     break;
-                  }
-                  case k1000TVL:
-                  {
-                     #define kRGBX             (kRed  << 0) | (kGreen << 4) | (kBlue  << 8) | (kBlack << 12)  
-                     #define kRBGX             (kRed  << 0) | (kBlue  << 4) | (kGreen << 8) | (kBlack << 12)  
-                     #define kBGRX             (kBlue << 0) | (kGreen << 4) | (kRed   << 8) | (kBlack << 12)  
-                     
-                     /*
-                         kRGBX, kRGBX
-                         kRGBX, kXXXX
-                         kRGBX, kRGBX
-                         kXXXX, kRGBX
-
-                         kRBGX, kRBGX
-                         kRBGX, kXXXX
-                         kRBGX, kRBGX
-                         kXXXX, kRBGX  
-
-                         kBGRX, kBGRX
-                         kBGRX, kXXXX
-                         kBGRX, kBGRX
-                         kXXXX, kBGRX
-                     */
-
-                     if((element == 5) || (element == 10))
-                     {
-                        colour_mask = kBlack;
-                     }
-                     else
-                     {
-                        const uint rgb_mask[kBGRAxis] = { kRGBX, kRBGX, kBGRX };
-                        colour_mask = (rgb_mask[lcd_subpixel_layout] >> (mask * 4)) & 0xF;   
-                     }
-                     
-                     #undef kRGBX     
-                     #undef kRBGX
-                     #undef kBGRX
-
-                     break;
-                  }
-                  default:
-                  {
-                     break;
-                  }                 
-               }
-
-               break;
-            }
-            default:
-            {
-               break;
-            }                 
-         }
-
-         break;
-      }
-      default:
-      {
-         break;
-      }
-   }
-
-   const float scanline_size           = output_size.y / source_size.y;
-
-   const vec3 horizontal_convergence   = vec3(HCRT_RED_HORIZONTAL_CONVERGENCE, HCRT_GREEN_HORIZONTAL_CONVERGENCE, HCRT_BLUE_HORIZONTAL_CONVERGENCE);
-   const vec3 vertical_convergence     = vec3(HCRT_RED_VERTICAL_CONVERGENCE, HCRT_GREEN_VERTICAL_CONVERGENCE, HCRT_BLUE_VERTICAL_CONVERGENCE);
-   const vec3 beam_sharpness           = vec3(HCRT_RED_BEAM_SHARPNESS, HCRT_GREEN_BEAM_SHARPNESS, HCRT_BLUE_BEAM_SHARPNESS);
-   const vec3 beam_attack              = vec3(HCRT_RED_BEAM_ATTACK, HCRT_GREEN_BEAM_ATTACK, HCRT_BLUE_BEAM_ATTACK);
-   const vec3 scanline_min             = vec3(HCRT_RED_SCANLINE_MIN, HCRT_GREEN_SCANLINE_MIN, HCRT_BLUE_SCANLINE_MIN);
-   const vec3 scanline_max             = vec3(HCRT_RED_SCANLINE_MAX, HCRT_GREEN_SCANLINE_MAX, HCRT_BLUE_SCANLINE_MAX);
-   const vec3 scanline_attack          = vec3(HCRT_RED_SCANLINE_ATTACK, HCRT_GREEN_SCANLINE_ATTACK, HCRT_BLUE_SCANLINE_ATTACK);
-
-   const uint channel_count            = colour_mask & 3;
-
-   vec3 scanline_colour = vec3(0.0f);
-
-   if(channel_count > 0)
-   {
-      const uint channel_0             = (colour_mask >> kFirstChannelShift) & 3;
-
-      const float scanline_channel_0   = GenerateScanline(  channel_0,
-                                                            tex_coord,
-                                                            source_size.xy, 
-                                                            scanline_size, 
-                                                            horizontal_convergence[channel_0], 
-                                                            vertical_convergence[channel_0], 
-                                                            beam_sharpness[channel_0], 
-                                                            beam_attack[channel_0], 
-                                                            scanline_min[channel_0], 
-                                                            scanline_max[channel_0], 
-                                                            scanline_attack[channel_0]);
-
-      scanline_colour =  scanline_channel_0 * kColourMask[channel_0];
-   }
-
-   if(channel_count > 1)
-   {
-      const uint channel_1             = (colour_mask >> kSecondChannelShift) & 3;
-
-      const float scanline_channel_1   = GenerateScanline(channel_1,
-                                                          tex_coord,
-                                                          source_size.xy, 
-                                                          scanline_size, 
-                                                          horizontal_convergence[channel_1], 
-                                                          vertical_convergence[channel_1], 
-                                                          beam_sharpness[channel_1], 
-                                                          beam_attack[channel_1], 
-                                                          scanline_min[channel_1], 
-                                                          scanline_max[channel_1], 
-                                                          scanline_attack[channel_1]);
-
-      scanline_colour += scanline_channel_1 * kColourMask[channel_1];
-   }
-
-   if(channel_count > 2)
-   {
-      const uint channel_2             = (colour_mask >> kThirdChannelShift) & 3;
-
-      const float scanline_channel_2   = GenerateScanline(channel_2,
-                                                          tex_coord,
-                                                          source_size.xy, 
-                                                          scanline_size, 
-                                                          horizontal_convergence[channel_2], 
-                                                          vertical_convergence[channel_2], 
-                                                          beam_sharpness[channel_2], 
-                                                          beam_attack[channel_2], 
-                                                          scanline_min[channel_2], 
-                                                          scanline_max[channel_2], 
-                                                          scanline_attack[channel_2]);
-
-      scanline_colour += scanline_channel_2 * kColourMask[channel_2];
-   }
-
-   vec3 transformed_colour;
-
-   if(HCRT_COLOUR_ACCURATE >= 1.0f)
-   {
-      if(HCRT_HDR >= 1.0f)
-      {
-         const vec3 rec2020  = scanline_colour * k2020Gamuts[uint(HCRT_EXPAND_GAMUT)];
-         transformed_colour  = rec2020 * (HCRT_PAPER_WHITE_NITS / kMaxNitsFor2084);
-      }
-      else if(HCRT_OUTPUT_COLOUR_SPACE == 2.0f)
-      {
-         transformed_colour = (scanline_colour * k709_to_XYZ) * kXYZ_to_DCIP3; 
-      }
-      else
-      {
-         transformed_colour = scanline_colour;
-      }
-   } 
-   else
-   {      
-      transformed_colour = scanline_colour;
-   }
-
-   vec3 gamma_corrected; 
-   
-   GammaCorrect(transformed_colour, gamma_corrected);
-
-   FragColor = vec4(gamma_corrected, 1.0f);
-}
diff --git a/hdr/shaders/crt-sony-megatron.slangp b/hdr/shaders/crt-sony-megatron.slangp
deleted file mode 100644
index ec30872bb8..0000000000
--- a/hdr/shaders/crt-sony-megatron.slangp
+++ /dev/null
@@ -1,55 +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.
-#
-#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
-#
-#DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory
-
-
-shaders = "3"
-feedback_pass = "0"
-
-shader0 = "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"
-float_framebuffer0 = "true"
-
-shader1 = "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"
-float_framebuffer1 = "true"
-
-shader2 = "crt-sony-megatron.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
diff --git a/hdr/shaders/hdr10.slang b/hdr/shaders/hdr10.slang
deleted file mode 100644
index 1eedb709ab..0000000000
--- a/hdr/shaders/hdr10.slang
+++ /dev/null
@@ -1,54 +0,0 @@
-#version 450
-
-/* 
-Part of the crt-sony-megatron shader group. Does the exact same thing as RetroArch does internally to map into HDR10 space.
-
-This is used to do this mapping BEFORE screen effects are applied.
-
-Originally part of the crt\crt-sony-pvm-4k-hdr.slangp but can be used for any shader
-*/
-
-#pragma format A2B10G10R10_UNORM_PACK32
-
-#include "include\hdr10.h"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float PaperWhiteNits;
-   float ExpandGamut;
-} params;
-
-#pragma parameter PaperWhiteNits    "Paper White Luminance"    200.0    0.0 10000.0 10.0
-#pragma parameter ExpandGamut       "ExpandGamut"              1.0      0.0 1.0     1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 hdr_linear = texture(Source, vTexCoord);
-   FragColor = vec4(Hdr10(hdr_linear.rgb, params.PaperWhiteNits, params.ExpandGamut), hdr_linear.a); 
-}
-
diff --git a/hdr/shaders/include/colour_grade.h b/hdr/shaders/include/colour_grade.h
deleted file mode 100644
index b986a472b3..0000000000
--- a/hdr/shaders/include/colour_grade.h
+++ /dev/null
@@ -1,214 +0,0 @@
-
-#define kColourSystems  4
-#define kPhosphorSets   5
-
-#define kD50            5003.0f
-#define kD55            5503.0f
-#define kD65            6504.0f
-#define kD75            7504.0f
-#define kD93            9305.0f
-
-// Input Colour Standards
-
-const mat3 k709_to_XYZ = mat3(
-   0.412391f, 0.357584f, 0.180481f,
-   0.212639f, 0.715169f, 0.072192f,
-   0.019331f, 0.119195f, 0.950532f);
-
-const mat3 kPAL_to_XYZ = mat3(
-   0.430554f, 0.341550f, 0.178352f,
-   0.222004f, 0.706655f, 0.071341f,
-   0.020182f, 0.129553f, 0.939322f);
-
-const mat3 kNTSC_to_XYZ = mat3(
-   0.393521f, 0.365258f, 0.191677f,
-   0.212376f, 0.701060f, 0.086564f,
-   0.018739f, 0.111934f, 0.958385f);
-
-// Phosphor Sets - These override the colour standards above when used
-
-// NTSC-J P22
-const mat3 kNTSCJ_P22_to_XYZ = mat3(
-   0.458432f, 0.309549f, 0.182474f,
-   0.256722f, 0.668848f, 0.074430f,
-   0.018337f, 0.127136f, 0.943584f);
-
-//P22 (80’s)
-const mat3 kP2280_to_XYZ = mat3(
-   0.460844f, 0.307613f, 0.181910f,
-   0.244311f, 0.676311f, 0.079378f,
-   0.007123f, 0.106901f, 0.975034f);
-
-//P22 (90’s/tinted phosphors)
-const mat3 kP2290_to_XYZ = mat3(
-   0.404151f, 0.354887f, 0.191418f,
-   0.201984f, 0.714530f, 0.083485f,
-   0.000607f, 0.062960f, 1.025491f);
-
-//RPTV (late 90’s/early 00’s)
-const mat3 kRPTV00_to_XYZ = mat3(
-   0.331718f, 0.429476f, 0.189261f,
-   0.173634f, 0.738044f, 0.088322f,
-   0.012958f, 0.091941f, 0.984159f);
-
-//  NTSC-FCC 1953 Standard Phosphor
-const mat3 k1953_to_XYZ = mat3(
-   0.588010f, 0.179133f, 0.183224f,
-   0.289661f, 0.605640f, 0.104699f,
-   0.000000f, 0.068241f, 1.020817f);
-
-// Output Colour Standards
-
-const mat3 kXYZ_to_709 = mat3(
-    3.240970f, -1.537383f, -0.498611f,
-   -0.969244f,  1.875968f,  0.041555f,
-    0.055630f, -0.203977f,  1.056972f);
-
-const mat3 kXYZ_to_DCIP3 = mat3 (
-    2.4934969119f, -0.9313836179f, -0.4027107845f,
-   -0.8294889696f,  1.7626640603f,  0.0236246858f,
-    0.0358458302f, -0.0761723893f,  0.9568845240f);   
-
-const mat3 kStandardsColourGamut[kColourSystems] = { k709_to_XYZ, kPAL_to_XYZ, kNTSC_to_XYZ, kNTSC_to_XYZ };
-const mat3 kPhosphorColourGamut[kPhosphorSets] = { kNTSCJ_P22_to_XYZ, kP2280_to_XYZ, kP2290_to_XYZ, kRPTV00_to_XYZ, k1953_to_XYZ };
-
-//const float kTemperatures[kColourSystems] = { kD65, kD65, kD65, kD93 }; 
-
-  // Values from: http://blenderartists.org/forum/showthread.php?270332-OSL-Goodness&p=2268693&viewfull=1#post2268693   
-const mat3 kWarmTemperature = mat3(
-   vec3(0.0, -2902.1955373783176,   -8257.7997278925690),
-	vec3(0.0,  1669.5803561666639,    2575.2827530017594),
-	vec3(1.0,     1.3302673723350029,    1.8993753891711275));
-
-const mat3 kCoolTemperature = mat3(
-   vec3( 1745.0425298314172,      1216.6168361476490,    -8257.7997278925690),
-   vec3(-2666.3474220535695,     -2173.1012343082230,     2575.2827530017594),
-	vec3(    0.55995389139931482,     0.70381203140554553,    1.8993753891711275));
-
-const mat4 kCubicBezier = mat4( 1.0f,  0.0f,  0.0f,  0.0f,
-                               -3.0f,  3.0f,  0.0f,  0.0f,
-                                3.0f, -6.0f,  3.0f,  0.0f,
-                               -1.0f,  3.0f, -3.0f,  1.0f );
-
-float Bezier(const float t0, const vec4 control_points)
-{
-   vec4 t = vec4(1.0, t0, t0*t0, t0*t0*t0);
-   return dot(t, control_points * kCubicBezier);
-}
-
-vec3 WhiteBalance(float temperature, vec3 colour)
-{
-   const mat3 m = (temperature < kD65) ? kWarmTemperature : kCoolTemperature;
-
-   const vec3 rgb_temperature = mix(clamp(vec3(m[0] / (vec3(clamp(temperature, 1000.0f, 40000.0f)) + m[1]) + m[2]), vec3(0.0f), vec3(1.0f)), vec3(1.0f), smoothstep(1000.0f, 0.0f, temperature));
-
-   vec3 result = colour * rgb_temperature;
-
-   result *= dot(colour, vec3(0.2126, 0.7152, 0.0722)) / max(dot(result, vec3(0.2126, 0.7152, 0.0722)), 1e-5); // Preserve luminance
-
-   return result;
-}
-
-float r601r709ToLinear_1(const float channel)
-{
-	//return (channel >= 0.081f) ? pow((channel + 0.099f) * (1.0f / 1.099f), (1.0f / 0.45f)) : channel * (1.0f / 4.5f);
-	return (channel >= (HCRT_GAMMA_CUTOFF * (1.0f / 1000.0f))) ? pow((channel + 0.099f) * (1.0f / 1.099f), HCRT_GAMMA_IN) : channel * (1.0f / 4.5f);
-}
-
-vec3 r601r709ToLinear(const vec3 colour)
-{
-	return vec3(r601r709ToLinear_1(colour.r), r601r709ToLinear_1(colour.g), r601r709ToLinear_1(colour.b));
-}
-
-// XYZ Yxy transforms found in Dogway's Grade.slang shader
-
-vec3 XYZtoYxy(const vec3 XYZ)
-{
-   const float XYZrgb   = XYZ.r + XYZ.g + XYZ.b;
-   const float Yxyg     = (XYZrgb <= 0.0f) ? 0.3805f : XYZ.r / XYZrgb;
-   const float Yxyb     = (XYZrgb <= 0.0f) ? 0.3769f : XYZ.g / XYZrgb;
-   return vec3(XYZ.g, Yxyg, Yxyb);
-}
-
-vec3 YxytoXYZ(const vec3 Yxy)
-{
-   const float Xs    = Yxy.r * (Yxy.g / Yxy.b);
-   const float Xsz   = (Yxy.r <= 0.0f) ? 0.0f : 1.0f;
-   const vec3 XYZ    = vec3(Xsz, Xsz, Xsz) * vec3(Xs, Yxy.r, (Xs / Yxy.g) - Xs - Yxy.r);
-   return XYZ;
-}
-
-const vec4 kTopBrightnessControlPoints    = vec4(0.0f, 1.0f, 1.0f, 1.0f);
-const vec4 kMidBrightnessControlPoints    = vec4(0.0f, 1.0f / 3.0f, (1.0f / 3.0f) * 2.0f, 1.0f);
-const vec4 kBottomBrightnessControlPoints = vec4(0.0f, 0.0f, 0.0f, 1.0f);
-
-float Brightness(const float luminance)
-{
-   if(HCRT_BRIGHTNESS >= 0.0f)
-   {
-      return Bezier(luminance, mix(kMidBrightnessControlPoints, kTopBrightnessControlPoints, HCRT_BRIGHTNESS));
-   }
-   else
-   {
-      return Bezier(luminance, mix(kMidBrightnessControlPoints, kBottomBrightnessControlPoints, abs(HCRT_BRIGHTNESS)));
-   }
-}
-
-const vec4 kTopContrastControlPoints    = vec4(0.0f, 0.0f, 1.0f, 1.0f);
-const vec4 kMidContrastControlPoints    = vec4(0.0f, 1.0f / 3.0f, (1.0f / 3.0f) * 2.0f, 1.0f);
-const vec4 kBottomContrastControlPoints = vec4(0.0f, 1.0f, 0.0f, 1.0f);
-
-float Contrast(const float luminance)
-{
-   if(HCRT_CONTRAST >= 0.0f)
-   {
-      return Bezier(luminance, mix(kMidContrastControlPoints, kTopContrastControlPoints, HCRT_CONTRAST));
-   }
-   else
-   {
-      return Bezier(luminance, mix(kMidContrastControlPoints, kBottomContrastControlPoints, abs(HCRT_CONTRAST)));
-   }
-}
-
-vec3 Saturation(const vec3 colour)
-{
-   const float luma           = dot(colour, vec3(0.2125, 0.7154, 0.0721));
-   const float saturation     = 0.5f + HCRT_SATURATION * 0.5f;
-
-   return clamp(mix(vec3(luma), colour, vec3(saturation) * 2.0f), 0.0f, 1.0f);
-}
-
-vec3 BrightnessContrastSaturation(const vec3 xyz)
-{
-   const vec3 Yxy             = XYZtoYxy(xyz);
-   const float Y_gamma        = clamp(pow(Yxy.x, 1.0f / 2.4f), 0.0f, 1.0f);
-   
-   const float Y_brightness   = Brightness(Y_gamma);
-
-   const float Y_contrast     = Contrast(Y_brightness);
-
-   const vec3 contrast_linear = vec3(pow(Y_contrast, 2.4f), Yxy.y, Yxy.z);
-   const vec3 contrast        = clamp(YxytoXYZ(contrast_linear) * kXYZ_to_709, 0.0f, 1.0f);
-
-   const vec3 saturation      = Saturation(contrast);
-
-   return saturation;
-}
-
-vec3 ColourGrade(const vec3 colour)
-{
-   const uint colour_system   = uint(HCRT_CRT_COLOUR_SYSTEM);
-   const uint phosphor_set    = uint(HCRT_CRT_PHOSPHOR_SET);
-
-   const float temperature[kColourSystems] = { HCRT_WHITE_TEMPERATURE_D65, HCRT_WHITE_TEMPERATURE_D65, HCRT_WHITE_TEMPERATURE_D65, HCRT_WHITE_TEMPERATURE_D93 };
-
-   const vec3 white_point     = WhiteBalance(temperature[colour_system], colour);
-
-   const vec3 linear          = pow(white_point, vec3(HCRT_GAMMA_IN)); // r601r709ToLinear(white_point); 
-
-   const vec3 xyz             = phosphor_set == 0 ? linear * kStandardsColourGamut[colour_system] : linear * kPhosphorColourGamut[phosphor_set - 1];
-
-   const vec3 graded          = BrightnessContrastSaturation(xyz); 
-
-   return graded;
-}
diff --git a/hdr/shaders/include/gamma_correct.h b/hdr/shaders/include/gamma_correct.h
deleted file mode 100644
index 8c2e9d22fd..0000000000
--- a/hdr/shaders/include/gamma_correct.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "hdr10.h"
-
-// SDR Colour output spaces
-
-const mat3 k709_to_XYZ = mat3(
-   0.412391f, 0.357584f, 0.180481f,
-   0.212639f, 0.715169f, 0.072192f,
-   0.019331f, 0.119195f, 0.950532f);
-
-const mat3 kXYZ_to_DCIP3 = mat3 (
-    2.4934969119f, -0.9313836179f, -0.4027107845f,
-   -0.8294889696f,  1.7626640603f,  0.0236246858f,
-    0.0358458302f, -0.0761723893f,  0.9568845240f);
-
-float LinearTosRGB_1(const float channel)
-{
-	return (channel > (HCRT_SRGB_GAMMA_CUTOFF * (1.0f / 1000.0f))) ? (1.055f * pow(channel, 1.0f / HCRT_SRGB_GAMMA_OUT)) - 0.055f : channel * 12.92f; 
-}
-
-vec3 LinearTosRGB(const vec3 colour)
-{
-	return vec3(LinearTosRGB_1(colour.r), LinearTosRGB_1(colour.g), LinearTosRGB_1(colour.b));
-}
-
-float LinearTo709_1(const float channel)
-{
-	return (channel >= (HCRT_R709_GAMMA_CUTOFF * (1.0f / 1000.0f))) ? pow(channel * 1.099f, 1.0f / HCRT_R709_GAMMA_OUT) - 0.099f : channel * 4.5f;
-}
-
-vec3 LinearTo709(const vec3 colour)
-{
-	return vec3(LinearTo709_1(colour.r), LinearTo709_1(colour.g), LinearTo709_1(colour.b));
-}
-
-float LinearToDCIP3_1(const float channel)
-{
-	return pow(channel, 1.0f / HCRT_P3_GAMMA_OUT);
-}
-
-vec3 LinearToDCIP3(const vec3 colour)
-{
-	return vec3(LinearToDCIP3_1(colour.r), LinearToDCIP3_1(colour.g), LinearToDCIP3_1(colour.b));
-}
-
-void GammaCorrect(const vec3 scanline_colour, inout vec3 gamma_corrected)
-{
-   if(HCRT_HDR < 1.0f)
-   {
-      if(HCRT_OUTPUT_COLOUR_SPACE == 0.0f)
-      {
-         gamma_corrected = LinearTo709(scanline_colour);
-      }
-      else if(HCRT_OUTPUT_COLOUR_SPACE == 1.0f)
-      {
-         gamma_corrected = LinearTosRGB(scanline_colour);
-      }
-      else
-      {
-         gamma_corrected = LinearToDCIP3(scanline_colour);
-      }
-   }
-   else
-   {
-      gamma_corrected = LinearToST2084(scanline_colour);
-   }
-}
\ No newline at end of file
diff --git a/hdr/shaders/include/hdr10.h b/hdr/shaders/include/hdr10.h
deleted file mode 100644
index c9c2cf0190..0000000000
--- a/hdr/shaders/include/hdr10.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#define kMaxNitsFor2084     10000.0f
-
-const mat3 k709_to_2020 = mat3 (
-   0.6274040f, 0.3292820f, 0.0433136f,
-   0.0690970f, 0.9195400f, 0.0113612f,
-   0.0163916f, 0.0880132f, 0.8955950f);
-
-/* START Converted from (Copyright (c) Microsoft Corporation - Licensed under the MIT License.)  https://github.com/microsoft/Xbox-ATG-Samples/tree/master/Kits/ATGTK/HDR */
-const mat3 kExpanded709_to_2020 = mat3 (
-    0.6274040f,  0.3292820f, 0.0433136f,
-    0.0457456f,  0.941777f,  0.0124772f,
-   -0.00121055f, 0.0176041f, 0.983607f);
-
-const mat3 k2020Gamuts[2] = { k709_to_2020, kExpanded709_to_2020 };
-
-float LinearToST2084_1(const float channel)
-{
-   float ST2084 = pow((0.8359375f + 18.8515625f * pow(abs(channel), 0.1593017578f)) / (1.0f + 18.6875f * pow(abs(channel), 0.1593017578f)), 78.84375f);
-   return ST2084;  /* Don't clamp between [0..1], so we can still perform operations on scene values higher than 10,000 nits */
-}
-
-vec3 LinearToST2084(const vec3 colour)
-{
-	return vec3(LinearToST2084_1(colour.r), LinearToST2084_1(colour.g), LinearToST2084_1(colour.b));
-}
-
-/* END Converted from (Copyright (c) Microsoft Corporation - Licensed under the MIT License.)  https://github.com/microsoft/Xbox-ATG-Samples/tree/master/Kits/ATGTK/HDR */
-
-/* Convert into HDR10 */
-vec3 Hdr10(const vec3 hdr_linear, float paper_white_nits, float expand_gamut)
-{
-   const vec3 rec2020       = hdr_linear * k2020Gamuts[uint(expand_gamut)];
-   const vec3 linearColour  = rec2020 * (paper_white_nits / kMaxNitsFor2084);
-   vec3 hdr10               = LinearToST2084(linearColour);
-
-   return hdr10;
-}
-
diff --git a/hdr/shaders/include/inverse_tonemap.h b/hdr/shaders/include/inverse_tonemap.h
deleted file mode 100644
index 1e64c704d6..0000000000
--- a/hdr/shaders/include/inverse_tonemap.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#define kMaxNitsFor2084     10000.0f
-#define kEpsilon            0.0001f
-
-vec3 InverseTonemap(const vec3 sdr_linear, const float max_nits, const float paper_white_nits)
-{
-   const float luma                 = dot(sdr_linear, vec3(0.2126, 0.7152, 0.0722));  /* Rec BT.709 luma coefficients - https://en.wikipedia.org/wiki/Luma_(video) */
-
-   /* Inverse reinhard tonemap */
-   const float max_value            = (max_nits / paper_white_nits) + kEpsilon;
-   const float elbow                = max_value / (max_value - 1.0f);                          
-   const float offset               = 1.0f - ((0.5f * elbow) / (elbow - 0.5f));              
-   
-   const float hdr_luma_inv_tonemap = offset + ((luma * elbow) / (elbow - luma));
-   const float sdr_luma_inv_tonemap = luma / ((1.0f + kEpsilon) - luma);                     /* Convert the srd < 0.5 to 0.0 -> 1.0 range */
-
-   const float luma_inv_tonemap     = (luma > 0.5f) ? hdr_luma_inv_tonemap : sdr_luma_inv_tonemap;
-   const vec3 hdr                   = sdr_linear / (luma + kEpsilon) * luma_inv_tonemap;
-
-   return hdr;
-}
diff --git a/hdr/shaders/include/parameters.h b/hdr/shaders/include/parameters.h
deleted file mode 100644
index d4ce2235d3..0000000000
--- a/hdr/shaders/include/parameters.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#pragma parameter hcrt_title                         "SONY MEGATRON COLOUR VIDEO MONITOR"                           0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_space0                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support0                      "SDR mode: Turn up your TV's brightness as high as possible"   0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support1                      "HDR mode: Set the peak luminance to that of your TV."         0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support2                      "Then adjust paper white luminance until it looks right"       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_space1                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support3                      "Default white points for the different colour systems:"       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support4                      "709: D65, PAL: D65, NTSC-U: D65, NTSC-J: D93"         		0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_space2                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support5                      "Rec. 709 gamma cutoff is 0.018 x 1000 = 18"       			0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support6                      "sRGB gamma cutoff is 0.0031308 x 1000 = ~31"       			0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_support7                      "Rec. 601/709 inverse gamma cutoff is 0.081 x 1000 = 81"       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_space3                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_user_settings                 "YOUR DISPLAY'S SETTINGS:"                                     0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_hdr                           "    SDR | HDR"                                                1.0      0.0   1.0      1.0
-#pragma parameter hcrt_space4                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_max_nits                      "    HDR: Display's Peak Luminance"                            1000.0   0.0   10000.0  10.0
-#pragma parameter hcrt_paper_white_nits              "    HDR: Display's Paper White Luminance"                     200.0    0.0   10000.0  10.0
-#pragma parameter hcrt_expand_gamut                  "    HDR: Original/Vivid"                                      0.0      0.0   1.0      1.0
-#pragma parameter hcrt_space5                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_colour_space                  "    SDR: Display's Colour Space: r709 | sRGB | DCI-P3"        1.0      0.0   2.0      1.0
-#pragma parameter hcrt_r709_gamma_out                "    SDR: r709 Gamma"                                          2.22     1.0   5.0      0.01
-#pragma parameter hcrt_srgb_gamma_out                "    SDR: sRGB Gamma"                                          2.4      1.0   5.0      0.01
-#pragma parameter hcrt_p3_gamma_out                  "    SDR: DCI-P3 Gamma"                                        2.6      1.0   5.0      0.01
-#pragma parameter hcrt_r709_gamma_cutoff             "    SDR: r709 Gamma Cutoff (x1000)"                           1.0      0.0   100.0    1.00
-#pragma parameter hcrt_srgb_gamma_cutoff             "    SDR: sRGB Gamma Cutoff (x1000)"                           1.0      0.0   100.0    1.00
-#pragma parameter hcrt_space6                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_lcd_resolution                "    Display's Resolution: 1080p | 4K | 8K"                    1.0      0.0   2.0      1.0
-#pragma parameter hcrt_lcd_subpixel                  "    Display's Subpixel Layout: RGB | RWBG (OLED) | BGR"       0.0      0.0   2.0      1.0
-#pragma parameter hcrt_colour_accurate               "    Mask Accurate/Colour Accurate"                            1.0      0.0   1.0      1.0
-#pragma parameter hcrt_space7                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_developer_settings            "CRT SETTINGS:"                                                0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_crt_screen_type               "    Screen Type: APERTURE GRILLE | SHADOW MASK | SLOT MASK"   0.0      0.0   2.0      1.0
-#pragma parameter hcrt_crt_resolution                "    Resolution: 300TVL | 600TVL | 800TVL | 1000TVL"           1.0      0.0   3.0      1.0
-#pragma parameter hcrt_colour_system                 "    Colour System: r709 | PAL | NTSC-U | NTSC-J"              2.0      0.0   3.0      1.0
-#pragma parameter hcrt_phosphor_set                  "    Phosphors: NONE | P22-J | P22-80 | P22-90 | RPTV | 1953"  0.0      0.0   5.0      1.0
-#pragma parameter hcrt_white_temperature_D65         "    D65 White Temperature (Kelvin)"                    		6504.0   0.0   18500.0  100.0
-#pragma parameter hcrt_white_temperature_D93         "    D93 White Temperature (Kelvin)"                    		9305.0   0.0   18500.0  100.0
-#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"                                                    2.22     1.0   5.0      0.01
-#pragma parameter hcrt_gamma_cutoff                  "    Inverse Gamma Cutoff (x1000)"                             1.0      0.0   100.0    1.0
-#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_space8                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_developer_settings0           "    VERTICAL SETTINGS:"                                       0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_v_size                        "        Vertical Size"                                        1.00     0.8   1.2      0.01
-#pragma parameter hcrt_v_cent                        "        Vertical Center"                                      0.00  -200.0 200.0      1.0
-#pragma parameter hcrt_red_vertical_convergence      "        Red Vertical Deconvergence"                           0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_green_vertical_convergence    "        Green Vertical Deconvergence"                         0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_blue_vertical_convergence     "        Blue Vertical Deconvergence"                          0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_red_scanline_min              "        Red Scanline Min"                                     0.50     0.0   2.0      0.01 
-#pragma parameter hcrt_red_scanline_max              "        Red Scanline Max"                                     1.00     0.0   2.0      0.01 
-#pragma parameter hcrt_red_scanline_attack           "        Red Scanline Attack"                                  0.20     0.0   1.0      0.01
-#pragma parameter hcrt_green_scanline_min            "        Green Scanline Min"                                   0.50     0.0   2.0      0.01 
-#pragma parameter hcrt_green_scanline_max            "        Green Scanline Max"                                   1.00     0.0   2.0      0.01 
-#pragma parameter hcrt_green_scanline_attack         "        Green Scanline Attack"                                0.20     0.0   1.0      0.01
-#pragma parameter hcrt_blue_scanline_min             "        Blue Scanline Min"                                    0.50     0.0   2.0      0.01 
-#pragma parameter hcrt_blue_scanline_max             "        Blue Scanline Max"                                    1.00     0.0   2.0      0.01 
-#pragma parameter hcrt_blue_scanline_attack          "        Blue Scanline Attack"                                 0.20     0.0   1.0      0.01
-#pragma parameter hcrt_space9                        " "                                                            0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_developer_settings1           "    HORIZONTAL SETTINGS:"                                     0.0      0.0   0.0001   0.0001
-#pragma parameter hcrt_h_size                        "        Horizontal Size"                                      1.00     0.8   1.2      0.01
-#pragma parameter hcrt_h_cent                        "        Horizontal Center"                                    0.00  -200.0 200.0      1.0
-#pragma parameter hcrt_red_horizontal_convergence    "        Red Horizontal Deconvergence"                         0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_green_horizontal_convergence  "        Green Horizontal Deconvergence"                       0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_blue_horizontal_convergence   "        Blue Horizontal Deconvergence"                        0.00     -10.0 10.0     0.01
-#pragma parameter hcrt_red_beam_sharpness            "        Red Beam Sharpness"                                   1.75     0.0   5.0      0.05
-#pragma parameter hcrt_red_beam_attack               "        Red Beam Attack"                                      0.50     0.0   2.0      0.01
-#pragma parameter hcrt_green_beam_sharpness          "        Green Beam Sharpness"                                 1.75     0.0   5.0      0.05
-#pragma parameter hcrt_green_beam_attack             "        Green Beam Attack"                                    0.50     0.0   2.0      0.01
-#pragma parameter hcrt_blue_beam_sharpness           "        Blue Beam Sharpness"                                  1.75     0.0   5.0      0.05
-#pragma parameter hcrt_blue_beam_attack              "        Blue Beam Attack"                                     0.50     0.0   2.0      0.01
-
diff --git a/hdr/shaders/include/scanline_generation.h b/hdr/shaders/include/scanline_generation.h
deleted file mode 100644
index e42f718162..0000000000
--- a/hdr/shaders/include/scanline_generation.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-#define kPi    3.1415926536f
-#define kEuler 2.718281828459f
-#define kMax   1.0f
-
-#define kBeamWidth 0.5f
-
-const vec4 kFallOffControlPoints    = vec4(0.0f, 0.0f, 0.0f, 1.0f);
-const vec4 kAttackControlPoints     = vec4(0.0f, 1.0f, 1.0f, 1.0f);
-//const vec4 kScanlineControlPoints = vec4(1.0f, 1.0f, 0.0f, 0.0f);
-
-const mat4 kCubicBezier = mat4( 1.0f,  0.0f,  0.0f,  0.0f,
-                               -3.0f,  3.0f,  0.0f,  0.0f,
-                                3.0f, -6.0f,  3.0f,  0.0f,
-                               -1.0f,  3.0f, -3.0f,  1.0f );
-
-float Bezier(const float t0, const vec4 control_points)
-{
-   vec4 t = vec4(1.0, t0, t0*t0, t0*t0*t0);
-   return dot(t, control_points * kCubicBezier);
-}
-
-vec4 BeamControlPoints(const float beam_attack, const bool falloff)
-{
-   const float inner_attack = clamp(beam_attack, 0.0f, 1.0);
-   const float outer_attack = clamp(beam_attack - 1.0f, 0.0f, 1.0);
-
-   return falloff ? kFallOffControlPoints + vec4(0.0f, outer_attack, inner_attack, 0.0f) : kAttackControlPoints - vec4(0.0f, inner_attack, outer_attack, 0.0f);
-}
-
-float ScanlineColour(const uint channel, 
-                     const vec2 tex_coord,
-                     const vec2 source_size, 
-                     const float scanline_size, 
-                     const float source_tex_coord_x, 
-                     const float narrowed_source_pixel_offset, 
-                     const float vertical_convergence, 
-                     const float beam_attack, 
-                     const float scanline_min, 
-                     const float scanline_max, 
-                     const float scanline_attack, 
-                     inout float next_prev)
-{
-   const float current_source_position_y  = ((tex_coord.y * source_size.y) - vertical_convergence) + next_prev;
-   const float current_source_center_y    = floor(current_source_position_y) + 0.5f; 
-   
-   const float source_tex_coord_y         = current_source_center_y / source_size.y; 
-
-   const float scanline_delta             = fract(current_source_position_y) - 0.5f;
-
-   // Slightly increase the beam width to get maximum brightness
-   float beam_distance                    = abs(scanline_delta - next_prev) - (kBeamWidth / scanline_size);
-   beam_distance                          = beam_distance < 0.0f ? 0.0f : beam_distance;
-   const float scanline_distance          = beam_distance * 2.0f;
-
-   next_prev = scanline_delta > 0.0f ? 1.0f : -1.0f;
-
-   const vec2 tex_coord_0                 = vec2(source_tex_coord_x, source_tex_coord_y);
-   const vec2 tex_coord_1                 = vec2(source_tex_coord_x + (1.0f / source_size.x), source_tex_coord_y);
-
-   const float sdr_channel_0              = COMPAT_TEXTURE(SourceSDR, tex_coord_0)[channel];
-   const float sdr_channel_1              = COMPAT_TEXTURE(SourceSDR, tex_coord_1)[channel];
-
-   const float hdr_channel_0              = COMPAT_TEXTURE(SourceHDR, tex_coord_0)[channel];
-   const float hdr_channel_1              = COMPAT_TEXTURE(SourceHDR, tex_coord_1)[channel];
-
-   /* Horizontal interpolation between pixels */ 
-   const float horiz_interp               = Bezier(narrowed_source_pixel_offset, BeamControlPoints(beam_attack, sdr_channel_0 > sdr_channel_1));  
-
-   const float hdr_channel                = mix(hdr_channel_0, hdr_channel_1, horiz_interp);
-   const float sdr_channel                = mix(sdr_channel_0, sdr_channel_1, horiz_interp);
-
-   const float channel_scanline_distance  = clamp(scanline_distance / ((sdr_channel * (scanline_max - scanline_min)) + scanline_min), 0.0f, 1.0f);
-
-   const vec4 channel_control_points      = vec4(1.0f, 1.0f, sdr_channel * scanline_attack,    0.0f);
-
-   const float luminance                  = Bezier(channel_scanline_distance, channel_control_points);
-
-   return luminance * hdr_channel;
-}
-
-float GenerateScanline( const uint channel, 
-                        const vec2 tex_coord,
-                        const vec2 source_size, 
-                        const float scanline_size, 
-                        const float horizontal_convergence, 
-                        const float vertical_convergence, 
-                        const float beam_sharpness, 
-                        const float beam_attack, 
-                        const float scanline_min, 
-                        const float scanline_max, 
-                        const float scanline_attack)
-{
-   const float current_source_position_x      = (tex_coord.x * source_size.x) - horizontal_convergence;
-   const float current_source_center_x        = floor(current_source_position_x) + 0.5f; 
-   
-   const float source_tex_coord_x             = current_source_center_x / source_size.x; 
-
-   const float source_pixel_offset            = fract(current_source_position_x);
-
-   const float narrowed_source_pixel_offset   = clamp(((source_pixel_offset - 0.5f) * beam_sharpness) + 0.5f, 0.0f, 1.0f);
-
-   float next_prev = 0.0f;
-
-   const float scanline_colour0  = ScanlineColour( channel, 
-                                                   tex_coord,
-                                                   source_size, 
-                                                   scanline_size, 
-                                                   source_tex_coord_x, 
-                                                   narrowed_source_pixel_offset, 
-                                                   vertical_convergence,  
-                                                   beam_attack, 
-                                                   scanline_min, 
-                                                   scanline_max, 
-                                                   scanline_attack, 
-                                                   next_prev);
-
-   // Optionally sample the neighbouring scanline
-   float scanline_colour1 = 0.0f;
-   if(scanline_max > 1.0f)
-   {
-      scanline_colour1           = ScanlineColour( channel, 
-                                                   tex_coord,
-                                                   source_size, 
-                                                   scanline_size, 
-                                                   source_tex_coord_x, 
-                                                   narrowed_source_pixel_offset,
-                                                   vertical_convergence,  
-                                                   beam_attack, 
-                                                   scanline_min, 
-                                                   scanline_max, 
-                                                   scanline_attack,  
-                                                   next_prev);
-   }
-
-   return scanline_colour0 + scanline_colour1;
-}
\ No newline at end of file
diff --git a/hdr/shaders/inverse_tonemap.slang b/hdr/shaders/inverse_tonemap.slang
deleted file mode 100644
index 03d63c3746..0000000000
--- a/hdr/shaders/inverse_tonemap.slang
+++ /dev/null
@@ -1,63 +0,0 @@
-#version 450
-
-/* 
-Part of the crt-sony-megatron shader group. Does the exact same thing as RetroArch does internally to inverse tonemap from a SDR image to HDR.
-
-This is used to do this mapping BEFORE screen effects are applied.
-
-Originally part of the crt\crt-sony-pvm-4k-hdr.slangp but can be used for any shader
-*/
-
-#pragma format R16G16B16A16_SFLOAT
-
-#include "include\inverse_tonemap.h"
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float Contrast;
-   float PaperWhiteNits;
-   float MaxNits;
-   float Saturation;
-   float DisplayGamma;
-} params;
-
-#pragma parameter Contrast          "Contrast"              3.75     0.0 10.0    0.05
-#pragma parameter PaperWhiteNits    "Paper White Luminance" 200.0    0.0 10000.0 10.0
-#pragma parameter MaxNits           "Peak Luminance"        1000.0   0.0 10000.0 10.0
-#pragma parameter Saturation        "Saturation"            0.25     0.0 1.0     0.01
-#pragma parameter DisplayGamma      "Display Gamma"         2.2      0.0 5.0     0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 source = texture(Source, vTexCoord);
-
-   vec3 sdr = pow(abs(source.rgb), vec3(params.Contrast / params.DisplayGamma));       /* Display Gamma - needs to be determined by calibration screen */
-
-   FragColor = vec4(InverseTonemap(sdr, params.MaxNits, params.PaperWhiteNits, params.Saturation), source.a); 
-}
-
diff --git a/include/compat_macros.inc b/include/compat_macros.inc
deleted file mode 100644
index d56723e053..0000000000
--- a/include/compat_macros.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-// compatibility macros for transparently converting HLSLisms into GLSLisms
-#define mul(a,b) (b*a)
-#define lerp(a,b,c) mix(a,b,c)
-#define saturate(c) clamp(c, 0.0, 1.0)
-#define frac(x) (fract(x))
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float2x2 mat2x2
-#define float3x3 mat3x3
-#define float4x4 mat4x4
-#define float4x3 mat4x3
-#define float2x4 mat2x4
-#define IN params
-#define texture_size SourceSize.xy
-#define video_size SourceSize.xy
-#define output_size OutputSize.xy
-#define frame_count FrameCount
-#define static  
-#define inline  
-#define const  
-#define fmod(x,y) mod(x,y)
-#define ddx(c) dFdx(c)
-#define ddy(c) dFdy(c)
-#define atan2(x,y) atan(x,y)
-#define rsqrt(c) inversesqrt(c)
diff --git a/include/img/border_mask.h b/include/img/border_mask.h
deleted file mode 100644
index 5940429bba..0000000000
--- a/include/img/border_mask.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef BORDER_MASK
-#define BORDER_MASK
-
-#pragma parameter ia_TOPMASK "Overscan Mask Top" 0.0 0.0 1.0 0.0025
-#pragma parameter ia_BOTMASK "Overscan Mask Bottom" 0.0 0.0 1.0 0.0025
-#pragma parameter ia_LMASK "Overscan Mask Left" 0.0 0.0 1.0 0.0025
-#pragma parameter ia_RMASK "Overscan Mask Right" 0.0 0.0 1.0 0.0025
-
-vec3 border_mask(vec3 in_col, vec2 coord){
-   vec3 out_col = (coord.y > ia_TOPMASK && coord.y < (1.0 - ia_BOTMASK)) ?
-      in_col : vec3(0.0);
-   out_col = (coord.x > ia_LMASK && coord.x < (1.0 - ia_RMASK)) ?
-      out_col : vec3(0.0);
-   return out_col;
-}
-
-#endif
diff --git a/include/img/bright_con.h b/include/img/bright_con.h
deleted file mode 100644
index a1ff273c99..0000000000
--- a/include/img/bright_con.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef BRIGHT_CON
-#define BRIGHT_CON
-
-#pragma parameter ia_contrast "Contrast" 1.0 0.0 10.0 0.05
-#pragma parameter ia_bright_boost "Brightness Boost" 0.0 -1.0 1.0 0.05
-
-vec3 cntrst(vec3 in_col){
-   vec3 out_col = in_col - 0.5;
-   out_col *= ia_contrast;
-   out_col += 0.5;
-   out_col += ia_bright_boost;
-   out_col = clamp(out_col, 0.0, 1.0);
-   return out_col;
-}
-
-#endif
diff --git a/include/img/col_mangler.h b/include/img/col_mangler.h
deleted file mode 100644
index 52cb31eded..0000000000
--- a/include/img/col_mangler.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CHANNEL_MIX
-#define CHANNEL_MIX
-
-#pragma parameter ia_rr "Red Channel" 1.0 0.0 2.0 0.01
-#pragma parameter ia_gg "Green Channel" 1.0 0.0 2.0 0.01
-#pragma parameter ia_bb "Blue Channel" 1.0 0.0 2.0 0.01
-#pragma parameter ia_rg "Red-Green Tint" 0.0 0.0 1.0 0.005
-#pragma parameter ia_rb "Red-Blue Tint" 0.0 0.0 1.0 0.005
-#pragma parameter ia_gr "Green-Red Tint" 0.0 0.0 1.0 0.005
-#pragma parameter ia_gb "Green-Blue Tint" 0.0 0.0 1.0 0.005
-#pragma parameter ia_br "Blue-Red Tint" 0.0 0.0 1.0 0.005
-#pragma parameter ia_bg "Blue-Green Tint" 0.0 0.0 1.0 0.005
-
-mat3 mangler = mat3( ia_rr,   ia_rg,   ia_rb,  //red channel
-                     ia_gr,   ia_gg,   ia_gb,  //green channel
-                     ia_br,   ia_bg,   ia_bb); //blue channel
-                     
-vec3 channel_mix(vec3 in_col){
-   vec3 out_col = in_col * mangler;
-   return out_col;
-}
-
-#endif
diff --git a/include/img/corner.h b/include/img/corner.h
deleted file mode 100644
index 5659776fe9..0000000000
--- a/include/img/corner.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CORNER
-#define CORNER
-
-#pragma parameter cornersize "Corner Size" 0.03 0.001 1.0 0.005
-#pragma parameter cornersmooth "Corner Smoothness" 1000.0 80.0 2000.0 100.0
-
-const vec2 corner_aspect   = vec2(1.0,  0.75);
-
-float corner(vec2 coord)
-{
-    coord = (coord - vec2(0.5)) + vec2(0.5, 0.5);
-    coord = min(coord, vec2(1.0) - coord) * corner_aspect;
-    vec2 cdist = vec2(cornersize);
-    coord = (cdist - min(coord, cdist));
-    float dist = sqrt(dot(coord, coord));
-    
-    return clamp((cdist.x - dist)*cornersmooth, 0.0, 1.0);
-}
-
-#endif
diff --git a/include/img/exp_gamma.h b/include/img/exp_gamma.h
deleted file mode 100644
index 4998572631..0000000000
--- a/include/img/exp_gamma.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef GAMMA
-#define GAMMA
-
-#pragma parameter ia_monitor_gamma "Physical Monitor Gamma" 2.2 0.1 5.0 0.05
-#pragma parameter ia_target_gamma_r "Simulated Gamma R Channel" 2.2 0.1 5.0 0.05
-#pragma parameter ia_target_gamma_g "Simulated Gamma G Channel" 2.2 0.1 5.0 0.05
-#pragma parameter ia_target_gamma_b "Simulated Gamma B Channel" 2.2 0.1 5.0 0.05
-
-vec3 gamma_in(vec3 in_col){
-   vec3 out_col = pow(in_col, vec3(ia_target_gamma_r, ia_target_gamma_g, ia_target_gamma_b));
-   return out_col;
-}
-
-vec3 gamma_out(vec3 in_col){
-   vec3 out_col= pow(in_col, 1./vec3(ia_monitor_gamma));
-   return out_col;
-}
-
-#endif
diff --git a/include/img/film_grain.h b/include/img/film_grain.h
deleted file mode 100644
index 637f476041..0000000000
--- a/include/img/film_grain.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef FILM_GRAIN
-#define FILM_GRAIN
-
-#pragma parameter ia_GRAIN_STR "Grain Strength" 0.0 0.0 72.0 3.0
-
-#include "col_tools.h"
-
-//https://www.shadertoy.com/view/4sXSWs strength= 16.0
-vec3 rgb_grain(vec2 uv, float strength, uint counter){       
-    float x = ((uv.x + 4.0 ) * (uv.y + 5.0 ) * ((mod(vec2(counter, counter).x, 800.0) + 10.0) * 8.0));
-    float y = ((uv.x + 5.0 ) * (uv.y + 6.0 ) * ((mod(vec2(counter, counter).x, 678.0) + 8.0) * 6.0));
-    float z = ((uv.x + 6.0 ) * (uv.y + 4.0 ) * ((mod(vec2(counter, counter).x, 498.0) + 6.0) * 10.0));
-    float r = (mod((mod(x, 13.0) + 1.0) * (mod(x, 123.0) + 1.0), 0.01)-0.005);
-    float g = (mod((mod(y, 13.0) + 1.0) * (mod(y, 123.0) + 1.0), 0.01)-0.005);
-    float b = (mod((mod(z, 13.0) + 1.0) * (mod(z, 123.0) + 1.0), 0.01)-0.005);
-	return  vec3(r, g, b) * strength;
-}
-
-vec3 luma_grain(vec3 in_col, vec2 uv, float strength, uint counter){
-    float x = (uv.x + 4.0 ) * (uv.y + 4.0 ) * ((mod(vec2(counter, counter).x, 800.0) + 10.0) * 10.0);
-	 x = (mod((mod(x, 13.0) + 1.0) * (mod(x, 123.0) + 1.0), 0.01)-0.005) * strength;
-	 vec3 out_col = RGBtoYIQ(in_col);
-	 out_col.r += x;
-	 return YIQtoRGB(out_col);
-}
-
-#endif
diff --git a/include/img/gamma_srgb.h b/include/img/gamma_srgb.h
deleted file mode 100644
index 716c93dd32..0000000000
--- a/include/img/gamma_srgb.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef GAMMA
-#define GAMMA
-
-#pragma parameter gamma_in_lvl "CRT Gamma" 2.4 0.0 3.0 0.05
-#pragma parameter gamma_out_lvl "LCD Gamma" 2.2 0.0 3.0 0.05
-
-#include "moncurve.h"
-
-vec3 gamma_in(vec3 in_col){
-   vec3 out_col = moncurve_f_f3(in_col, gamma_in_lvl + 0.15, 0.055);
-   return out_col;
-}
-
-vec3 gamma_out(vec3 in_col){
-   vec3 out_col = moncurve_r_f3(in_col, gamma_out_lvl + 0.20, 0.055);
-   return out_col;
-}
-
-#endif
diff --git a/include/img/gristle_warp.h b/include/img/gristle_warp.h
deleted file mode 100644
index a766003711..0000000000
--- a/include/img/gristle_warp.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CURV
-#define CURV
-
-#pragma parameter warpX "Warp X" 0.031 0.0 0.125 0.01
-#pragma parameter warpY "Warp Y" 0.041 0.0 0.125 0.01
-vec2 Distortion = vec2(warpX, warpY) * 15.;
-
-vec2 warp(vec2 texCoord){
-  vec2 Distortion = vec2(warpX, warpY) * 15.;
-  vec2 curvedCoords = texCoord * 2.0 - 1.0;
-  float curvedCoordsDistance = sqrt(curvedCoords.x*curvedCoords.x+curvedCoords.y*curvedCoords.y);
-
-  curvedCoords = curvedCoords / curvedCoordsDistance;
-
-  curvedCoords = curvedCoords * (1.0-pow(vec2(1.0-(curvedCoordsDistance/1.4142135623730950488016887242097)),(1.0/(1.0+Distortion*0.2))));
-
-  curvedCoords = curvedCoords / (1.0-pow(vec2(0.29289321881345247559915563789515),(1.0/(vec2(1.0)+Distortion*0.2))));
-
-  curvedCoords = curvedCoords * 0.5 + 0.5;
-  return curvedCoords;
-}
-
-#endif
diff --git a/include/img/helper_macros.h b/include/img/helper_macros.h
deleted file mode 100644
index c1dcfa2cef..0000000000
--- a/include/img/helper_macros.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef HELPER_MACROS
-#define HELPER_MACROS
-
-// All of the parameter macros in one place
-// replace 'global' with whichever struct you use for parameters
-
-#define ia_FLIP_HORZ global.ia_FLIP_HORZ
-#define ia_FLIP_VERT global.ia_FLIP_VERT
-#define ia_overscan_percent_x global.ia_overscan_percent_x
-#define ia_overscan_percent_y global.ia_overscan_percent_y
-#define ia_ZOOM global.ia_ZOOM
-#define ia_XPOS global.ia_XPOS
-#define ia_YPOS global.ia_YPOS
-#define ia_GRAIN_STR global.ia_GRAIN_STR
-#define ia_SHARPEN global.ia_SHARPEN
-#define ia_saturation global.ia_saturation
-#define ia_luminance global.ia_luminance
-#define ia_contrast global.ia_contrast
-#define ia_bright_boost global.ia_bright_boost
-#define ia_black_level global.ia_black_level
-#define ia_target_gamma_r global.ia_target_gamma_r
-#define ia_target_gamma_g global.ia_target_gamma_g
-#define ia_target_gamma_b global.ia_target_gamma_b
-#define ia_monitor_gamma global.ia_monitor_gamma
-#define ia_R global.ia_R
-#define ia_G global.ia_G
-#define ia_B global.ia_B
-#define ia_TOPMASK global.ia_TOPMASK
-#define ia_BOTMASK global.ia_BOTMASK
-#define ia_LMASK global.ia_LMASK
-#define ia_RMASK global.ia_RMASK
-#define ia_rr global.ia_rr
-#define ia_gg global.ia_gg
-#define ia_bb global.ia_bb
-#define ia_rg global.ia_rg
-#define ia_rb global.ia_rb
-#define ia_gr global.ia_gr
-#define ia_gb global.ia_gb
-#define ia_br global.ia_br
-#define ia_bg global.ia_bg
-#define temperature global.temperature
-#define luma_preserve global.luma_preserve
-#define wp_red global.wp_red
-#define wp_green global.wp_green
-#define wp_blue global.wp_blue
-#define integer_scale global.integer_scale
-#define overscale global.overscale
-#define ar_num global.ar_num
-#define ar_den global.ar_den
-#define g_hpfix global.g_hpfix
-#define g_cntrst global.g_cntrst
-#define g_mid global.g_mid
-#define mask_strength global.mask_strength
-#define mask_picker global.mask_picker
-#define LUT_Size1 global.LUT_Size1
-#define LUT_Size2 global.LUT_Size2
-#define g_vignette global.g_vignette
-#define g_vstr global.g_vstr
-#define g_vpower global.g_vpower
-#define gamma_in_lvl global.gamma_in_lvl
-#define gamma_out_lvl global.gamma_out_lvl
-#define warpX global.warpX
-#define warpY global.warpY
-#define cornersize global.cornersize
-#define cornersmooth global.cornersmooth
-#define Radius global.Radius
-#define Distance global.Distance
-#define x_tilt global.x_tilt
-#define y_tilt global.y_tilt
-
-#endif
diff --git a/include/img/image_flip.h b/include/img/image_flip.h
deleted file mode 100644
index d09e573067..0000000000
--- a/include/img/image_flip.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef IMAGE_FLIP
-#define IMAGE_FLIP
-
-// wraps the Position in gl_Position calculation
-
-#pragma parameter ia_FLIP_HORZ "Flip Horiz Axis" 0.0 0.0 1.0 1.0
-#pragma parameter ia_FLIP_VERT "Flip Vert Axis" 0.0 0.0 1.0 1.0
-   
-vec4 flip_pos(vec4 in_pos){
-   vec4 out_pos = in_pos;
-   out_pos.x = (ia_FLIP_HORZ < 0.5) ? out_pos.x : 1.0 - out_pos.x;
-   out_pos.y = (ia_FLIP_VERT < 0.5) ? out_pos.y : 1.0 - out_pos.y;
-   return out_pos;
-}
-
-#endif
diff --git a/include/img/lottes_warp.h b/include/img/lottes_warp.h
deleted file mode 100644
index d348a02196..0000000000
--- a/include/img/lottes_warp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef CURV
-#define CURV
-
-#pragma parameter warpX "Warp X" 0.031 0.0 0.125 0.01
-#pragma parameter warpY "Warp Y" 0.041 0.0 0.125 0.01
-
-// Distortion of scanlines, and end of screen alpha.
-vec2 warp(vec2 pos)
-{
-    pos  = pos*2.0-1.0;    
-    pos *= vec2(1.0 + (pos.y*pos.y)*warpX, 1.0 + (pos.x*pos.x)*warpY);
-    
-    return pos*0.5 + 0.5;
-}
-
-#endif
diff --git a/include/img/lum_chrom.h b/include/img/lum_chrom.h
deleted file mode 100644
index 0f64fabc62..0000000000
--- a/include/img/lum_chrom.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SAT_LUM
-#define SAT_LUM
-
-#pragma parameter ia_saturation "Chrominance" 1.0 0.01 2.0 0.01
-#pragma parameter ia_luminance "Luminance" 1.0 0.0 2.0 0.01
-
-#include "col_tools.h"
-
-// Note: This saturation should be similar to broadcast television.
-//       0% chrome == pure luma.
-
-vec3 sat_lum(vec3 in_col){
-   vec3 out_col = RGBtoYIQ(in_col);
-   out_col *= vec3(ia_luminance, ia_saturation, ia_saturation);
-   return YIQtoRGB(out_col);
-}
-
-#endif
diff --git a/include/img/lut1.h b/include/img/lut1.h
deleted file mode 100644
index ed57bd4fbf..0000000000
--- a/include/img/lut1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef LUT
-#define LUT
-
-// only #include in the fragment stage
-#pragma parameter LUT_Size1 "LUT Size 1" 16.0 1.0 64.0 1.0
-
-layout(set = 0, binding = 3) uniform sampler2D SamplerLUT1;
-
-// This shouldn't be necessary but it seems some undefined values can
-// creep in and each GPU vendor handles that differently. This keeps
-// all values within a safe range
-vec3 mixfix(vec3 a, vec3 b, float c)
-{
-	return (a.z < 1.0) ? mix(a, b, c) : a;
-}
-
-vec3 lut1(vec3 in_col)
-{
-	float red = ( in_col.r * (LUT_Size1 - 1.0) + 0.4999 ) / (LUT_Size1 * LUT_Size1);
-	float green = ( in_col.g * (LUT_Size1 - 1.0) + 0.4999 ) / LUT_Size1;
-	float blue1 = (floor( in_col.b  * (LUT_Size1 - 1.0) ) / LUT_Size1) + red;
-	float blue2 = (ceil( in_col.b  * (LUT_Size1 - 1.0) ) / LUT_Size1) + red;
-	float mixer = clamp(max((in_col.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-	vec3 color1 = texture( SamplerLUT1, vec2( blue1, green )).rgb;
-	vec3 color2 = texture( SamplerLUT1, vec2( blue2, green )).rgb;
-	return mixfix(color1, color2, mixer);
-}
-
-#endif
diff --git a/include/img/lut2.h b/include/img/lut2.h
deleted file mode 100644
index 8435e3b341..0000000000
--- a/include/img/lut2.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef LUT
-#define LUT
-
-// only #include in the fragment stage
-#pragma parameter LUT_Size1 "LUT Size 1" 16.0 1.0 64.0 1.0
-#pragma parameter LUT_Size2 "LUT Size 2" 16.0 1.0 64.0 1.0
-
-layout(set = 0, binding = 3) uniform sampler2D SamplerLUT1;
-layout(set = 0, binding = 4) uniform sampler2D SamplerLUT2;
-
-// This shouldn't be necessary but it seems some undefined values can
-// creep in and each GPU vendor handles that differently. This keeps
-// all values within a safe range
-vec3 mixfix(vec3 a, vec3 b, float c)
-{
-	return (a.z < 1.0) ? mix(a, b, c) : a;
-}
-
-vec3 lut1(vec3 in_col)
-{
-	float red = ( in_col.r * (LUT_Size1 - 1.0) + 0.4999 ) / (LUT_Size1 * LUT_Size1);
-	float green = ( in_col.g * (LUT_Size1 - 1.0) + 0.4999 ) / LUT_Size1;
-	float blue1 = (floor( in_col.b  * (LUT_Size1 - 1.0) ) / LUT_Size1) + red;
-	float blue2 = (ceil( in_col.b  * (LUT_Size1 - 1.0) ) / LUT_Size1) + red;
-	float mixer = clamp(max((in_col.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-	vec3 color1 = texture( SamplerLUT1, vec2( blue1, green )).rgb;
-	vec3 color2 = texture( SamplerLUT1, vec2( blue2, green )).rgb;
-	return mixfix(color1, color2, mixer);
-}
-
-vec3 lut2(vec3 in_col)
-{
-	float red = ( in_col.r * (LUT_Size2 - 1.0) + 0.4999 ) / (LUT_Size2 * LUT_Size2);
-	float green = ( in_col.g * (LUT_Size2 - 1.0) + 0.4999 ) / LUT_Size2;
-	float blue1 = (floor( in_col.b  * (LUT_Size2 - 1.0) ) / LUT_Size2) + red;
-	float blue2 = (ceil( in_col.b  * (LUT_Size2 - 1.0) ) / LUT_Size2) + red;
-	float mixer = clamp(max((in_col.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-	vec3 color1 = texture( SamplerLUT2, vec2( blue1, green )).rgb;
-	vec3 color2 = texture( SamplerLUT2, vec2( blue2, green )).rgb;
-	return mixfix(color1, color2, mixer);
-}
-
-#endif
diff --git a/include/img/moncurve.h b/include/img/moncurve.h
deleted file mode 100644
index 46347d68ce..0000000000
--- a/include/img/moncurve.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef MONCURVE
-#define MONCURVE
-
-float moncurve_f( float color, float gamma, float offs)
-{
-    // Forward monitor curve
-    color = clamp(color, 0.0, 1.0);
-    float fs = (( gamma - 1.0) / offs) * pow( offs * gamma / ( ( gamma - 1.0) * ( 1.0 + offs)), gamma);
-    float xb = offs / ( gamma - 1.0);
-
-    color = ( color > xb) ? pow( ( color + offs) / ( 1.0 + offs), gamma) : color * fs;
-    return color;
-}
-
-
-vec3 moncurve_f_f3( vec3 color, float gamma, float offs)
-{
-    color.r = moncurve_f( color.r, gamma, offs);
-    color.g = moncurve_f( color.g, gamma, offs);
-    color.b = moncurve_f( color.b, gamma, offs);
-    return color.rgb;
-}
-
-
-float moncurve_r( float color, float gamma, float offs)
-{
-    // Reverse monitor curve
-    color = clamp(color, 0.0, 1.0);
-    float yb = pow( offs * gamma / ( ( gamma - 1.0) * ( 1.0 + offs)), gamma);
-    float rs = pow( ( gamma - 1.0) / offs, gamma - 1.0) * pow( ( 1.0 + offs) / gamma, gamma);
-
-    color = ( color > yb) ? ( 1.0 + offs) * pow( color, 1.0 / gamma) - offs : color * rs;
-    return color;
-}
-
-
-vec3 moncurve_r_f3( vec3 color, float gamma, float offs)
-{
-    color.r = moncurve_r( color.r, gamma, offs);
-    color.g = moncurve_r( color.g, gamma, offs);
-    color.b = moncurve_r( color.b, gamma, offs);
-    return color.rgb;
-}
-
-#endif
diff --git a/include/img/param_floats.h b/include/img/param_floats.h
deleted file mode 100644
index d22c9a94e5..0000000000
--- a/include/img/param_floats.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef PARAM_FLOATS
-#define PARAM_FLOATS
-
-// The parameters that go into your struct
-// Collected here for tidiness
-   float ia_FLIP_HORZ;
-   float ia_FLIP_VERT;
-	float ia_overscan_percent_x;
-	float ia_overscan_percent_y;
-	float ia_ZOOM;
-	float ia_XPOS;
-	float ia_YPOS;
-	float ia_GRAIN_STR;
-	float ia_SHARPEN;
-	float ia_saturation;
-	float ia_luminance;
-	float ia_contrast;
-	float ia_bright_boost;
-	float ia_black_level;
-	float ia_target_gamma_r;
-	float ia_target_gamma_g;
-	float ia_target_gamma_b;
-	float ia_monitor_gamma;
-	float ia_TOPMASK;
-	float ia_BOTMASK;
-	float ia_LMASK;
-	float ia_RMASK;
-	float ia_rr;
-	float ia_gg;
-	float ia_bb;
-	float ia_rg;
-	float ia_rb;
-	float ia_gr;
-	float ia_gb;
-	float ia_br;
-	float ia_bg;
-   float temperature;
-   float luma_preserve;
-   float wp_red;
-   float wp_green;
-   float wp_blue;
-   float ar_num;
-   float ar_den;
-   float integer_scale;
-   float overscale;
-   float g_hpfix;
-   float g_cntrst;
-   float g_mid;
-   float mask_strength;
-   float mask_picker;
-   float LUT_Size1;
-   float LUT_Size2;
-   float g_vignette;
-   float g_vstr;
-   float g_vpower;
-   float gamma_in_lvl;
-   float gamma_out_lvl;
-   float warpX;
-   float warpY;
-   float cornersize;
-   float cornersmooth;
-   float Radius;
-   float Distance;
-   float x_tilt;
-   float y_tilt;
-   
-#endif
diff --git a/include/img/sat_lum.h b/include/img/sat_lum.h
deleted file mode 100644
index 9c46b1845d..0000000000
--- a/include/img/sat_lum.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SAT_LUM
-#define SAT_LUM
-
-#pragma parameter ia_saturation "Saturation" 1.0 0.0 5.0 0.1
-#pragma parameter ia_luminance "Value" 1.0 0.0 2.0 0.1
-
-#include "col_tools.h"
-
-// Note: saturation 0 does not mean grayscale in this case.
-//       It's purely a measure of the saturation of the colors.
-//       That is, pure r, g and b each look white.
-
-vec3 sat_lum(vec3 in_color){
-   vec3 out_color = RGBtoHSV(in_color);
-   out_color *= vec3(1.0, ia_saturation, ia_luminance);
-   out_color = HSVtoRGB(out_color);
-   out_color = clamp(out_color, 0.0, 1.0);
-   return out_color;
-}
-
-#endif
diff --git a/include/img/sharpening.h b/include/img/sharpening.h
deleted file mode 100644
index f2e89dcff9..0000000000
--- a/include/img/sharpening.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef SHARP_COORD
-#define SHARP_COORD
-
-// wrap texture coordinate when sampling
-
-#pragma parameter ia_SHARPEN "Sharpen" 0.0 0.0 1.0 0.05
-
-const vec2 offset = vec2(0.5, 0.5);
-
-// based on "Improved texture interpolation" by Iñigo Quílez
-// Original description: http://www.iquilezles.org/www/articles/texture/texture.htm
-vec2 sharp(vec2 in_coord, vec4 tex_size){
-	vec2 p = in_coord.xy;
-	p = p * tex_size.xy + offset;
-	vec2 i = floor(p);
-	vec2 f = p - i;
-	f = f * f * f * (f * (f * 6.0 - vec2(15.0, 15.0)) + vec2(10.0, 10.0));
-	p = i + f;
-	p = (p - offset) * tex_size.zw;
-	p = mix(in_coord, p, ia_SHARPEN);
-	return p;
-}
-
-#endif
diff --git a/include/img/sigmoidal_con.h b/include/img/sigmoidal_con.h
deleted file mode 100644
index e143769522..0000000000
--- a/include/img/sigmoidal_con.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef SIG_CON
-#define SIG_CON
-
-// borrowed from dogway's grade shader
-
-#pragma parameter g_cntrst "Contrast" 0.0 -1.0 1.0 0.05
-#pragma parameter g_mid "Contrast Pivot" 0.5 0.0 1.0 0.01
-#pragma parameter g_hpfix "Contrast Hotspot Fix" 0.0 0.0 1.0 1.00
-
-#include "col_tools.h"
-#include "moncurve.h"
-
-//  Performs better in gamma encoded space
-float contrast_sigmoid(float color, float cont, float pivot){
-
-    cont = pow(cont + 1., 3.);
-
-    float knee = 1. / (1. + exp(cont * pivot));
-    float shldr = 1. / (1. + exp(cont * (pivot - 1.)));
-
-    color = (1. / (1. + exp(cont * (pivot - color))) - knee) / (shldr - knee);
-
-    return color;
-}
-
-
-//  Performs better in gamma encoded space
-float contrast_sigmoid_inv(float color, float cont, float pivot){
-
-    cont = pow(cont - 1., 3.);
-
-    float knee = 1. / (1. + exp (cont * pivot));
-    float shldr = 1. / (1. + exp (cont * (pivot - 1.)));
-
-    color = pivot - log(1. / (color * (shldr - knee) + knee) - 1.) / cont;
-
-    return color;
-}
-
-//  Saturation agnostic sigmoidal contrast
-vec3 cntrst(vec3 in_col){
-    vec3 Yxy = XYZtoYxy(sRGB_to_XYZ(in_col));
-    float toGamma = clamp(moncurve_r(Yxy.r, 2.40, 0.055), 0.0, 1.0);
-    toGamma = (g_hpfix == 0.0) ? toGamma : ((Yxy.r > 0.5) ?
-      contrast_sigmoid_inv(toGamma, 2.3, 0.5) : toGamma);
-    float sigmoid = (g_cntrst > 0.0) ? contrast_sigmoid(toGamma, g_cntrst, g_mid) : contrast_sigmoid_inv(toGamma, g_cntrst, g_mid);
-    vec3 out_col = vec3(moncurve_f(sigmoid, 2.40, 0.055), Yxy.g, Yxy.b);
-    vec3 XYZsrgb = clamp(XYZ_to_sRGB(YxytoXYZ(out_col)), 0.0, 1.0);
-    out_col = (g_cntrst == 0.0) && (g_hpfix == 0.0) ? in_col :
-      ((g_cntrst != 0.0) || (g_hpfix != 0.0) ? XYZsrgb : in_col);
-   return out_col;
-}
-
-#endif
diff --git a/include/img/stretch_zoom_pan.h b/include/img/stretch_zoom_pan.h
deleted file mode 100644
index 0be46415d9..0000000000
--- a/include/img/stretch_zoom_pan.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CROP_ZOOM_PAN
-#define CROP_ZOOM_PAN
-
-// wraps the standard TexCoord
-
-#pragma parameter ia_overscan_percent_x "Stretch Width" 0.0 -25.0 25.0 1.0
-#pragma parameter ia_overscan_percent_y "Stretch Height" 0.0 -25.0 25.0 1.0
-#pragma parameter ia_ZOOM "Zoom In/Out" 1.0 0.0 4.0 0.01
-#pragma parameter ia_XPOS "Pan X" 0.0 -2.0 2.0 0.005
-#pragma parameter ia_YPOS "Pan Y" 0.0 -2.0 2.0 0.005
-
-const vec2 shift = vec2(0.5);
-
-vec2 crop_zoom_pan(vec2 in_coord){
-   vec2 out_coord = in_coord - shift;
-   out_coord /= ia_ZOOM;
-   out_coord *= vec2(1.0 - ia_overscan_percent_x / 100.0, 1.0 - ia_overscan_percent_y / 100.0);
-   out_coord += shift;
-   out_coord += vec2(ia_XPOS, ia_YPOS);
-   return out_coord;
-}
-
-#endif
diff --git a/include/img/vignette.h b/include/img/vignette.h
deleted file mode 100644
index afff7cbffd..0000000000
--- a/include/img/vignette.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef VIG
-#define VIG
-
-#pragma parameter g_vignette "Vignette Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter g_vstr "Vignette Strength" 40.0 0.0 50.0 1.0
-#pragma parameter g_vpower "Vignette Power" 0.20 0.0 0.5 0.01
-
-vec3 vignette(vec3 in_col, vec2 in_coord){
-    vec2 coord = in_coord * (1.0 - in_coord.xy);
-    float vig = coord.x * coord.y * g_vstr;
-    vig = min(pow(vig, g_vpower), 1.0);
-    vec3 out_col = in_col;
-    out_col *= (g_vignette == 1.0) ? vig : 1.0;
-    return out_col;
-}
-
-#endif
diff --git a/include/img/white_point.h b/include/img/white_point.h
deleted file mode 100644
index 4d38f9b446..0000000000
--- a/include/img/white_point.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef WHITE_POINT
-#define WHITE_POINT
-
-// White Point Mapping
-//          ported by Dogway
-//
-// From the first comment post (sRGB primaries and linear light compensated)
-//      http://www.zombieprototypes.com/?p=210#comment-4695029660
-// Based on the Neil Bartlett's blog update
-//      http://www.zombieprototypes.com/?p=210
-// Inspired itself by Tanner Helland's work
-//      http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code
-
-#include "col_tools.h"
-
-#pragma parameter temperature "White Point" 6500.0 1031.0 12047.0 72.0
-#pragma parameter luma_preserve "Preserve Luminance" 1.0 0.0 1.0 1.0
-#pragma parameter wp_red "Red Shift" 0.0 -1.0 1.0 0.01
-#pragma parameter wp_green "Green Shift" 0.0 -1.0 1.0 0.01
-#pragma parameter wp_blue "Blue Shift" 0.0 -1.0 1.0 0.01
-
-vec3 wp_adjust(vec3 color){
-
-    float temp = temperature / 100.;
-    float k = temperature / 10000.;
-    float lk = log(k);
-
-    vec3 wp = vec3(1.);
-
-    // calculate RED
-    wp.r = (temp <= 65.) ? 1. : 0.32068362618584273 + (0.19668730877673762 * pow(k - 0.21298613432655075, - 1.5139012907556737)) + (- 0.013883432789258415 * lk);
-
-    // calculate GREEN
-    float mg = 1.226916242502167 + (- 1.3109482654223614 * pow(k - 0.44267061967913873, 3.) * exp(- 5.089297600846147 * (k - 0.44267061967913873))) + (0.6453936305542096 * lk);
-    float pg = 0.4860175851734596 + (0.1802139719519286 * pow(k - 0.14573069517701578, - 1.397716496795082)) + (- 0.00803698899233844 * lk);
-    wp.g = (temp <= 65.5) ? ((temp <= 8.) ? 0. : mg) : pg;
-
-    // calculate BLUE
-    wp.b = (temp <= 19.) ? 0. : (temp >= 66.) ? 1. : 1.677499032830161 + (- 0.02313594016938082 * pow(k - 1.1367244820333684, 3.) * exp(- 4.221279555918655 * (k - 1.1367244820333684))) + (1.6550275798913296 * lk);
-
-    // clamp
-    wp.rgb = clamp(wp.rgb, vec3(0.), vec3(1.));
-
-    // R/G/B independent manual White Point adjustment
-    wp.rgb += vec3(wp_red, wp_green, wp_blue);
-
-    // Linear color input
-    return color * wp;
-}
-
-vec3 white_point(vec3 in_col){
-   vec3 original = sRGB_to_linear(in_col, 2.20);
-   vec3 adjusted = wp_adjust(original);
-   vec3 base_luma = XYZtoYxy(sRGB_to_XYZ(original));
-   vec3 adjusted_luma = XYZtoYxy(sRGB_to_XYZ(adjusted));
-   adjusted = (luma_preserve > 0.5) ? adjusted_luma + (vec3(base_luma.r,0.,0.) - vec3(adjusted_luma.r,0.,0.)) : adjusted_luma;
-   return linear_to_sRGB(XYZ_to_sRGB(YxytoXYZ(adjusted)), 2.20);
-}
-
-#endif
diff --git a/interpolation/bicubic-5-taps.slangp b/interpolation/bicubic-5-taps.slangp
deleted file mode 100644
index cce90d43a1..0000000000
--- a/interpolation/bicubic-5-taps.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/bicubic-5-taps.slang
-wrap_mode0 = clamp_to_edge
-scale_type0 = viewport
-filter_linear0 = true
diff --git a/interpolation/catmull-rom-5-taps.slangp b/interpolation/catmull-rom-5-taps.slangp
deleted file mode 100644
index 4f73a814ff..0000000000
--- a/interpolation/catmull-rom-5-taps.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/catmull-rom-5-taps.slang
-wrap_mode0 = clamp_to_edge
-scale_type0 = viewport
-filter_linear0 = true
diff --git a/interpolation/catmull-rom.slangp b/interpolation/catmull-rom.slangp
deleted file mode 100644
index f4e5e8fe6f..0000000000
--- a/interpolation/catmull-rom.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/catmull-rom.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/interpolation/cubic-README.md b/interpolation/cubic-README.md
deleted file mode 100644
index 596660090a..0000000000
--- a/interpolation/cubic-README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Cubic Interpolation
-
-This is a method of interpolation that uses cubic polynomials to connect real pixels and estimate pixels in between to fill the screen (generally it's used for upscaling, though not necessarily). In two dimensions, a cubic interpolation is called bicubic. A Cubic polynomial is a curve of third degree of this general form:
-
-```sh
-f(x) = Ax^3 + Bx^2 + Cx + D
-```
-When the polynomials are piecewise linear, which means they're smooth (second derivative is zero on each side of a real pixel connecting two polynomials), then these cubics are called cubic splines. Cubic splines are the best curves to interpolate using cubic polynomials, because the smooth transition between polynomials through a real pixel looks seamless to the observer.
-
-There are many methods developed to implement bicubic (2-dimensions) interpolation. The most famous bicubic implementation are the BC-spline proposed by Mitchell-Netravali:
-
-https://www.cs.utexas.edu/~fussell/courses/cs384g-fall2013/lectures/mitchell/Mitchell.pdf
-
-They proposed a family of cubic spline interpolators parameterized (B and C parameters) that can be used to perform some known cubic spline interpolations:
-
-```sh
-B=1.0, C=0.0 --> B-Spline
-B=0.0, C=0.5 --> Catmull-Rom
-B=1.0/3.0, C=1.0/3.0 --> Mitchell-Netravali or "vanilla" bicubic
-```
-
-Other cubic splines were proposed by Helmut Dersch (see below). He developed the spline16 and spline36 interpolators.
-
-https://www.panotools.org/dersch/interpolator/interpolator.html
-
-b-spline-fast
---------------
-
-This shader implements b-spline interpolation from Mitchell-Netravali method. It's a multipass shader that separates interpolation in horizontal and vertical directions, reducing the number of texture fetches from 16 to only 8. This shader produces a very smooth interpolation that ends up being too blurry if used to upscale by a scale factor bigger than 2x. Because of its blurry nature, it doesn't overshoot at edge pixels points and, hence, doesn't need an anti-ringing as other shaders. It's good for small upscalings and very good for downscaling.
-
-bicubic-fast
---------------
-
-This shader implements classical Mitchell-Netravali method recommendation (B=C=1.0/3.0). It's a multipass shader that separates interpolation in horizontal and vertical directions, reducing the number of texture fetches from 16 to only 8. This shader produces an interpolation that balances very well blurriness, pixelization and ringing. Being a very good method to upscale/downscale using any scale factor. It produces a bit of ringing, so in this implementation there's an anti-ringing code enabled.
-
-bicubic
---------------
-
-This shader implements classical Mitchell-Netravali method recommendation (B=C=1.0/3.0). It was the first bicubic implementation in libretro and is an standalone shader, so it's slower than the multipass version described earlier. It doesn't have anti-ringing code, so the overshoot can be seen mainly in huds of cartoon games.
-
-catmull-rom-fast
---------------
-
-This shader implements catmull-rom interpolation from Mitchell-Netravali method using B=0.0 and C=0.5. It's a multipass shader that separates interpolation in horizontal and vertical directions, reducing the number of texture fetches from 16 to only 8. This shader produces an interpolation that enphasizes sharpness instead pixelization and blurriness. This way it overshoots strongly produncing very noticeable rings around edges. This implementation has an anti-ringing code enabled to minimize this bad effect. It's a very good shader to upscale to any scale factor.
-
-catmull-rom
---------------
-
-This shader implements catmull-rom interpolation from Mitchell-Netravali method using B=0.0 and C=0.5. It's a standalone shader that uses only 9 texture fetches in linear space, so it's very fast even being standalone. This shader produces an interpolation that enphasizes sharpness instead pixelization and blurriness. This way it overshoots strongly produncing very noticeable rings around edges. Unfortunately, this implementation doesn't allow an easy way to anti-ringing, so it doesn't have one. It's a very good shader to upscale to any scale factor.
-
-spline16-fast
---------------
-
-This shader implements spline16 interpolation from Helmut Dersch method for cubic splines. It's a multipass shader that separates interpolation in horizontal and vertical directions, reducing the number of texture fetches from 16 to only 8. This shader produces an interpolation that enphasizes sharpness instead pixelization and blurriness. It's even sharper than Catmull-Rom shader, rivaling with lanczos2 interpolation. It overshoots strongly producing a very noticeable rings around edges. This implementation has an anti-ringing code enabled to minimize this bad effect. It's a very good shader to upscale to any scale factor.
-
-spline36-fast
---------------
-
-This shader implements spline36 interpolation from Helmut Dersch method for cubic splines. It's a multipass shader that separates interpolation in horizontal and vertical directions, reducing the number of texture fetches from 36 to only 12. This shader produces an interpolation that enphasizes sharpness instead pixelization and blurriness. It's even sharper than spline16 shader, rivaling with lanczos3 interpolation. It overshoots very strongly producing a very noticeable rings around edges. This implementation has an anti-ringing code enabled to minimize this bad effect. It's a very good shader to upscale to any scale factor.
diff --git a/interpolation/cubic-gamma-correct.slangp b/interpolation/cubic-gamma-correct.slangp
deleted file mode 100644
index ee5c6cebf5..0000000000
--- a/interpolation/cubic-gamma-correct.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 2
-shader0 = shaders/linearize.slang
-shader1 = shaders/cubic-gamma-correct.slang
-scale_type1 = viewport
-
-filter_linear0 = false 
-scale_type0 = source
-scale0 = 1.0
-srgb_framebuffer0 = true
-
-filter_linear1 = false 
diff --git a/interpolation/cubic.slangp b/interpolation/cubic.slangp
deleted file mode 100644
index d43a140b3e..0000000000
--- a/interpolation/cubic.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-shader0 = shaders/cubic.slang
-filter_linear0 = false 
-scale_type0 = viewport
diff --git a/interpolation/hermite.slangp b/interpolation/hermite.slangp
deleted file mode 100644
index f543bc4350..0000000000
--- a/interpolation/hermite.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/hermite.slang
-wrap_mode0 = clamp_to_edge
-scale_type0 = viewport
-filter_linear0 = true
diff --git a/interpolation/lanczos2-5-taps.slangp b/interpolation/lanczos2-5-taps.slangp
deleted file mode 100644
index d17f69018b..0000000000
--- a/interpolation/lanczos2-5-taps.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/lanczos2-5-taps.slang
-wrap_mode0 = clamp_to_edge
-scale_type0 = viewport
-filter_linear0 = true
diff --git a/interpolation/quilez.slangp b/interpolation/quilez.slangp
deleted file mode 100644
index 7922046934..0000000000
--- a/interpolation/quilez.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/quilez.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/interpolation/shaders/bicubic-5-taps.slang b/interpolation/shaders/bicubic-5-taps.slang
deleted file mode 100644
index 9101609b3c..0000000000
--- a/interpolation/shaders/bicubic-5-taps.slang
+++ /dev/null
@@ -1,113 +0,0 @@
-#version 450
-
-/*
-	Bicubic 5-taps (Fast) - ported by Hyllian - 2024
-
-	Samples a texture with B-Spline filtering, using only 4 texture fetches instead of 16.
-	See http://vec3.ca/bicubic-filtering-in-fewer-taps/ for more details
-	Source: https://www.shadertoy.com/view/styXDh
-	http://www.profhua.com/Sub/Article/BicubicFiltering/BicubicFiltering.html
-
-	ATENTION: This code only work using LINEAR filter sampling set on Retroarch!
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float B, C;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma parameter B "Bicubic Coeff B" 0.33 0.0 1.0 0.01
-#pragma parameter C "Bicubic Coeff C" 0.33 0.0 1.0 0.01
-
-#define B params.B
-#define C params.C
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate. We'll do this by rounding
-    // down the sample location to get the exact center of our "starting" texel. The starting texel will be at
-    // location [1, 1] in the grid, where [0, 0] is the top left corner.
-    vec2 texSize = params.SourceSize.xy;
-    vec2 invTexSize = 1.0 / texSize;
-    vec2 iTc = vTexCoord * texSize;
-
-    vec2 tc = floor(iTc - vec2(0.5)) + vec2(0.5);
-
-    // Compute the fractional offset from our starting texel to our original sample location, which we'll
-    // feed into the B-Spline function to get our filter weights.
-    vec2 f  = iTc - tc;
-    vec2 f2 = f * f;
-    vec2 f3 = f2 * f;
-
-    vec2 lf  = vec2(1.) + f;
-    vec2 lf2 = lf * lf;
-    vec2 lf3 = lf2 * lf;
-
-    vec2 rf  = vec2(2.) - f;
-    vec2 rf2 = rf * rf;
-    vec2 rf3 = rf2 * rf;
-
-    vec2 w0 = ((-B-6.*C)*lf3+(6.*B+30.*C)*lf2+(-12.*B-48.*C)*lf+(8.*B+24.*C))/6.0;
-    vec2 w1 = ((12.-9.*B-6.*C)*f3+(-18.+12.*B+6.*C)*f2+(6.-2.*B))/6.0;
-    vec2 w3 = ((-B-6.*C)*rf3+(6.*B+30.*C)*rf2+(-12.*B-48.*C)*rf+(8.*B+24.*C))/6.0;
-    vec2 w2 = vec2(1.) - w0 - w1 - w3;
-
-    vec2 Weight[3];
-    vec2 Sample[3];
-
-    Weight[0] = w0;
-    Weight[1] = w1 + w2;
-    Weight[2] = w3;
-
-    Sample[0] = tc - vec2(1.);
-    Sample[1] = tc + w2 / Weight[1];
-    Sample[2] = tc + vec2(2.);
-
-    Sample[0] *= invTexSize;
-    Sample[1] *= invTexSize;
-    Sample[2] *= invTexSize;
-
-    float sampleWeight[5];
-    sampleWeight[0] = Weight[1].x * Weight[0].y;
-    sampleWeight[1] = Weight[0].x * Weight[1].y;
-    sampleWeight[2] = Weight[1].x * Weight[1].y;
-    sampleWeight[3] = Weight[2].x * Weight[1].y;
-    sampleWeight[4] = Weight[1].x * Weight[2].y;
-
-    vec3 Ct = texture(Source, vec2(Sample[1].x, Sample[0].y)).rgb * sampleWeight[0];    
-    vec3 Cl = texture(Source, vec2(Sample[0].x, Sample[1].y)).rgb * sampleWeight[1];    
-    vec3 Cc = texture(Source, vec2(Sample[1].x, Sample[1].y)).rgb * sampleWeight[2];    
-    vec3 Cr = texture(Source, vec2(Sample[2].x, Sample[1].y)).rgb * sampleWeight[3];    
-    vec3 Cb = texture(Source, vec2(Sample[1].x, Sample[2].y)).rgb * sampleWeight[4];
-    
-    float WeightMultiplier = 1./(sampleWeight[0]+sampleWeight[1]+sampleWeight[2]+sampleWeight[3]+sampleWeight[4]);
-
-    FragColor = vec4((Ct+Cl+Cc+Cr+Cb)*WeightMultiplier, 1.0);
-}
diff --git a/interpolation/shaders/catmull-rom-5-taps.slang b/interpolation/shaders/catmull-rom-5-taps.slang
deleted file mode 100644
index 6fa5c8aa64..0000000000
--- a/interpolation/shaders/catmull-rom-5-taps.slang
+++ /dev/null
@@ -1,101 +0,0 @@
-#version 450
-
-/*
-	Bicubic Catmull-Rom 5-taps (Fast) - ported by Hyllian - 2024
-
-	Samples a texture with B-Spline filtering, using only 4 texture fetches instead of 16.
-	See http://vec3.ca/bicubic-filtering-in-fewer-taps/ for more details
-	Source: https://www.shadertoy.com/view/styXDh
-	http://www.profhua.com/Sub/Article/BicubicFiltering/BicubicFiltering.html
-
-	ATENTION: This code only work using LINEAR filter sampling set on Retroarch!
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate. We'll do this by rounding
-    // down the sample location to get the exact center of our "starting" texel. The starting texel will be at
-    // location [1, 1] in the grid, where [0, 0] is the top left corner.
-    vec2 texSize = params.SourceSize.xy;
-    vec2 invTexSize = 1.0 / texSize;
-    vec2 iTc = vTexCoord * texSize;
-
-    vec2 tc = floor(iTc - vec2(0.5)) + vec2(0.5);
-
-    // Compute the fractional offset from our starting texel to our original sample location, which we'll
-    // feed into the B-Spline function to get our filter weights.
-    vec2 f  = iTc - tc;
-    vec2 f2 = f * f;
-    vec2 f3 = f2 * f;
-
-    vec2 of = vec2(1.)-f;
-    vec2 of2 = of*of;
-    vec2 of3 = of2*of;
-    
-    vec2 w0 = f2 - 0.5 * (f3 + f);
-    vec2 w1 = 1.5 * f3 - 2.5 * f2 + vec2(1.);
-    vec2 w3 = 0.5 * (f3 - f2);
-    vec2 w2 = vec2(1.) - w0 - w1 - w3;
-
-    vec2 Weight[3];
-    vec2 Sample[3];
-
-    Weight[0] = w0;
-    Weight[1] = w1 + w2;
-    Weight[2] = w3;
-
-    Sample[0] = tc - vec2(1.);
-    Sample[1] = tc + w2 / Weight[1];
-    Sample[2] = tc + vec2(2.);
-
-    Sample[0] *= invTexSize;
-    Sample[1] *= invTexSize;
-    Sample[2] *= invTexSize;
-
-    float sampleWeight[5];
-    sampleWeight[0] = Weight[1].x * Weight[0].y;
-    sampleWeight[1] = Weight[0].x * Weight[1].y;
-    sampleWeight[2] = Weight[1].x * Weight[1].y;
-    sampleWeight[3] = Weight[2].x * Weight[1].y;
-    sampleWeight[4] = Weight[1].x * Weight[2].y;
-
-    vec3 Ct = texture(Source, vec2(Sample[1].x, Sample[0].y)).rgb * sampleWeight[0];    
-    vec3 Cl = texture(Source, vec2(Sample[0].x, Sample[1].y)).rgb * sampleWeight[1];    
-    vec3 Cc = texture(Source, vec2(Sample[1].x, Sample[1].y)).rgb * sampleWeight[2];    
-    vec3 Cr = texture(Source, vec2(Sample[2].x, Sample[1].y)).rgb * sampleWeight[3];    
-    vec3 Cb = texture(Source, vec2(Sample[1].x, Sample[2].y)).rgb * sampleWeight[4];
-    
-    float WeightMultiplier = 1./(sampleWeight[0]+sampleWeight[1]+sampleWeight[2]+sampleWeight[3]+sampleWeight[4]);
-
-    FragColor = vec4((Ct+Cl+Cc+Cr+Cb)*WeightMultiplier, 1.0);
-}
diff --git a/interpolation/shaders/catmull-rom.slang b/interpolation/shaders/catmull-rom.slang
deleted file mode 100644
index 2315ac9760..0000000000
--- a/interpolation/shaders/catmull-rom.slang
+++ /dev/null
@@ -1,103 +0,0 @@
-#version 450
-
-/*
-	Bicubic Catmull-Rom 9 taps (Fast) - ported by Hyllian - 2020
-
-	The following code is licensed under the MIT license: https://gist.github.com/TheRealMJP/bc503b0b87b643d3505d41eab8b332ae
-
-	Ported from code: https://gist.github.com/TheRealMJP/c83b8c0f46b63f3a88a5986f4fa982b1
-
-	Samples a texture with Catmull-Rom filtering, using 9 texture fetches instead of 16.
-	See http://vec3.ca/bicubic-filtering-in-fewer-taps/ for more details
-
-	ATENTION: This code only work using LINEAR filter sampling set on Retroarch!
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define mul(c,d) (d*c)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate. We'll do this by rounding
-    // down the sample location to get the exact center of our "starting" texel. The starting texel will be at
-    // location [1, 1] in the grid, where [0, 0] is the top left corner.
-    vec2 samplePos = vTexCoord * params.SourceSize.xy;
-    vec2 texPos1 = floor(samplePos - 0.5) + 0.5;
-
-    // Compute the fractional offset from our starting texel to our original sample location, which we'll
-    // feed into the Catmull-Rom spline function to get our filter weights.
-    vec2 f = samplePos - texPos1;
-
-    // Compute the Catmull-Rom weights using the fractional offset that we calculated earlier.
-    // These equations are pre-expanded based on our knowledge of where the texels will be located,
-    // which lets us avoid having to evaluate a piece-wise function.
-    vec2 w0 = f * (-0.5 + f * (1.0 - 0.5 * f));
-    vec2 w1 = 1.0 + f * f * (-2.5 + 1.5 * f);
-    vec2 w2 = f * (0.5 + f * (2.0 - 1.5 * f));
-    vec2 w3 = f * f * (-0.5 + 0.5 * f);
- //   vec2 w3 = 1.0 - w0 - w1 - w2;
-
-    // Work out weighting factors and sampling offsets that will let us use bilinear filtering to
-    // simultaneously evaluate the middle 2 samples from the 4x4 grid.
-    vec2 w12 = w1 + w2;
-    vec2 offset12 = w2 / (w1 + w2);
-
-    // Compute the final UV coordinates we'll use for sampling the texture
-    vec2 texPos0  = texPos1 - 1.;
-    vec2 texPos3  = texPos1 + 2.;
-    vec2 texPos12 = texPos1 + offset12;
-
-    texPos0  *= params.SourceSize.zw;
-    texPos3  *= params.SourceSize.zw;
-    texPos12 *= params.SourceSize.zw;
-
-    vec4 c00  = texture(Source, vec2(texPos0.x, texPos0.y));
-    vec4 c10  = texture(Source, vec2(texPos12.x, texPos0.y));
-    vec4 c20  = texture(Source, vec2(texPos3.x, texPos0.y));
-
-    vec4 c01  = texture(Source, vec2(texPos0.x, texPos12.y));
-    vec4 c11  = texture(Source, vec2(texPos12.x, texPos12.y));
-    vec4 c21  = texture(Source, vec2(texPos3.x, texPos12.y));
-
-    vec4 c02  = texture(Source, vec2(texPos0.x, texPos3.y));
-    vec4 c12  = texture(Source, vec2(texPos12.x, texPos3.y));
-    vec4 c22  = texture(Source, vec2(texPos3.x, texPos3.y));
-
-    vec3 wx   = vec3(w0.x, w12.x, w3.x);
-    vec3 wy   = vec3(w0.y, w12.y, w3.y);
-
-    vec4 c1   = mul(wx, mat3x4(c00, c10, c20));
-    vec4 c2   = mul(wx, mat3x4(c01, c11, c21));
-    vec4 c3   = mul(wx, mat3x4(c02, c12, c22));
-
-    FragColor = mul(wy, mat3x4(c1, c2, c3));
-}
\ No newline at end of file
diff --git a/interpolation/shaders/cubic-gamma-correct.slang b/interpolation/shaders/cubic-gamma-correct.slang
deleted file mode 100644
index 5c7f57a3c1..0000000000
--- a/interpolation/shaders/cubic-gamma-correct.slang
+++ /dev/null
@@ -1,84 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void weights(out vec4 x, out vec4 y, vec2 t)
-{
-   vec2 t2 = t * t;
-   vec2 t3 = t2 * t;
-
-   vec4 xs = vec4(1.0, t.x, t2.x, t3.x);
-   vec4 ys = vec4(1.0, t.y, t2.y, t3.y);
-
-   const vec4 p0 = vec4(+0.0, -0.5, +1.0, -0.5);
-   const vec4 p1 = vec4(+1.0,  0.0, -2.5, +1.5);
-   const vec4 p2 = vec4(+0.0, +0.5, +2.0, -1.5);
-   const vec4 p3 = vec4(+0.0,  0.0, -0.5, +0.5);
-
-   x = vec4(dot(xs, p0), dot(xs, p1), dot(xs, p2), dot(xs, p3));
-   y = vec4(dot(ys, p0), dot(ys, p1), dot(ys, p2), dot(ys, p3));
-}
-
-void main()
-{
-   vec2 uv = vTexCoord * global.SourceSize.xy - 0.5;
-   vec2 texel = floor(uv);
-   vec2 tex = (texel + 0.5) * global.SourceSize.zw;
-   vec2 phase = uv - texel;
-
-#define TEX(x, y) textureLodOffset(Source, tex, 0.0, ivec2(x, y)).rgb
-
-   vec4 x;
-   vec4 y;
-   weights(x, y, phase);
-
-   vec3 color;
-   vec4 row = x * y.x;
-   color  = TEX(-1, -1) * row.x;
-   color += TEX(+0, -1) * row.y;
-   color += TEX(+1, -1) * row.z;
-   color += TEX(+2, -1) * row.w;
-
-   row = x * y.y;
-   color += TEX(-1, +0) * row.x;
-   color += TEX(+0, +0) * row.y;
-   color += TEX(+1, +0) * row.z;
-   color += TEX(+2, +0) * row.w;
-
-   row = x * y.z;
-   color += TEX(-1, +1) * row.x;
-   color += TEX(+0, +1) * row.y;
-   color += TEX(+1, +1) * row.z;
-   color += TEX(+2, +1) * row.w;
-
-   row = x * y.w;
-   color += TEX(-1, +2) * row.x;
-   color += TEX(+0, +2) * row.y;
-   color += TEX(+1, +2) * row.z;
-   color += TEX(+2, +2) * row.w;
-
-   color = sqrt(clamp(color, vec3(0.0), vec3(1.0)));
-   FragColor = vec4(color, 1.0);
-}
diff --git a/interpolation/shaders/cubic.slang b/interpolation/shaders/cubic.slang
deleted file mode 100644
index a294794d44..0000000000
--- a/interpolation/shaders/cubic.slang
+++ /dev/null
@@ -1,83 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void weights(out vec4 x, out vec4 y, vec2 t)
-{
-   vec2 t2 = t * t;
-   vec2 t3 = t2 * t;
-
-   vec4 xs = vec4(1.0, t.x, t2.x, t3.x);
-   vec4 ys = vec4(1.0, t.y, t2.y, t3.y);
-
-   const vec4 p0 = vec4(+0.0, -0.5, +1.0, -0.5);
-   const vec4 p1 = vec4(+1.0,  0.0, -2.5, +1.5);
-   const vec4 p2 = vec4(+0.0, +0.5, +2.0, -1.5);
-   const vec4 p3 = vec4(+0.0,  0.0, -0.5, +0.5);
-
-   x = vec4(dot(xs, p0), dot(xs, p1), dot(xs, p2), dot(xs, p3));
-   y = vec4(dot(ys, p0), dot(ys, p1), dot(ys, p2), dot(ys, p3));
-}
-
-void main()
-{
-   vec2 uv = vTexCoord * global.SourceSize.xy - 0.5;
-   vec2 texel = floor(uv);
-   vec2 tex = (texel + 0.5) * global.SourceSize.zw;
-   vec2 phase = uv - texel;
-
-#define TEX(x, y) textureLodOffset(Source, tex, 0.0, ivec2(x, y)).rgb
-
-   vec4 x;
-   vec4 y;
-   weights(x, y, phase);
-
-   vec3 color;
-   vec4 row = x * y.x;
-   color  = TEX(-1, -1) * row.x;
-   color += TEX(+0, -1) * row.y;
-   color += TEX(+1, -1) * row.z;
-   color += TEX(+2, -1) * row.w;
-
-   row = x * y.y;
-   color += TEX(-1, +0) * row.x;
-   color += TEX(+0, +0) * row.y;
-   color += TEX(+1, +0) * row.z;
-   color += TEX(+2, +0) * row.w;
-
-   row = x * y.z;
-   color += TEX(-1, +1) * row.x;
-   color += TEX(+0, +1) * row.y;
-   color += TEX(+1, +1) * row.z;
-   color += TEX(+2, +1) * row.w;
-
-   row = x * y.w;
-   color += TEX(-1, +2) * row.x;
-   color += TEX(+0, +2) * row.y;
-   color += TEX(+1, +2) * row.z;
-   color += TEX(+2, +2) * row.w;
-
-   FragColor = vec4(color, 1.0);
-}
diff --git a/interpolation/shaders/hermite.slang b/interpolation/shaders/hermite.slang
deleted file mode 100644
index a79a322b0f..0000000000
--- a/interpolation/shaders/hermite.slang
+++ /dev/null
@@ -1,55 +0,0 @@
-#version 450
-
-/*
-     Hermite cubic shader - it's the cubic performed by smoothstep function
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 p = vTexCoord.xy;
-
-	p = p * params.SourceSize.xy + vec2(0.5, 0.5);
-
-	vec2 i = floor(p);
-	vec2 f = p - i;
-
-	// Smoothstep - amazingly, smoothstep() is slower than calculating directly the expression!
-//	f = smoothstep(0.0, 1.0, f);
-	f = f * f * ( -2.0 * f + 3.0);
-
-	p = i + f;
-
-	p = (p - vec2(0.5, 0.5)) * params.SourceSize.zw;
-
-	// final sum and weight normalization
-   FragColor = vec4(texture(Source, p).rgb, 1.0);
-}
diff --git a/interpolation/shaders/lanczos2-5-taps.slang b/interpolation/shaders/lanczos2-5-taps.slang
deleted file mode 100644
index 579124c4d2..0000000000
--- a/interpolation/shaders/lanczos2-5-taps.slang
+++ /dev/null
@@ -1,121 +0,0 @@
-#version 450
-
-/*
-	Lanczos2 in 5-taps (Fast) - adapted by Hyllian - 2024
-
-	Adapted from these bicubic sources:
-
-	See http://vec3.ca/bicubic-filtering-in-fewer-taps/ for more details
-	Bicubic Sources: https://www.shadertoy.com/view/styXDh
-	http://www.profhua.com/Sub/Article/BicubicFiltering/BicubicFiltering.html
-
-	ATENTION: This code only work using LINEAR filter sampling set on Retroarch!
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float AR_STRENGTH;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter AR_STRENGTH "Anti-Ringing Strength" 0.5 0.0 1.0 0.05
-#define AR_STRENGTH params.AR_STRENGTH
-
-#define pi    3.1415926535897932384626433832795
-
-vec2 sinc(vec2 x) { return sin(pi*x)/(pi*x+0.00001); }
-
-vec2 lanczos2(vec2 x) { return sinc(x) * sinc(x / 2.0); }
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-
-void main()
-{
-    // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate. We'll do this by rounding
-    // down the sample location to get the exact center of our "starting" texel. The starting texel will be at
-    // location [1, 1] in the grid, where [0, 0] is the top left corner.
-    vec2 texSize = params.SourceSize.xy;
-    vec2 invTexSize = 1.0 / texSize;
-    vec2 iTc = vTexCoord * texSize;
-
-    vec2 tc = floor(iTc - vec2(0.5)) + vec2(0.5);
-
-    // Compute the fractional offset from our starting texel to our original sample location, which we'll
-    // feed into the function to get our filter weights.
-    vec2 f  = iTc - tc;
-
-    vec2 w0 = lanczos2(f+vec2(1.));
-    vec2 w1 = lanczos2(         f);
-    vec2 w2 = lanczos2(vec2(1.)-f);
-    vec2 w3 = vec2(1.) - w0 - w1 - w2;
-
-    vec2 Weight[3];
-    vec2 Sample[3];
-
-    Weight[0] = w0;
-    Weight[1] = w1 + w2;
-    Weight[2] = w3;
-
-    Sample[0] = (tc       - vec2(1.)) * invTexSize;
-    Sample[1] = (tc + w2 / Weight[1]) * invTexSize;
-    Sample[2] = (tc       + vec2(2.)) * invTexSize;
-
-    float sampleWeight[5];
-    sampleWeight[0] = Weight[1].x * Weight[0].y;
-    sampleWeight[1] = Weight[0].x * Weight[1].y;
-    sampleWeight[2] = Weight[1].x * Weight[1].y;
-    sampleWeight[3] = Weight[2].x * Weight[1].y;
-    sampleWeight[4] = Weight[1].x * Weight[2].y;
-
-    vec3 CT = texture(Source, vec2(Sample[1].x, Sample[0].y)).rgb;    
-    vec3 CL = texture(Source, vec2(Sample[0].x, Sample[1].y)).rgb;    
-    vec3 CC = texture(Source, vec2(Sample[1].x, Sample[1].y)).rgb;    
-    vec3 CR = texture(Source, vec2(Sample[2].x, Sample[1].y)).rgb;    
-    vec3 CB = texture(Source, vec2(Sample[1].x, Sample[2].y)).rgb;
-
-    vec3 Ct = CT * sampleWeight[0];    
-    vec3 Cl = CL * sampleWeight[1];    
-    vec3 Cc = CC * sampleWeight[2];    
-    vec3 Cr = CR * sampleWeight[3];    
-    vec3 Cb = CB * sampleWeight[4];
-    
-    float WeightMultiplier = 1./(sampleWeight[0]+sampleWeight[1]+sampleWeight[2]+sampleWeight[3]+sampleWeight[4]);
-
-    vec3 color = (Ct+Cl+Cc+Cr+Cb)*WeightMultiplier;
-
-    // Anti-ringing
-    vec3 aux = color;
-    vec3 min_sample = min(min(min(CC,CT), CL), min(CR, CB));
-    vec3 max_sample = max(max(max(CC,CT), CL), max(CR, CB));
-    color = clamp(color, min_sample, max_sample);
-    color = mix(aux, color, AR_STRENGTH*step(0.0, (CL-CC)*(CC-CR)+(CB-CC)*(CC-CT)));
-
-    FragColor = vec4(color, 1.0);
-}
diff --git a/interpolation/shaders/linearize.slang b/interpolation/shaders/linearize.slang
deleted file mode 100644
index d54a15150b..0000000000
--- a/interpolation/shaders/linearize.slang
+++ /dev/null
@@ -1,32 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec3 gamma(vec3 v)
-{
-   return v * v;
-}
-
-void main()
-{
-   FragColor = vec4(gamma(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/interpolation/shaders/quilez.slang b/interpolation/shaders/quilez.slang
deleted file mode 100644
index 172d510059..0000000000
--- a/interpolation/shaders/quilez.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-/*
-	Fragment shader based on "Improved texture interpolation" by Iñigo Quílez
-	Original description: http://www.iquilezles.org/www/articles/texture/texture.htm
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 p = vTexCoord.xy;
-
-	p = p * params.SourceSize.xy + vec2(0.5, 0.5);
-
-	vec2 i = floor(p);
-	vec2 f = p - i;
-	f = f * f * f * (f * (f * 6.0 - vec2(15.0, 15.0)) + vec2(10.0, 10.0));
-	p = i + f;
-
-	p = (p - vec2(0.5, 0.5)) * params.SourceSize.zw;
-
-	// final sum and weight normalization
-   FragColor = vec4(texture(Source, p));
-}
\ No newline at end of file
diff --git a/linear/linear-gamma-correct.slang b/linear/linear-gamma-correct.slang
deleted file mode 100644
index de3f0ff7a3..0000000000
--- a/linear/linear-gamma-correct.slang
+++ /dev/null
@@ -1,31 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec3 color = texture(Source, vTexCoord).rgb;
-   FragColor = vec4(sqrt(color), 1.0);
-}
diff --git a/linear/linear-gamma-correct.slangp b/linear/linear-gamma-correct.slangp
deleted file mode 100644
index beb4d1b440..0000000000
--- a/linear/linear-gamma-correct.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-shader0 = linearize.slang
-shader1 = linear-gamma-correct.slang
-
-filter_linear0 = false 
-scale_type0 = source
-scale0 = 1.0
-srgb_framebuffer0 = true
-
-filter_linear1 = true
diff --git a/linear/linearize.slang b/linear/linearize.slang
deleted file mode 100644
index d54a15150b..0000000000
--- a/linear/linearize.slang
+++ /dev/null
@@ -1,32 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec3 gamma(vec3 v)
-{
-   return v * v;
-}
-
-void main()
-{
-   FragColor = vec4(gamma(texture(Source, vTexCoord).rgb), 1.0);
-}
diff --git a/misc/accessibility_mods.slangp b/misc/accessibility_mods.slangp
deleted file mode 100644
index e37f3cbdb6..0000000000
--- a/misc/accessibility_mods.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/accessibility_mods.slang
-scale_type0 = source
diff --git a/misc/ascii.slangp b/misc/ascii.slangp
deleted file mode 100644
index 5751b94f5c..0000000000
--- a/misc/ascii.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ascii.slang
-scale_type0 = viewport
diff --git a/misc/chroma.slangp b/misc/chroma.slangp
deleted file mode 100644
index ab7b0173ca..0000000000
--- a/misc/chroma.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/chroma.slang
-scale_type0 = source
diff --git a/misc/cmyk-halftone-dot.slangp b/misc/cmyk-halftone-dot.slangp
deleted file mode 100644
index 6ec902e13f..0000000000
--- a/misc/cmyk-halftone-dot.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/cmyk-halftone-dot.slang
-scale_type0 = viewport
diff --git a/misc/cocktail-cabinet.slangp b/misc/cocktail-cabinet.slangp
deleted file mode 100644
index 90f11136cc..0000000000
--- a/misc/cocktail-cabinet.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/cocktail-cabinet.slang
-scale_type0 = source
diff --git a/misc/color-mangler.slangp b/misc/color-mangler.slangp
deleted file mode 100644
index e12916900d..0000000000
--- a/misc/color-mangler.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/color-mangler.slang
-scale_type0 = source
diff --git a/misc/colorimetry.slangp b/misc/colorimetry.slangp
deleted file mode 100644
index ad9403a421..0000000000
--- a/misc/colorimetry.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/colorimetry.slang
-scale_type0 = source
diff --git a/misc/convergence.slangp b/misc/convergence.slangp
deleted file mode 100644
index b6e3ce1b72..0000000000
--- a/misc/convergence.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/convergence.slang
-scale_type0 = source
-filter_linear0 = true
diff --git a/misc/edge-detect.slangp b/misc/edge-detect.slangp
deleted file mode 100644
index 93eb67249a..0000000000
--- a/misc/edge-detect.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/edge-detect.slang
-scale_type0 = source
diff --git a/misc/ega.slangp b/misc/ega.slangp
deleted file mode 100644
index b72899cc14..0000000000
--- a/misc/ega.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ega.slang
-scale_type0 = source
diff --git a/misc/geom.slangp b/misc/geom.slangp
deleted file mode 100644
index 7602bfb125..0000000000
--- a/misc/geom.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-shaders = 2
-
-shader0 = ../stock.slang
-filter_linear0 = false
-scale_type0 = viewport
-
-shader1 = shaders/geom.slang
-filter_linear1 = true
-scale_type1 = viewport
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "true"
-
diff --git a/misc/half_res.slangp b/misc/half_res.slangp
deleted file mode 100644
index 097b454aab..0000000000
--- a/misc/half_res.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-shaders = "1"
-feedback_pass = "0"
-shader0 = "../stock.slang"
-filter_linear0 = false
-scale_type_x0 = "source"
-scale_x0 = "1.0"
-scale_type_y0 = "source"
-scale_y0 = "0.5"
\ No newline at end of file
diff --git a/misc/natural-vision.slangp b/misc/natural-vision.slangp
deleted file mode 100644
index b92c0011f8..0000000000
--- a/misc/natural-vision.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/natural-vision.slang
-scale_type0 = source
diff --git a/misc/night-mode.slangp b/misc/night-mode.slangp
deleted file mode 100644
index ea98949424..0000000000
--- a/misc/night-mode.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/night_mode.slang
-scale_type0 = source
diff --git a/misc/ntsc-colors.slangp b/misc/ntsc-colors.slangp
deleted file mode 100644
index c785ff6453..0000000000
--- a/misc/ntsc-colors.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ntsc-colors.slang
-scale_type0 = source
diff --git a/misc/patchy-color.slangp b/misc/patchy-color.slangp
deleted file mode 100644
index 5b53ed35c8..0000000000
--- a/misc/patchy-color.slangp
+++ /dev/null
@@ -1,68 +0,0 @@
-shaders = "3"
-feedback_pass = "0"
-shader0 = "../ntsc/shaders/patchy-ntsc/patchy-color.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "true"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../ntsc/shaders/patchy-ntsc/trilinearLUT-switchable.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../ntsc/shaders/patchy-ntsc/linear-to-srgb.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-textures = "PhosphorSamplerLUT1;PhosphorSamplerLUT2;PhosphorSamplerLUT3;PhosphorSamplerLUT4;PhosphorSamplerLUT5;PhosphorSamplerLUT6"
-
-PhosphorSamplerLUT1 = "../ntsc/shaders/patchy-ntsc/P22_80s_D65.png"
-PhosphorSamplerLUT1_wrap_mode = "clamp_to_border"
-PhosphorSamplerLUT1_mipmap = "false"
-PhosphorSamplerLUT1_linear = "false"
-
-PhosphorSamplerLUT2 = "../ntsc/shaders/patchy-ntsc/P22_90s_D65.png"
-PhosphorSamplerLUT2_wrap_mode = "clamp_to_border"
-PhosphorSamplerLUT2_mipmap = "false"
-PhosphorSamplerLUT2_linear = "false"
-
-PhosphorSamplerLUT3 = "../ntsc/shaders/patchy-ntsc/P22_J_D65.png"
-PhosphorSamplerLUT3_wrap_mode = "clamp_to_border"
-PhosphorSamplerLUT3_mipmap = "false"
-PhosphorSamplerLUT3_linear = "false"
-
-PhosphorSamplerLUT4 = "../ntsc/shaders/patchy-ntsc/TrinitronP22_D65.png"
-PhosphorSamplerLUT4_wrap_mode = "clamp_to_border"
-PhosphorSamplerLUT4_mipmap = "false"
-PhosphorSamplerLUT4_linear = "false"
-
-PhosphorSamplerLUT5 = "../ntsc/shaders/patchy-ntsc/P22_J_D93.png"
-PhosphorSamplerLUT5_wrap_mode = "clamp_to_border"
-PhosphorSamplerLUT5_mipmap = "false"
-PhosphorSamplerLUT5_linear = "false"
-
-PhosphorSamplerLUT6 = "../ntsc/shaders/patchy-ntsc/TrinitronP22_D93.png"
-PhosphorSamplerLUT6_wrap_mode = "clamp_to_border"
-PhosphorSamplerLUT6_mipmap = "false"
-PhosphorSamplerLUT6_linear = "false"
-
diff --git a/misc/print-resolution.slangp b/misc/print-resolution.slangp
deleted file mode 100644
index e68ff4d94a..0000000000
--- a/misc/print-resolution.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-shaders = 2
-
-
-shader0 = shaders/print-resolution/print-resolution-generate-and-cache.slang
-scale_type0 = source
-
-shader1 = shaders/print-resolution/print-resolution-apply.slang
-scale_type1 = source
\ No newline at end of file
diff --git a/misc/retro-palettes.slangp b/misc/retro-palettes.slangp
deleted file mode 100644
index 9efe9a440b..0000000000
--- a/misc/retro-palettes.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/retro-palettes.slang
-scale_type0 = source
diff --git a/misc/shaders/accessibility_mods.slang b/misc/shaders/accessibility_mods.slang
deleted file mode 100644
index 5cee4cd69a..0000000000
--- a/misc/shaders/accessibility_mods.slang
+++ /dev/null
@@ -1,85 +0,0 @@
-#version 450
-
-// Accessibility Mods
-// based on work by Karen Stevens for Electronic Arts
-// adapted for slang by hunterk
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float Protanopia, Deuteranopia, Tritanopia, D_factor, D_contrast, D_brightness;
-} params;
-
-#pragma parameter D_factor "Accessibility Adjustment Strength" 0.5 0.0 1.0 0.05
-#pragma parameter Protanopia "Protanopia Correction Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter Deuteranopia "Deuteranopia Correction Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter Tritanopia "Tritanopia Correction Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter D_contrast "Contrast Adjustment" 0.0 0.0 1.0 0.05
-#pragma parameter D_brightness "Brightness Adjustment" 0.0 -1.0 1.0 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define mul(a,b) b*a
-
-// RGB to LMS and back again
-// https://ssodelta.wordpress.com/tag/rgb-to-lms/
-mat3 RGBtoLMS = mat3( 17.8824,  43.5161,  4.1193,
-                       3.4557,  27.1554,  3.8671,
-                       0.02996,  0.18431, 1.4670);
-                       
-mat3 LMStoRGB = mat3( 0.0809, -0.1305,  0.1167,
-                     -0.0102,  0.0540, -0.1136,
-                     -0.0003, -0.0041,  0.6935);
-
-// This function draws heavily from Karen Stevens' Daltonization work, found here:
-// https://twvideo01.ubm-us.net/o1/vault/gdc2017/Presentations/Stevens_Karen_GameAccessibilityPracticalFixes.pdf
-vec3 Daltonize(vec3 input_col){
-   vec3 Dalton_col = input_col;
-   vec3 LMS_col = mul(input_col, RGBtoLMS);
-   Dalton_col.r = mix(LMS_col.r, (2.02344 * LMS_col.g) - (2.5281 * LMS_col.b), params.Protanopia);
-   Dalton_col.g = mix(LMS_col.g, (0.494207 * LMS_col.r) + (1.24827 * LMS_col.b), params.Deuteranopia);
-   Dalton_col.b = mix(LMS_col.b, (-0.395913 * LMS_col.r) + (0.801109 * LMS_col.g), params.Tritanopia);
-   
-   vec3 diff_col = input_col - mul(Dalton_col, LMStoRGB);
-
-   vec3 shift_col;
-   shift_col.r = 0.0;
-   shift_col.g = diff_col.g + diff_col.r;
-   shift_col.b = diff_col.b + diff_col.r;
-   
-   vec3 out_col = input_col + shift_col.rgb;
-   out_col = clamp(out_col, 0.0, 1.0);
-   
-   return out_col;
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec3 frame = texture(Source, vTexCoord).rgb;
-   frame = mix(frame, (((frame - 0.5) * (1.0 + params.D_contrast * 5.)) + 0.5), params.D_factor);
-   frame += params.D_brightness * params.D_factor;
-   vec3 Daltonized_frame = Daltonize(frame);
-   FragColor = vec4(mix(frame, Daltonized_frame, params.D_factor), 1.0);
-}
diff --git a/misc/shaders/ascii.slang b/misc/shaders/ascii.slang
deleted file mode 100755
index ec89d492c5..0000000000
--- a/misc/shaders/ascii.slang
+++ /dev/null
@@ -1,66 +0,0 @@
-#version 450
-
-// Bitmap to ASCII (not really) fragment shader by movAX13h, September 2013
-// --- This shader is now used in Pixi JS ---
-// Pixi JS is MIT-licensed
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-float character(float n, vec2 p) // some compilers have the word "char" reserved
-{
-	p = floor(p*vec2(4.0, -4.0) + 2.5);
-	if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y)
-	{
-		if (int(mod(n/exp2(p.x + 5.0*p.y), 2.0)) == 1) return 1.0;
-	}	
-	return 0.0;
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 uv = vTexCoord * params.OutputSize.xy;
-	vec3 col = texture(Source, floor(uv/8.0)*8.0/params.OutputSize.xy).rgb;	
-	
-	float gray = dot(col.rgb, vec3(0.299, 0.587, 0.114));
-	
-	float n =  65536.0;             // .
-	if (gray > 0.2) n = 65600.0;    // :
-	if (gray > 0.3) n = 332772.0;   // *
-	if (gray > 0.4) n = 15255086.0; // o 
-	if (gray > 0.5) n = 23385164.0; // &
-	if (gray > 0.6) n = 15252014.0; // 8
-	if (gray > 0.7) n = 13199452.0; // @
-	if (gray > 0.8) n = 11512810.0; // #
-	
-	vec2 p = mod(uv/4.0, 2.0) - vec2(1.0);
-	col = col*character(n, p);
-	
-   FragColor = vec4(col, 1.0);
-}
diff --git a/misc/shaders/chroma.slang b/misc/shaders/chroma.slang
deleted file mode 100644
index b87d9fedf1..0000000000
--- a/misc/shaders/chroma.slang
+++ /dev/null
@@ -1,104 +0,0 @@
-#version 450
-
-// Chroma / YIQ
-// by torridgristle
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float BrightenLevel;
-	float BrightenAmount;
-	float ContrastAmount;
-	float ChromaLevel;
-	float IAmount;
-	float QAmount;
-	float ITilt;
-	float QTilt;
-	float ITiltHigh;
-	float QTiltHigh;
-	float ITiltMid;
-	float QTiltMid;
-	float ITiltLow;
-	float QTiltLow;
-	float LumBoost;
-} params;
-
-#pragma parameter BrightenLevel "Brighten Level" 2.0 1.0 10.0 1.0
-#pragma parameter BrightenAmount "Brighten Amount" 0.0 0.0 1.0 0.1
-#pragma parameter ContrastAmount "Contrast Amount" 0.0 0.0 1.0 0.1
-#pragma parameter ChromaLevel "Chroma Level" 2.0 1.0 10.0 1.0
-#pragma parameter IAmount "I Amount" 0.0 0.0 1.0 0.1
-#pragma parameter QAmount "Q Amount" 0.0 0.0 1.0 0.1
-#pragma parameter ITilt "I Tilt" 0.5 0.4 0.6 0.01
-#pragma parameter QTilt "Q Tilt" 0.5 0.4 0.6 0.01
-#pragma parameter ITiltHigh "I Tilt High" 0.5 0.4 0.6 0.01
-#pragma parameter QTiltHigh "Q Tilt High" 0.5 0.4 0.6 0.01
-#pragma parameter ITiltMid "I Tilt Mid" 0.5 0.4 0.6 0.01
-#pragma parameter QTiltMid "Q Tilt Mid" 0.5 0.4 0.6 0.01
-#pragma parameter ITiltLow "I Tilt Low" 0.5 0.4 0.6 0.01
-#pragma parameter QTiltLow "Q Tilt Low" 0.5 0.4 0.6 0.01
-#pragma parameter LumBoost "Luma Boost" 0.0 0.0 1.0 0.1
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define RGB_to_YIQ 	mat3x3( 0.299 , 0.595716 , 0.211456 ,	0.587    , -0.274453 , -0.522591 ,		0.114    , -0.321263 , 0.311135 )
-#define YIQ_to_RGB 	mat3x3( 1.0   , 1.0      , 1.0      ,	0.9563   , -0.2721   , -1.1070   ,		0.6210   , -0.6474   , 1.7046   )
-
-vec3 Chroma(vec3 Photo, float Level) {
-    Photo *= RGB_to_YIQ;
-    float I_Tilt = ((params.ITilt - 0.5) * 2);
-    float Q_Tilt = ((params.QTilt - 0.5) * 2);
-    float LumHigh = max(Photo.x-0.5,0.0)*2.0;
-    float LumMid  = 1-abs(Photo.x-0.5)*2.0;
-    float LumLow  = max((1-Photo.x)-0.5,0.0)*2.0;
-    float I_TiltHigh = ((params.ITiltHigh - 0.5) * 2) * LumHigh;
-    float Q_TiltHigh = ((params.QTiltHigh - 0.5) * 2) * LumHigh;
-    float I_TiltMid = ((params.ITiltMid - 0.5) * 2) * LumMid;
-    float Q_TiltMid = ((params.QTiltMid - 0.5) * 2) * LumMid;
-    float I_TiltLow = ((params.ITiltLow - 0.5) * 2) * LumLow;
-    float Q_TiltLow = ((params.QTiltLow - 0.5) * 2) * LumLow;
-    Photo.yz = mix(Photo.yz,(1.0-pow(1.0-abs(Photo.yz),vec2(Level)))*sign(Photo.yz),vec2(params.IAmount,params.QAmount));
-    Photo.y = Photo.y * (1-abs(I_Tilt)) + I_Tilt;
-    Photo.z = Photo.z * (1-abs(Q_Tilt)) + Q_Tilt;
-    Photo.y = Photo.y * (1-abs(I_TiltHigh)) + I_TiltHigh;
-    Photo.z = Photo.z * (1-abs(Q_TiltHigh)) + Q_TiltHigh;
-    Photo.y = Photo.y * (1-abs(I_TiltMid)) + I_TiltMid;
-    Photo.z = Photo.z * (1-abs(Q_TiltMid)) + Q_TiltMid;
-    Photo.y = Photo.y * (1-abs(I_TiltLow)) + I_TiltLow;
-    Photo.z = Photo.z * (1-abs(Q_TiltLow)) + Q_TiltLow;
-    Photo.x = mix(Photo.x,1-pow(1-Photo.x,2.0),params.LumBoost);
-    Photo *= YIQ_to_RGB;
-    Photo = clamp(Photo,0.0,1.0);
-    Photo = mix(Photo,1.0-pow(1.0-Photo,vec3(params.BrightenLevel)),params.BrightenAmount);
-    Photo = mix(Photo,Photo * Photo * (3 - 2 * Photo),params.ContrastAmount);
-    return Photo;
-}
-
-void main()
-{
-    vec3 Picture = texture(Source, vTexCoord).xyz;
-
-    FragColor = vec4(Chroma(Picture,params.ChromaLevel),1.0);
-}
diff --git a/misc/shaders/cmyk-halftone-dot.slang b/misc/shaders/cmyk-halftone-dot.slang
deleted file mode 100644
index e9be9a3f31..0000000000
--- a/misc/shaders/cmyk-halftone-dot.slang
+++ /dev/null
@@ -1,80 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float frequency;
-} params;
-
-#pragma parameter frequency "CMYK HalfTone Dot Density" 275.0 50.0 500.0 25.0
-#define frequency params.frequency
-
-#define mul(a,b) (b*a)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	// Distance to nearest point in a grid of
-	// (frequency x frequency) points over the unit square
-	mat2 rotation_matrix = mat2(0.707, 0.707, -0.707, 0.707);
-	vec2 st2 = mul(rotation_matrix , vTexCoord);
-	vec2 nearest = 2.0 * fract(frequency * st2) - 1.0;
-	float dist = length(nearest);
-	vec3 texcolor = texture(Source, vTexCoord).rgb; // Unrotated coords
-	vec3 black = texcolor; // kinda cheating, but it makes the colors look much better
-
-	// Perform a rough RGB-to-CMYK conversion
-	vec4 cmyk;
-	cmyk.xyz = 1.0 - texcolor;
-	cmyk.w = min(cmyk.x, min(cmyk.y, cmyk.z)); // Create K
-
-	mat2 k_matrix = mat2(0.707, 0.707, -0.707, 0.707);
-	vec2 Kst = frequency * mul(k_matrix , vTexCoord);
-	vec2 Kuv = 2.0 * fract(Kst) - 1.0;
-	float k = step(0.0, sqrt(cmyk.w) - length(Kuv));
-	mat2 c_matrix = mat2(0.966, 0.259, -0.259, 0.966);
-	vec2 Cst = frequency * mul(c_matrix , vTexCoord);
-	vec2 Cuv = 2.0 * fract(Cst) - 1.0;
-	float c = step(0.0, sqrt(cmyk.x) - length(Cuv));
-	mat2 m_matrix = mat2(0.966, -0.259, 0.259, 0.966);
-	vec2 Mst = frequency * mul(m_matrix , vTexCoord);
-	vec2 Muv = 2.0 * fract(Mst) - 1.0;
-	float m = step(0.0, sqrt(cmyk.y) - length(Muv));
-	vec2 Yst = frequency * vTexCoord; // 0 deg
-	vec2 Yuv = 2.0 * fract(Yst) - 1.0;
-	float y = step(0.0, sqrt(cmyk.z) - length(Yuv));
-
-	vec3 rgbscreen = 1.0 - vec3(c,m,y);
-	rgbscreen = mix(rgbscreen, black, k);
-
-	float afwidth = 2.0 * frequency * length(params.OutputSize.zw);
-	float blend = smoothstep(0.0, 1.0, afwidth);
-	
-	vec4 color = vec4(mix(rgbscreen , texcolor, blend), 1.0);
-	color = (max(texcolor.r, max(texcolor.g, texcolor.b)) < 0.01) ? vec4(0.,0.,0.,0.) : color; // make blacks actually black
-
-	FragColor = color;
-}
\ No newline at end of file
diff --git a/misc/shaders/cocktail-cabinet.slang b/misc/shaders/cocktail-cabinet.slang
deleted file mode 100644
index 5bcfb2fd1a..0000000000
--- a/misc/shaders/cocktail-cabinet.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float height;
-	float width;
-	float location;
-} params;
-
-#pragma parameter height "CocktailTable Image Height" 1.0 -3.0 3.0 0.01
-#pragma parameter width "CocktailTable Image Width" 1.0 -3.0 3.0 0.05
-#pragma parameter location "CocktailTable Image Separation" 0.0001 -2.0 2.0 0.001
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 vTexCoord1;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord  = ((TexCoord.xy - vec2(0.5 - (params.location), 0.5)) * mat2x2(0.0,  1.0001 * (params.width), -2.0001 * (params.height), 0.0)) + vec2(0.5, 0. );
-   vTexCoord1 = ((TexCoord.xy - vec2(0.5 + (params.location), 0.5)) * mat2x2(0.0, -1.0001 * (params.width),  2.0001 * (params.height), 0.0)) + vec2(0.5, 0. );
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 vTexCoord1;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(texture(Source, vTexCoord).rgb, 1.0) + vec4(texture(Source, vTexCoord1).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/misc/shaders/color-mangler.slang b/misc/shaders/color-mangler.slang
deleted file mode 100644
index 7fd294f835..0000000000
--- a/misc/shaders/color-mangler.slang
+++ /dev/null
@@ -1,94 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	float gamma_boost_r;
-	float gamma_boost_g;
-	float gamma_boost_b;
-	float sat;
-	float lum;
-	float cntrst;
-	float r;
-	float g;
-	float b;
-	float rg;
-	float rb;
-	float gr;
-	float gb;
-	float br;
-	float bg;
-	float blr;
-	float blg;
-	float blb;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-/*
-   Color Mangler
-   Author: hunterk
-   License: Public domain
-*/
-#pragma parameter gamma_boost_r "Gamma Mod Red Channel" 0.0 -5.0 5.0 0.1
-#pragma parameter gamma_boost_g "Gamma Mod Green Channel" 0.0 -5.0 5.0 0.1
-#pragma parameter gamma_boost_b "Gamma Mod Blue Channel" 0.0 -5.0 5.0 0.1
-#pragma parameter sat "Saturation" 1.0 0.0 3.0 0.01
-#pragma parameter lum "Luminance" 1.0 0.0 5.0 0.01
-#pragma parameter cntrst "Contrast" 1.0 0.0 2.0 0.01
-#pragma parameter r "Red" 1.0 0.0 2.0 0.01
-#pragma parameter g "Green" 1.0 0.0 2.0 0.01
-#pragma parameter b "Blue" 1.0 0.0 2.0 0.01
-#pragma parameter rg "Red-Green Tint" 0.0 0.0 1.0 0.005
-#pragma parameter rb "Red-Blue Tint" 0.0 0.0 1.0 0.005
-#pragma parameter gr "Green-Red Tint" 0.0 0.0 1.0 0.005
-#pragma parameter gb "Green-Blue Tint" 0.0 0.0 1.0 0.005
-#pragma parameter br "Blue-Red Tint" 0.0 0.0 1.0 0.005
-#pragma parameter bg "Blue-Green Tint" 0.0 0.0 1.0 0.005
-#pragma parameter blr "Black-Red Tint" 0.0 0.0 1.0 0.005
-#pragma parameter blg "Black-Green Tint" 0.0 0.0 1.0 0.005
-#pragma parameter blb "Black-Blue Tint" 0.0 0.0 1.0 0.005
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 screen = pow(texture(Source, vTexCoord), vec4(2.2)).rgba;
-   vec4 avglum = vec4(0.5);
-   screen = mix(screen, avglum, (1.0 - params.cntrst));
-   
- //				params.r   params.g    params.b   params.black
-mat4 color = mat4(params.r,  params.rg,  params.rb, 0.0,  //red channel
-			   params.gr,  params.g,   params.gb, 0.0,  //green channel
-			   params.br,  params.bg,  params.b,  0.0,  //blue channel
-			  params.blr, params.blg, params.blb,    0.0); //alpha channel; these numbers do nothing for our purposes.
-			  
-mat4 adjust = mat4((1.0 - params.sat) * 0.2126 + params.sat, (1.0 - params.sat) * 0.2126, (1.0 - params.sat) * 0.2126, 1.0,
-(1.0 - params.sat) * 0.7152, (1.0 - params.sat) * 0.7152 + params.sat, (1.0 - params.sat) * 0.7152, 1.0,
-(1.0 - params.sat) * 0.0722, (1.0 - params.sat) * 0.0722, (1.0 - params.sat) * 0.0722 + params.sat, 1.0,
-0.0, 0.0, 0.0, 1.0);
-	color *= adjust;
-	screen = clamp(screen * params.lum, 0.0, 1.0);
-	screen = color * screen;
-	vec3 out_gamma = vec3(1.) / (vec3(2.2) - vec3(params.gamma_boost_r, params.gamma_boost_g, params.gamma_boost_b));
-	FragColor = pow(screen, vec4(out_gamma, 1.0));
-}
\ No newline at end of file
diff --git a/misc/shaders/colorimetry.slang b/misc/shaders/colorimetry.slang
deleted file mode 100644
index b86936b23c..0000000000
--- a/misc/shaders/colorimetry.slang
+++ /dev/null
@@ -1,256 +0,0 @@
-#version 450
-
-/*
-   Colorimetry shader
-   Ported from Drag's NES Palette Generator
-   http://drag.wootest.net/misc/palgen.html
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-layout(push_constant) uniform Push
-{
-   float color_mode;
-   float white_point_d93;
-   float clipping_method;
-} params;
-
-#pragma parameter color_mode "Colorimetry mode" 0.0 0.0 2.0 1.0
-#pragma parameter white_point_d93 "Use D93 white point" 1.0 0.0 1.0 1.0
-#pragma parameter clipping_method "Color clipping method" 0.0 0.0 2.0 1.0
-
-#define color_mode params.color_mode
-#define white_point_d93 params.white_point_d93
-#define clipping_method params.clipping_method
-
-vec3 huePreserveClipDarken(float r, float g, float b)
-{
-   float ratio = 1.0;
-   if ((r > 1.0) || (g > 1.0) || (b > 1.0))
-   {
-      float max = r;
-      if (g > max)
-         max = g;
-      if (b > max)
-         max = b;
-      ratio = 1.0 / max;
-   }
-
-   r *= ratio;
-   g *= ratio;
-   b *= ratio;
-
-   r = clamp(r, 0.0, 1.0);
-   g = clamp(g, 0.0, 1.0);
-   b = clamp(b, 0.0, 1.0);
-
-   return vec3(r, g, b);
-}
-
-vec3 huePreserveClipDesaturate(float r, float g, float b)
-{
-   float l = (.299 * r) + (0.587 * g) + (0.114 * b);
-   bool ovr = false;
-   float ratio = 1.0;
-
-   if ((r > 1.0) || (g > 1.0) || (b > 1.0))
-   {
-      ovr = true;
-      float max = r;
-      if (g > max) max = g;
-      if (b > max) max = b;
-      ratio = 1.0 / max;
-   }
-
-   if (ovr)
-   {
-      r -= 1.0;
-      g -= 1.0;
-      b -= 1.0;
-      r *= ratio;
-      g *= ratio;
-      b *= ratio;
-      r += 1.0;
-      g += 1.0;
-      b += 1.0;
-   }
-
-   r = clamp(r, 0.0, 1.0);
-   g = clamp(g, 0.0, 1.0);
-   b = clamp(b, 0.0, 1.0);
-
-   return vec3(r, g, b);
-}
-
-vec3 ApplyColorimetry(vec3 color)
-{
-   //http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html
-   //http://www.dr-lex.be/random/matrix_inv.html
-   // Convert the (x,y) values to X Y Z.
-
-   float R = color.r;
-   float G = color.g;
-   float B = color.b;
-
-   float Rx = 0.0;
-   float Ry = 0.0;
-   float Gx = 0.0;
-   float Gy = 0.0;
-   float Bx = 0.0;
-   float By = 0.0;
-   float Wx = 0.0;
-   float Wy = 0.0;
-
-   if (white_point_d93 > 0.5)
-   {
-      Wx = 0.31;
-      Wy = 0.316;
-   }
-   else
-   {
-      Wx = 0.3127;
-      Wy = 0.329;
-   }
-
-   if (color_mode < 0.5)
-   {
-      // FCC 1953
-      // Original FCC standard for the color of the phosphors
-      Rx = 0.67;
-      Ry = 0.33;
-      Gx = 0.21;
-      Gy = 0.71;
-      Bx = 0.14;
-      By = 0.08;
-   }
-   else if (color_mode == 1.0) 
-   {
-      // SMPTE C (1987)
-      // A newer standard for the color of the phospors. (Not used in Japan)
-      Rx = 0.63;
-      Ry = 0.34;
-      Gx = 0.31;
-      Gy = 0.595;
-      Bx = 0.155;
-      By = 0.07;
-   }
-   else
-   {
-      //sRGB (PC Monitors)
-      //The colorimetry used in PC monitors, like the one you're (probably) looking at right now.
-      Rx = 0.64;
-      Ry = 0.33;
-      Gx = 0.3;
-      Gy = 0.6;
-      Bx = 0.15;
-      By = 0.06;
-   }
-
-   float Xr = Rx / Ry;
-   float Xg = Gx / Gy;
-   float Xb = Bx / By;
-   float Xw = Wx / Wy;
-   float Yr = 1.0;
-   float Yg = 1.0;
-   float Yb = 1.0;
-   float Yw = 1.0;
-   float Zr = (1.0 - Rx - Ry) / Ry;
-   float Zg = (1.0 - Gx - Gy) / Gy;
-   float Zb = (1.0 - Bx - By) / By;
-   float Zw = (1.0 - Wx - Wy) / Wy;
-
-   // Get ready for a bunch of painful math. I need to invert a matrix, then multiply it by a vector.
-   // Determinant for inverse matrix
-
-   float sDet = (Xr*((Zb*Yg)-(Zg*Yb)))-(Yr*((Zb*Xg)-(Zg*Xb)))+(Zr*((Yb*Xg)-(Yg*Xb)));
-
-   float Sr = ((((Zb*Yg)-(Zg*Yb))/sDet)*Xw) + ((-((Zb*Xg)-(Zg*Xb))/sDet)*Yw) + ((((Yb*Xg)-(Yg*Xb))/sDet)*Zw);
-   float Sg = ((-((Zb*Yr)-(Zr*Yb))/sDet)*Xw) + ((((Zb*Xr)-(Zr*Xb))/sDet)*Yw) + ((-((Yb*Xr)-(Yr*Xb))/sDet)*Zw);
-   float Sb = ((((Zg*Yr)-(Zr*Yg))/sDet)*Xw) + ((-((Zg*Xr)-(Zr*Xg))/sDet)*Yw) + ((((Yg*Xr)-(Yr*Xg))/sDet)*Zw);
-
-   // This should be the completed RGB -> XYZ matrix.
-   // Multiply each of the first three members by R, then add them together to get X
-   float convMatrix[9] = float[] (0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
-
-   convMatrix[0] = Sr*Xr;
-   convMatrix[1] = Sg*Xg;
-   convMatrix[2] = Sb*Xb;
-   convMatrix[3] = Sr*Yr;
-   convMatrix[4] = Sg*Yg;
-   convMatrix[5] = Sb*Yb;
-   convMatrix[6] = Sr*Zr;
-   convMatrix[7] = Sg*Zg;
-   convMatrix[8] = Sb*Zb;
-
-   // Convert RGB to XYZ using the matrix generated with the specified RGB and W points.	
-   float X = (convMatrix[0] * R) + (convMatrix[1] * G) + (convMatrix[2] * B);
-   float Y = (convMatrix[3] * R) + (convMatrix[4] * G) + (convMatrix[5] * B);
-   float Z = (convMatrix[6] * R) + (convMatrix[7] * G) + (convMatrix[8] * B);
-
-   // This is the conversion matrix for CIEXYZ -> sRGB. I nicked this from:
-   // http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html
-   // and I know it's right because when you use the sRGB colorimetry, this matrix produces identical results to
-   // just using the raw R, G, and B above.
-   float xyztorgb[9] = float[] (3.2404, -1.5371, -0.4985, -0.9693, 1.876, 0.0416, 0.0556, -0.204, 1.0572);
-
-   // Convert back to RGB using the XYZ->sRGB matrix.
-   R = (xyztorgb[0]*X) + (xyztorgb[1]*Y) + (xyztorgb[2]*Z);
-   G = (xyztorgb[3]*X) + (xyztorgb[4]*Y) + (xyztorgb[5]*Z);
-   B = (xyztorgb[6]*X) + (xyztorgb[7]*Y) + (xyztorgb[8]*Z);
-
-   vec3 corrected_rgb;
-
-   // Apply desired clipping method to out-of-gamut colors.
-   if (clipping_method < 0.5)
-   {
-      //If a channel is out of range (> 1.0), it's simply clamped to 1.0. This may change hue, saturation, and/or lightness.
-      R = clamp(R, 0.0, 1.0);
-      G = clamp(G, 0.0, 1.0);
-      B = clamp(B, 0.0, 1.0);
-      corrected_rgb = vec3(R, G, B);
-   }
-   else if (clipping_method == 1.0)
-   {
-      //If any channels are out of range, the color is darkened until it is completely in range.
-      corrected_rgb = huePreserveClipDarken(R, G, B);
-   }
-   else if (clipping_method == 2.0)
-   {
-      //If any channels are out of range, the color is desaturated towards the luminance it would've had.
-      corrected_rgb = huePreserveClipDesaturate(R, G, B);
-   }
-
-   return corrected_rgb;
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 c = texture(Source, vTexCoord.xy);
-   vec3 rgb = vec3(c.r, c.g, c.b);
-
-   vec3 out_color = ApplyColorimetry(rgb);
-   FragColor = vec4(out_color, 1.0);
-}
diff --git a/misc/shaders/convergence.slang b/misc/shaders/convergence.slang
deleted file mode 100644
index b98d59e442..0000000000
--- a/misc/shaders/convergence.slang
+++ /dev/null
@@ -1,71 +0,0 @@
-#version 450
-
-/*
-convergence pass DariusG 2023. 
-Run in Linear, BEFORE actual shader pass
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	float C_STR,Rx,Ry,Gx,Gy,Bx,By;
-} params;
-
-#pragma parameter C_STR "Convergence Overall Strength" 0.5 0.0 0.5 0.05
-#pragma parameter Rx "Convergence Red Horiz." 0.9 -5.0 5.0 0.05
-#pragma parameter Ry "Convergence Red Vert." 0.05 -5.0 5.0 0.05
-#pragma parameter Gx "Convergence Green Horiz." -0.95 -5.0 5.0 0.05
-#pragma parameter Gy "Convergence Green Vert." -0.05 -5.0 5.0 0.05
-#pragma parameter Bx "Convergence Blue Horiz." 0.9 -5.0 5.0 0.05
-#pragma parameter By "Convergence Blue Vert." 0.05 -5.0 5.0 0.05
-
-#define C_STR params.C_STR
-#define Rx params.Rx
-#define Ry params.Ry
-#define Gx params.Gx
-#define Gy params.Gy
-#define Bx params.Bx
-#define By params.By
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 FinalViewportSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-
-void main()
-{
-vec2 dx = vec2(params.SourceSize.z,0.0);
-vec2 dy = vec2(0.0,params.SourceSize.w);
-vec2 pos = vTexCoord;
-vec3 res0 = texture(Source,pos).rgb;
-float resr = texture(Source,pos + dx*Rx + dy*Ry).r;
-float resg = texture(Source,pos + dx*Gx + dy*Gy).g;
-float resb = texture(Source,pos + dx*Bx + dy*By).b;
-
-vec3 res = vec3(  res0.r*(1.0-C_STR) +  resr*C_STR,
-                  res0.g*(1.0-C_STR) +  resg*C_STR,
-                  res0.b*(1.0-C_STR) +  resb*C_STR 
-                   );
-FragColor.rgb = res;    
-}
diff --git a/misc/shaders/edge-detect.slang b/misc/shaders/edge-detect.slang
deleted file mode 100644
index 6701f78a8e..0000000000
--- a/misc/shaders/edge-detect.slang
+++ /dev/null
@@ -1,83 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float minimum;
-   float maximum;
-} params;
-
-#pragma parameter minimum "Edge Thresh Min" 0.05 0.0 1.0 0.01
-#pragma parameter maximum "Edge Thresh Max" 0.35 0.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-float threshold(float thr1, float thr2 , float val) {
- val = (val < thr1) ? 0.0 : val;
- val = (val > thr2) ? 1.0 : val;
- return val;
-}
-
-// averaged pixel intensity from 3 color channels
-float avg_intensity(vec4 pix) {
- return dot(pix.rgb, vec3(0.2126, 0.7152, 0.0722));
-}
-
-vec4 get_pixel(sampler2D tex, vec2 coords, float dx, float dy) {
- return texture(tex, coords + vec2(dx, dy));
-}
-
-// returns pixel color
-float IsEdge(sampler2D tex, vec2 coords){
-  float dxtex = params.SourceSize.z;
-  float dytex = params.SourceSize.w;
-  float pix[9];
-  int k = -1;
-  float delta;
-
-  // read neighboring pixel intensities
-  for (int i=-1; i<2; i++) {
-   for(int j=-1; j<2; j++) {
-    k++;
-    pix[k] = avg_intensity(get_pixel(tex, coords, float(i) * dxtex,
-                                          float(j) * dytex));
-   }
-  }
-
-  // average color differences around neighboring pixels
-  delta = (abs(pix[1]-pix[7])+
-          abs(pix[5]-pix[3]) +
-          abs(pix[0]-pix[8])+
-          abs(pix[2]-pix[6])
-           )/4.;
-
-  return threshold(params.minimum, params.maximum,clamp(delta,0.0,1.0));
-}
-
-void main()
-{
-   float test = IsEdge(Source, vTexCoord);
-   FragColor = vec4(test);
-}
diff --git a/misc/shaders/ega.slang b/misc/shaders/ega.slang
deleted file mode 100644
index 14d5fe4e4a..0000000000
--- a/misc/shaders/ega.slang
+++ /dev/null
@@ -1,164 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-  vec4 SourceSize;
-  vec4 OriginalSize;
-  vec4 OutputSize;
-  uint FrameCount;
-  float palette, color_enhance;
-} params;
-
-#pragma parameter palette "Choose palette Hercules/CGA/EGA" 2.0 0.0 2.0 1.0
-#define palette params.palette
-
-#pragma parameter color_enhance "Color Enchance" 1.4 1.0 4.0 0.05
-#define color_enhance params.color_enhance
-
-#define _ 0.0
-#define o (1./3.)
-#define b (2./3.)
-#define B 1.0
-
-
-#define SourceSize params.SourceSize
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-  mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord*1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-// Color lookup table (RGBI palette with brown fix)
-const vec3 rgbi_palette[19] = 
-{
-  vec3(_, _, _),   // cga
-  vec3(B, B, B),   // cga white
-  vec3(o, B, B),   // cga cyan
-  vec3(B, o, B),   // cga pink
-  vec3(_, _, b),
-  vec3(_, b, _),
-  vec3(_, b, _),
-  vec3(_, b, _),
-  vec3(_, b, _),
-  vec3(_, b, b),
-  vec3(b, _, _),
-  vec3(b, _, b),
-  vec3(b, o, _),
-  vec3(b, b, b),
-  vec3(o, o, o),
-  vec3(o, o, B),
-  vec3(o, B, o),
-  vec3(B, o, o),
-  vec3(B, B, o),
- 
-};
-
-const vec3 cga_palette[4] = 
-{
-  vec3(_, _, _),   // cga
-  vec3(o, B, B),   // cga cyan
-  vec3(B, o, B),   // cga pink
-  vec3(B, B, B),   // cga white
-};
-
-const vec3 simcga_palette[2] = 
-{
-  vec3(_, _, _),   // black
-  vec3(o, b, o),   // green
-
-};
-
-
-// Came off the wikipedia(R) article for Ordered_Dithering
-const int dithertable[16] = 
-{
-	 1, 9, 3,11,
-	13, 5,15, 7,
-	 4,12, 2,10,
-  16, 8,14, 6,
-};
-
-
-// Compare vector distances and return nearest RGBI color
-vec3 nearest_rgbi (vec3 original) 
-{
-  float dst;
-  float min_dst = 2.0;
-  int idx = 0;
-
-  int set; if (palette == 2.0)set = 19; else if (palette == 1.0) set = 4;else if (palette == 1.0) set = 2;
-  for (int i=0; i<set; i++) 
-  {
-    dst = distance(original, rgbi_palette[i]);
-    if (dst < min_dst) 
-     {
-      min_dst = dst;
-      idx = i;
-     }
-  }
-  if (palette == 2.0) return rgbi_palette[idx];
-  else if (palette == 1.0) return cga_palette[idx];
-  else if (palette == 0.0) return simcga_palette[idx];
- 
-}
-
-
-float modu(float x, float y)
-{
-	return x - y * floor(x/y);
-}
-
-
-void main()
-{
-  vec3 color = texture(Source, vTexCoord.xy).rgb;
-
-	// leilei - dither 
-	vec2 res;
-	vec2 tex=vTexCoord.xy;
-	res.x = SourceSize.x; 
-
-	if (SourceSize.y < 900.0)
-		res.y = SourceSize.y; 
-	   else
-	     res.y = SourceSize.y / 2.0; 
-
-	int ohyes;
-  int i;
-  vec2 ditheu = tex.xy * res.xy;
-
-  int ditdex =  int(modu(ditheu.x, 4))*4 + int(modu(ditheu.y, 4)); // 4x4!
-
-  // looping through a lookup table matrix
-  
-  for (i = ditdex; i < (ditdex+16); i = i+1) 
-      ohyes = dithertable[i-15] * 2 - 21;
-      ohyes = ohyes - 6;
-      
-      color *= 255.0;
-      color += ohyes;
-      color /= 255.0;
-     
-
-      vec3 final = nearest_rgbi(color*color_enhance);
- 
-
-  FragColor = vec4(final, 1.0);
-}
diff --git a/misc/shaders/natural-vision.slang b/misc/shaders/natural-vision.slang
deleted file mode 100644
index c5836e80cf..0000000000
--- a/misc/shaders/natural-vision.slang
+++ /dev/null
@@ -1,74 +0,0 @@
-#version 450
-
-/*
-   ShadX's Natural Vision Shader
-
-   Ported and tweaked by Hyllian - 2016
-   parameterized by Sp00kyFox
-
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-layout(push_constant) uniform push_constant
-{
-    vec4 SourceSize;
-    vec4 OutputSize;
-    float GIN;
-    float GOUT;
-    float Y;
-    float I;
-    float Q;
-} params;
-
-#pragma parameter GIN   "NaturalVision Gamma In"    2.2 0.0 10.0 0.05
-#pragma parameter GOUT  "NaturalVision Gamma Out"   2.2 0.0 10.0 0.05
-#pragma parameter Y "NaturalVision Luminance"   1.1 0.0 10.0 0.01
-#pragma parameter I "NaturalVision Orange-Cyan" 1.1 0.0 10.0 0.01
-#pragma parameter Q "NaturalVision Magenta-Green"   1.1 0.0 10.0 0.01
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-/*    VERTEX_SHADER    */
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-const mat3x3 RGBtoYIQ = mat3x3( 0.299,     0.587,     0.114,
-                                0.595716, -0.274453, -0.321263,
-                                0.211456, -0.522591,  0.311135);
-
-const mat3x3 YIQtoRGB = mat3x3( 1,  0.95629572,  0.62102442,
-                                1, -0.27212210, -0.64738060,
-                                1, -1.10698902,  1.70461500);
-
-const vec3 YIQ_lo = vec3(0, -0.595716, -0.522591);
-const vec3 YIQ_hi = vec3(1,  0.595716,  0.522591);
-
-
-void main()
-{
-    vec3 c = texture(Source, vTexCoord).xyz;
-
-    c = pow(c, vec3(params.GIN));
-    c = c * RGBtoYIQ;
-    c = vec3(pow(c.x, params.Y), c.y*params.I, c.z*params.Q);
-    c = clamp(c, YIQ_lo, YIQ_hi);
-    c = c * YIQtoRGB;
-    c = pow(c, vec3(1.0/params.GOUT));
-
-    FragColor = vec4(c, 1.0);
-}
diff --git a/misc/shaders/night_mode.slang b/misc/shaders/night_mode.slang
deleted file mode 100644
index af84fa57ea..0000000000
--- a/misc/shaders/night_mode.slang
+++ /dev/null
@@ -1,60 +0,0 @@
-#version 450
-
-/*
-   2023
-   Night mode (!) by DariusG
-
-*/
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	float WP;
-	float strength;
-
-} params;
-#pragma parameter WP "Color Temperature" 0.1 0.0 0.25 0.01
-#pragma parameter strength "Night mode Strength" 0.8 0.5 1.0 0.05
-
-#define WP params.WP
-#define strength params.strength
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 FinalViewportSize;
-	vec4 OutputSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-
-void main()
-{	
-	vec3 color = texture(Source, vTexCoord).rgb;
-	
-	color *= vec3(strength);
-	color  = vec3(color.r+WP, color.g, color.b-WP);
-
-
-	FragColor = vec4(color,1.0);
-}
diff --git a/misc/shaders/ntsc-colors.slang b/misc/shaders/ntsc-colors.slang
deleted file mode 100755
index a3a6b2b38e..0000000000
--- a/misc/shaders/ntsc-colors.slang
+++ /dev/null
@@ -1,42 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float intensity;
-} params;
-
-#pragma parameter intensity "NTSC Intensity" 1.0 0.0 1.0 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#include "../../include/colorspace-tools.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-     vec3 color = texture(Source, vTexCoord).rgb;
-     color = mix(color.rgb, NTSCtoSRGB(color.rgb), params.intensity);
-   FragColor = vec4(color, 1.0);
-}
diff --git a/misc/shaders/print-resolution/print-resolution-apply.slang b/misc/shaders/print-resolution/print-resolution-apply.slang
deleted file mode 100644
index a65bb26b82..0000000000
--- a/misc/shaders/print-resolution/print-resolution-apply.slang
+++ /dev/null
@@ -1,83 +0,0 @@
-#version 450
-
-/*
-	print-resolution-text-apply.slang
-	Takes the output of the text generate pass and applies it on top of the image
-*/ 
-
-#pragma name TextApplyPass
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float PRINT_RESOLUTION_TEXT_ON;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter PRINT_RESOLUTION_TEXT_TITLE								"[ PRINT RESOLUTION TEXT ]" 0 0 0.001 0.001
-
-#pragma parameter PRINT_RESOLUTION_TEXT_ON							"          Show Resolution Text" 1 0 1 1
-float PRINT_RESOLUTION_TEXT_ON = params.PRINT_RESOLUTION_TEXT_ON;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D TextGeneratePass;
-
-
-/* Composite one image over top another using the alpha to blend
- * It is expected that the input colors have been already premultiplied
- * which means their rgb has already been multiplied by their alpha */
-vec4 PreMultAlphaBlend(vec4 color_under, vec4 color_over)
-{
-	vec4 out_color = vec4(color_over.rgb + (color_under.rgb * (1 - color_over.a)), clamp(color_under.a + color_over.a, 0, 1));
-	return out_color;
-}
-
-void main()
-{
-	vec4 in_pass_color = texture(TextGeneratePass, vTexCoord);
-	FragColor = in_pass_color;
-
-	//////// Draw text to show resolutions ////////// 
-	if (PRINT_RESOLUTION_TEXT_ON == 1 && vTexCoord.x > params.OutputSize.z * 2 && vTexCoord.y > params.OutputSize.w * 2)
-	{
-		vec2 ps = params.OutputSize.zw;
-		vec2 outline_offset_mult = ps;
-		outline_offset_mult.x *= max(floor(params.OutputSize.x / 240 + 0.01), 1);
-		outline_offset_mult.y *= max(floor(params.OutputSize.y / 200 + 0.01), 1);
-
-		vec4 text_rgba = vec4(FragColor.a);
-		text_rgba.rgb *= vec3(1, 1, 0);
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(1, 0)).a;
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(0, 1)).a;
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(1, 1)).a;
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(-1, 1)).a;
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(-1, 0)).a;
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(0, -1)).a;
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(-1, -1)).a;
-		text_rgba.a += texture(TextGeneratePass, vTexCoord + outline_offset_mult * vec2(1, -1)).a;
-		text_rgba = clamp(text_rgba, 0, 1);
-		FragColor.rgb = PreMultAlphaBlend(FragColor, text_rgba).rgb;
-	}
-
-	return;
-}
\ No newline at end of file
diff --git a/misc/shaders/retro-palettes.slang b/misc/shaders/retro-palettes.slang
deleted file mode 100644
index 1fb21bfbc8..0000000000
--- a/misc/shaders/retro-palettes.slang
+++ /dev/null
@@ -1,47 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float pal;
-} params;
-
-#pragma parameter pal "color palette colors: (1+x)^3" 1.0 1.0 15.0 1.0
-#pragma parameter something "1: ZX Spectrum, 2: Amstrad, 3: EGA, 7:Genesis, 15:Amiga" 0.0 0.0 0.0 0.0
-#define pal params.pal
-
-#define SourceSize params.SourceSize
-#define OutputSize params.OutputSize
-#define OriginalSize params.OriginalSize
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord*1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{	
-	vec3 res = texture(Source,vTexCoord).rgb;
-
-  	res= round(res*pal)/pal;
-   FragColor = vec4(res,1.0);
-}
\ No newline at end of file
diff --git a/misc/shaders/simple_color_controls.slang b/misc/shaders/simple_color_controls.slang
deleted file mode 100644
index 75b9307666..0000000000
--- a/misc/shaders/simple_color_controls.slang
+++ /dev/null
@@ -1,277 +0,0 @@
-#version 450
-
-
-layout(push_constant) uniform Push
-{
-	
-    float sc_sat,sc_black,sc_temp,sc_sega,sc_brightness,sc_postbr,sc_contrast,
-    sc_gamma_out, sc_gamma_in, sc_mono, sc_r,sc_g,sc_b, sc_cs, sc_rg,sc_rb,sc_gb,r_out,g_out,b_out, sc_postdk;
-} params;
-
-
-
-#pragma parameter sc_cs "Colors: sRGB, PAL, NTSC-U, NTSC-J" 0.0 0.0 3.0 1.0
-#pragma parameter sc_temp "Color Temperature in Kelvins (NTSC-J 9300)"  6863.0 1031.0 12047.0 72.0
-#pragma parameter sc_gamma_in "Gamma In" 2.4 1.0 4.0 0.05
-#pragma parameter sc_rg "Green <-to-> Red Hue" 0.0 -0.25 0.25 0.01
-#pragma parameter sc_rb "Blue <-to-> Red Hue"  0.0 -0.25 0.25 0.01
-#pragma parameter sc_gb "Blue <-to-> Green Hue" 0.0 -0.25 0.25 0.01
-#pragma parameter r_out "CRT Red Vibrancy" 0.29 0.0 1.0 0.01
-#pragma parameter g_out "CRT Green Vibrancy" 0.62 0.0 1.0 0.01
-#pragma parameter b_out "CRT Blue Vibrancy" 0.09 0.0 1.0 0.01
-#pragma parameter sc_brightness "Brightness" 1.0 0.0 2.0 0.01
-#pragma parameter sc_contrast "Contrast" 1.0 0.00 2.00 0.01
-#pragma parameter sc_sat "Saturation" 1.0 0.0 2.0 0.01
-#pragma parameter sc_black  "Black Level" 0.0 -0.20 0.20 0.01 
-#pragma parameter sc_sega "Lum Fix: ST/GEN-CPC-AMIGA" 0.0 0.0 3.0 1.0
-#pragma parameter sc_postbr "Bright Boost" 1.0 1.0 2.0 0.05
-#pragma parameter sc_postdk "Dark Boost" 1.0 1.0 2.0 0.05
-#pragma parameter sc_gamma_out "Gamma out" 2.2 1.0 4.0 0.05
-#pragma parameter sc_mono "Mono Display On/Off" 0.0 0.0 1.0 1.0
-#pragma parameter sc_r "Mono Red/Channel" 1.0 0.0 2.0 0.01
-#pragma parameter sc_g "Mono Green/Channel" 1.0 0.0 2.0 0.01
-#pragma parameter sc_b "Mono Blue/Channel" 1.0 0.0 2.0 0.01
-
-
-#define sc_cs params.sc_cs
-#define sc_rg params.sc_rg
-#define sc_rb params.sc_rb
-#define sc_gb params.sc_gb
-#define r_out params.r_out
-#define g_out params.g_out
-#define b_out params.b_out
-#define sc_temp params.sc_temp
-#define sc_sat params.sc_sat
-#define sc_brightness params.sc_brightness
-#define sc_contrast params.sc_contrast
-#define sc_black params.sc_black
-#define sc_sega params.sc_sega
-#define sc_postbr params.sc_postbr
-#define sc_postdk params.sc_postdk
-#define sc_gamma_in params.sc_gamma_in
-#define sc_gamma_out params.sc_gamma_out
-#define sc_mono params.sc_mono
-#define sc_r params.sc_r
-#define sc_g params.sc_g
-#define sc_b params.sc_b
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-    uint FrameCount;
-} global;
-
-
-#define OutputSize global.OutputSize
-#define OriginalSize global.OriginalSize
-#define SourceSize global.SourceSize
-#define FrameCount global.FrameCount
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#if defined GL_ES
-
-mat3 PAL = mat3(                    
-0.7954  ,   0.1881  ,   0.0053  ,
--0.0310 ,   1.0343  ,   -0.0044 ,
--0.0236 ,   0.1383  ,   0.8927  );
-
-mat3 NTSC = mat3(                   
-0.6837  ,   0.2635  ,   0.0336  ,
--0.0499 ,   1.0323  ,   0.0139  ,
--0.0119 ,   0.1071  ,   0.9111  );
-
-mat3 NTSC_J = mat3(                 
-0.8642  ,   0.1253  ,   0.0030  ,
-0.0545  ,   0.9513  ,   -0.0029 ,
--0.0214 ,   0.1554  ,   0.8750  );
-
-#else
-// standard 6500k
-mat3 PAL = mat3(                    
-1.0740  ,   -0.0574 ,   -0.0119 ,
-0.0384  ,   0.9699  ,   -0.0059 ,
--0.0079 ,   0.0204  ,   0.9884  );
-
-// standard 6500k
-mat3 NTSC = mat3(                   
-0.9318  ,   0.0412  ,   0.0217  ,
-0.0135  ,   0.9711  ,   0.0148  ,
-0.0055  ,   -0.0143 ,   1.0085  );
-
-// standard 6500k
-mat3 NTSC_J = mat3(                 
-1.0185  ,   -0.0144 ,   -0.0029 ,
-0.0732  ,   0.9369  ,   -0.0059 ,
--0.0318 ,   -0.0080 ,   1.0353  );
-#endif
-
-
-float saturate(float v) 
-    { 
-        return clamp(v, 0.0, 1.0);       
-    }
-
-vec3 ColorTemp(float temperatureInKelvins)
-{
-    vec3 retColor;
-    temperatureInKelvins = clamp(temperatureInKelvins, 1000.0, 40000.0) / 100.0;
-    
-    if (temperatureInKelvins <= 66.0)
-    {
-        retColor.r = 1.0;
-        retColor.g = saturate(0.39008157876901960784 * log(temperatureInKelvins) - 0.63184144378862745098);
-    }
-    else
-    {
-        float t = temperatureInKelvins - 60.0;
-        retColor.r = saturate(1.29293618606274509804 * pow(t, -0.1332047592));
-        retColor.g = saturate(1.12989086089529411765 * pow(t, -0.0755148492));
-    }
-    
-    if (temperatureInKelvins >= 66.0)
-        retColor.b = 1.0;
-    else if(temperatureInKelvins <= 19.0)
-        retColor.b = 0.0;
-    else
-        retColor.b = saturate(0.54320678911019607843 * log(temperatureInKelvins - 10.0) - 1.19625408914);
-
-    return retColor;
-}
-
-mat4 contrastMatrix(float contr)
-{   
-    float t = (1.0 - contr) / 2.0;
-    
-    return mat4(contr, 0,               0,               0,
-                0,               contr, 0,               0,
-                0,               0,               contr, 0,
-                t,               t,               t,               1);
-}
-
-
-vec3 toGrayscale(vec3 color)
-{
-
-  float average = dot(vec3(0.3,0.59,0.11),color);
-  if (sc_cs == 0.0) average = dot(vec3(0.22,0.71,0.07),color);
-  return vec3(average);
-}
-
-vec3 colorize(vec3 grayscale, vec3 color)
-{
-    return (grayscale * color);
-}
-
-
-vec3 huePreserveClipDesaturate(float r, float g, float b)
-{
-   float l = (.299 * r) + (0.587 * g) + (0.114 * b);
-   bool ovr = false;
-   float ratio = 1.0;
-
-   if ((r > 1.0) || (g > 1.0) || (b > 1.0))
-   {
-      ovr = true;
-      float max = r;
-      if (g > max) max = g;
-      if (b > max) max = b;
-      ratio = 1.0 / max;
-   }
-
-   if (ovr)
-   {
-      r -= 1.0;
-      g -= 1.0;
-      b -= 1.0;
-      r *= ratio;
-      g *= ratio;
-      b *= ratio;
-      r += 1.0;
-      g += 1.0;
-      b += 1.0;
-   }
-
-   r = clamp(r, 0.0, 1.0);
-   g = clamp(g, 0.0, 1.0);
-   b = clamp(b, 0.0, 1.0);
-
-   return vec3(r, g, b);
-}
-
-
-void main()
-{
-mat3 hue = mat3(
-    1.0, -sc_rg, -sc_rb,
-    sc_rg, 1.0, -sc_gb,
-    sc_rb, sc_gb, 1.0
-);
-
-   vec3 col = texture(Source,vTexCoord).rgb;
-
-  if (sc_sega == 1.0) col = floor(col*7.0+0.5)/7.0;
-  if (sc_sega == 2.0) col = floor(col*2.0+0.5)/2.0;
-  if (sc_sega == 3.0) col = floor(col*15.0+0.5)/15.0;
-   
-
-   col *= sc_brightness;
-   
-   col = pow((col+0.099)/1.099, vec3(sc_gamma_in));
-//color temperature  
-   col *= ColorTemp(sc_temp);
-
-   
-if (sc_cs != 0.0){
-    if (sc_cs == 1.0) col *= PAL;
-    if (sc_cs == 2.0) col *= NTSC;
-    if (sc_cs == 3.0) col *= NTSC_J;
-    col /= vec3(0.24,0.69,0.07);
-    col *= vec3(r_out,g_out,b_out); 
-    col = clamp(col,0.0,2.0);
-}
-
-    col = pow(1.099*col, vec3(1.0/sc_gamma_out))-0.099;
-   
-    col -= vec3(sc_black);
-    col*= vec3(1.0)/vec3(1.0-sc_black);
-    
-//saturation
-vec3 lumw = vec3(0.3,0.59,0.11);
-if (sc_cs == 0.0) lumw = vec3(0.2124,0.7011, 0.0866);   
-float l = dot(col, lumw);
-    
-   col = mix(vec3(l), col, sc_sat); 
-    if (sc_mono == 1.0)
-    {
-    vec3 col1 = toGrayscale (col);
-    vec3 c = vec3(sc_r, sc_g, sc_b);
-    col = colorize (col1, c);
-    }
-   col *= hue;
-
-col *= mix(sc_postdk,sc_postbr,l);
-col = (contrastMatrix(sc_contrast) * vec4(col,1.0)).rgb;  
-
-   col = huePreserveClipDesaturate(col.r, col.g, col.b);
-
-   FragColor = vec4(col,1.0);
-}
diff --git a/misc/shaders/tonemapping.slang b/misc/shaders/tonemapping.slang
deleted file mode 100755
index 59592b6d7c..0000000000
--- a/misc/shaders/tonemapping.slang
+++ /dev/null
@@ -1,177 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float MAP1;
-	float MAP2;
-	float SPLIT_LINE;
-} params;
-
-#pragma parameter MAP1 "Tone Map Method Left" 0.0 0.0 7.0 1.0
-#define MAP1 params.MAP1
-
-#pragma parameter MAP2 "Tone Map Method Right" 0.0 0.0 7.0 1.0
-#define MAP2 params.MAP2
-
-#pragma parameter SPLIT_LINE "Split Location" 0.5 0.0 1.0 0.05
-#define SPLIT_LINE params.SPLIT_LINE
-
-// uncomment one of the following lines to divide the screen into
-// sections using each tonemapping method or do splitscreen comparison
-// #define HORIZ_BANDS
-// #define VERT_BANDS
- #define SPLITSCREEN
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-/*
-This shader experiments the effect of different tone mapping operators.
-This is still a work in progress.
-More info:
-http://slideshare.net/ozlael/hable-john-uncharted2-hdr-lighting
-http://filmicgames.com/archives/75
-http://filmicgames.com/archives/183
-http://filmicgames.com/archives/190
-http://imdoingitwrong.wordpress.com/2010/08/19/why-reinhard-desaturates-my-blacks-3/
-http://mynameismjp.wordpress.com/2010/04/30/a-closer-look-at-tone-mapping/
-http://renderwonk.com/publications/s2010-color-course/
---
-Zavie
-*/
-
-float gamma = 2.2;
-
-vec3 linearToneMapping(vec3 color)
-{
-	float exposure = 1.;
-	color = clamp(exposure * color, 0., 1.);
-	color = pow(color, vec3(1. / gamma));
-	return color;
-}
-
-vec3 simpleReinhardToneMapping(vec3 color)
-{
-	float exposure = 1.5;
-	color *= exposure/(1. + color / exposure);
-	color = pow(color, vec3(1. / gamma));
-	return color;
-}
-
-vec3 lumaBasedReinhardToneMapping(vec3 color)
-{
-	float luma = dot(color, vec3(0.2126, 0.7152, 0.0722));
-	float toneMappedLuma = luma / (1. + luma);
-	color *= toneMappedLuma / luma;
-	color = pow(color, vec3(1. / gamma));
-	return color;
-}
-
-vec3 whitePreservingLumaBasedReinhardToneMapping(vec3 color)
-{
-	float white = 2.;
-	float luma = dot(color, vec3(0.2126, 0.7152, 0.0722));
-	float toneMappedLuma = luma * (1. + luma / (white*white)) / (1. + luma);
-	color *= toneMappedLuma / luma;
-	color = pow(color, vec3(1. / gamma));
-	return color;
-}
-
-vec3 RomBinDaHouseToneMapping(vec3 color)
-{
-    color = exp( -1.0 / ( 2.72*color + 0.15 ) );
-	color = pow(color, vec3(1. / gamma));
-	return color;
-}
-
-vec3 filmicToneMapping(vec3 color)
-{
-	color = max(vec3(0.), color - vec3(0.004));
-	color = (color * (6.2 * color + .5)) / (color * (6.2 * color + 1.7) + 0.06);
-	return color;
-}
-
-vec3 Uncharted2ToneMapping(vec3 color)
-{
-	float A = 0.15;
-	float B = 0.50;
-	float C = 0.10;
-	float D = 0.20;
-	float E = 0.02;
-	float F = 0.30;
-	float W = 11.2;
-	float exposure = 2.;
-	color *= exposure;
-	color = ((color * (A * color + C * B) + D * E) / (color * (A * color + B) + D * F)) - E / F;
-	float white = ((W * (A * W + C * B) + D * E) / (W * (A * W + B) + D * F)) - E / F;
-	color /= white;
-	color = pow(color, vec3(1. / gamma));
-	return color;
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec3 color = texture(Source, vTexCoord.xy).rgb;
-	vec4 mapped = vec4(color, 1.0);
-	vec4 right;
-#ifdef HORIZ_BANDS
-	if (vTexCoord.x < 0.15) mapped = vec4(linearToneMapping(color), 1.0);
-	else if (vTexCoord.x > 0.15 && vTexCoord.x < 0.30) mapped = vec4(simpleReinhardToneMapping(color), 1.0);
-	else if (vTexCoord.x > 0.30 && vTexCoord.x < 0.45) mapped = vec4(lumaBasedReinhardToneMapping(color), 1.0);
-	else if (vTexCoord.x > 0.45 && vTexCoord.x < 0.60) mapped = vec4(whitePreservingLumaBasedReinhardToneMapping(color), 1.0);
-	else if (vTexCoord.x > 0.60 && vTexCoord.x < 0.75) mapped = vec4(RomBinDaHouseToneMapping(color), 1.0);
-	else if (vTexCoord.x > 0.75 && vTexCoord.x < 0.90) mapped = vec4(filmicToneMapping(color), 1.0);
-	else mapped = vec4(Uncharted2ToneMapping(color), 1.0);
-#endif
-#ifdef VERT_BANDS
-	if (vTexCoord.y < 0.15) mapped = vec4(linearToneMapping(color), 1.0);
-	else if (vTexCoord.y > 0.15 && vTexCoord.y < 0.30) mapped = vec4(simpleReinhardToneMapping(color), 1.0);
-	else if (vTexCoord.y > 0.30 && vTexCoord.y < 0.45) mapped = vec4(lumaBasedReinhardToneMapping(color), 1.0);
-	else if (vTexCoord.y > 0.45 && vTexCoord.y < 0.60) mapped = vec4(whitePreservingLumaBasedReinhardToneMapping(color), 1.0);
-	else if (vTexCoord.y > 0.60 && vTexCoord.y < 0.75) mapped = vec4(RomBinDaHouseToneMapping(color), 1.0);
-	else if (vTexCoord.y > 0.75 && vTexCoord.y < 0.90) mapped = vec4(filmicToneMapping(color), 1.0);
-	else mapped = vec4(Uncharted2ToneMapping(color), 1.0);
-#endif
-#ifdef SPLITSCREEN
-	if (MAP1 == 0.0) mapped = vec4(linearToneMapping(color), 1.0);
-	if (MAP1 == 1.0) mapped = vec4(simpleReinhardToneMapping(color), 1.0);
-	if (MAP1 == 2.0) mapped = vec4(lumaBasedReinhardToneMapping(color), 1.0);
-	if (MAP1 == 3.0) mapped = vec4(whitePreservingLumaBasedReinhardToneMapping(color), 1.0);
-	if (MAP1 == 4.0) mapped = vec4(RomBinDaHouseToneMapping(color), 1.0);
-	if (MAP1 == 5.0) mapped = vec4(filmicToneMapping(color), 1.0);
-	if (MAP1 == 6.0) mapped = vec4(Uncharted2ToneMapping(color), 1.0);
-	if (MAP1 == 7.0) mapped = vec4(color, 1.0);
-	if (MAP2 == 0.0) right = vec4(linearToneMapping(color), 1.0);
-	if (MAP2 == 1.0) right = vec4(simpleReinhardToneMapping(color), 1.0);
-	if (MAP2 == 2.0) right = vec4(lumaBasedReinhardToneMapping(color), 1.0);
-	if (MAP2 == 3.0) right = vec4(whitePreservingLumaBasedReinhardToneMapping(color), 1.0);
-	if (MAP2 == 4.0) right = vec4(RomBinDaHouseToneMapping(color), 1.0);
-	if (MAP2 == 5.0) right = vec4(filmicToneMapping(color), 1.0);
-	if (MAP2 == 6.0) right = vec4(Uncharted2ToneMapping(color), 1.0);
-	if (MAP2 == 7.0) right = vec4(color, 1.0);
-	mapped = (vTexCoord.x < SPLIT_LINE) ? mapped : right;
-#endif
-	FragColor = mapped;
-}
diff --git a/misc/shaders/white_point.slang b/misc/shaders/white_point.slang
deleted file mode 100644
index ba1bad0ee7..0000000000
--- a/misc/shaders/white_point.slang
+++ /dev/null
@@ -1,158 +0,0 @@
-#version 450
-
-// White Point Mapping
-//          ported by Dogway
-//
-// From the first comment post (sRGB primaries and linear light compensated)
-//      http://www.zombieprototypes.com/?p=210#comment-4695029660
-// Based on the Neil Bartlett's blog update
-//      http://www.zombieprototypes.com/?p=210
-// Inspired itself by Tanner Helland's work
-//      http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/
-
-layout(push_constant) uniform Push
-{
-    vec4 SourceSize;
-    vec4 OriginalSize;
-    vec4 OutputSize;
-    uint FrameCount;
-   float temperature;
-   float luma_preserve;
-   float wp_red;
-   float wp_green;
-   float wp_blue;
-} params;
-
-#pragma parameter temperature "White Point" 9311.0 1031.0 12047.0 72.0
-#pragma parameter luma_preserve "Preserve Luminance" 1.0 0.0 1.0 1.0
-#pragma parameter wp_red "Red Shift" 0.0 -1.0 1.0 0.01
-#pragma parameter wp_green "Green Shift" 0.0 -1.0 1.0 0.01
-#pragma parameter wp_blue "Blue Shift" 0.0 -1.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-
-vec3 wp_adjust(vec3 color){
-
-    float temp = params.temperature / 100.;
-    float k = params.temperature / 10000.;
-    float lk = log(k);
-
-    vec3 wp = vec3(1.);
-
-    // calculate RED
-    wp.r = (temp <= 65.) ? 1. : 0.32068362618584273 + (0.19668730877673762 * pow(k - 0.21298613432655075, - 1.5139012907556737)) + (- 0.013883432789258415 * lk);
-
-    // calculate GREEN
-    float mg = 1.226916242502167 + (- 1.3109482654223614 * pow(k - 0.44267061967913873, 3.) * exp(- 5.089297600846147 * (k - 0.44267061967913873))) + (0.6453936305542096 * lk);
-    float pg = 0.4860175851734596 + (0.1802139719519286 * pow(k - 0.14573069517701578, - 1.397716496795082)) + (- 0.00803698899233844 * lk);
-    wp.g = (temp <= 65.5) ? ((temp <= 8.) ? 0. : mg) : pg;
-
-    // calculate BLUE
-    wp.b = (temp <= 19.) ? 0. : (temp >= 66.) ? 1. : 1.677499032830161 + (- 0.02313594016938082 * pow(k - 1.1367244820333684, 3.) * exp(- 4.221279555918655 * (k - 1.1367244820333684))) + (1.6550275798913296 * lk);
-
-    // clamp
-    wp.rgb = clamp(wp.rgb, vec3(0.), vec3(1.));
-
-    // R/G/B independent manual White Point adjustment
-    wp.rgb += vec3(params.wp_red, params.wp_green, params.wp_blue);
-
-    // Linear color input
-    return color * wp;
-}
-
-vec3 sRGB_to_XYZ(vec3 RGB){
-
-    const mat3x3 m = mat3x3(
-    0.4124564,  0.3575761,  0.1804375,
-    0.2126729,  0.7151522,  0.0721750,
-    0.0193339,  0.1191920,  0.9503041);
-    return RGB * m;
-}
-
-
-vec3 XYZtoYxy(vec3 XYZ){
-
-    float XYZrgb = XYZ.r+XYZ.g+XYZ.b;
-    float Yxyr = XYZ.g;
-    float Yxyg = (XYZrgb <= 0.0) ? 0.3805 : XYZ.r / XYZrgb;
-    float Yxyb = (XYZrgb <= 0.0) ? 0.3769 : XYZ.g / XYZrgb;
-    return vec3(Yxyr,Yxyg,Yxyb);
-}
-
-vec3 XYZ_to_sRGB(vec3 XYZ){
-
-    const mat3x3 m = mat3x3(
-    3.2404542, -1.5371385, -0.4985314,
-   -0.9692660,  1.8760108,  0.0415560,
-    0.0556434, -0.2040259,  1.0572252);
-    return XYZ * m;
-}
-
-
-vec3 YxytoXYZ(vec3 Yxy){
-
-    float Xs = Yxy.r * (Yxy.g/Yxy.b);
-    float Xsz = (Yxy.r <= 0.0) ? 0 : 1;
-    vec3 XYZ = vec3(Xsz,Xsz,Xsz) * vec3(Xs, Yxy.r, (Xs/Yxy.g)-Xs-Yxy.r);
-    return XYZ;
-}
-
-
-vec3 linear_to_sRGB(vec3 color, float gamma){
-
-    color = clamp(color, 0.0, 1.0);
-    color.r = (color.r <= 0.00313066844250063) ?
-    color.r * 12.92 : 1.055 * pow(color.r, 1.0 / gamma) - 0.055;
-    color.g = (color.g <= 0.00313066844250063) ?
-    color.g * 12.92 : 1.055 * pow(color.g, 1.0 / gamma) - 0.055;
-    color.b = (color.b <= 0.00313066844250063) ?
-    color.b * 12.92 : 1.055 * pow(color.b, 1.0 / gamma) - 0.055;
-
-    return color.rgb;
-}
-
-
-vec3 sRGB_to_linear(vec3 color, float gamma){
-
-    color = clamp(color, 0.0, 1.0);
-    color.r = (color.r <= 0.04045) ?
-    color.r / 12.92 : pow((color.r + 0.055) / (1.055), gamma);
-    color.g = (color.g <= 0.04045) ?
-    color.g / 12.92 : pow((color.g + 0.055) / (1.055), gamma);
-    color.b = (color.b <= 0.04045) ?
-    color.b / 12.92 : pow((color.b + 0.055) / (1.055), gamma);
-
-    return color.rgb;
-}
-
-
-void main()
-{
-   vec3 original = sRGB_to_linear(texture(Source, vTexCoord).rgb, 2.40);
-   vec3 adjusted = wp_adjust(original);
-   vec3 base_luma = XYZtoYxy(sRGB_to_XYZ(original));
-   vec3 adjusted_luma = XYZtoYxy(sRGB_to_XYZ(adjusted));
-   adjusted = (params.luma_preserve == 1.0) ? adjusted_luma + (vec3(base_luma.r,0.,0.) - vec3(adjusted_luma.r,0.,0.)) : adjusted_luma;
-   FragColor = vec4(linear_to_sRGB(XYZ_to_sRGB(YxytoXYZ(adjusted)), 2.40), 1.0);
-}
diff --git a/misc/shaders/yiq-hue-adjustment.slang b/misc/shaders/yiq-hue-adjustment.slang
deleted file mode 100644
index ada4727ee0..0000000000
--- a/misc/shaders/yiq-hue-adjustment.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-/* 
-	YIQ Hue Adjustment Shader
-	Ported from https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Source/Shaders/Builtin/Functions/hue.glsl
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float hue_degrees;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter hue_degrees "Hue" 0.0 -360.0 360.0 1.0
-#define M_PI 3.1415926535897932384626433832795
-
-#include "../../include/colorspace-tools.h"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec3 rgb = texture(Source, vTexCoord).rgb;
-   vec3 yiq = RGBtoYIQ(rgb);
-   float hue_radians = params.hue_degrees * (M_PI / 180.0);
-   float hue = atan(yiq.z, yiq.y) + hue_radians;
-   float chroma = sqrt(yiq.z * yiq.z + yiq.y * yiq.y);
-   
-   vec3 color = vec3(yiq.x, chroma * cos(hue), chroma * sin(hue));
-   FragColor = vec4(YIQtoRGB(color).rgb, 1.0);
-}
diff --git a/misc/simple_color_controls.slangp b/misc/simple_color_controls.slangp
deleted file mode 100644
index 93907d5041..0000000000
--- a/misc/simple_color_controls.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/simple_color_controls.slang
-scale_type0 = source
diff --git a/misc/tonemapping.slangp b/misc/tonemapping.slangp
deleted file mode 100644
index e4c1d9e568..0000000000
--- a/misc/tonemapping.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/tonemapping.slang
-scale_type0 = source
diff --git a/misc/white_point.slangp b/misc/white_point.slangp
deleted file mode 100644
index 887d09bfc4..0000000000
--- a/misc/white_point.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/white_point.slang
-scale_type0 = source
diff --git a/misc/yiq-hue-adjustment.slangp b/misc/yiq-hue-adjustment.slangp
deleted file mode 100644
index 26e3d7bb6a..0000000000
--- a/misc/yiq-hue-adjustment.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/yiq-hue-adjustment.slang
-scale_type0 = source
diff --git a/motion-interpolation/motion_interpolation.slangp b/motion-interpolation/motion_interpolation.slangp
deleted file mode 100644
index 1794847011..0000000000
--- a/motion-interpolation/motion_interpolation.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-shaders = 2
-
-shader0 = shaders/motion_interpolation/motion_interpolation_pass0.slang
-alias0 = Pass0
-filter_linear0 = true
-scale_type0 = viewport
-
-shader1 = shaders/motion_interpolation/motion_interpolation_pass3.slang
-filter_linear1 = true
diff --git a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass0.slang b/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass0.slang
deleted file mode 100644
index f3c638201b..0000000000
--- a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass0.slang
+++ /dev/null
@@ -1,83 +0,0 @@
-#version 450
-
-// Video Motion Interpolation
-// based on Drudgerist's shadertoy:
-// https://www.shadertoy.com/view/MtVfRz
-// which is, in turn, based on bodhid's V+
-// https://github.com/bodhid/Vplus
-// This pass generates motion vectors based on the current and previous frames
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-
-#define iChannel0 OriginalHistory1
-#define iChannel1 Source
-#pragma name Pass0
-
-float PixV(sampler2D Target, vec2 Shift, vec2 iuv, vec2 texelSize)
-{
-    vec4 c = texture(Target,iuv);
-    c += texture(Target, iuv + Shift+ (vec2(1, 0) * texelSize));
-    c += texture(Target, iuv + Shift + (vec2(0, 1) * texelSize));
-    c += texture(Target, iuv + Shift + (vec2(-1, 0) * texelSize));
-    c += texture(Target, iuv + Shift + (vec2(0, -1) * texelSize));
-    return c.r + c.g + c.b;
-}
-
-void main()
-{
-    const float magic = 6.28;
-    vec2 uv = vTexCoord.xy;
-    vec2 texelSize = params.SourceSize.zw;
-    float CheckValue, FirstValue, PrevValue, LastMatch;
-	vec2 FinalUvShift,CheckUvShift;
-
-    PrevValue = PixV(iChannel0, vec2(0,0), uv, texelSize);
-    LastMatch = abs(PrevValue - PixV(iChannel1, vec2(0,0), uv, texelSize));
-
-    for(int Circle = 1; Circle < 4; ++Circle)
-    {
-        for(int j = 0; j < 4 * Circle; ++j)
-        {
-            float circleF = float(Circle);
-            float jF = float(j);
-
-            FirstValue = magic / (4.0 * circleF);
-			CheckUvShift = vec2(sin(FirstValue * jF), cos(FirstValue * jF));
-            float currentValue = PixV(iChannel1, CheckUvShift * texelSize * circleF, uv, texelSize);
-            if ((CheckValue = abs(PrevValue - currentValue)) < LastMatch)
-            {
-                LastMatch = CheckValue;
-                FinalUvShift = CheckUvShift;
-            }
-        }
-    }
-    FragColor = vec4(FinalUvShift.xy, 0, 1);
-}
\ No newline at end of file
diff --git a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass1.slang b/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass1.slang
deleted file mode 100644
index 6fe5417a98..0000000000
--- a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass1.slang
+++ /dev/null
@@ -1,57 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 blur(vec2 uv, vec2 TexelSize, vec2 Direction)
-{
-    vec4 c = vec4(0.0);
-    
-    c += texture(Source, uv + (TexelSize*Direction*.5))*0.49;
-    c += texture(Source, uv + (TexelSize*Direction*1.5))*0.33;
-    c += texture(Source, uv + (TexelSize*Direction*2.5))*0.14;
-    c += texture(Source, uv + (TexelSize*Direction*3.5))*9.0;
-    c += texture(Source, uv + (TexelSize*Direction*4.5))*0.01;
-    c += texture(Source, uv - (TexelSize*Direction*.5))*0.49;
-    c += texture(Source, uv - (TexelSize*Direction*1.5))*0.33;
-    c += texture(Source, uv - (TexelSize*Direction*2.5))*0.14;
-    c += texture(Source, uv - (TexelSize*Direction*3.5))*0.04;
-    c += texture(Source, uv - (TexelSize*Direction*4.5))*0.01;
-    
-    return c/2.0;
-}
-
-void main()
-{
-    vec2 uv = vTexCoord.xy;
-    vec2 TexelSize = params.SourceSize.zw;
-    vec2 DirectionH = vec2(1.0, 0.0);
-    vec4 cH = blur(uv, TexelSize, DirectionH);
-    FragColor = cH;
-}
\ No newline at end of file
diff --git a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass2.slang b/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass2.slang
deleted file mode 100644
index 7ef9cc4106..0000000000
--- a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass2.slang
+++ /dev/null
@@ -1,57 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 blur(vec2 uv, vec2 TexelSize, vec2 Direction)
-{
-    vec4 c = vec4(0.0);
-    
-    c += texture(Source, uv + (TexelSize*Direction*.5))*0.49;
-    c += texture(Source, uv + (TexelSize*Direction*1.5))*0.33;
-    c += texture(Source, uv + (TexelSize*Direction*2.5))*0.14;
-    c += texture(Source, uv + (TexelSize*Direction*3.5))*9.0;
-    c += texture(Source, uv + (TexelSize*Direction*4.5))*0.01;
-    c += texture(Source, uv - (TexelSize*Direction*.5))*0.49;
-    c += texture(Source, uv - (TexelSize*Direction*1.5))*0.33;
-    c += texture(Source, uv - (TexelSize*Direction*2.5))*0.14;
-    c += texture(Source, uv - (TexelSize*Direction*3.5))*0.04;
-    c += texture(Source, uv - (TexelSize*Direction*4.5))*0.01;
-    
-    return c/2.0;
-}
-
-void main()
-{
-    vec2 uv = vTexCoord.xy;
-    vec2 TexelSize = params.SourceSize.zw;
-    vec2 DirectionV = vec2(0.0, 1.0);
-    vec4 cV = blur(uv, TexelSize, DirectionV);
-    FragColor = cV;
-}
\ No newline at end of file
diff --git a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass3.slang b/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass3.slang
deleted file mode 100644
index 78fed23bc0..0000000000
--- a/motion-interpolation/shaders/motion_interpolation/motion_interpolation_pass3.slang
+++ /dev/null
@@ -1,69 +0,0 @@
-#version 450
-
-// Video Motion Interpolation
-// based on Drudgerist's shadertoy:
-// https://www.shadertoy.com/view/MtVfRz
-// which is, in turn, based on bodhid's V+
-// https://github.com/bodhid/Vplus
-// This pass uses the motion vectors to make an in-between frame
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float MOTION_SCALE_FACTOR;
-   float MOTION_MIX_FACTOR;
-} params;
-
-#pragma parameter MOTION_SCALE_FACTOR "Motion Interp Factor" 300.0 100.0 1000.0 50.0
-#pragma parameter MOTION_MIX_FACTOR "Motion Blur Factor" 0.5 0.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-layout(set = 0, binding = 4) uniform sampler2D Pass0;
-layout(set = 0, binding = 5) uniform sampler2D Original;
-
-// uncomment the next line to see the motion vectors for debugging purposes
-//#define OUTPUT_MOTION_VECTOR
-#define iChannel3 Source
-#define iChannel2 Pass0
-#define iChannel1 Original
-#define iChannel0 OriginalHistory1
-
-void main()
-{
-    vec2 uv = vTexCoord.xy;
-    vec4 col = texture(iChannel3, uv);
-#ifdef OUTPUT_MOTION_VECTOR
-    FragColor = (col * 0.5) + 0.5;
-	return;
-#endif
-    
-    float testShift = params.MOTION_MIX_FACTOR;//iMouse.x / iResolution.x;
-    vec2 FinalUvShift = texture(iChannel2, uv).rg / params.MOTION_SCALE_FACTOR;
-    vec4 previousFrame = texture(iChannel0, uv - (FinalUvShift * 0.5));
-    vec4 nextFrame = texture(iChannel1, uv - (FinalUvShift * (0.5)));
-    
-    FragColor = mix(previousFrame, nextFrame, testShift);
-}
\ No newline at end of file
diff --git a/motionblur/feedback.slangp b/motionblur/feedback.slangp
deleted file mode 100644
index 9b491f8560..0000000000
--- a/motionblur/feedback.slangp
+++ /dev/null
@@ -1,7 +0,0 @@
-shaders = 1
-
-shader0 = shaders/feedback.slang
-scale_type0 = source
-scale0 = 1.0
-
-filter_linear0 = false
diff --git a/motionblur/motionblur-blue.slangp b/motionblur/motionblur-blue.slangp
deleted file mode 100644
index 5603d4acc2..0000000000
--- a/motionblur/motionblur-blue.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/motionblur-blue.slang
-filter_linear0 = false
-scale_type0 = source
diff --git a/motionblur/motionblur-color.slangp b/motionblur/motionblur-color.slangp
deleted file mode 100644
index 9a70dd2fe4..0000000000
--- a/motionblur/motionblur-color.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/motionblur-color.slang
-filter_linear0 = false
-scale_type0 = source
diff --git a/motionblur/shaders/feedback.slang b/motionblur/shaders/feedback.slang
deleted file mode 100644
index 75b5868938..0000000000
--- a/motionblur/shaders/feedback.slang
+++ /dev/null
@@ -1,42 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-    float mixfactor;
-} param;
-
-#pragma parameter mixfactor "Motionblur Fadeout" 0.75 0.0 1.0 0.01
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D PassFeedback0;
-
-void main()
-{
-    vec4 current = pow(texture(Source,        vTexCoord), vec4(2.2));
-    vec4 fdback  = pow(texture(PassFeedback0, vTexCoord), vec4(2.2));
-    vec4 mixed   = (1.0 - param.mixfactor) * current + param.mixfactor * fdback;
-    
-    FragColor = pow(mixed, vec4(1.0 / 2.2));
-}
diff --git a/motionblur/shaders/mix_frames_smart.slang b/motionblur/shaders/mix_frames_smart.slang
deleted file mode 100644
index 369e22d1e4..0000000000
--- a/motionblur/shaders/mix_frames_smart.slang
+++ /dev/null
@@ -1,111 +0,0 @@
-#version 450
-
-/*
-	mix_frames_smart - performs 50:50 blending between the current and 
-	previous frames, but only if pixels repeatedly switch state on alternate
-	frames (i.e. prevents flicker on games that use LCD ghosting for transparency,
-	without blurring the entire screen). This is not 100% effective, but 'good
-	enough' in many cases (e.g. it fixes map rendering issues in F-Zero GP on the GBA).
-	Works best when flickering objects are in a fixed location.
-	
-	Author: jdgleaver
-	
-	This program is free software; you can redistribute it and/or modify it
-	under the terms of the GNU General Public License as published by the Free
-	Software Foundation; either version 2 of the License, or (at your option)
-	any later version.
-*/
-
-// User-specified fudge factor. Increasing this value loosens up the
-// detection of repeated 'flicker' frames. This is required for
-// games like Boktai on the GBA, where the character shadow flickers
-// on and off between frames, but is sometimes overlaid with a screen
-// shading effect (so checking for pixel RGB equality fails - need to
-// check whether pixels are 'almost' equal)
-#pragma parameter DEFLICKER_EMPHASIS "Deflicker Emphasis" 0.0 0.0 1.0 0.01
-
-layout(push_constant) uniform Push
-{
-	float DEFLICKER_EMPHASIS;
-} registers;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-/*
-    VERTEX_SHADER
-*/
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-layout(set = 0, binding = 4) uniform sampler2D OriginalHistory2;
-layout(set = 0, binding = 5) uniform sampler2D OriginalHistory3;
-layout(set = 0, binding = 6) uniform sampler2D OriginalHistory4;
-layout(set = 0, binding = 7) uniform sampler2D OriginalHistory5;
-
-#define EPSILON 0.000001
-
-float is_equal(vec3 x, vec3 y)
-{
-	vec3 result = 1.0 - abs(sign(x - y));
-	return min(min(result.r, result.g), result.b);
-}
-
-float is_approx_equal(vec3 x, vec3 y)
-{
-	vec3 result = 1.0 - step(EPSILON + registers.DEFLICKER_EMPHASIS, abs(x - y));
-	return min(min(result.r, result.g), result.b);
-}
-
-/*
-    FRAGMENT SHADER
-*/
-void main()
-{
-	// Get pixel colours of current + last 5 frames
-	// NB: Using fewer frames results in too many false positives
-	vec3 colour0 = texture(Source, vTexCoord.xy).rgb;
-	vec3 colour1 = texture(OriginalHistory1, vTexCoord.xy).rgb;
-	vec3 colour2 = texture(OriginalHistory2, vTexCoord.xy).rgb;
-	vec3 colour3 = texture(OriginalHistory3, vTexCoord.xy).rgb;
-	vec3 colour4 = texture(OriginalHistory4, vTexCoord.xy).rgb;
-	vec3 colour5 = texture(OriginalHistory5, vTexCoord.xy).rgb;
-	
-	// Determine whether mixing should occur
-	// i.e. whether alternate frames have the same pixel colour, but
-	// adjacent frames do not (don't need to check colour0 != colour1,
-	// since if this is true the mixing will do nothing)
-	float doMix =   (1.0 - is_equal(colour0, colour3))
-					  * (1.0 - is_equal(colour0, colour5))
-					  * (1.0 - is_equal(colour1, colour2))
-					  * (1.0 - is_equal(colour1, colour4))
-					  * (1.0 - is_equal(colour2, colour3))
-					  * (1.0 - is_equal(colour2, colour5))
-					  * min(
-					       (is_approx_equal(colour0, colour2) * is_approx_equal(colour2, colour4)) +
-					       (is_approx_equal(colour1, colour3) * is_approx_equal(colour3, colour5)),
-					       1.0
-					    );
-	
-	// Mix colours
-	colour0.rgb = mix(colour0.rgb, colour1.rgb, doMix * 0.5);
-	
-	FragColor = vec4(colour0.rgb, 1.0);
-}
diff --git a/motionblur/shaders/motionblur-blue.slang b/motionblur/shaders/motionblur-blue.slang
deleted file mode 100644
index d0c71a0bea..0000000000
--- a/motionblur/shaders/motionblur-blue.slang
+++ /dev/null
@@ -1,52 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-layout(set = 0, binding = 4) uniform sampler2D OriginalHistory2;
-layout(set = 0, binding = 5) uniform sampler2D OriginalHistory3;
-layout(set = 0, binding = 6) uniform sampler2D OriginalHistory4;
-layout(set = 0, binding = 7) uniform sampler2D OriginalHistory5;
-layout(set = 0, binding = 8) uniform sampler2D OriginalHistory6;
-layout(set = 0, binding = 9) uniform sampler2D OriginalHistory7;
-
-void main()
-{
-    float blue_result = 
-        texture(OriginalHistory1, vTexCoord).b +
-        texture(OriginalHistory2, vTexCoord).b +
-        texture(OriginalHistory3, vTexCoord).b +
-        texture(OriginalHistory4, vTexCoord).b +
-        texture(OriginalHistory5, vTexCoord).b +
-        texture(OriginalHistory6, vTexCoord).b +
-        texture(OriginalHistory7, vTexCoord).b -
-        texture(Source,           vTexCoord).b * 7.0;
-
-    blue_result = clamp(blue_result, 0.0, 1.0);
-    
-    FragColor = clamp(
-        texture(Source, vTexCoord) + 0.4 * vec4(0.0, 0.0, blue_result, 1.0),
-        0.0, 1.0
-    );
-}
diff --git a/motionblur/shaders/motionblur-color.slang b/motionblur/shaders/motionblur-color.slang
deleted file mode 100644
index bc15aa77f4..0000000000
--- a/motionblur/shaders/motionblur-color.slang
+++ /dev/null
@@ -1,78 +0,0 @@
-#version 450
-/* Derived from https://github.com/libretro/slang-shaders/blob/master/motionblur/motionblur-blue.slang
-   To increase the effect, uncomment more OriginalHistory# lines in each color channel
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-layout(set = 0, binding = 4) uniform sampler2D OriginalHistory2;
-layout(set = 0, binding = 5) uniform sampler2D OriginalHistory3;
-layout(set = 0, binding = 6) uniform sampler2D OriginalHistory4;
-layout(set = 0, binding = 7) uniform sampler2D OriginalHistory5;
-layout(set = 0, binding = 8) uniform sampler2D OriginalHistory6;
-layout(set = 0, binding = 9) uniform sampler2D OriginalHistory7;
-
-void main()
-{
-    float red_result = 
-        texture(OriginalHistory1, vTexCoord).r +
-        texture(OriginalHistory2, vTexCoord).r /*+
-        texture(OriginalHistory3, vTexCoord).r +
-        texture(OriginalHistory4, vTexCoord).r +
-        texture(OriginalHistory5, vTexCoord).r +
-        texture(OriginalHistory6, vTexCoord).r +
-        texture(OriginalHistory7, vTexCoord).r*/;
-
-    float green_result = 
-        texture(OriginalHistory1, vTexCoord).g +
-        texture(OriginalHistory2, vTexCoord).g /*+
-        texture(OriginalHistory3, vTexCoord).g +
-        texture(OriginalHistory4, vTexCoord).g +
-        texture(OriginalHistory5, vTexCoord).g +
-        texture(OriginalHistory6, vTexCoord).g +
-        texture(OriginalHistory7, vTexCoord).g*/;
-
-    float blue_result = 
-        texture(OriginalHistory1, vTexCoord).b +
-        texture(OriginalHistory2, vTexCoord).b /*+
-        texture(OriginalHistory3, vTexCoord).b +
-        texture(OriginalHistory4, vTexCoord).b +
-        texture(OriginalHistory5, vTexCoord).b +
-        texture(OriginalHistory6, vTexCoord).b +
-        texture(OriginalHistory7, vTexCoord).b*/;
-
-
-    blue_result = clamp(blue_result, 0.0, 1.0);
-    
-    FragColor = 
-        clamp(texture(Source, vTexCoord) + 0.4 * 
-            vec4(clamp(red_result   - 7.0 * texture(Source, vTexCoord).r, 0.0, 1.0),
-                 clamp(green_result - 7.0 * texture(Source, vTexCoord).g, 0.0, 1.0),
-                 clamp(blue_result  - 7.0 * texture(Source, vTexCoord).b, 0.0, 1.0),
-                 1.0),
-            0.0, 
-            1.0
-        );
-}
diff --git a/nearest.slangp b/nearest.slangp
deleted file mode 100644
index a529f8f069..0000000000
--- a/nearest.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = stock.slang
-filter_linear0 = false
diff --git a/nes_raw_palette/cgwg-famicom-geom.slangp b/nes_raw_palette/cgwg-famicom-geom.slangp
deleted file mode 100644
index 6632533035..0000000000
--- a/nes_raw_palette/cgwg-famicom-geom.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 5
-
-shader0 = shaders/cgwg-famicom-geom/composite-encode.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 2.0
-frame_count_mod0 = 2
-alias0 = encode_pass
-float_framebuffer0 = true
-
-shader1 = shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.slang
-frame_count_mod1 = 2
-filter_linear1 = false
-float_framebuffer1 = true
-
-shader2 = shaders/cgwg-famicom-geom/adaptive-comb-decode.slang
-filter_linear2 = false
-frame_count_mod2 = 2
-float_framebuffer2 = true
-
-shader3 = shaders/cgwg-famicom-geom/lowpass-chroma.slang
-filter_linear3 = false
-float_framebuffer3 = true
-
-shader4 = shaders/cgwg-famicom-geom/crt-geom-famicom.slang
-scale_type4 = viewport
diff --git a/nes_raw_palette/ntsc-nes.slangp b/nes_raw_palette/ntsc-nes.slangp
deleted file mode 100644
index fd2c87beea..0000000000
--- a/nes_raw_palette/ntsc-nes.slangp
+++ /dev/null
@@ -1,23 +0,0 @@
-shaders = 3
-shader0 = shaders/nes-color-decoder.slang
-shader1 = ../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
-shader2 = ../ntsc/shaders/maister/ntsc-pass2-3phase.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-
-scale_type0 = source
-scale0 = 1.0
-
-scale_type_x1 = absolute
-scale_type_y1 = source
-scale_x1 = 1024
-scale_y1 = 1.0
-frame_count_mod1 = 2
-float_framebuffer1 = true
-
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
diff --git a/nes_raw_palette/shaders/cgwg-famicom-geom/adaptive-comb-decode.slang b/nes_raw_palette/shaders/cgwg-famicom-geom/adaptive-comb-decode.slang
deleted file mode 100644
index 1024862837..0000000000
--- a/nes_raw_palette/shaders/cgwg-famicom-geom/adaptive-comb-decode.slang
+++ /dev/null
@@ -1,118 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	vec4 encode_passSize;
-} params;
-
-#define phase params.FrameCount
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D encode_pass;
-
-vec4 decode_sample(vec2 shift) {
-  const float min = 0.350*0.746;
-  const float max = 1.962;
-  const float black = 0.518;
-  vec2 coord = texCoord + params.encode_passSize.zw*shift;
-  if (coord.x < 0.0 || coord.x > 1.0 || coord.y < 0.0 || coord.y > 1.0) return vec4(0.0);
-  return (texture(encode_pass, coord) * vec4(max-min) + vec4(min-black)) / vec4(max-black);
-}
-
-vec3 filtsample(vec2 shift) {
-  vec2 coord = texCoord + params.SourceSize.zw*shift;
-  if (coord.x < 0.0 || coord.x > 1.0 || coord.y < 0.0 || coord.y > 1.0) return vec3(0.0);
-  return texture(Source, texCoord + params.SourceSize.zw*shift).xyz-vec3(0,0.5,0.5);
-}
-
-void main()
-{
-  vec4 samps[] = vec4[](decode_sample(vec2(-1,0)),
-			decode_sample(vec2( 0,0)),			
-			decode_sample(vec2( 1,0)));
-  // quarter-pixel shift between scanlines needed for comb filter
-  vec4 s1, s2, s3, s4;
-  s1 = decode_sample(vec2(-2,-1));
-  s2 = decode_sample(vec2(-1,-1));
-  s3 = decode_sample(vec2( 0,-1));
-  s4 = decode_sample(vec2( 1,-1));
-  vec4 samps_prev[] = vec4[](vec4(s1.zw,s2.xy),
-			     vec4(s2.zw,s3.xy),
-			     vec4(s3.zw,s4.xy));
-  s1 = decode_sample(vec2(-1,1));
-  s2 = decode_sample(vec2(-0,1));
-  s3 = decode_sample(vec2( 1,1));
-  s4 = decode_sample(vec2( 2,1));
-  vec4 samps_next[] = vec4[](vec4(s1.zw,s2.xy),
-			     vec4(s2.zw,s3.xy),
-			     vec4(s3.zw,s4.xy));
-
-  uint x = uint(floor(texCoord.x*params.SourceSize.x));
-  uint y = uint(floor(texCoord.y*params.SourceSize.y));
-  uint p = (x+y+uint(phase)) % 3u;
-
-  const vec4 one = vec4(1.0);
-  const vec4 PI_6 = vec4(3.14159265359/6.0);
-  const vec4 offs = vec4(-0.0);
-  const vec4 sins[] = vec4[](sin((vec4(0,1, 2, 3)+offs)*PI_6),
-			     sin((vec4(4,5, 6, 7)+offs)*PI_6),
-			     sin((vec4(8,9,10,11)+offs)*PI_6));
-  const vec4 coss[] = vec4[](cos((vec4(0,1, 2, 3)+offs)*PI_6),
-			     cos((vec4(4,5, 6, 7)+offs)*PI_6),
-			     cos((vec4(8,9,10,11)+offs)*PI_6));
-
-  vec3 filt      = filtsample(vec2(0, 0));
-  vec3 filt_cur  = (filt + filtsample(vec2(-1,0))+filtsample(vec2(1,0)))/3.0;
-  vec3 filt_prev = (filtsample(vec2(0,-1))+filtsample(vec2(-1,-1))+filtsample(vec2(1,-1)))/3.0;
-  vec3 filt_next = (filtsample(vec2(0, 1))+filtsample(vec2(-1, 1))+filtsample(vec2(1, 1)))/3.0;
-  vec3 dif1 = filt_cur-filt_prev;
-  vec3 dif2 = filt_cur-filt_next;
-  // this formula can be tweaked
-  float xprev = clamp(0.5-sqrt(dot(dif1,dif1)),0,0.5);
-  float xnext = clamp(0.5-sqrt(dot(dif2,dif2)),0,0.5);
-  float xcur  = clamp(xprev+xnext,0,0.5);
-  float scale = (xcur+0.0001)/(xprev+xnext+0.0001);
-  xprev *= scale;
-  xnext *= scale;
-  float xfilt = 1.0 - 2.0*xcur;
-
-  vec3 yiq = vec3(0.0);
-  yiq.x = xcur*dot(samps[1],one) + xprev*dot(samps_prev[1],one) + xnext*dot(samps_next[1],one);
-  for (uint i = 0u; i < 3u; i++) {
-    samps[i] = xcur*samps[i] - xprev*samps_prev[i] - xnext*samps_next[i];
-    yiq.y += dot(samps[i],coss[(i+p+2u)%3u]);
-    yiq.z += dot(samps[i],sins[(i+p+2u)%3u]);
-  }
-
-  yiq *= vec3(1.0/4.0, 1.0/6.0, 1.0/6.0);
-  yiq += xfilt*filt;
-
-  //FragColor = vec4(dot(yiq, vec3(1.0, 0.946882, 0.623557)),
-  //		   dot(yiq, vec3(1.0,-0.274788,-0.635691)),
-  //		   dot(yiq, vec3(1.0,-1.108545, 1.709007)),
-  //		   0.0);
-  FragColor = vec4(yiq+vec3(0,0.5,0.5),0.0);
-}
diff --git a/nes_raw_palette/shaders/cgwg-famicom-geom/composite-encode.slang b/nes_raw_palette/shaders/cgwg-famicom-geom/composite-encode.slang
deleted file mode 100644
index 18aa2d791b..0000000000
--- a/nes_raw_palette/shaders/cgwg-famicom-geom/composite-encode.slang
+++ /dev/null
@@ -1,75 +0,0 @@
-#version 450
-#pragma name encode_pass
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-bool wave (int p, int color)
-{
-   return ((color + p + 8) % 12 < 6);
-}
-
-void main()
-{
-/* original palette decode for historical purposes:
-  uint n = uint(texture(Source, vTexCoord).r);
-  uint color = n & 0xfu;
-  uint level = color < 0xeu ? (n>>4u)&3u : 1u;
-uint emphasis = n >> 6u;
-*/
-
-   vec4 c = texture(Source, vTexCoord.xy);
-
-   // Extract the chroma, level, and emphasis from the normalized RGB triplet
-   int color =    int(floor((c.r * 15.0) + 0.5));
-   int level =    int(floor((c.g *  3.0) + 0.5));
-   int emphasis = int(floor((c.b *  7.0) + 0.5));
-
-  const float levels[] = float[](0.350, 0.518, 0.962, 1.550,
-				 1.094, 1.506, 1.962, 1.962);
-  const float attenuation = 0.746;
-  const float min = levels[0]*attenuation;
-  const float max = levels[7];
-
-  float lo_hi[] = float[](levels[level + 4u*uint(color == 0x0u)],
-			  levels[level + 4u*uint(color <  0xdu)]);
-
-  uint x = uint(floor(vTexCoord.x*params.SourceSize.x*2.0));
-  uint y = uint(floor(vTexCoord.y*params.SourceSize.y));
-  float frag[4];
-  for (uint i = 0u; i < 4u; i++) {
-    uint p = (x*4u+i + y*4u + uint(params.FrameCount*4)) % 12u;
-#define wave(ph,co) (((co)+(ph)+8u)%12u<6u)
-    float spot = lo_hi[uint(wave(p,color))];
-    if ( (((emphasis&1u)==1u) && wave(p,12u))
-	 || (((emphasis&2u)==1u) && wave(p,4u))
-	 || (((emphasis&4u)==1u) && wave(p,8u)))
-      spot *= attenuation;
-    frag[i] = spot;
-  }
-  FragColor = (vec4(frag[0], frag[1], frag[2], frag[3]) - vec4(min))/vec4(max-min);
-}
diff --git a/nes_raw_palette/shaders/cgwg-famicom-geom/crt-geom-famicom.slang b/nes_raw_palette/shaders/cgwg-famicom-geom/crt-geom-famicom.slang
deleted file mode 100644
index c56027ec2f..0000000000
--- a/nes_raw_palette/shaders/cgwg-famicom-geom/crt-geom-famicom.slang
+++ /dev/null
@@ -1,329 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float CURVATURE_toggle, CRTgamma, overscan_x, overscan_y, distance, radius, tiltangle_x, tiltangle_y, cornersize, cornersmooth;
-} params;
-
-#pragma parameter CURVATURE_toggle "Curvature Toggle" 1.0 0.0 1.0 1.0
-#define CURVATURE bool(params.CURVATURE_toggle)
-// gamma of simulated CRT
-#pragma parameter CRTgamma "CRT Gamma" 2.4 1.0 4.0 0.05
-#define CRTgamma params.CRTgamma
-// overscan (e.g. 1.02 for 2% overscan)
-#pragma parameter overscan_x "Overscan X" 1.0 0.0 2.0 0.01
-#pragma parameter overscan_y "Overscan Y" 1.0 0.0 2.0 0.01
-#define overscan vec2(params.overscan_x, params.overscan_y)
-#pragma parameter distance "Viewing Distance" 2.0 0.1 5.0 0.1
-#define distance params.distance
-// radius of curvature
-#pragma parameter radius "Curvature Radius" 2.0 0.1 5.0 0.1
-#define radius params.radius
-// tilt angle in radians
-// (behavior might be a bit wrong if both components are nonzero)
-#pragma parameter tiltangle_x "Tilt Angle X" 0.0 -1.0 1.0 0.05
-#pragma parameter tiltangle_y "Tilt Angle Y" 0.0 -1.0 1.0 0.05
-#define tiltangle vec2(params.tiltangle_x, params.tiltangle_y) + 0.001
-// size of curved corners
-#pragma parameter cornersize "Corner Size" 0.02 0.0001 0.1 0.01
-#define cornersize params.cornersize
-// border smoothness parameter
-// decrease if borders are too aliased
-#pragma parameter cornersmooth "Corner Smoothness" 800.0 0.8 2000.0 50.0
-#define cornersmooth params.cornersmooth
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texCoord;
-layout(location = 1) out vec3 stretch;
-
-const vec2 aspect = vec2(1.0, 0.75);
-float d = distance;
-float R = radius;
-vec2 sinangle = sin(tiltangle);
-vec2 cosangle = cos(tiltangle);
-
-vec2 one;
-float mod_factor;
-vec2 ilfac;
-
-#define FIX(c) max(abs(c), 1e-5);
-
-float intersect(vec2 xy)
-{
-  float A = dot(xy,xy)+d*d;
-  float B = 2.0*(R*(dot(xy,sinangle)-d*cosangle.x*cosangle.y)-d*d);
-  float C = d*d + 2.0*R*d*cosangle.x*cosangle.y;
-  return (-B-sqrt(B*B-4.0*A*C))/(2.0*A);
-}
-
-vec2 bkwtrans(vec2 xy)
-{
-  float c = intersect(xy);
-  vec2 point = vec2(c)*xy;
-  point -= vec2(-R)*sinangle;
-  point /= vec2(R);
-  vec2 tang = sinangle/cosangle;
-  vec2 poc = point/cosangle;
-  float A = dot(tang,tang)+1.0;
-  float B = -2.0*dot(poc,tang);
-  float C = dot(poc,poc)-1.0;
-  float a = (-B+sqrt(B*B-4.0*A*C))/(2.0*A);
-  vec2 uv = (point-a*sinangle)/cosangle;
-  float r = R*acos(a);
-  return uv*r/sin(r/R);
-}
-
-vec2 fwtrans(vec2 uv)
-{
-  float r = FIX(sqrt(dot(uv,uv)));
-  uv *= sin(r/R)/r;
-  float x = 1.0-cos(r/R);
-  float D = d/R + x*cosangle.x*cosangle.y+dot(uv,sinangle);
-  return d*(uv*cosangle-x*sinangle)/D;
-}
-
-vec3 maxscale()
-{
-  vec2 c = bkwtrans(-R * sinangle / (1.0 + R/d*cosangle.x*cosangle.y));
-  vec2 a = vec2(0.5,0.5)*aspect;
-  vec2 lo = vec2(fwtrans(vec2(-a.x,c.y)).x,
-		 fwtrans(vec2(c.x,-a.y)).y)/aspect;
-  vec2 hi = vec2(fwtrans(vec2(+a.x,c.y)).x,
-		 fwtrans(vec2(c.x,+a.y)).y)/aspect;
-  return vec3((hi+lo)*aspect*0.5,max(hi.x-lo.x,hi.y-lo.y));
-}
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texCoord = TexCoord;
-   stretch = maxscale();
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texCoord;
-layout(location = 1) in vec3 stretch;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-// Comment the next line to disable interpolation in linear gamma (and gain speed).
-//#define LINEAR_PROCESSING
-
-// Enable 3x oversampling of the beam profile
-#define OVERSAMPLE
-
-// Use the older, purely gaussian beam profile
-//#define USEGAUSSIAN
-
-// gamma of display monitor (typically 2.2 is correct)
-#define monitorgamma 2.2
-
-// aspect ratio
-const vec2 aspect = vec2(1.0, 0.75);
-// lengths are measured in units of (approximately) the width of the monitor
-// simulated distance from viewer to monitor
-float d = distance;
-float R = radius;
-
-vec2 sinangle = sin(tiltangle);
-vec2 cosangle = cos(tiltangle);
-
-#define one (params.SourceSize.zw)
-
-// Macros.
-#define FIX(c) max(abs(c), 1e-5);
-#define PI 3.141592653589
-
-#ifdef LINEAR_PROCESSING
-#       define TEX2D(c) pow(texture(Source, (c)), vec4(CRTgamma))
-#else
-#       define TEX2D(c) texture(Source, (c))
-#endif
-
-#define FIX(c) max(abs(c), 1e-5);
-
-float intersect(vec2 xy)
-{
-  float A = dot(xy,xy)+d*d;
-  float B = 2.0*(R*(dot(xy,sinangle)-d*cosangle.x*cosangle.y)-d*d);
-  float C = d*d + 2.0*R*d*cosangle.x*cosangle.y;
-  return (-B-sqrt(B*B-4.0*A*C))/(2.0*A);
-}
-
-vec2 bkwtrans(vec2 xy)
-{
-  float c = intersect(xy);
-  vec2 point = vec2(c)*xy;
-  point -= vec2(-R)*sinangle;
-  point /= vec2(R);
-  vec2 tang = sinangle/cosangle;
-  vec2 poc = point/cosangle;
-  float A = dot(tang,tang)+1.0;
-  float B = -2.0*dot(poc,tang);
-  float C = dot(poc,poc)-1.0;
-  float a = (-B+sqrt(B*B-4.0*A*C))/(2.0*A);
-  vec2 uv = (point-a*sinangle)/cosangle;
-  float r = FIX(R*acos(a));
-  return uv*r/sin(r/R);
-}
-
-vec2 transform(vec2 coord)
-{
-  coord = (coord-vec2(0.5))*aspect*stretch.z+stretch.xy;
-  return (bkwtrans(coord)/overscan/aspect+vec2(0.5));
-}
-
-float corner(vec2 coord)
-{
-  coord = (coord - vec2(0.5)) * overscan + vec2(0.5);
-  coord = min(coord, vec2(1.0)-coord) * aspect;
-  vec2 cdist = vec2(cornersize);
-  coord = (cdist - min(coord,cdist));
-  float dist = sqrt(dot(coord,coord));
-  return clamp((cdist.x-dist)*cornersmooth,0.0, 1.0);
-}
-
-// Calculate the influence of a scanline on the current pixel.
-//
-// 'dist' is the distance in texture coordinates from the current
-// pixel to the scanline in question.
-// 'color' is the colour of the scanline at the horizontal location of
-// the current pixel.
-vec4 scanlineWeights(float dist, vec4 color)
-{
-  // "wid" controls the width of the scanline beam, for each RGB channel
-  // The "weights" lines basically specify the formula that gives
-  // you the profile of the beam, i.e. the intensity as
-  // a function of distance from the vertical center of the
-  // scanline. In this case, it is gaussian if width=2, and
-  // becomes nongaussian for larger widths. Ideally this should
-  // be normalized so that the integral across the beam is
-  // independent of its width. That is, for a narrower beam
-  // "weights" should have a higher peak at the center of the
-  // scanline than for a wider beam.
-#ifdef USEGAUSSIAN
-  vec4 wid = 0.3 + 0.1 * pow(color, vec4(3.0));
-  vec4 weights = vec4(dist / wid);
-  return 0.4 * exp(-weights * weights) / wid;
-#else
-  vec4 wid = 2.0 + 2.0 * pow(color, vec4(4.0));
-  vec4 weights = vec4(dist / 0.3);
-  return 1.4 * exp(-pow(weights * inversesqrt(0.5 * wid), wid)) / (0.6 + 0.2 * wid);
-#endif
-}
-
-void main()
-{
-  // Here's a helpful diagram to keep in mind while trying to
-  // understand the code:
-  //
-  //  |      |      |      |      |
-  // -------------------------------
-  //  |      |      |      |      |
-  //  |  01  |  11  |  21  |  31  | <-- current scanline
-  //  |      | @    |      |      |
-  // -------------------------------
-  //  |      |      |      |      |
-  //  |  02  |  12  |  22  |  32  | <-- next scanline
-  //  |      |      |      |      |
-  // -------------------------------
-  //  |      |      |      |      |
-  //
-  // Each character-cell represents a pixel on the output
-  // surface, "@" represents the current pixel (always somewhere
-  // in the bottom half of the current scan-line, or the top-half
-  // of the next scanline). The grid of lines represents the
-  // edges of the texels of the underlying texture.
-
-  // Texture coordinates of the texel containing the active pixel.
-  vec2 xy = CURVATURE ? transform(texCoord) : texCoord;
-  float cval = corner(xy);
-  
-  // Of all the pixels that are mapped onto the texel we are
-  // currently rendering, which pixel are we currently rendering?
-  vec2 ratio_scale = xy * params.SourceSize.xy - vec2(0.5);
-
-#ifdef OVERSAMPLE
-  float filter_ = fwidth(ratio_scale.y);
-#endif
-  vec2 uv_ratio = fract(ratio_scale);
-
-  // Snap to the center of the underlying texel.
-  xy = (floor(ratio_scale) + vec2(0.5)) / params.SourceSize.xy;
-
-  // Calculate Lanczos scaling coefficients describing the effect
-  // of various neighbour texels in a scanline on the current
-  // pixel.
-  vec4 coeffs = PI * vec4(1.0 + uv_ratio.x, uv_ratio.x, 1.0 - uv_ratio.x, 2.0 - uv_ratio.x);
-
-  // Prevent division by zero.
-  coeffs = FIX(coeffs);
-
-  // Lanczos2 kernel.
-  coeffs = 2.0 * sin(coeffs) * sin(coeffs / 2.0) / (coeffs * coeffs);
-
-  // Normalize.
-  coeffs /= dot(coeffs, vec4(1.0));
-
-  // Calculate the effective colour of the current and next
-  // scanlines at the horizontal location of the current pixel,
-  // using the Lanczos coefficients above.
-  vec4 col  = clamp(mat4(
-			 TEX2D(xy + vec2(-one.x, 0.0)),
-			 TEX2D(xy),
-			 TEX2D(xy + vec2(one.x, 0.0)),
-			 TEX2D(xy + vec2(2.0 * one.x, 0.0))) * coeffs,
-		    0.0, 1.0);
-  vec4 col2 = clamp(mat4(
-			 TEX2D(xy + vec2(-one.x, one.y)),
-			 TEX2D(xy + vec2(0.0, one.y)),
-			 TEX2D(xy + one),
-			 TEX2D(xy + vec2(2.0 * one.x, one.y))) * coeffs,
-		    0.0, 1.0);
-
-#ifndef LINEAR_PROCESSING
-  col  = pow(col , vec4(CRTgamma));
-  col2 = pow(col2, vec4(CRTgamma));
-#endif
-
-  // Calculate the influence of the current and next scanlines on
-  // the current pixel.
-  vec4 weights  = scanlineWeights(uv_ratio.y, col);
-  vec4 weights2 = scanlineWeights(1.0 - uv_ratio.y, col2);
-#ifdef OVERSAMPLE
-  uv_ratio.y =uv_ratio.y+1.0/3.0*filter_;
-  weights = (weights+scanlineWeights(uv_ratio.y, col))/3.0;
-  weights2=(weights2+scanlineWeights(abs(1.0-uv_ratio.y), col2))/3.0;
-  uv_ratio.y =uv_ratio.y-2.0/3.0*filter_;
-  weights=weights+scanlineWeights(abs(uv_ratio.y), col)/3.0;
-  weights2=weights2+scanlineWeights(abs(1.0-uv_ratio.y), col2)/3.0;
-#endif
-  vec3 mul_res  = (col * weights + col2 * weights2).rgb * vec3(cval);
-
-  // dot-mask emulation:
-  // Output pixels are alternately tinted green and magenta.
-  vec3 dotMaskWeights = mix(
-          vec3(1.0, 0.7, 1.0),
-          vec3(0.7, 1.0, 0.7),
-          floor(mod(texCoord.x*params.OutputSize.x, 2.0))
-      );
-					
-  mul_res *= dotMaskWeights;
-
-  // Convert the image gamma for display on our output device.
-  mul_res = pow(mul_res, vec3(1.0 / monitorgamma));
-
-  // Color the texel.
-  FragColor = vec4(mul_res, 1.0);
-}
diff --git a/nes_raw_palette/shaders/cgwg-famicom-geom/int_stock.slang b/nes_raw_palette/shaders/cgwg-famicom-geom/int_stock.slang
deleted file mode 100644
index dde8789ddf..0000000000
--- a/nes_raw_palette/shaders/cgwg-famicom-geom/int_stock.slang
+++ /dev/null
@@ -1,36 +0,0 @@
-#version 450
-#pragma format R32_UINT
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(texture(Source, vTexCoord).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-chroma.slang b/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-chroma.slang
deleted file mode 100644
index 8ed2e046b7..0000000000
--- a/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-chroma.slang
+++ /dev/null
@@ -1,82 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float postfilter_taps, postfilter_chromacutoff;
-} params;
-
-  // after mixing with the adaptive comb filter
-#pragma parameter postfilter_taps "Post-filter Taps" 15.0 1.0 30.0 1.0
-#define postfiltertaps int(params.postfilter_taps)
-#pragma parameter postfilter_chromacutoff "Post-filter Chroma Cutoff" 0.3 0.1 1.0 0.05
-#define postfilterchromacutoff params.postfilter_chromacutoff
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec3 chroma_sample(vec2 shift) {
-  vec2 coord = texCoord + params.SourceSize.zw*shift;
-  if (coord.x < 0.0 || coord.x > 1.0) return vec3(0.0);
-  return texture(Source, texCoord + params.SourceSize.zw*shift).xyz-vec3(0,0.5,0.5);
-}
-
-float sinc(float x) {
-  x = max(abs(x),0.0001);
-  return sin(x)/x;
-}
-
-void main()
-{
-  const int width = postfiltertaps;
-  const float bw_c = postfilterchromacutoff/3.0;
-
-  const vec4 one = vec4(1.0);
-  const float PI = 3.14159265359;
-  const vec4 PI_6 = vec4(PI/6.0);
-
-  float norm_c = 0.0;
-  vec3 yiq = vec3(0.0);
-  yiq.x = chroma_sample(vec2(0,0)).x;
-  for (int i = -width/2; i <= width/2; i++) {
-    // Hamming window
-    const float alpha = 0.54;
-    const float beta  = 0.46;
-    float window = alpha - beta * cos(2.0*PI/(width-1)*(width/2+i));
-
-    float chromafilt = 2.0*bw_c*sinc(2.0*PI*bw_c*i);
-
-    vec3 samp = chroma_sample(vec2(i,0));
-    float filt = window*chromafilt;
-    yiq.yz += samp.yz*vec2(filt);
-    norm_c += filt;
-  }
-
-  yiq *= vec3(1.0, 1.0/norm_c, 1.0/norm_c);
-
-  FragColor = vec4(dot(yiq, vec3(1.0, 0.946882, 0.623557)),
-		   dot(yiq, vec3(1.0,-0.274788,-0.635691)),
-		   dot(yiq, vec3(1.0,-1.108545, 1.709007)),
-		   0.0);
-}
diff --git a/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.slang b/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.slang
deleted file mode 100644
index eba26b5bc9..0000000000
--- a/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.slang
+++ /dev/null
@@ -1,133 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float filter_taps, lumacutoff, chromacutoff;
-} params;
-
-  // frequencies are in units of the chroma subcarrier
-  // these are for the lowpass+notch filter
-#pragma parameter filter_taps "Filter Taps" 15.0 1.0 30.0 1.0
-#define filtertaps int(params.filter_taps)
-#pragma parameter lumacutoff "Luma Cutoff" 0.9 0.1 1.0 0.05
-#define lumacutoff params.lumacutoff
-#pragma parameter chromacutoff "Chroma Cutoff" 0.3 0.1 1.0 0.05
-#define chromacutoff params.chromacutoff
-
-#define phase int(params.FrameCount)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 decode_sample(vec2 coord) {
-  const float min = 0.350*0.746;
-  const float max = 1.962;
-  const float black = 0.518;
-  if (coord.x < 0.0 || coord.x > 1.0) return vec4(0.0);
-  return (texture(Source, coord) * vec4(max-min) + vec4(min-black)) / vec4(max-black);
-}
-
-vec4 sinc(vec4 x) {
-  x = max(abs(x),vec4(0.0001));
-  return sin(x)/x;
-}
-vec2 sinc(vec2 x) {
-  x = max(abs(x),vec2(0.0001));
-  return sin(x)/x;
-}
-
-void main()
-{
-  const int width = filtertaps;
-  const float bw_y =   lumacutoff/12.0;
-  const float bw_c = chromacutoff/12.0;
-
-  int x = int(floor(texCoord.x*params.SourceSize.x));
-  int y = int(floor(texCoord.y*params.SourceSize.y));
-  int p = (x+y+phase) % 3;
-
-  const vec4 one = vec4(1.0);
-  const float PI = 3.14159265359;
-  const vec4 PI_6 = vec4(PI/6.0);
-
-  float norm_y = 0.0;
-  float norm_c = 0.0;
-  vec3 yiq = vec3(0.0);
-
-  vec4 samp  = decode_sample(texCoord + vec2((-width/2  )*params.SourceSize.z,0));
-  vec4 samp2 = decode_sample(texCoord + vec2((-width/2+1)*params.SourceSize.z,0));
-  // Hamming window
-  const float alpha = 0.54;
-  const float beta  = 0.46;
-  int i;
-  for (i = -width/2; i <= width/2-2; i++) {
-    vec4 window = vec4(alpha) - vec4(beta) * cos(vec4(2.0*PI/(4*width-7))*(vec4(4*(width/2+i))+vec4(0,1,2,3)));
-
-    vec4 t = vec4(i*4)+vec4(-1.5,-0.5,+0.5,+1.5);
-#define lowpass(freq,x) vec4(2.0*(freq))*sinc(vec4(2.0*PI*(freq))*(x))
-    vec4 lumafilt   = lowpass(bw_y, t);
-    vec4 chromafilt = lowpass(bw_c, t);
-#undef lowpass
-
-    vec4 samp3 = decode_sample(texCoord + vec2((i+2)*params.SourceSize.z,0));
-    vec4 rsamp  = vec4(samp2.zw, samp3.xy);
-    vec4 filt = window*lumafilt;
-    yiq.x += dot(samp, filt) + dot(rsamp,filt);
-    norm_y += dot(one, filt);
-    filt = window*chromafilt;
-    yiq.y += dot(samp, filt*cos((vec4(0,1,2,3)+vec4(4*(i+p)))*PI_6));
-    yiq.y += dot(rsamp,filt*cos((vec4(6,7,8,9)+vec4(4*(i+p)))*PI_6));
-    yiq.z += dot(samp, filt*sin((vec4(0,1,2,3)+vec4(4*(i+p)))*PI_6));
-    yiq.z += dot(rsamp,filt*sin((vec4(6,7,8,9)+vec4(4*(i+p)))*PI_6));
-    norm_c += dot(one,filt);
-
-    samp  = samp2;
-    samp2 = samp3;
-  }
-  vec2 window = vec2(alpha) - vec2(beta) * cos(vec2(2.0*PI/(4*width-7))*(vec2(4*(width/2+i))+vec2(0,1)));
-  vec2 t = vec2(i*4)+vec2(-1.5,-0.5);
-
-#define lowpass(freq,x) vec2(2.0*(freq))*sinc(vec2(2.0*PI*(freq))*(x))
-  vec2 lumafilt   = lowpass(bw_y, t);
-  vec2 chromafilt = lowpass(bw_c, t);
-#undef lowpass
-  vec2 filt = window*lumafilt;
-  yiq.x += dot(samp.xy, filt) + dot(samp2.zw, filt);
-  norm_y += dot(one.xy, filt);
-  filt = window*chromafilt;
-  yiq.y += dot(samp.xy, filt*cos((vec2(0,1)+vec2(4*(i+p)))*vec2(PI/6.0)));
-  yiq.y += dot(samp2.zw,filt*cos((vec2(6,7)+vec2(4*(i+p)))*vec2(PI/6.0)));
-  yiq.z += dot(samp.xy, filt*sin((vec2(0,1)+vec2(4*(i+p)))*vec2(PI/6.0)));
-  yiq.z += dot(samp2.zw,filt*sin((vec2(6,7)+vec2(4*(i+p)))*vec2(PI/6.0)));
-  norm_c += dot(one.xy, filt);
-
-  yiq *= vec3(0.5/norm_y, 1.0/norm_c, 1.0/norm_c);
-
-  //FragColor = vec4(dot(yiq, vec3(1.0, 0.946882, 0.623557)),
-  //		   dot(yiq, vec3(1.0,-0.274788,-0.635691)),
-  //		   dot(yiq, vec3(1.0,-1.108545, 1.709007)),
-  //		   0.0);
-  FragColor = vec4(yiq+vec3(0,0.5,0.5),0.0);
-}
diff --git a/nes_raw_palette/shaders/nes-color-decoder.slang b/nes_raw_palette/shaders/nes-color-decoder.slang
deleted file mode 100644
index eedb696337..0000000000
--- a/nes_raw_palette/shaders/nes-color-decoder.slang
+++ /dev/null
@@ -1,268 +0,0 @@
-#version 450
-
-/*
-   NES NTSC Color Decoder shader
-   Ported from Bisqwit's C++ NES Palette Generator
-   https://forums.nesdev.com/viewtopic.php?p=85060#p85060
-
-   Hue Preserve Clip functions ported from Drag's Palette Generator
-   http://drag.wootest.net/misc/palgen.html
-
-   Use with Nestopia or FCEUmm libretro cores with the palette set to 'raw'.
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-layout(push_constant) uniform Push
-{
-   float nes_saturation;
-   float nes_hue;
-   float nes_contrast;
-   float nes_brightness;
-   float nes_gamma;
-   float nes_sony_matrix;
-   float nes_clip_method;
-} params;
-
-#pragma parameter nes_saturation "Saturation" 1.0 0.0 5.0 0.05
-#pragma parameter nes_hue "Hue" 0.0 -360.0 360.0 1.0
-#pragma parameter nes_contrast "Contrast" 1.0 0.0 2.0 0.05
-#pragma parameter nes_brightness "Brightness" 1.0 0.0 2.0 0.05
-#pragma parameter nes_gamma "Gamma" 1.8 1.0 2.5 0.05
-#pragma parameter nes_sony_matrix "Sony CXA2025AS US colors" 0.0 0.0 1.0 1.0
-#pragma parameter nes_clip_method "Palette clipping method" 0.0 0.0 2.0 1.0
-
-#define saturation params.nes_saturation
-#define hue params.nes_hue
-#define contrast params.nes_contrast
-#define brightness params.nes_brightness
-#define gamma params.nes_gamma
-#define nes_sony_matrix params.nes_sony_matrix
-#define nes_clip_method params.nes_clip_method
-
-//comment the define out to use the "common" conversion matrix instead of the FCC sanctioned one
-#define USE_FCC_MATRIX
-
-bool wave (int p, int color)
-{
-   return ((color + p + 8) % 12 < 6);
-}
-
-float gammafix (float f)
-{
-   return f < 0.0 ? 0.0 : pow(f, 2.2 / gamma);
-}
-
-vec3 huePreserveClipDarken(float r, float g, float b)
-{
-   float ratio = 1.0;
-   if ((r > 1.0) || (g > 1.0) || (b > 1.0))
-   {
-      float max = r;
-      if (g > max)
-         max = g;
-      if (b > max)
-         max = b;
-      ratio = 1.0 / max;
-   }
-
-   r *= ratio;
-   g *= ratio;
-   b *= ratio;
-
-   r = clamp(r, 0.0, 1.0);
-   g = clamp(g, 0.0, 1.0);
-   b = clamp(b, 0.0, 1.0);
-
-   return vec3(r, g, b);
-}
-
-vec3 huePreserveClipDesaturate(float r, float g, float b)
-{
-   float l = (.299 * r) + (0.587 * g) + (0.114 * b);
-   bool ovr = false;
-   float ratio = 1.0;
-
-   if ((r > 1.0) || (g > 1.0) || (b > 1.0))
-   {
-      ovr = true;
-      float max = r;
-      if (g > max) max = g;
-      if (b > max) max = b;
-      ratio = 1.0 / max;
-   }
-
-   if (ovr)
-   {
-      r -= 1.0;
-      g -= 1.0;
-      b -= 1.0;
-      r *= ratio;
-      g *= ratio;
-      b *= ratio;
-      r += 1.0;
-      g += 1.0;
-      b += 1.0;
-   }
-
-   r = clamp(r, 0.0, 1.0);
-   g = clamp(g, 0.0, 1.0);
-   b = clamp(b, 0.0, 1.0);
-
-   return vec3(r, g, b);
-}
-
-vec3 MakeRGBColor(int emphasis, int level, int color)
-{
-   float y = 0.0;
-   float i = 0.0;
-   float q = 0.0;
-
-   float r = 0.0;
-   float g = 0.0;
-   float b = 0.0;
-
-   float yiq2rgb[6];
-
-   // Color 0xE and 0xF are black
-   level = (color < 14) ? level : 1;
-
-   // Voltage levels, relative to synch voltage
-   float black = 0.518;
-   float white = 1.962;
-   float attenuation = 0.746;
-   const float levels[8] = float[] (   0.350 , 0.518, 0.962, 1.550,
-                                       1.094, 1.506, 1.962, 1.962);
-   
-   float low  = levels[level + 4 * int(color == 0)];
-   float high = levels[level + 4 * int(color < 13)];
-   
-   // Calculate the luma and chroma by emulating the relevant circuits:
-   for(int p = 0; p < 12; p++) // 12 clock cycles per pixel.
-   {
-      // NES NTSC modulator (square wave between two voltage levels):
-      float spot = wave(p, color) ? high : low;
-
-      // De-emphasis bits attenuate a part of the signal:
-      if ((bool(emphasis & 1) && wave(p, 12)) ||
-          (bool(emphasis & 2) && wave(p, 4)) ||
-          (bool(emphasis & 4) && wave(p, 8))) 
-      {
-          spot *= attenuation;
-      }
-
-      // Normalize:
-      float v = (spot - black) / (white - black);
-
-      // Ideal TV NTSC demodulator:
-      // Apply contrast/brightness
-      v = (v - 0.5) * contrast + 0.5;
-      v *= (brightness / 12.0);
-
-      float hue_tweak = hue * 12.0 / 360.0;
-
-      y += v;
-      i += v * cos((3.141592653 / 6.0) * (p + hue_tweak) );
-      q += v * sin((3.141592653 / 6.0) * (p + hue_tweak) );
-
-   }
-
-   i *= saturation;
-   q *= saturation;
-
-   if (nes_sony_matrix > 0.5)
-   {
-      // Sony CXA2025AS US conversion matrix
-      yiq2rgb[0] = 1.630;
-      yiq2rgb[1] = 0.317;
-      yiq2rgb[2] = -0.378;
-      yiq2rgb[3] = -0.466;
-      yiq2rgb[4] = -1.089;
-      yiq2rgb[5] = 1.677;
-   }
-   else
-   {
-#ifdef USE_FCC_MATRIX
-      // FCC sanctioned conversion matrix
-      yiq2rgb[0] = 0.946882;
-      yiq2rgb[1] = 0.623557;
-      yiq2rgb[2] = -0.274788;
-      yiq2rgb[3] = -0.635691;
-      yiq2rgb[4] = -1.108545;
-      yiq2rgb[5] = 1.709007;
-#else
-      // commonly used conversion matrix
-      yiq2rgb[0] = 0.956;
-      yiq2rgb[1] = 0.621;
-      yiq2rgb[2] = -0.272;
-      yiq2rgb[3] = -0.647;
-      yiq2rgb[4] = -1.105;
-      yiq2rgb[5] = 1.702;
-#endif
-   }
-
-   // Convert YIQ into RGB according to selected conversion matrix
-   r = gammafix(y + yiq2rgb[0] * i + yiq2rgb[1] * q);
-   g = gammafix(y + yiq2rgb[2] * i + yiq2rgb[3] * q);
-   b = gammafix(y + yiq2rgb[4] * i + yiq2rgb[5] * q);
-
-   vec3 corrected_rgb;
-
-   // Apply desired clipping method to out-of-gamut colors.
-   if (nes_clip_method < 0.5)
-   {
-      //If a channel is out of range (> 1.0), it's simply clamped to 1.0. This may change hue, saturation, and/or lightness.
-      r = clamp(r, 0.0, 1.0);
-      g = clamp(g, 0.0, 1.0);
-      b = clamp(b, 0.0, 1.0);
-      corrected_rgb = vec3(r, g, b);
-   }
-   else if (nes_clip_method == 1.0)
-   {
-      //If any channels are out of range, the color is darkened until it is completely in range.
-      corrected_rgb = huePreserveClipDarken(r, g, b);
-   }
-   else if (nes_clip_method == 2.0)
-   {
-      //If any channels are out of range, the color is desaturated towards the luminance it would've had.
-      corrected_rgb = huePreserveClipDesaturate(r, g, b);
-   }
-
-   return corrected_rgb;
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 c = texture(Source, vTexCoord.xy);
-
-   // Extract the chroma, level, and emphasis from the normalized RGB triplet
-   int color =    int(floor((c.r * 15.0) + 0.5));
-   int level =    int(floor((c.g *  3.0) + 0.5));
-   int emphasis = int(floor((c.b *  7.0) + 0.5));
-
-   vec3 out_color = MakeRGBColor(emphasis, level, color);
-   FragColor = vec4(out_color, 1.0);
-}
diff --git a/ntsc/artifact-colors.slangp b/ntsc/artifact-colors.slangp
deleted file mode 100644
index 9aa0541e1a..0000000000
--- a/ntsc/artifact-colors.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-alias0 = artifact_colors_refpass
-
-shader1 = ../stock.slang
-scale_x1 = "640.0"
-scale_type_x1 = absolute
-
-shader2 = ../ntsc/shaders/artifact-colors/artifact-colors0.slang
-scale2 = 1.0
-scale_type2 = source
-filter_linear2 = false
-alias2 = Pass1
-
-shader3 = ../ntsc/shaders/artifact-colors/artifact-colors1.slang
-scale3 = 1.0
-scale_type3 = source
-filter_linear3 = false
-alias3 = Pass2
-float_framebuffer3 = true
-
-shader4 = ../ntsc/shaders/artifact-colors/artifact-colors2.slang
-scale4 = 1.0
-scale_type4 = source
-filter_linear4 = false
diff --git a/ntsc/mame-ntsc.slangp b/ntsc/mame-ntsc.slangp
deleted file mode 100644
index 0f22fba310..0000000000
--- a/ntsc/mame-ntsc.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = 2
-
-shader0 = shaders/mame-ntsc/mame-ntsc.slang
-scale_type0 = source
-filter_linear0 = true
-scale0 = 1.0
-
-shader1 = shaders/mame-ntsc/mame-postproc.slang
-filter_linear1 = true
-scale_type1 = viewport
diff --git a/ntsc/ntsc-256px-composite-scanline.slangp b/ntsc/ntsc-256px-composite-scanline.slangp
deleted file mode 100644
index c768259d66..0000000000
--- a/ntsc/ntsc-256px-composite-scanline.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 4
-shader0 = shaders/maister/ntsc-pass1-composite-3phase.slang
-shader1 = shaders/maister/ntsc-pass2-3phase.slang
-shader2 = shaders/maister/ntsc-gauss-pass.slang
-shader3 = shaders/maister/ntsc-stock.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = true 
-
-scale_type_x0 = absolute
-scale_type_y0 = source
-scale_x0 = 1024
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
-scale_type_x2 = source
-scale_type_y2 = viewport
-scale2 = 1.0
-
diff --git a/ntsc/ntsc-256px-composite.slangp b/ntsc/ntsc-256px-composite.slangp
deleted file mode 100644
index 8cb31fceca..0000000000
--- a/ntsc/ntsc-256px-composite.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = 2
-shader0 = shaders/maister/ntsc-pass1-composite-3phase.slang
-shader1 = shaders/maister/ntsc-pass2-3phase-gamma.slang
-
-filter_linear0 = false
-filter_linear1 = false
-
-scale_type_x0 = absolute
-scale_type_y0 = source
-scale_x0 = 1024
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
diff --git a/ntsc/ntsc-256px-svideo-scanline.slangp b/ntsc/ntsc-256px-svideo-scanline.slangp
deleted file mode 100644
index c521f91d2b..0000000000
--- a/ntsc/ntsc-256px-svideo-scanline.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 4
-shader0 = shaders/maister/ntsc-pass1-svideo-3phase.slang
-shader1 = shaders/maister/ntsc-pass2-3phase.slang
-shader2 = shaders/maister/ntsc-gauss-pass.slang
-shader3 = shaders/maister/ntsc-stock.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = true 
-
-scale_type_x0 = absolute
-scale_type_y0 = source
-scale_x0 = 1024
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
-scale_type_x2 = source
-scale_type_y2 = viewport
-scale2 = 1.0
-
diff --git a/ntsc/ntsc-256px-svideo.slangp b/ntsc/ntsc-256px-svideo.slangp
deleted file mode 100644
index c95c695bc4..0000000000
--- a/ntsc/ntsc-256px-svideo.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = 2
-shader0 = shaders/maister/ntsc-pass1-svideo-3phase.slang
-shader1 = shaders/maister/ntsc-pass2-3phase-gamma.slang
-
-filter_linear0 = false
-filter_linear1 = false
-
-scale_type_x0 = absolute
-scale_type_y0 = source
-scale_x0 = 1024
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
diff --git a/ntsc/ntsc-320px-composite-scanline.slangp b/ntsc/ntsc-320px-composite-scanline.slangp
deleted file mode 100644
index 7c83711431..0000000000
--- a/ntsc/ntsc-320px-composite-scanline.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 4
-shader0 = shaders/maister/ntsc-pass1-composite-2phase.slang
-shader1 = shaders/maister/ntsc-pass2-2phase.slang
-shader2 = shaders/maister/ntsc-gauss-pass.slang
-shader3 = shaders/maister/ntsc-stock.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = true 
-
-scale_type_x0 = absolute 
-scale_type_y0 = source
-scale_x0 = 1280
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
-scale_type_x2 = source
-scale_type_y2 = viewport
-scale2 = 1.0
-
diff --git a/ntsc/ntsc-320px-composite.slangp b/ntsc/ntsc-320px-composite.slangp
deleted file mode 100644
index e3d1b8f1c6..0000000000
--- a/ntsc/ntsc-320px-composite.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = 2
-shader0 = shaders/maister/ntsc-pass1-composite-2phase.slang
-shader1 = shaders/maister/ntsc-pass2-2phase-gamma.slang
-
-filter_linear0 = false
-filter_linear1 = false
-
-scale_type_x0 = absolute 
-scale_type_y0 = source
-scale_x0 = 1280
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
diff --git a/ntsc/ntsc-320px-svideo-scanline.slangp b/ntsc/ntsc-320px-svideo-scanline.slangp
deleted file mode 100644
index 5f52c204f9..0000000000
--- a/ntsc/ntsc-320px-svideo-scanline.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 4
-shader0 = shaders/maister/ntsc-pass1-svideo-2phase.slang
-shader1 = shaders/maister/ntsc-pass2-2phase.slang
-shader2 = shaders/maister/ntsc-gauss-pass.slang
-shader3 = shaders/maister/ntsc-stock.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-filter_linear3 = true 
-
-scale_type_x0 = absolute 
-scale_type_y0 = source
-scale_x0 = 1280
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
-scale_type_x2 = source
-scale_type_y2 = viewport
-scale2 = 1.0
-
diff --git a/ntsc/ntsc-320px-svideo.slangp b/ntsc/ntsc-320px-svideo.slangp
deleted file mode 100644
index b78b8c5931..0000000000
--- a/ntsc/ntsc-320px-svideo.slangp
+++ /dev/null
@@ -1,18 +0,0 @@
-shaders = 2
-shader0 = shaders/maister/ntsc-pass1-svideo-2phase.slang
-shader1 = shaders/maister/ntsc-pass2-2phase-gamma.slang
-
-filter_linear0 = false
-filter_linear1 = false
-
-scale_type_x0 = absolute 
-scale_type_y0 = source
-scale_x0 = 1280
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
diff --git a/ntsc/ntsc-adaptive-4x.slangp b/ntsc/ntsc-adaptive-4x.slangp
deleted file mode 100644
index b8cc14555e..0000000000
--- a/ntsc/ntsc-adaptive-4x.slangp
+++ /dev/null
@@ -1,14 +0,0 @@
-shaders = 2
-
-shader0 = shaders/ntsc-adaptive/ntsc-pass1.slang
-scale_type0 = source
-scale_x0 = 1.0
-filter_linear0 = false
-scale_y0 = 0.25
-float_framebuffer0 = true
-
-shader1 = shaders/ntsc-adaptive/ntsc-pass2.slang
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 4.0
-filter_linear1 = true
\ No newline at end of file
diff --git a/ntsc/ntsc-adaptive-old.slangp b/ntsc/ntsc-adaptive-old.slangp
deleted file mode 100644
index 45a5c05a93..0000000000
--- a/ntsc/ntsc-adaptive-old.slangp
+++ /dev/null
@@ -1,14 +0,0 @@
-shaders = 2
-
-shader0 = shaders/ntsc-adaptive/ntsc-pass1.slang
-scale_type0 = source
-scale_x0 = 4.0
-filter_linear0 = false
-scale_y0 = 1.0
-float_framebuffer0 = true
-
-shader1 = shaders/ntsc-adaptive/ntsc-pass2.slang
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-filter_linear1 = true
\ No newline at end of file
diff --git a/ntsc/ntsc-adaptive-tate.slangp b/ntsc/ntsc-adaptive-tate.slangp
deleted file mode 100644
index d11bbbd64a..0000000000
--- a/ntsc/ntsc-adaptive-tate.slangp
+++ /dev/null
@@ -1,14 +0,0 @@
-shaders = 2
-
-shader0 = shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang
-scale_type0 = source
-scale_x0 = 1.0
-filter_linear0 = false
-scale_y0 = 4.0
-float_framebuffer0 = true
-
-shader1 = shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang
-scale_type1 = source
-scale_x1 = 1.0
-scale_y1 = 0.5
-filter_linear1 = true
diff --git a/ntsc/ntsc-adaptive.slangp b/ntsc/ntsc-adaptive.slangp
deleted file mode 100644
index b7029d1c22..0000000000
--- a/ntsc/ntsc-adaptive.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 4
-
-shader0 = ../stock.slang
-alias0 = PrePass0
-
-shader1 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
diff --git a/ntsc/ntsc-blastem.slangp b/ntsc/ntsc-blastem.slangp
deleted file mode 100644
index 7bde911028..0000000000
--- a/ntsc/ntsc-blastem.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ntsc-blastem.slang
-scale_type0 = source
-scale0 = 1.0
diff --git a/ntsc/ntsc-md-rainbows.slangp b/ntsc/ntsc-md-rainbows.slangp
deleted file mode 100644
index d6440237c2..0000000000
--- a/ntsc/ntsc-md-rainbows.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-# Based on dannyld's rainbow settings
-
-shaders = 2
-
-shader0 = "../crt/shaders/mame_hlsl/shaders/mame_ntsc_encode.slang"
-filter_linear0 = "true"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../crt/shaders/mame_hlsl/shaders/mame_ntsc_decode.slang"
-filter_linear1 = "true"
-scale_type1 = "source"
-scale_1 = "1.000000"
-
-# ntsc parameters
-ntscsignal = "1.000000"
-avalue = "0.000000"
-bvalue = "0.000000"
-scantime = "47.900070"
-
-# optional blur
-shadowalpha = "0.100000"
-notch_width = "3.450001"
-ifreqresponse = "1.750000"
-qfreqresponse = "1.450000"
-
-# uncomment for jailbars in blue
-#pvalue = "1.100000"
diff --git a/ntsc/ntsc-mini.slangp b/ntsc/ntsc-mini.slangp
deleted file mode 100644
index 5aafe607cb..0000000000
--- a/ntsc/ntsc-mini.slangp
+++ /dev/null
@@ -1,10 +0,0 @@
-shaders = "1"
-feedback_pass = "0"
-shader0 = "shaders/ntsc-simple/ntsc-mini.slang"
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-
diff --git a/ntsc/ntsc-simple.slangp b/ntsc/ntsc-simple.slangp
deleted file mode 100644
index 237d4304dd..0000000000
--- a/ntsc/ntsc-simple.slangp
+++ /dev/null
@@ -1,25 +0,0 @@
-shaders = "4"
-feedback_pass = "0"
-shader0 = "../stock.slang"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "shaders/ntsc-simple/ntsc-simple-1.slang"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "shaders/ntsc-simple/ntsc-simple-2.slang"
-scale_type_x2 = "source"
-scale_x2 = "0.500000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/ntsc-simple/kaizer-lp-small.slang"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
diff --git a/ntsc/ntsc-xot.slangp b/ntsc/ntsc-xot.slangp
deleted file mode 100644
index 4293d1f5ec..0000000000
--- a/ntsc/ntsc-xot.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-shaders = 2
-
-shader0 = ../stock.slang
-scale_type_x0 = absolute
-scale_x0 = "640.0"
-
-shader1 = shaders/ntsc-xot.slang
-scale1 = 1.0
-scale_type1 = source
diff --git a/ntsc/shaders/artifact-colors/artifact-colors0.slang b/ntsc/shaders/artifact-colors/artifact-colors0.slang
deleted file mode 100644
index 48adf70afb..0000000000
--- a/ntsc/shaders/artifact-colors/artifact-colors0.slang
+++ /dev/null
@@ -1,73 +0,0 @@
-#version 450
-
-/*
-Adapted for RetroArch from Flyguy's "Apple II-Like Artifact Colors" from shadertoy:
-https://www.shadertoy.com/view/llyGzR
-
-"Colors created through NTSC artifacting on 4-bit patterns, similar to the Apple II's lo-res mode."
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float F_COL;
-} params;
-
-#pragma parameter F_COL "F Col" 0.25 0.25 0.5 0.25
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0004;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-//Modulator
-
-//#define F_COL (1.0 / 4.0) // moved to parameter
-
-float tau = atan(1.0)*8.0;
-
-mat3 rgb2yiq = mat3(0.299, 0.596, 0.211,
-                    0.587,-0.274,-0.523,
-                    0.114,-0.322, 0.312);
-
-//Complex oscillator, Fo = Oscillator freq., Fs = Sample freq., n = Sample index
-vec2 Oscillator(float Fo, float Fs, float n)
-{
-    float phase = (tau*Fo*floor(n))/Fs;
-    return vec2(cos(phase),sin(phase));
-}
-
-void main()
-{
-    float Fs = params.SourceSize.x;
-    float Fcol = Fs * params.F_COL;
-    float n = floor(vTexCoord.x * params.OutputSize.x);
-    
-    vec3 cRGB = texture(Source, vTexCoord.xy).rgb;
-    vec3 cYIQ = rgb2yiq * cRGB;
-    
-    vec2 cOsc = Oscillator(Fcol, Fs, n);
-    
-    float sig = cYIQ.x + dot(cOsc, cYIQ.yz);
-
-   FragColor = vec4(sig,0.,0.,0.);
-}
\ No newline at end of file
diff --git a/ntsc/shaders/artifact-colors/artifact-colors1.slang b/ntsc/shaders/artifact-colors/artifact-colors1.slang
deleted file mode 100644
index a0dc268abb..0000000000
--- a/ntsc/shaders/artifact-colors/artifact-colors1.slang
+++ /dev/null
@@ -1,152 +0,0 @@
-#version 450
-
-/*
-Adapted for RetroArch from Flyguy's "Apple II-Like Artifact Colors" from shadertoy:
-https://www.shadertoy.com/view/llyGzR
-
-"Colors created through NTSC artifacting on 4-bit patterns, similar to the Apple II's lo-res mode."
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float FIR_SIZE;
-	float F_COL;
-	float F_LUMA_LP;
-	float F_COL_BW;
-} params;
-
-#pragma parameter FIR_SIZE "FIR Size" 29.0 1.0 50.0 1.0
-#pragma parameter F_COL "F Col" 0.25 0.25 0.5 0.25
-#pragma parameter F_LUMA_LP "F Luma LP" 0.16667 0.0001 0.333333 0.02
-#pragma parameter F_COL_BW "F Col BW" 50.0 10.0 200.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0004;
-}
-
-#pragma stage fragment
-#pragma format R16G16B16A16_SFLOAT
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-//Demodulator
-
-//#define F_COL (1.0 / 4.0) // moved to parameter
-//#define F_LUMA_LP (1.0 / 6.0) // moved to parameter
-//#define F_COL_BW (1.0 / 50.0) // moved to parameter
-
-
-//#define FIR_SIZE 29 // moved to parameter
-
-float pi = 3.141592654;//atan(1.0)*4.0;
-float tau = 6.283185308;//atan(1.0)*8.0;
-
-//Non-normalized texture sampling.
-vec4 sample2D(sampler2D tex,vec2 resolution, vec2 uv)
-{
-    return texture(tex, uv / resolution);
-}
-
-//Complex multiply
-vec2 cmul(vec2 a, vec2 b)
-{
-   return vec2((a.x * b.x) - (a.y * b.y), (a.x * b.y) + (a.y * b.x));
-}
-
-float sinc(float x)
-{
-	return (x == 0.0) ? 1.0 : sin(x*pi)/(x*pi);   
-}
-
-//https://en.wikipedia.org/wiki/Window_function
-float WindowBlackman(float a, int N, int i)
-{
-    float a0 = (1.0 - a) / 2.0;
-    float a1 = 0.5;
-    float a2 = a / 2.0;
-    
-    float wnd = a0;
-    wnd -= a1 * cos(2.0 * pi * (float(i) / float(N - 1)));
-    wnd += a2 * cos(4.0 * pi * (float(i) / float(N - 1)));
-    
-    return wnd;
-}
-
-//FIR lowpass filter 
-//Fc = Cutoff freq., Fs = Sample freq., N = # of taps, i = Tap index
-float Lowpass(float Fc, float Fs, int N, int i)
-{    
-    float wc = (Fc/Fs);
-    
-    float wnd = WindowBlackman(0.16, N, i);
-    
-    return 2.0*wc * wnd * sinc(2.0*wc * float(i - N/2));
-}
-
-//FIR bandpass filter 
-//Fa/Fb = Low/High cutoff freq., Fs = Sample freq., N = # of taps, i = Tap index
-float Bandpass(float Fa, float Fb, float Fs, int N, int i)
-{    
-    float wa = (Fa/Fs);
-    float wb = (Fb/Fs);
-    
-    float wnd = WindowBlackman(0.16, N, i);
-    
-    return 2.0*(wb-wa) * wnd * (sinc(2.0*wb * float(i - N/2)) - sinc(2.0*wa * float(i - N/2)));
-}
-
-//Complex oscillator, Fo = Oscillator freq., Fs = Sample freq., n = Sample index
-vec2 Oscillator(float Fo, float Fs, float N)
-{
-    float phase = (tau*Fo*floor(N))/Fs;
-    return vec2(cos(phase),sin(phase));
-}
-
-void main()
-{
-    float Fs = params.SourceSize.x;
-    float Fcol = Fs * params.F_COL;
-    float Fcolbw = Fs * (1.0 / params.F_COL_BW);
-    float Flumlp = Fs * params.F_LUMA_LP;
-    float n = floor(vTexCoord.x * params.OutputSize.x);
-    
-    float y_sig = 0.0;    
-    float iq_sig = 0.0;
-    
-    vec2 cOsc = Oscillator(Fcol, Fs, n);
-	
-    n += float(params.FIR_SIZE)/2.0;
-    
-    //Separate luma(Y) & chroma(IQ) signals
-    for(int i = 0;i < params.FIR_SIZE;i++)
-    {
-        int tpidx = int(params.FIR_SIZE) - i - 1;
-        float lp = Lowpass(Flumlp, Fs, int(params.FIR_SIZE), tpidx);
-        float bp = Bandpass(Fcol - Fcolbw, Fcol + Fcolbw, Fs, int(params.FIR_SIZE), tpidx);
-        
-        y_sig += sample2D(Source, params.SourceSize.xy, vec2(n - float(i), (vTexCoord.y * params.OutputSize.y))).r * lp;
-        iq_sig += sample2D(Source, params.SourceSize.xy, vec2(n - float(i), (vTexCoord.y * params.OutputSize.y))).r * bp;
-    }
-    
-    //Shift IQ signal down from Fcol to DC 
-    vec2 iq_sig_mix = cmul(vec2(iq_sig, 0.), cOsc);
-    
-   FragColor = vec4(y_sig, iq_sig_mix, 0.);
-}
\ No newline at end of file
diff --git a/ntsc/shaders/artifact-colors/artifact-colors2.slang b/ntsc/shaders/artifact-colors/artifact-colors2.slang
deleted file mode 100644
index 5a1b551b5d..0000000000
--- a/ntsc/shaders/artifact-colors/artifact-colors2.slang
+++ /dev/null
@@ -1,176 +0,0 @@
-#version 450
-
-/*
-Adapted for RetroArch from Flyguy's "Apple II-Like Artifact Colors" from shadertoy:
-https://www.shadertoy.com/view/llyGzR
-
-"Colors created through NTSC artifacting on 4-bit patterns, similar to the Apple II's lo-res mode."
-*/ 
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float FIR_SIZE;
-	float F_COL;
-	float SATURATION;
-	float BRIGHTNESS;
-	float F_LUMA_LP;
-	float HUE;
-	float split;
-	float split_line;
-} params;
-
-#pragma parameter FIR_SIZE "FIR Size" 29.0 1.0 50.0 1.0
-#pragma parameter F_COL "F Col" 0.25 0.25 0.5 0.25
-#pragma parameter SATURATION "Saturation" 30.0 0.0 100.0 1.0
-#pragma parameter BRIGHTNESS "Brightness" 1.0 0.0 2.0 0.01
-#pragma parameter F_LUMA_LP "F Luma LP" 0.16667 0.0001 0.333333 0.02
-#pragma parameter HUE "Hue" 0.0 0.0 1.0 0.01
-#pragma parameter split "Split Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter split_line "Split Line Location" 0.5 0.0 1.0 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0004;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D artifact_colors_refpass;
-layout(set = 0, binding = 4) uniform sampler2D Pass2;
-layout(set = 0, binding = 5) uniform sampler2D Pass1;
-
-//Composite color artifact simulator
-//Change Buf A to change the input image.
-
-//#define HUE 0.0 // moved to parameter
-//#define SATURATION 30.0 // moved to parameter
-//#define BRIGHTNESS 1.0 // moved to parameter
-
-#define COMPOSITE 0 //Composite demodulated image
-#define RGB 1 //Raw RGB input image
-#define LUMA 2 //Luma component
-#define CHROMA 3 //Chroma component
-#define SIGNAL 4 //Modulated image
-#define SPLIT 5 //Left = Input RGB, Right = Output composite
-
-#define VIEW_MODE COMPOSITE
-
-//#define F_COL (1.0 / 4.0) // moved to parameter
-//#define F_LUMA_LP (1.0 / 6.0) // moved to parameter
-
-//#define FIR_SIZE 29  // moved to parameter
-
-float pi = 3.141592654;//atan(1.0)*4.0;
-float tau = 6.283185308;//atan(1.0)*8.0;
-
-mat3 yiq2rgb = mat3(1.000, 1.000, 1.000,
-                    0.956,-0.272,-1.106,
-                    0.621,-0.647, 1.703);
-
-//Angle -> 2D rotation matrix 
-mat2 rotate(float a)
-{
-    return mat2( cos(a), sin(a),
-                -sin(a), cos(a));
-}
-
-//Non-normalized texture sampling.
-vec4 sample2D(sampler2D tex,vec2 resolution, vec2 uv)
-{
-    return texture(tex, uv / resolution);
-}
-
-float sinc(float x)
-{
-	return (x == 0.0) ? 1.0 : sin(x*pi)/(x*pi);   
-}
-
-//https://en.wikipedia.org/wiki/Window_function
-float WindowBlackman(float a, int N, int i)
-{
-    float a0 = (1.0 - a) / 2.0;
-    float a1 = 0.5;
-    float a2 = a / 2.0;
-    
-    float wnd = a0;
-    wnd -= a1 * cos(2.0 * pi * (float(i) / float(N - 1)));
-    wnd += a2 * cos(4.0 * pi * (float(i) / float(N - 1)));
-    
-    return wnd;
-}
-
-//FIR lowpass filter 
-//Fc = Cutoff freq., Fs = Sample freq., N = # of taps, i = Tap index
-float Lowpass(float Fc, float Fs, int N, int i)
-{    
-    float wc = (Fc/Fs);
-    
-    float wnd = WindowBlackman(0.16, N, i);
-    
-    return 2.0*wc * wnd * sinc(2.0*wc * float(i - N/2));
-}
-
-void main()
-{
-    float Fs = params.SourceSize.x;
-    float Fcol = Fs * params.F_COL;
-    float Flumlp = Fs * params.F_LUMA_LP;
-    float n = floor(vTexCoord.x * params.OutputSize.x);
-    
-	vec2 uv = vTexCoord.xy * params.OutputSize.xy;
-    
-    float luma = sample2D(Source, params.SourceSize.xy, uv).r;
-    vec2 chroma = vec2(0.);
-    
-    //Filtering out unwanted high freqency content from the chroma(IQ) signal.
-    for(int i = 0;i < int(params.FIR_SIZE);i++)
-    {
-        int tpidx = int(params.FIR_SIZE) - i - 1;
-        float lp = Lowpass(Flumlp, Fs, int(params.FIR_SIZE), tpidx);
-        chroma += sample2D(Source, params.SourceSize.xy, uv - vec2(float(i) - params.FIR_SIZE / 2., 0.)).yz * lp;
-    }
-    
-    chroma *= rotate(tau * params.HUE);
-    
-    vec3 color = yiq2rgb * vec3(params.BRIGHTNESS * luma, chroma * params.SATURATION);
-    
-    #if(VIEW_MODE == COMPOSITE)
-    	FragColor = vec4(color, 0.);
-    
-    #elif(VIEW_MODE == RGB)
-   		FragColor = texture(artifact_colors_refpass, uv / params.SourceSize.xy);
-    
-    #elif(VIEW_MODE == LUMA) 
-    	FragColor = vec4(luma);
-    
-    #elif(VIEW_MODE == CHROMA)
-    	FragColor = vec4(40.0*chroma+0.5,0.,0.);
-    
-    #elif(VIEW_MODE == SIGNAL)
-    	FragColor = 0.5 * texture(Pass2, uv / params.SourceSize.xy).rrrr+0.25;
-	#endif
-    
-    	if(params.split > 0.5)
-        {
-            FragColor = vec4(texture(Pass1, uv / params.SourceSize.xy).r);
-        }
-    		FragColor = (vTexCoord.x > params.split_line) ? vec4(color, 0.) : FragColor;
-    
-}
diff --git a/ntsc/shaders/maister/ntsc-decode-filter-2phase.inc b/ntsc/shaders/maister/ntsc-decode-filter-2phase.inc
deleted file mode 100644
index a549162226..0000000000
--- a/ntsc/shaders/maister/ntsc-decode-filter-2phase.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-#define TAPS 32
-const float luma_filter[TAPS + 1] = float[TAPS + 1](
-   -0.000174844,
-   -0.000205844,
-   -0.000149453,
-   -0.000051693,
-   0.000000000,
-   -0.000066171,
-   -0.000245058,
-   -0.000432928,
-   -0.000472644,
-   -0.000252236,
-   0.000198929,
-   0.000687058,
-   0.000944112,
-   0.000803467,
-   0.000363199,
-   0.000013422,
-   0.000253402,
-   0.001339461,
-   0.002932972,
-   0.003983485,
-   0.003026683,
-   -0.001102056,
-   -0.008373026,
-   -0.016897700,
-   -0.022914480,
-   -0.021642347,
-   -0.008863273,
-   0.017271957,
-   0.054921920,
-   0.098342579,
-   0.139044281,
-   0.168055832,
-   0.178571429);
-
-const float chroma_filter[TAPS + 1] = float[TAPS + 1](
-   0.001384762,
-   0.001678312,
-   0.002021715,
-   0.002420562,
-   0.002880460,
-   0.003406879,
-   0.004004985,
-   0.004679445,
-   0.005434218,
-   0.006272332,
-   0.007195654,
-   0.008204665,
-   0.009298238,
-   0.010473450,
-   0.011725413,
-   0.013047155,
-   0.014429548,
-   0.015861306,
-   0.017329037,
-   0.018817382,
-   0.020309220,
-   0.021785952,
-   0.023227857,
-   0.024614500,
-   0.025925203,
-   0.027139546,
-   0.028237893,
-   0.029201910,
-   0.030015081,
-   0.030663170,
-   0.031134640,
-   0.031420995,
-   0.031517031);
diff --git a/ntsc/shaders/maister/ntsc-decode-filter-3phase.inc b/ntsc/shaders/maister/ntsc-decode-filter-3phase.inc
deleted file mode 100644
index ed6b41ce1a..0000000000
--- a/ntsc/shaders/maister/ntsc-decode-filter-3phase.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-#define TAPS 24
-const float luma_filter[TAPS + 1] = float[TAPS + 1](
-   -0.000012020,
-   -0.000022146,
-   -0.000013155,
-   -0.000012020,
-   -0.000049979,
-   -0.000113940,
-   -0.000122150,
-   -0.000005612,
-   0.000170516,
-   0.000237199,
-   0.000169640,
-   0.000285688,
-   0.000984574,
-   0.002018683,
-   0.002002275,
-   -0.000909882,
-   -0.007049081,
-   -0.013222860,
-   -0.012606931,
-   0.002460860,
-   0.035868225,
-   0.084016453,
-   0.135563500,
-   0.175261268,
-   0.190176552);
-
-const float chroma_filter[TAPS + 1] = float[TAPS + 1](
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
diff --git a/ntsc/shaders/maister/ntsc-gauss-pass.slang b/ntsc/shaders/maister/ntsc-gauss-pass.slang
deleted file mode 100644
index 2beb198c58..0000000000
--- a/ntsc/shaders/maister/ntsc-gauss-pass.slang
+++ /dev/null
@@ -1,68 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 OutputSize;
-	vec4 OriginalSize;
-	vec4 SourceSize;
-	uint FrameCount;
-	float NTSC_CRT_GAMMA;
-	float NTSC_DISPLAY_GAMMA;
-} registers;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma parameter NTSC_CRT_GAMMA "NTSC CRT Gamma" 2.5 0.0 10.0 0.1
-#pragma parameter NTSC_DISPLAY_GAMMA "NTSC Display Gamma" 2.1 0.0 10.0 0.1
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 one;
-layout(location = 2) out vec2 pix_no;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   pix_no = TexCoord * registers.SourceSize.xy;
-   one = 1.0 / registers.SourceSize.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 one;
-layout(location = 2) in vec2 pix_no;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define TEX(off) pow(texture(Source, vTexCoord + vec2(0.0, (off) * one.y)).rgb, vec3(registers.NTSC_CRT_GAMMA))
-
-
-void main()
-{
-   vec3 frame0 = TEX(-2.0);
-   vec3 frame1 = TEX(-1.0);
-   vec3 frame2 = TEX(0.0);
-   vec3 frame3 = TEX(1.0);
-   vec3 frame4 = TEX(2.0);
-
-   float offset_dist = fract(pix_no.y) - 0.5;
-   float dist0 =  2.0 + offset_dist;
-   float dist1 =  1.0 + offset_dist;
-   float dist2 =  0.0 + offset_dist;
-   float dist3 = -1.0 + offset_dist;
-   float dist4 = -2.0 + offset_dist;
-
-   vec3 scanline = frame0 * exp(-5.0 * dist0 * dist0);
-   scanline += frame1 * exp(-5.0 * dist1 * dist1);
-   scanline += frame2 * exp(-5.0 * dist2 * dist2);
-   scanline += frame3 * exp(-5.0 * dist3 * dist3);
-   scanline += frame4 * exp(-5.0 * dist4 * dist4);
-
-FragColor = vec4(pow(1.15 * scanline, vec3(1.0 / registers.NTSC_DISPLAY_GAMMA)), 1.0);
-}
diff --git a/ntsc/shaders/maister/ntsc-param.inc b/ntsc/shaders/maister/ntsc-param.inc
deleted file mode 100644
index f460b5a1aa..0000000000
--- a/ntsc/shaders/maister/ntsc-param.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-#define PI 3.14159265
-
-#if defined(TWO_PHASE)
-#define CHROMA_MOD_FREQ (4.0 * PI / 15.0)
-#elif defined(THREE_PHASE)
-#define CHROMA_MOD_FREQ (PI / 3.0)
-#endif
-
-#if defined(COMPOSITE)
-#define SATURATION 1.0
-#define BRIGHTNESS 1.0
-#define ARTIFACTING 1.0
-#define FRINGING 1.0
-#elif defined(SVIDEO)
-#define SATURATION 1.0
-#define BRIGHTNESS 1.0
-#define ARTIFACTING 0.0
-#define FRINGING 0.0
-#endif
-
-#if defined(COMPOSITE) || defined(SVIDEO)
-mat3 mix_mat = mat3(
-	BRIGHTNESS, FRINGING, FRINGING,
-	ARTIFACTING, 2.0 * SATURATION, 0.0,
-	ARTIFACTING, 0.0, 2.0 * SATURATION
-);
-#endif
-
diff --git a/ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang b/ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang
deleted file mode 100644
index 523725afd6..0000000000
--- a/ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang
+++ /dev/null
@@ -1,28 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#define TWO_PHASE
-#define COMPOSITE
-#include "ntsc-param.inc"
-#include "ntsc-rgbyuv.inc"
-
-#include "ntsc-pass1-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass1-encode-demodulate.inc"
-}
diff --git a/ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang b/ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
deleted file mode 100644
index b0826d0751..0000000000
--- a/ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
+++ /dev/null
@@ -1,27 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#define THREE_PHASE
-#define COMPOSITE
-#include "ntsc-param.inc"
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-pass1-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass1-encode-demodulate.inc"
-}
diff --git a/ntsc/shaders/maister/ntsc-pass1-encode-demodulate.inc b/ntsc/shaders/maister/ntsc-pass1-encode-demodulate.inc
deleted file mode 100644
index fabc7b76ec..0000000000
--- a/ntsc/shaders/maister/ntsc-pass1-encode-demodulate.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-vec3 col = texture(Source, vTexCoord).rgb;
-vec3 yiq = rgb2yiq(col);
-
-#if defined(TWO_PHASE)
-float chroma_phase = PI * (mod(pix_no.y, 2.0) + global.FrameCount);
-#elif defined(THREE_PHASE)
-float chroma_phase = 0.6667 * PI * (mod(pix_no.y, 3.0) + global.FrameCount);
-#endif
-
-float mod_phase = chroma_phase + pix_no.x * CHROMA_MOD_FREQ;
-
-float i_mod = cos(mod_phase);
-float q_mod = sin(mod_phase);
-
-yiq.yz *= vec2(i_mod, q_mod); // Modulate.
-yiq *= mix_mat; // Cross-talk.
-yiq.yz *= vec2(i_mod, q_mod); // Demodulate.
-FragColor = vec4(yiq, 1.0);
-
diff --git a/ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang b/ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang
deleted file mode 100644
index 9f12940b4f..0000000000
--- a/ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang
+++ /dev/null
@@ -1,27 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#define TWO_PHASE
-#define SVIDEO
-#include "ntsc-param.inc"
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-pass1-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass1-encode-demodulate.inc"
-}
diff --git a/ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang b/ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang
deleted file mode 100644
index 39b6f6eabd..0000000000
--- a/ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang
+++ /dev/null
@@ -1,27 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#define THREE_PHASE
-#define SVIDEO
-#include "ntsc-param.inc"
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-pass1-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass1-encode-demodulate.inc"
-}
diff --git a/ntsc/shaders/maister/ntsc-pass1-vertex.inc b/ntsc/shaders/maister/ntsc-pass1-vertex.inc
deleted file mode 100644
index 0262e9f467..0000000000
--- a/ntsc/shaders/maister/ntsc-pass1-vertex.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 pix_no;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   pix_no = TexCoord * global.SourceSize.xy * (global.OutputSize.xy / global.SourceSize.xy);
-}
diff --git a/ntsc/shaders/maister/ntsc-pass2-2phase-gamma.slang b/ntsc/shaders/maister/ntsc-pass2-2phase-gamma.slang
deleted file mode 100644
index 5bef5c8f67..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-2phase-gamma.slang
+++ /dev/null
@@ -1,32 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-decode-filter-2phase.inc"
-
-#define fetch_offset(offset, one_x) \
-   texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz
-
-#define NTSC_CRT_GAMMA 2.5
-#define NTSC_MONITOR_GAMMA 2.0
-
-#include "ntsc-pass2-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass2-decode.inc"
-vec3 rgb = yiq2rgb(signal);
-FragColor = vec4(pow(rgb, vec3(NTSC_CRT_GAMMA / NTSC_MONITOR_GAMMA)), 1.0);
-}
diff --git a/ntsc/shaders/maister/ntsc-pass2-2phase-linear.slang b/ntsc/shaders/maister/ntsc-pass2-2phase-linear.slang
deleted file mode 100644
index 506fac2c16..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-2phase-linear.slang
+++ /dev/null
@@ -1,31 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-decode-filter-2phase.inc"
-
-#define fetch_offset(offset, one_x) \
-   texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz
-
-#define NTSC_CRT_GAMMA 2.4
-   
-#include "ntsc-pass2-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass2-decode.inc"
-vec3 rgb = yiq2rgb(signal);
-FragColor = vec4(pow(rgb, vec3(NTSC_CRT_GAMMA)), 1.0);
-}
diff --git a/ntsc/shaders/maister/ntsc-pass2-2phase.slang b/ntsc/shaders/maister/ntsc-pass2-2phase.slang
deleted file mode 100644
index edf981e022..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-2phase.slang
+++ /dev/null
@@ -1,29 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-decode-filter-2phase.inc"
-
-#define fetch_offset(offset, one_x) \
-   texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz
-   
-#include "ntsc-pass2-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass2-decode.inc"
-vec3 rgb = yiq2rgb(signal);
-FragColor = vec4(rgb, 1.0);
-}
diff --git a/ntsc/shaders/maister/ntsc-pass2-3phase-gamma.slang b/ntsc/shaders/maister/ntsc-pass2-3phase-gamma.slang
deleted file mode 100644
index 9e5872c240..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-3phase-gamma.slang
+++ /dev/null
@@ -1,32 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-decode-filter-3phase.inc"
-
-#define fetch_offset(offset, one_x) \
-   texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz
-
-#define NTSC_CRT_GAMMA 2.5
-#define NTSC_MONITOR_GAMMA 2.0
-
-#include "ntsc-pass2-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass2-decode.inc"
-vec3 rgb = yiq2rgb(signal);
-FragColor = vec4(pow(rgb, vec3(NTSC_CRT_GAMMA / NTSC_MONITOR_GAMMA)), 1.0);
-}
diff --git a/ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang b/ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang
deleted file mode 100644
index e277c058b6..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang
+++ /dev/null
@@ -1,31 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-decode-filter-3phase.inc"
-
-#define fetch_offset(offset, one_x) \
-   texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz
-
-#define NTSC_CRT_GAMMA 2.4
-
-#include "ntsc-pass2-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass2-decode.inc"
-vec3 rgb = yiq2rgb(signal);
-FragColor = vec4(pow(rgb, vec3(NTSC_CRT_GAMMA)), 1.0);
-}
diff --git a/ntsc/shaders/maister/ntsc-pass2-3phase.slang b/ntsc/shaders/maister/ntsc-pass2-3phase.slang
deleted file mode 100644
index afbe993c35..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-3phase.slang
+++ /dev/null
@@ -1,29 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-} global;
-
-#include "ntsc-rgbyuv.inc"
-#include "ntsc-decode-filter-3phase.inc"
-
-#define fetch_offset(offset, one_x) \
-   texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz
-
-#include "ntsc-pass2-vertex.inc"
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-#include "ntsc-pass2-decode.inc"
-vec3 rgb = yiq2rgb(signal);
-FragColor = vec4(rgb, 1.0);
-}
diff --git a/ntsc/shaders/maister/ntsc-pass2-decode.inc b/ntsc/shaders/maister/ntsc-pass2-decode.inc
deleted file mode 100644
index 7214c8ccd3..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-decode.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-float one_x = 1.0 / global.SourceSize.x;
-vec3 signal = vec3(0.0);
-for (int i = 0; i < TAPS; i++)
-{
-   float offset = float(i);
-
-   vec3 sums = fetch_offset(offset - float(TAPS), one_x) +
-      fetch_offset(float(TAPS) - offset, one_x);
-
-   signal += sums * vec3(luma_filter[i], chroma_filter[i], chroma_filter[i]);
-}
-signal += texture(Source, vTexCoord).xyz *
-   vec3(luma_filter[TAPS], chroma_filter[TAPS], chroma_filter[TAPS]);
diff --git a/ntsc/shaders/maister/ntsc-pass2-vertex.inc b/ntsc/shaders/maister/ntsc-pass2-vertex.inc
deleted file mode 100644
index 738a495827..0000000000
--- a/ntsc/shaders/maister/ntsc-pass2-vertex.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord - vec2(0.5 / global.SourceSize.x, 0.0); // Compensate for decimate-by-2.
-}
\ No newline at end of file
diff --git a/ntsc/shaders/maister/ntsc-rgbyuv.inc b/ntsc/shaders/maister/ntsc-rgbyuv.inc
deleted file mode 100644
index 27fb136c22..0000000000
--- a/ntsc/shaders/maister/ntsc-rgbyuv.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
diff --git a/ntsc/shaders/maister/ntsc-stock.slang b/ntsc/shaders/maister/ntsc-stock.slang
deleted file mode 100644
index 86730dc12c..0000000000
--- a/ntsc/shaders/maister/ntsc-stock.slang
+++ /dev/null
@@ -1,31 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-FragColor = texture(Source, vTexCoord).rgba;
-}
\ No newline at end of file
diff --git a/ntsc/shaders/mame-ntsc/constants.inc b/ntsc/shaders/mame-ntsc/constants.inc
deleted file mode 100644
index 8f617fd3b7..0000000000
--- a/ntsc/shaders/mame-ntsc/constants.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-// Useful Constants
-const vec4 Zero = vec4(0.0);
-const vec4 Half = vec4(0.5);
-const vec4 One = vec4(1.0);
-const vec4 Two = vec4(2.0);
-const vec3 Gray = vec3(0.3, 0.59, 0.11);
-const float Pi = 3.1415926535;
-const float Pi2 = 6.283185307;
-
-// NTSC Constants
-const vec4 A = vec4(0.5);
-const vec4 A2 = vec4(1.0);
-const vec4 B = vec4(0.5);
-const float P = 1.0;
-const float CCFrequency = 3.59754545;
-const float NotchUpperFrequency = 3.59754545 + 2.0;
-const float NotchLowerFrequency = 3.59754545 - 2.0;
-const float YFrequency = 6.0;
-const float IFrequency = 1.2;
-const float QFrequency = 0.6;
-const float NotchHalfWidth = 2.0;
-const float ScanTime = 52.6;
-const float Pi2ScanTime = 6.283185307 * 52.6;
-const float MaxC = 2.1183;
-const vec4 YTransform = vec4(0.299, 0.587, 0.114, 0.0);
-const vec4 ITransform = vec4(0.595716, -0.274453, -0.321263, 0.0);
-const vec4 QTransform = vec4(0.211456, -0.522591, 0.311135, 0.0);
-const vec3 YIQ2R = vec3(1.0, 0.956, 0.621);
-const vec3 YIQ2G = vec3(1.0, -0.272, -0.647);
-const vec3 YIQ2B = vec3(1.0, -1.106, 1.703);
-const vec4 MinC = vec4(-1.1183);
-const vec4 CRange = vec4(3.2366);
-const vec4 InvCRange = vec4(1.0/3.2366);
-const float Pi2Length = Pi2 / 63.0;
-const vec4 NotchOffset = vec4(0.0, 1.0, 2.0, 3.0);
-const vec4 W = vec4(Pi2 * CCFrequency * ScanTime);
-
-// Color Convolution Constants
-const vec3 RedMatrix = vec3(1.0, 0.0, 0.0);
-const vec3 GrnMatrix = vec3(0.0, 1.0, 0.0);
-const vec3 BluMatrix = vec3(0.0, 0.0, 1.0);
-const vec3 DCOffset = vec3(0.0, 0.0, 0.0);
-const vec3 ColorScale = vec3(0.95, 0.95, 0.95);
-const float Saturation = 1.4;
-
-// Deconverge Constants
-const vec3 ConvergeX = vec3(-0.4,  0.0, 0.2);
-const vec3 ConvergeY = vec3( 0.0, -0.4, 0.2);
-const vec3 RadialConvergeX = vec3(1.0, 1.0, 1.0);
-const vec3 RadialConvergeY = vec3(1.0, 1.0, 1.0);
-
-// Scanline/Pincushion Constants
-const float PincushionAmount = 0.015;
-const float CurvatureAmount = 0.015;
-//const float ScanlineAmount = 0.175; <- move to parameter
-const float ScanlineScale = 1.0;
-const float ScanlineHeight = 1.0;
-const float ScanlineBrightScale = 1.0;
-const float ScanlineBrightOffset = 0.0;
-const float ScanlineOffset = 0.0;
-const vec3 Floor = vec3(0.05, 0.05, 0.05);
-
-// 60Hz Bar Constants
-const float SixtyHertzRate = (60.0 / 59.97 - 1.0); // Difference between NTSC and line frequency
-const float SixtyHertzScale = 0.1;
\ No newline at end of file
diff --git a/ntsc/shaders/mame-ntsc/mame-ntsc.slang b/ntsc/shaders/mame-ntsc/mame-ntsc.slang
deleted file mode 100644
index 1ad009865f..0000000000
--- a/ntsc/shaders/mame-ntsc/mame-ntsc.slang
+++ /dev/null
@@ -1,188 +0,0 @@
-#version 450
-
-// This is a port of the NTSC encode/decode shader pair in MAME and MESS, modified to use only
-// one pass rather than an encode pass and a decode pass. It accurately emulates the sort of
-// signal decimation one would see when viewing a composite signal, though it could benefit from a
-// pre-pass to re-size the input content to more accurately reflect the actual size that would
-// be incoming from a composite signal source.
-//
-// To encode the composite signal, I convert the RGB value to YIQ, then subsequently evaluate
-// the standard NTSC composite equation. Four composite samples per RGB pixel are generated from
-// the incoming linearly-interpolated texels.
-//
-// The decode pass implements a Fixed Impulse Response (FIR) filter designed by MAME/MESS contributor
-// "austere" in matlab (if memory serves correctly) to mimic the behavior of a standard television set
-// as closely as possible. The filter window is 83 composite samples wide, and there is an additional
-// notch filter pass on the luminance (Y) values in order to strip the color signal from the luminance
-// signal prior to processing.
-//
-// Yes, this code could greatly use some cleaning up.
-
-// ported from UltraMoogleMan's "Full MAME/MESS Shader Pipe" shadertoy: https://www.shadertoy.com/view/ldf3Rf
-// license: presumably MAME's license at the time, which was noncommercial
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "constants.inc"
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define iChannel0 Source
-
-vec4 CompositeSample(vec2 UV, vec2 InverseRes) {
-	vec2 InverseP = vec2(P, 0.0) * InverseRes;
-	
-	// UVs for four linearly-interpolated samples spaced 0.25 texels apart
-	vec2 C0 = UV;
-	vec2 C1 = UV + InverseP * 0.25;
-	vec2 C2 = UV + InverseP * 0.50;
-	vec2 C3 = UV + InverseP * 0.75;
-	vec4 Cx = vec4(C0.x, C1.x, C2.x, C3.x);
-	vec4 Cy = vec4(C0.y, C1.y, C2.y, C3.y);
-
-	vec4 Texel0 = texture(iChannel0, C0);
-	vec4 Texel1 = texture(iChannel0, C1);
-	vec4 Texel2 = texture(iChannel0, C2);
-	vec4 Texel3 = texture(iChannel0, C3);
-	
-	float Frequency = CCFrequency;
-	//Frequency = Frequency;// Uncomment for bad color sync + (sin(UV.y * 2.0 - 1.0) / CCFrequency) * 0.001;
-
-	// Calculated the expected time of the sample.
-	vec4 T = A2 * Cy * vec4(params.SourceSize.y) + B + Cx;
-	vec4 W = vec4(Pi2ScanTime * Frequency);
-	vec4 TW = T * W;
-	vec4 Y = vec4(dot(Texel0, YTransform), dot(Texel1, YTransform), dot(Texel2, YTransform), dot(Texel3, YTransform));
-	vec4 I = vec4(dot(Texel0, ITransform), dot(Texel1, ITransform), dot(Texel2, ITransform), dot(Texel3, ITransform));
-	vec4 Q = vec4(dot(Texel0, QTransform), dot(Texel1, QTransform), dot(Texel2, QTransform), dot(Texel3, QTransform));
-
-	vec4 Encoded = Y + I * cos(TW) + Q * sin(TW);
-	return (Encoded - MinC) * InvCRange;
-}
-
-vec4 NTSCCodec(vec2 UV, vec2 InverseRes)
-{
-	vec4 YAccum = Zero;
-	vec4 IAccum = Zero;
-	vec4 QAccum = Zero;
-	float QuadXSize = params.SourceSize.x * 4.0;
-	float TimePerSample = ScanTime / QuadXSize;
-	
-	// Frequency cutoffs for the individual portions of the signal that we extract.
-	// Y1 and Y2 are the positive and negative frequency limits of the notch filter on Y.
-	// Y3 is the center of the frequency response of the Y filter.
-	// I is the center of the frequency response of the I filter.
-	// Q is the center of the frequency response of the Q filter.
-	float Fc_y1 = NotchLowerFrequency * TimePerSample;
-	float Fc_y2 = NotchUpperFrequency * TimePerSample;
-	float Fc_y3 = YFrequency * TimePerSample;
-	float Fc_i = IFrequency * TimePerSample;
-	float Fc_q = QFrequency * TimePerSample;
-	float Pi2Fc_y1 = Fc_y1 * Pi2;
-	float Pi2Fc_y2 = Fc_y2 * Pi2;
-	float Pi2Fc_y3 = Fc_y3 * Pi2;
-	float Pi2Fc_i = Fc_i * Pi2;
-	float Pi2Fc_q = Fc_q * Pi2;
-	float Fc_y1_2 = Fc_y1 * 2.0;
-	float Fc_y2_2 = Fc_y2 * 2.0;
-	float Fc_y3_2 = Fc_y3 * 2.0;
-	float Fc_i_2 = Fc_i * 2.0;
-	float Fc_q_2 = Fc_q * 2.0;
-	vec4 CoordY = vec4(UV.y);
-	
-	// 83 composite samples wide, 4 composite pixels per texel
-	for(float n = -31.0; n < 32.0; n += 4.0)
-	{
-		vec4 n4 = n + NotchOffset;
-		vec4 CoordX = UV.x + InverseRes.x * n4 * 0.25;
-		vec2 TexCoord = vec2(CoordX.x, CoordY.x);
-		vec4 C = CompositeSample(TexCoord, InverseRes) * CRange + MinC;
-		vec4 WT = W * (CoordX  + A2 * CoordY * params.SourceSize.y + B);
-		vec4 Cosine = 0.54 + 0.46 * cos(Pi2Length * n4);
-
-		vec4 SincYIn1 = Pi2Fc_y1 * n4;
-		vec4 SincYIn2 = Pi2Fc_y2 * n4;
-		vec4 SincYIn3 = Pi2Fc_y3 * n4;
-		vec4 SincY1 = sin(SincYIn1) / SincYIn1;
-		vec4 SincY2 = sin(SincYIn2) / SincYIn2;
-		vec4 SincY3 = sin(SincYIn3) / SincYIn3;
-		
-		// These zero-checks could be made more efficient if WebGL supported mix(vec4, vec4, bvec4)
-		// Unfortunately, the universe hates us
-		if(SincYIn1.x == 0.0) SincY1.x = 1.0;
-		if(SincYIn1.y == 0.0) SincY1.y = 1.0;
-		if(SincYIn1.z == 0.0) SincY1.z = 1.0;
-		if(SincYIn1.w == 0.0) SincY1.w = 1.0;
-		if(SincYIn2.x == 0.0) SincY2.x = 1.0;
-		if(SincYIn2.y == 0.0) SincY2.y = 1.0;
-		if(SincYIn2.z == 0.0) SincY2.z = 1.0;
-		if(SincYIn2.w == 0.0) SincY2.w = 1.0;
-		if(SincYIn3.x == 0.0) SincY3.x = 1.0;
-		if(SincYIn3.y == 0.0) SincY3.y = 1.0;
-		if(SincYIn3.z == 0.0) SincY3.z = 1.0;
-		if(SincYIn3.w == 0.0) SincY3.w = 1.0;
-		vec4 IdealY = (Fc_y1_2 * SincY1 - Fc_y2_2 * SincY2) + Fc_y3_2 * SincY3;
-		vec4 FilterY = Cosine * IdealY;		
-		
-		vec4 SincIIn = Pi2Fc_i * n4;
-		vec4 SincI = sin(SincIIn) / SincIIn;
-		if (SincIIn.x == 0.0) SincI.x = 1.0;
-		if (SincIIn.y == 0.0) SincI.y = 1.0;
-		if (SincIIn.z == 0.0) SincI.z = 1.0;
-		if (SincIIn.w == 0.0) SincI.w = 1.0;
-		vec4 IdealI = Fc_i_2 * SincI;
-		vec4 FilterI = Cosine * IdealI;
-		
-		vec4 SincQIn = Pi2Fc_q * n4;
-		vec4 SincQ = sin(SincQIn) / SincQIn;
-		if (SincQIn.x == 0.0) SincQ.x = 1.0;
-		if (SincQIn.y == 0.0) SincQ.y = 1.0;
-		if (SincQIn.z == 0.0) SincQ.z = 1.0;
-		if (SincQIn.w == 0.0) SincQ.w = 1.0;
-		vec4 IdealQ = Fc_q_2 * SincQ;
-		vec4 FilterQ = Cosine * IdealQ;
-		
-		YAccum += C * FilterY;
-		IAccum += C * cos(WT) * FilterI;
-		QAccum += C * sin(WT) * FilterQ;
-	}
-	
-	float Y = dot(YAccum, One);
-	float I = dot(IAccum, One) * 2.0;
-	float Q = dot(QAccum, One) * 2.0;
-	
-	vec3 YIQ = vec3(Y, I, Q);
-	vec3 OutRGB = vec3(dot(YIQ, YIQ2R), dot(YIQ, YIQ2G), dot(YIQ, YIQ2B));
-	
-	return vec4(OutRGB, 1.0);
-}
-
-void main()
-{
-   FragColor = vec4(NTSCCodec(vTexCoord, params.SourceSize.zw));
-}
\ No newline at end of file
diff --git a/ntsc/shaders/mame-ntsc/mame-postproc.slang b/ntsc/shaders/mame-ntsc/mame-postproc.slang
deleted file mode 100644
index fac74229e8..0000000000
--- a/ntsc/shaders/mame-ntsc/mame-postproc.slang
+++ /dev/null
@@ -1,147 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float scanlines;
-	float scandark;
-	float deconverge;
-	float pincushion;
-	float hertzroll;
-} params;
-
-#pragma parameter scanlines "Scanline Toggle" 1.0 0.0 1.0 1.0
-#pragma parameter scandark "Scanline Intensity" 0.175 0.0 1.0 0.05
-#pragma parameter deconverge "Deconvergence/Convolution" 1.0 0.0 1.0 1.0
-#pragma parameter pincushion "Bezel Toggle" 0.0 0.0 1.0 1.0
-#pragma parameter hertzroll "Refresh Roll Toggle" 1.0 0.0 1.0 1.0
-
-#include "constants.inc"
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 ColorConvolution(vec2 UV, vec2 InverseRes)
-{
-	vec3 InPixel = texture(Source, UV).rgb;
-	
-	// Color Matrix
-	float RedValue = dot(InPixel, RedMatrix);
-	float GrnValue = dot(InPixel, GrnMatrix);
-	float BluValue = dot(InPixel, BluMatrix);
-	vec3 OutColor = vec3(RedValue, GrnValue, BluValue);
-	
-	// DC Offset & Scale
-	OutColor = (OutColor * ColorScale) + DCOffset;
-	
-	// Saturation
-	float Luma = dot(OutColor, Gray);
-	vec3 Chroma = OutColor - Luma;
-	OutColor = (Chroma * Saturation) + Luma;
-	
-	return vec4(OutColor, 1.0);
-}
-
-vec4 Deconverge(vec2 UV)
-{
-	vec2 InverseRes = 1.0 / params.SourceSize.xy;
-	vec2 InverseSrcRes = 1.0 / params.OriginalSize.xy;
-
-	vec3 CoordX = UV.x * RadialConvergeX;
-	vec3 CoordY = UV.y * RadialConvergeY;
-
-	CoordX += ConvergeX * InverseRes.x - (RadialConvergeX - 1.0) * 0.5;
-	CoordY += ConvergeY * InverseRes.y - (RadialConvergeY - 1.0) * 0.5;
-
-	float RedValue = ColorConvolution(vec2(CoordX.x, CoordY.x), InverseSrcRes).r;
-	float GrnValue = ColorConvolution(vec2(CoordX.y, CoordY.y), InverseSrcRes).g;
-	float BluValue = ColorConvolution(vec2(CoordX.z, CoordY.z), InverseSrcRes).b;
-
-	if (params.deconverge > 0.5) return vec4(RedValue, GrnValue, BluValue, 1.0);
-	else return vec4(texture(Source, UV));
-}
-
-vec4 ScanlinePincushion(vec2 UV)
-{
-	vec4 InTexel = Deconverge(UV);
-	
-	vec2 PinUnitCoord = UV * Two.xy - One.xy;
-	float PincushionR2 = pow(length(PinUnitCoord), 2.0);
-	vec2 PincushionCurve = PinUnitCoord * PincushionAmount * PincushionR2;
-	vec2 BaseCoord = UV;
-	vec2 ScanCoord = UV;
-	
-	BaseCoord *= One.xy - PincushionAmount * 0.2; // Warning: Magic constant
-	BaseCoord += PincushionAmount * 0.1;
-	BaseCoord += PincushionCurve;
-	
-	ScanCoord *= One.xy - PincushionAmount * 0.2; // Warning: Magic constant
-	ScanCoord += PincushionAmount * 0.1;
-	ScanCoord += PincushionCurve;
-	
-	vec2 CurveClipUnitCoord = UV * Two.xy - One.xy;
-	float CurvatureClipR2 = pow(length(CurveClipUnitCoord), 2.0);
-	vec2 CurvatureClipCurve = CurveClipUnitCoord * CurvatureAmount * CurvatureClipR2;
-	vec2 ScreenClipCoord = UV;
-	ScreenClipCoord -= Half.xy;
-	ScreenClipCoord *= One.xy - CurvatureAmount * 0.2; // Warning: Magic constant
-	ScreenClipCoord += Half.xy;
-	ScreenClipCoord += CurvatureClipCurve;
-
-	if (params.pincushion > 0.5){
-		// -- Alpha Clipping --
-		if (BaseCoord.x < 0.0) return vec4(0.0, 0.0, 0.0, 1.0);
-		if (BaseCoord.y < 0.0) return vec4(0.0, 0.0, 0.0, 1.0);
-		if (BaseCoord.x > 1.0) return vec4(0.0, 0.0, 0.0, 1.0);
-		if (BaseCoord.y > 1.0) return vec4(0.0, 0.0, 0.0, 1.0);
-	}
-	
-	// -- Scanline Simulation --
-	float InnerSine = ScanCoord.y * params.OriginalSize.y * ScanlineScale;
-	float ScanBrightMod = sin(InnerSine * Pi + ScanlineOffset * params.OriginalSize.y);
-	float ScanBrightness = mix(1.0, (pow(ScanBrightMod * ScanBrightMod, ScanlineHeight) * ScanlineBrightScale + 1.0) * 0.5, params.scandark);
-	vec3 ScanlineTexel = InTexel.rgb * ScanBrightness;
-	
-	// -- Color Compression (increasing the floor of the signal without affecting the ceiling) --
-	ScanlineTexel = Floor + (One.xyz - Floor) * ScanlineTexel;
-	if (params.scanlines > 0.5)	return vec4(ScanlineTexel, 1.0);
-	else return vec4(InTexel);
-}
-
-vec4 SixtyHertz(vec2 UV)
-{
-	vec4 InPixel = ScanlinePincushion(UV);
-	float Milliseconds = float(params.FrameCount) * 15.0;
-	float TimeStep = fract(Milliseconds * SixtyHertzRate);
-	float BarPosition = 1.0 - fract(UV.y + TimeStep) * SixtyHertzScale;
-	vec4 OutPixel = InPixel * BarPosition;
-	if (params.hertzroll > 0.5) return OutPixel;
-	else return InPixel;
-}
-
-void main()
-{
-	vec4 OutPixel = SixtyHertz(vTexCoord.xy);
-	FragColor = OutPixel;
-}
\ No newline at end of file
diff --git a/ntsc/shaders/mame-ntsc/ntsc-mame-singlepass.slang b/ntsc/shaders/mame-ntsc/ntsc-mame-singlepass.slang
deleted file mode 100644
index e889c5fad0..0000000000
--- a/ntsc/shaders/mame-ntsc/ntsc-mame-singlepass.slang
+++ /dev/null
@@ -1,209 +0,0 @@
-#version 450
-
-// This is a port of the NTSC encode/decode shader pair in MAME and MESS, modified to use only
-// one pass rather than an encode pass and a decode pass. It accurately emulates the sort of
-// signal decimation one would see when viewing a composite signal, though it could benefit from a
-// pre-pass to re-size the input content to more accurately reflect the actual size that would
-// be incoming from a composite signal source.
-//
-// To encode the composite signal, I convert the RGB value to YIQ, then subsequently evaluate
-// the standard NTSC composite equation. Four composite samples per RGB pixel are generated from
-// the incoming linearly-interpolated texels.
-//
-// The decode pass implements a Fixed Impulse Response (FIR) filter designed by MAME/MESS contributor
-// "austere" in matlab (if memory serves correctly) to mimic the behavior of a standard television set
-// as closely as possible. The filter window is 83 composite samples wide, and there is an additional
-// notch filter pass on the luminance (Y) values in order to strip the color signal from the luminance
-// signal prior to processing.
-//
-// - UltraMoogleMan [8/2/2013]
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// Useful Constants
-const vec4 Zero = vec4(0.0);
-const vec4 Half = vec4(0.5);
-const vec4 One = vec4(1.0);
-const vec4 Two = vec4(2.0);
-const float Pi = 3.1415926535;
-const float Pi2 = 6.283185307;
-
-// NTSC Constants
-const vec4 A = vec4(0.5);
-const vec4 B = vec4(0.5);
-const float P = 1.0;
-const float CCFrequency = 3.59754545;
-const float YFrequency = 6.0;
-const float IFrequency = 1.2;
-const float QFrequency = 0.6;
-const float NotchHalfWidth = 2.0;
-const float ScanTime = 52.6;
-const float MaxC = 2.1183;
-const vec4 MinC = vec4(-1.1183);
-const vec4 CRange = vec4(3.2366);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 CompositeSample(vec2 UV) {
-	vec2 InverseRes = params.SourceSize.zw;
-	vec2 InverseP = vec2(P, 0.0) * InverseRes;
-	
-	// UVs for four linearly-interpolated samples spaced 0.25 texels apart
-	vec2 C0 = UV;
-	vec2 C1 = UV + InverseP * 0.25;
-	vec2 C2 = UV + InverseP * 0.50;
-	vec2 C3 = UV + InverseP * 0.75;
-	vec4 Cx = vec4(C0.x, C1.x, C2.x, C3.x);
-	vec4 Cy = vec4(C0.y, C1.y, C2.y, C3.y);
-
-	vec3 Texel0 = texture(Source, C0).rgb;
-	vec3 Texel1 = texture(Source, C1).rgb;
-	vec3 Texel2 = texture(Source, C2).rgb;
-	vec3 Texel3 = texture(Source, C3).rgb;
-	
-	// Calculated the expected time of the sample.
-	vec4 T = A * Cy * vec4(params.SourceSize.x) * Two + B + Cx;
-
-	const vec3 YTransform = vec3(0.299, 0.587, 0.114);
-	const vec3 ITransform = vec3(0.595716, -0.274453, -0.321263);
-	const vec3 QTransform = vec3(0.211456, -0.522591, 0.311135);
-
-	float Y0 = dot(Texel0, YTransform);
-	float Y1 = dot(Texel1, YTransform);
-	float Y2 = dot(Texel2, YTransform);
-	float Y3 = dot(Texel3, YTransform);
-	vec4 Y = vec4(Y0, Y1, Y2, Y3);
-
-	float I0 = dot(Texel0, ITransform);
-	float I1 = dot(Texel1, ITransform);
-	float I2 = dot(Texel2, ITransform);
-	float I3 = dot(Texel3, ITransform);
-	vec4 I = vec4(I0, I1, I2, I3);
-
-	float Q0 = dot(Texel0, QTransform);
-	float Q1 = dot(Texel1, QTransform);
-	float Q2 = dot(Texel2, QTransform);
-	float Q3 = dot(Texel3, QTransform);
-	vec4 Q = vec4(Q0, Q1, Q2, Q3);
-
-	vec4 W = vec4(Pi2 * CCFrequency * ScanTime);
-	vec4 Encoded = Y + I * cos(T * W) + Q * sin(T * W);
-	return (Encoded - MinC) / CRange;
-}
-
-vec4 NTSCCodec(vec2 UV)
-{
-	vec2 InverseRes = params.SourceSize.zw;
-	vec4 YAccum = Zero;
-	vec4 IAccum = Zero;
-	vec4 QAccum = Zero;
-	float QuadXSize = params.SourceSize.x * 4.0;
-	float TimePerSample = ScanTime / QuadXSize;
-	
-	// Frequency cutoffs for the individual portions of the signal that we extract.
-	// Y1 and Y2 are the positive and negative frequency limits of the notch filter on Y.
-	// 
-	float Fc_y1 = (CCFrequency - NotchHalfWidth) * TimePerSample;
-	float Fc_y2 = (CCFrequency + NotchHalfWidth) * TimePerSample;
-	float Fc_y3 = YFrequency * TimePerSample;
-	float Fc_i = IFrequency * TimePerSample;
-	float Fc_q = QFrequency * TimePerSample;
-	float Pi2Length = Pi2 / 82.0;
-	vec4 NotchOffset = vec4(0.0, 1.0, 2.0, 3.0);
-	vec4 W = vec4(Pi2 * CCFrequency * ScanTime);
-	for(float n = -41.0; n < 42.0; n += 4.0)
-	{
-		vec4 n4 = n + NotchOffset;
-		vec4 CoordX = UV.x + InverseRes.x * n4 * 0.25;
-		vec4 CoordY = vec4(UV.y);
-		vec2 TexCoord = vec2(CoordX.r, CoordY.r);
-		vec4 C = CompositeSample(TexCoord) * CRange + MinC;
-		vec4 WT = W * (CoordX  + A * CoordY * Two * params.SourceSize.x + B);
-
-		vec4 SincYIn1 = Pi2 * Fc_y1 * n4;
-		vec4 SincYIn2 = Pi2 * Fc_y2 * n4;
-		vec4 SincYIn3 = Pi2 * Fc_y3 * n4;
-		bvec4 notEqual = notEqual(SincYIn1, Zero);
-		vec4 SincY1 = sin(SincYIn1) / SincYIn1;
-		vec4 SincY2 = sin(SincYIn2) / SincYIn2;
-		vec4 SincY3 = sin(SincYIn3) / SincYIn3;
-		if(SincYIn1.x == 0.0) SincY1.x = 1.0;
-		if(SincYIn1.y == 0.0) SincY1.y = 1.0;
-		if(SincYIn1.z == 0.0) SincY1.z = 1.0;
-		if(SincYIn1.w == 0.0) SincY1.w = 1.0;
-		if(SincYIn2.x == 0.0) SincY2.x = 1.0;
-		if(SincYIn2.y == 0.0) SincY2.y = 1.0;
-		if(SincYIn2.z == 0.0) SincY2.z = 1.0;
-		if(SincYIn2.w == 0.0) SincY2.w = 1.0;
-		if(SincYIn3.x == 0.0) SincY3.x = 1.0;
-		if(SincYIn3.y == 0.0) SincY3.y = 1.0;
-		if(SincYIn3.z == 0.0) SincY3.z = 1.0;
-		if(SincYIn3.w == 0.0) SincY3.w = 1.0;
-		//vec4 IdealY = (2.0 * Fc_y1 * SincY1 - 2.0 * Fc_y2 * SincY2) + 2.0 * Fc_y3 * SincY3;
-		vec4 IdealY = (2.0 * Fc_y1 * SincY1 - 2.0 * Fc_y2 * SincY2) + 2.0 * Fc_y3 * SincY3;
-		vec4 FilterY = (0.54 + 0.46 * cos(Pi2Length * n4)) * IdealY;		
-		
-		vec4 SincIIn = Pi2 * Fc_i * n4;
-		vec4 SincI = sin(SincIIn) / SincIIn;
-		if (SincIIn.x == 0.0) SincI.x = 1.0;
-		if (SincIIn.y == 0.0) SincI.y = 1.0;
-		if (SincIIn.z == 0.0) SincI.z = 1.0;
-		if (SincIIn.w == 0.0) SincI.w = 1.0;
-		vec4 IdealI = 2.0 * Fc_i * SincI;
-		vec4 FilterI = (0.54 + 0.46 * cos(Pi2Length * n4)) * IdealI;
-		
-		vec4 SincQIn = Pi2 * Fc_q * n4;
-		vec4 SincQ = sin(SincQIn) / SincQIn;
-		if (SincQIn.x == 0.0) SincQ.x = 1.0;
-		if (SincQIn.y == 0.0) SincQ.y = 1.0;
-		if (SincQIn.z == 0.0) SincQ.z = 1.0;
-		if (SincQIn.w == 0.0) SincQ.w = 1.0;
-		vec4 IdealQ = 2.0 * Fc_q * SincQ;
-		vec4 FilterQ = (0.54 + 0.46 * cos(Pi2Length * n4)) * IdealQ;
-		
-		YAccum = YAccum + C * FilterY;
-		IAccum = IAccum + C * cos(WT) * FilterI;
-		QAccum = QAccum + C * sin(WT) * FilterQ;
-	}
-	
-	float Y = YAccum.r + YAccum.g + YAccum.b + YAccum.a;
-	float I = (IAccum.r + IAccum.g + IAccum.b + IAccum.a) * 2.0;
-	float Q = (QAccum.r + QAccum.g + QAccum.b + QAccum.a) * 2.0;
-	
-	vec3 YIQ = vec3(Y, I, Q);
-
-	vec3 OutRGB = vec3(dot(YIQ, vec3(1.0, 0.956, 0.621)), dot(YIQ, vec3(1.0, -0.272, -0.647)), dot(YIQ, vec3(1.0, -1.106, 1.703)));		
-	
-	return vec4(OutRGB, 1.0);
-}
-
-void main()
-{
-	vec4 OutPixel = NTSCCodec(vTexCoord);
-   FragColor = vec4(OutPixel);
-}
\ No newline at end of file
diff --git a/ntsc/shaders/mame-ntsc/old-ntsc-mame-pass0.slang b/ntsc/shaders/mame-ntsc/old-ntsc-mame-pass0.slang
deleted file mode 100644
index a1b056624e..0000000000
--- a/ntsc/shaders/mame-ntsc/old-ntsc-mame-pass0.slang
+++ /dev/null
@@ -1,132 +0,0 @@
-#version 450
-
-// This is a port of the NTSC encode/decode shader pair in MAME and MESS, modified to use only
-// one pass rather than an encode pass and a decode pass. It accurately emulates the sort of
-// signal decimation one would see when viewing a composite signal, though it could benefit from a
-// pre-pass to re-size the input content to more accurately reflect the actual size that would
-// be incoming from a composite signal source.
-//
-// To encode the composite signal, I convert the RGB value to YIQ, then subsequently evaluate
-// the standard NTSC composite equation. Four composite samples per RGB pixel are generated from
-// the incoming linearly-interpolated texels.
-//
-// The decode pass implements a Fixed Impulse Response (FIR) filter designed by MAME/MESS contributor
-// "austere" in matlab (if memory serves correctly) to mimic the behavior of a standard television set
-// as closely as possible. The filter window is 83 composite samples wide, and there is an additional
-// notch filter pass on the luminance (Y) values in order to strip the color signal from the luminance
-// signal prior to processing.
-//
-// - UltraMoogleMan [8/2/2013]
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-
-//-----------------------------------------------------------------------------
-// NTSC Pixel Shader
-//-----------------------------------------------------------------------------
-
-const float AValue = 0.5f;
-const float BValue = 0.5f;
-const float CCValue = 3.5795454f;
-const float OValue = 0.0f;
-const float PValue = 1.0f;
-const float ScanTime = 52.6f;
-
-const float NotchHalfWidth = 1.0f;
-const float YFreqResponse = 6.0f;
-const float IFreqResponse = 1.2f;
-const float QFreqResponse = 0.6f;
-
-const float SignalOffset = 0.0f;
-
-//-----------------------------------------------------------------------------
-// Constants
-//-----------------------------------------------------------------------------
-
- const float PI = 3.1415927f;
- const float PI2 = 6.2830854f;
-
- const float4 YDot = float4(0.299f, 0.587f, 0.114f, 0.0f);
- const float4 IDot = float4(0.595716f, -0.274453f, -0.321263f, 0.0f);
- const float4 QDot = float4(0.211456f, -0.522591f, 0.311135f, 0.0f);
-
- const float3 RDot = float3(1.0f, 0.956f, 0.621f);
- const float3 GDot = float3(1.0f, -0.272f, -0.647f);
- const float3 BDot = float3(1.0f, -1.106f, 1.703f);
-
- const float4 OffsetX = float4(0.0f, 0.25f, 0.50f, 0.75f);
- const float4 NotchOffset = float4(0.0f, 1.0f, 2.0f, 3.0f);
-
- const int SampleCount = 64;
- const int HalfSampleCount = 32;
- 
- float4 GetCompositeYIQ(sampler2D tex, float2 TexCoord, float2 size)
-{
-	float2 PValueSourceTexel = float2(PValue / size.x, 0.0f);
-
-	float2 C0 = TexCoord + PValueSourceTexel * OffsetX.x;
-	float2 C1 = TexCoord + PValueSourceTexel * OffsetX.y;
-	float2 C2 = TexCoord + PValueSourceTexel * OffsetX.z;
-	float2 C3 = TexCoord + PValueSourceTexel * OffsetX.w;
-	float4 Cx = float4(C0.x, C1.x, C2.x, C3.x);
-	float4 Cy = float4(C0.y, C1.y, C2.y, C3.y);
-	float4 Texel0 = texture(tex, C0);
-	float4 Texel1 = texture(tex, C1);
-	float4 Texel2 = texture(tex, C2);
-	float4 Texel3 = texture(tex, C3);
-
-	float4 HPosition = Cx;
-	float4 VPosition = Cy;
-
-	float4 Y = float4(dot(Texel0, YDot), dot(Texel1, YDot), dot(Texel2, YDot), dot(Texel3, YDot));
-	float4 I = float4(dot(Texel0, IDot), dot(Texel1, IDot), dot(Texel2, IDot), dot(Texel3, IDot));
-	float4 Q = float4(dot(Texel0, QDot), dot(Texel1, QDot), dot(Texel2, QDot), dot(Texel3, QDot));
-
-	float W = PI2 * CCValue * ScanTime;
-	float WoPI = W / PI;
-
-	float HOffset = (BValue + SignalOffset) / WoPI;
-	float VScale = (AValue * size.y) / WoPI;
-
-	float4 T = HPosition + HOffset + VPosition * VScale;
-	float4 TW = T * W;
-
-	float4 CompositeYIQ = Y + I * cos(TW) + Q * sin(TW);
-
-	return CompositeYIQ;
-}
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = GetCompositeYIQ(Source, vTexCoord, params.SourceSize.xy);
-}
\ No newline at end of file
diff --git a/ntsc/shaders/mame-ntsc/old-ntsc-mame-pass1.slang b/ntsc/shaders/mame-ntsc/old-ntsc-mame-pass1.slang
deleted file mode 100644
index 4e368f0f5b..0000000000
--- a/ntsc/shaders/mame-ntsc/old-ntsc-mame-pass1.slang
+++ /dev/null
@@ -1,180 +0,0 @@
-#version 450
-
-// This is a port of the NTSC encode/decode shader pair in MAME and MESS, modified to use only
-// one pass rather than an encode pass and a decode pass. It accurately emulates the sort of
-// signal decimation one would see when viewing a composite signal, though it could benefit from a
-// pre-pass to re-size the input content to more accurately reflect the actual size that would
-// be incoming from a composite signal source.
-//
-// To encode the composite signal, I convert the RGB value to YIQ, then subsequently evaluate
-// the standard NTSC composite equation. Four composite samples per RGB pixel are generated from
-// the incoming linearly-interpolated texels.
-//
-// The decode pass implements a Fixed Impulse Response (FIR) filter designed by MAME/MESS contributor
-// "austere" in matlab (if memory serves correctly) to mimic the behavior of a standard television set
-// as closely as possible. The filter window is 83 composite samples wide, and there is an additional
-// notch filter pass on the luminance (Y) values in order to strip the color signal from the luminance
-// signal prior to processing.
-//
-// - UltraMoogleMan [8/2/2013]
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-
-//-----------------------------------------------------------------------------
-// NTSC Pixel Shader
-//-----------------------------------------------------------------------------
-
-const float AValue = 0.5f;
-const float BValue = 0.5f;
-const float CCValue = 3.5795454f;
-const float OValue = 0.0f;
-const float PValue = 1.0f;
-const float ScanTime = 52.6f;
-
-const float NotchHalfWidth = 1.0f;
-const float YFreqResponse = 6.0f;
-const float IFreqResponse = 1.2f;
-const float QFreqResponse = 0.6f;
-
-const float SignalOffset = 0.0f;
-
-//-----------------------------------------------------------------------------
-// Constants
-//-----------------------------------------------------------------------------
-
- const float PI = 3.1415927f;
- const float PI2 = 6.2830854f;
-
- const float4 YDot = float4(0.299f, 0.587f, 0.114f, 0.0f);
- const float4 IDot = float4(0.595716f, -0.274453f, -0.321263f, 0.0f);
- const float4 QDot = float4(0.211456f, -0.522591f, 0.311135f, 0.0f);
-
- const float3 RDot = float3(1.0f, 0.956f, 0.621f);
- const float3 GDot = float3(1.0f, -0.272f, -0.647f);
- const float3 BDot = float3(1.0f, -1.106f, 1.703f);
-
- const float4 OffsetX = float4(0.0f, 0.25f, 0.50f, 0.75f);
- const float4 NotchOffset = float4(0.0f, 1.0f, 2.0f, 3.0f);
-
- const int SampleCount = 64;
- const int HalfSampleCount = 32;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-
-void main()
-{
-	float4 BaseTexel = texture(Original, vTexCoord);
-	
-	vec2 size = params.SourceSize.xy;//(params.SourceSize.y > 400.0) ? params.SourceSize.xy : params.SourceSize.xy * vec2(1.0, 0.5);
-
-	float TimePerSample = ScanTime / (size.x * 4.0f);
-
-	float Fc_y1 = (CCValue - NotchHalfWidth) * TimePerSample;
-	float Fc_y2 = (CCValue + NotchHalfWidth) * TimePerSample;
-	float Fc_y3 = YFreqResponse * TimePerSample;
-	float Fc_i = IFreqResponse * TimePerSample;
-	float Fc_q = QFreqResponse * TimePerSample;
-	float Fc_i_2 = Fc_i * 2.0f;
-	float Fc_q_2 = Fc_q * 2.0f;
-	float Fc_y1_2 = Fc_y1 * 2.0f;
-	float Fc_y2_2 = Fc_y2 * 2.0f;
-	float Fc_y3_2 = Fc_y3 * 2.0f;
-	float Fc_i_pi2 = Fc_i * PI2;
-	float Fc_q_pi2 = Fc_q * PI2;
-	float Fc_y1_pi2 = Fc_y1 * PI2;
-	float Fc_y2_pi2 = Fc_y2 * PI2;
-	float Fc_y3_pi2 = Fc_y3 * PI2;
-	float PI2Length = PI2 / SampleCount;
-
-	float W = PI2 * CCValue * ScanTime;
-	float WoPI = W / PI;
-
-	float HOffset = (BValue + SignalOffset) / WoPI;
-	float VScale = (AValue * size.y) / WoPI;
-
-	float4 YAccum = vec4(0.0);
-	float4 IAccum = vec4(0.0);
-	float4 QAccum = vec4(0.0);
-
-	float4 Cy = vec4(vTexCoord.y);
-	float4 VPosition = Cy;
-
-	for (float i = 0; i < SampleCount; i += 4.0f)
-	{
-		float n = i - HalfSampleCount;
-		float4 n4 = n + NotchOffset;
-
-		float4 Cx = vTexCoord.x + (n4 * 0.25f) / size.x;
-		float4 HPosition = Cx;
-
-		float4 C = texture(Source, float2(Cx.r, Cy.r));
-
-		float4 T = HPosition + HOffset + VPosition * VScale;
-		float4 WT = W * T + OValue;
-
-		float4 SincKernel = 0.54f + 0.46f * cos(PI2Length * n4);
-
-		float4 SincYIn1 = Fc_y1_pi2 * n4;
-		float4 SincYIn2 = Fc_y2_pi2 * n4;
-		float4 SincYIn3 = Fc_y3_pi2 * n4;
-		float4 SincIIn = Fc_i_pi2 * n4;
-		float4 SincQIn = Fc_q_pi2 * n4;
-
-		float4 SincY1 = (notEqual(SincYIn1 , vec4(0.0)) == bvec4(true)) ? sin(SincYIn1) / SincYIn1 : vec4(0.5);
-		float4 SincY2 = (notEqual(SincYIn2 , vec4(0.0)) == bvec4(true)) ? sin(SincYIn2) / SincYIn2 : vec4(0.5);
-		float4 SincY3 = (notEqual(SincYIn3 , vec4(0.0)) == bvec4(true)) ? sin(SincYIn3) / SincYIn3 : vec4(0.5);
-
-		float4 IdealY = (Fc_y1_2 * SincY1 - Fc_y2_2 * SincY2) + Fc_y3_2 * SincY3;
-		float4 IdealI = Fc_i_2 * ((notEqual(SincIIn , vec4(0.0)) == bvec4(true)) ? sin(SincIIn) / SincIIn : vec4(0.5));
-		float4 IdealQ = Fc_q_2 * ((notEqual(SincQIn , vec4(0.0)) == bvec4(true)) ? sin(SincQIn) / SincQIn : vec4(0.5));
-
-		float4 FilterY = SincKernel * IdealY;
-		float4 FilterI = SincKernel * IdealI;
-		float4 FilterQ = SincKernel * IdealQ;
-
-		YAccum = YAccum + C * FilterY;
-		IAccum = IAccum + C * cos(WT) * FilterI;
-		QAccum = QAccum + C * sin(WT) * FilterQ;
-	}
-
-	float3 YIQ = float3(
-		(YAccum.r + YAccum.g + YAccum.b + YAccum.a),
-		(IAccum.r + IAccum.g + IAccum.b + IAccum.a) * 2.0f,
-		(QAccum.r + QAccum.g + QAccum.b + QAccum.a) * 2.0f);
-
-	float3 RGB = float3(
-		dot(YIQ, RDot),
-		dot(YIQ, GDot),
-		dot(YIQ, BDot));
-   FragColor = vec4(RGB, BaseTexel.a);
-}
\ No newline at end of file
diff --git a/ntsc/shaders/mame-ntsc/old-ntsc-mame-singlepass.slang b/ntsc/shaders/mame-ntsc/old-ntsc-mame-singlepass.slang
deleted file mode 100644
index e889c5fad0..0000000000
--- a/ntsc/shaders/mame-ntsc/old-ntsc-mame-singlepass.slang
+++ /dev/null
@@ -1,209 +0,0 @@
-#version 450
-
-// This is a port of the NTSC encode/decode shader pair in MAME and MESS, modified to use only
-// one pass rather than an encode pass and a decode pass. It accurately emulates the sort of
-// signal decimation one would see when viewing a composite signal, though it could benefit from a
-// pre-pass to re-size the input content to more accurately reflect the actual size that would
-// be incoming from a composite signal source.
-//
-// To encode the composite signal, I convert the RGB value to YIQ, then subsequently evaluate
-// the standard NTSC composite equation. Four composite samples per RGB pixel are generated from
-// the incoming linearly-interpolated texels.
-//
-// The decode pass implements a Fixed Impulse Response (FIR) filter designed by MAME/MESS contributor
-// "austere" in matlab (if memory serves correctly) to mimic the behavior of a standard television set
-// as closely as possible. The filter window is 83 composite samples wide, and there is an additional
-// notch filter pass on the luminance (Y) values in order to strip the color signal from the luminance
-// signal prior to processing.
-//
-// - UltraMoogleMan [8/2/2013]
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// Useful Constants
-const vec4 Zero = vec4(0.0);
-const vec4 Half = vec4(0.5);
-const vec4 One = vec4(1.0);
-const vec4 Two = vec4(2.0);
-const float Pi = 3.1415926535;
-const float Pi2 = 6.283185307;
-
-// NTSC Constants
-const vec4 A = vec4(0.5);
-const vec4 B = vec4(0.5);
-const float P = 1.0;
-const float CCFrequency = 3.59754545;
-const float YFrequency = 6.0;
-const float IFrequency = 1.2;
-const float QFrequency = 0.6;
-const float NotchHalfWidth = 2.0;
-const float ScanTime = 52.6;
-const float MaxC = 2.1183;
-const vec4 MinC = vec4(-1.1183);
-const vec4 CRange = vec4(3.2366);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec4 CompositeSample(vec2 UV) {
-	vec2 InverseRes = params.SourceSize.zw;
-	vec2 InverseP = vec2(P, 0.0) * InverseRes;
-	
-	// UVs for four linearly-interpolated samples spaced 0.25 texels apart
-	vec2 C0 = UV;
-	vec2 C1 = UV + InverseP * 0.25;
-	vec2 C2 = UV + InverseP * 0.50;
-	vec2 C3 = UV + InverseP * 0.75;
-	vec4 Cx = vec4(C0.x, C1.x, C2.x, C3.x);
-	vec4 Cy = vec4(C0.y, C1.y, C2.y, C3.y);
-
-	vec3 Texel0 = texture(Source, C0).rgb;
-	vec3 Texel1 = texture(Source, C1).rgb;
-	vec3 Texel2 = texture(Source, C2).rgb;
-	vec3 Texel3 = texture(Source, C3).rgb;
-	
-	// Calculated the expected time of the sample.
-	vec4 T = A * Cy * vec4(params.SourceSize.x) * Two + B + Cx;
-
-	const vec3 YTransform = vec3(0.299, 0.587, 0.114);
-	const vec3 ITransform = vec3(0.595716, -0.274453, -0.321263);
-	const vec3 QTransform = vec3(0.211456, -0.522591, 0.311135);
-
-	float Y0 = dot(Texel0, YTransform);
-	float Y1 = dot(Texel1, YTransform);
-	float Y2 = dot(Texel2, YTransform);
-	float Y3 = dot(Texel3, YTransform);
-	vec4 Y = vec4(Y0, Y1, Y2, Y3);
-
-	float I0 = dot(Texel0, ITransform);
-	float I1 = dot(Texel1, ITransform);
-	float I2 = dot(Texel2, ITransform);
-	float I3 = dot(Texel3, ITransform);
-	vec4 I = vec4(I0, I1, I2, I3);
-
-	float Q0 = dot(Texel0, QTransform);
-	float Q1 = dot(Texel1, QTransform);
-	float Q2 = dot(Texel2, QTransform);
-	float Q3 = dot(Texel3, QTransform);
-	vec4 Q = vec4(Q0, Q1, Q2, Q3);
-
-	vec4 W = vec4(Pi2 * CCFrequency * ScanTime);
-	vec4 Encoded = Y + I * cos(T * W) + Q * sin(T * W);
-	return (Encoded - MinC) / CRange;
-}
-
-vec4 NTSCCodec(vec2 UV)
-{
-	vec2 InverseRes = params.SourceSize.zw;
-	vec4 YAccum = Zero;
-	vec4 IAccum = Zero;
-	vec4 QAccum = Zero;
-	float QuadXSize = params.SourceSize.x * 4.0;
-	float TimePerSample = ScanTime / QuadXSize;
-	
-	// Frequency cutoffs for the individual portions of the signal that we extract.
-	// Y1 and Y2 are the positive and negative frequency limits of the notch filter on Y.
-	// 
-	float Fc_y1 = (CCFrequency - NotchHalfWidth) * TimePerSample;
-	float Fc_y2 = (CCFrequency + NotchHalfWidth) * TimePerSample;
-	float Fc_y3 = YFrequency * TimePerSample;
-	float Fc_i = IFrequency * TimePerSample;
-	float Fc_q = QFrequency * TimePerSample;
-	float Pi2Length = Pi2 / 82.0;
-	vec4 NotchOffset = vec4(0.0, 1.0, 2.0, 3.0);
-	vec4 W = vec4(Pi2 * CCFrequency * ScanTime);
-	for(float n = -41.0; n < 42.0; n += 4.0)
-	{
-		vec4 n4 = n + NotchOffset;
-		vec4 CoordX = UV.x + InverseRes.x * n4 * 0.25;
-		vec4 CoordY = vec4(UV.y);
-		vec2 TexCoord = vec2(CoordX.r, CoordY.r);
-		vec4 C = CompositeSample(TexCoord) * CRange + MinC;
-		vec4 WT = W * (CoordX  + A * CoordY * Two * params.SourceSize.x + B);
-
-		vec4 SincYIn1 = Pi2 * Fc_y1 * n4;
-		vec4 SincYIn2 = Pi2 * Fc_y2 * n4;
-		vec4 SincYIn3 = Pi2 * Fc_y3 * n4;
-		bvec4 notEqual = notEqual(SincYIn1, Zero);
-		vec4 SincY1 = sin(SincYIn1) / SincYIn1;
-		vec4 SincY2 = sin(SincYIn2) / SincYIn2;
-		vec4 SincY3 = sin(SincYIn3) / SincYIn3;
-		if(SincYIn1.x == 0.0) SincY1.x = 1.0;
-		if(SincYIn1.y == 0.0) SincY1.y = 1.0;
-		if(SincYIn1.z == 0.0) SincY1.z = 1.0;
-		if(SincYIn1.w == 0.0) SincY1.w = 1.0;
-		if(SincYIn2.x == 0.0) SincY2.x = 1.0;
-		if(SincYIn2.y == 0.0) SincY2.y = 1.0;
-		if(SincYIn2.z == 0.0) SincY2.z = 1.0;
-		if(SincYIn2.w == 0.0) SincY2.w = 1.0;
-		if(SincYIn3.x == 0.0) SincY3.x = 1.0;
-		if(SincYIn3.y == 0.0) SincY3.y = 1.0;
-		if(SincYIn3.z == 0.0) SincY3.z = 1.0;
-		if(SincYIn3.w == 0.0) SincY3.w = 1.0;
-		//vec4 IdealY = (2.0 * Fc_y1 * SincY1 - 2.0 * Fc_y2 * SincY2) + 2.0 * Fc_y3 * SincY3;
-		vec4 IdealY = (2.0 * Fc_y1 * SincY1 - 2.0 * Fc_y2 * SincY2) + 2.0 * Fc_y3 * SincY3;
-		vec4 FilterY = (0.54 + 0.46 * cos(Pi2Length * n4)) * IdealY;		
-		
-		vec4 SincIIn = Pi2 * Fc_i * n4;
-		vec4 SincI = sin(SincIIn) / SincIIn;
-		if (SincIIn.x == 0.0) SincI.x = 1.0;
-		if (SincIIn.y == 0.0) SincI.y = 1.0;
-		if (SincIIn.z == 0.0) SincI.z = 1.0;
-		if (SincIIn.w == 0.0) SincI.w = 1.0;
-		vec4 IdealI = 2.0 * Fc_i * SincI;
-		vec4 FilterI = (0.54 + 0.46 * cos(Pi2Length * n4)) * IdealI;
-		
-		vec4 SincQIn = Pi2 * Fc_q * n4;
-		vec4 SincQ = sin(SincQIn) / SincQIn;
-		if (SincQIn.x == 0.0) SincQ.x = 1.0;
-		if (SincQIn.y == 0.0) SincQ.y = 1.0;
-		if (SincQIn.z == 0.0) SincQ.z = 1.0;
-		if (SincQIn.w == 0.0) SincQ.w = 1.0;
-		vec4 IdealQ = 2.0 * Fc_q * SincQ;
-		vec4 FilterQ = (0.54 + 0.46 * cos(Pi2Length * n4)) * IdealQ;
-		
-		YAccum = YAccum + C * FilterY;
-		IAccum = IAccum + C * cos(WT) * FilterI;
-		QAccum = QAccum + C * sin(WT) * FilterQ;
-	}
-	
-	float Y = YAccum.r + YAccum.g + YAccum.b + YAccum.a;
-	float I = (IAccum.r + IAccum.g + IAccum.b + IAccum.a) * 2.0;
-	float Q = (QAccum.r + QAccum.g + QAccum.b + QAccum.a) * 2.0;
-	
-	vec3 YIQ = vec3(Y, I, Q);
-
-	vec3 OutRGB = vec3(dot(YIQ, vec3(1.0, 0.956, 0.621)), dot(YIQ, vec3(1.0, -0.272, -0.647)), dot(YIQ, vec3(1.0, -1.106, 1.703)));		
-	
-	return vec4(OutRGB, 1.0);
-}
-
-void main()
-{
-	vec4 OutPixel = NTSCCodec(vTexCoord);
-   FragColor = vec4(OutPixel);
-}
\ No newline at end of file
diff --git a/ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang b/ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang
deleted file mode 100644
index 209679044f..0000000000
--- a/ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang
+++ /dev/null
@@ -1,131 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-   float quality, ntsc_sat, cust_fringing, cust_artifacting, ntsc_bright, ntsc_scale, ntsc_fields, ntsc_phase;
-} global;
-
-#pragma parameter quality "NTSC Preset (Svideo=0 Composite=1 RF=2 Custom=-1)" 1.0 -1.0 2.0 1.0
-#pragma parameter ntsc_fields "NTSC Merge Fields" 0.0 0.0 1.0 1.0
-#pragma parameter ntsc_phase "NTSC Phase: Auto | 2 phase | 3 phase" 1.0 1.0 3.0 1.0
-#pragma parameter ntsc_scale "NTSC Resolution Scaling" 1.0 0.20 3.0 0.05
-#pragma parameter ntsc_sat "NTSC Color Saturation" 1.0 0.0 2.0 0.01
-#pragma parameter ntsc_bright "NTSC Brightness" 1.0 0.0 1.5 0.01
-#pragma parameter cust_fringing "NTSC Custom Fringing Value" 0.0 0.0 5.0 0.1
-#pragma parameter cust_artifacting "NTSC Custom Artifacting Value" 0.0 0.0 5.0 0.1
-
-#define PI 3.14159265
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 pix_no;
-layout(location = 2) out float phase;
-layout(location = 3) out float BRIGHTNESS;
-layout(location = 4) out float SATURATION;
-layout(location = 5) out float FRINGING;
-layout(location = 6) out float ARTIFACTING;
-layout(location = 7) out float CHROMA_MOD_FREQ;
-layout(location = 8) out float MERGE;
-
-void main()
-{
-	float res = global.ntsc_scale;
-	float OriginalSize = global.OriginalSize.y;
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-	if (res < 1.0) pix_no = TexCoord * global.SourceSize.xy * (res * global.OutputSize.xy / global.SourceSize.xy); else
-                   pix_no = TexCoord * global.SourceSize.xy * (      global.OutputSize.xy / global.SourceSize.xy);
-	phase = (global.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((global.ntsc_phase > 2.5) ? 3.0 : 2.0);
-	
-	res = max(res, 1.0);	
-	CHROMA_MOD_FREQ = (phase < 2.5) ? (4.0 * PI / 15.0) : (PI / 3.0);
-	ARTIFACTING = (global.quality > -0.5) ? global.quality * 0.5*(res+1.0) : global.cust_artifacting;
-	FRINGING = (global.quality > -0.5) ? global.quality : global.cust_fringing;
-	SATURATION = global.ntsc_sat;
-	BRIGHTNESS = global.ntsc_bright;	
-	pix_no.y = pix_no.y * res;
-
-	MERGE = (int(global.quality) == 2 || phase < 2.5) ? 0.0 : 1.0;
-	MERGE = (int(global.quality) == -1) ? global.ntsc_fields : MERGE;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 2) in float phase;
-layout(location = 3) in float BRIGHTNESS;
-layout(location = 4) in float SATURATION;
-layout(location = 5) in float FRINGING;
-layout(location = 6) in float ARTIFACTING;
-layout(location = 7) in float CHROMA_MOD_FREQ;
-layout(location = 8) in float MERGE;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define mix_mat mat3(BRIGHTNESS, FRINGING, FRINGING, ARTIFACTING, 2.0 * SATURATION, 0.0, ARTIFACTING, 0.0, 2.0 * SATURATION)
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-void main()
-{
-   vec3 col = texture(Source, vTexCoord).rgb;
-   vec3 yiq = rgb2yiq(col);
-   vec3 yiq2 = yiq;	
-
-   float mod1 = 2.0;
-   float mod2 = 3.0; 
-
-if (MERGE > 0.5)
-{
-   float chroma_phase2 = (phase < 2.5) ? PI * (mod(pix_no.x, mod1) + mod(global.FrameCount+1, 2.)) : 0.6667 * PI * (mod(pix_no.x, mod2) + mod(global.FrameCount+1, 2.));
-   float mod_phase2 = chroma_phase2 + pix_no.y * CHROMA_MOD_FREQ;
-   float i_mod2 = cos(mod_phase2);
-   float q_mod2 = sin(mod_phase2);
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Modulate.
-   yiq2 *= mix_mat; // Cross-talk.
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Demodulate.   
-}
-   
-   float chroma_phase = (phase < 2.5) ? PI * (mod(pix_no.x, mod1) + mod(global.FrameCount, 2.)) : 0.6667 * PI * (mod(pix_no.x, mod2) + mod(global.FrameCount, 2.));
-   float mod_phase = chroma_phase + pix_no.y * CHROMA_MOD_FREQ;
-
-   float i_mod = cos(mod_phase);
-   float q_mod = sin(mod_phase);
-
-   yiq.yz *= vec2(i_mod, q_mod); // Modulate.
-   yiq *= mix_mat; // Cross-talk.
-   yiq.yz *= vec2(i_mod, q_mod); // Demodulate.
-      
-   yiq = (MERGE < 0.5) ? yiq : 0.5*(yiq+yiq2);
-   
-   FragColor = vec4(yiq, 1.0);
-} 
diff --git a/ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang b/ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang
deleted file mode 100644
index 2fbbc98869..0000000000
--- a/ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang
+++ /dev/null
@@ -1,298 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float linearize;
-   float ntsc_scale;
-   float ntsc_phase;
-   float auto_res;
-   float chroma_scale;
-} global;
-
-#pragma parameter chroma_scale "NTSC Chroma Scaling" 1.0 1.0 4.0 0.2
-#pragma parameter ntsc_scale "NTSC Resolution Scaling" 1.0 0.20 3.0 0.05
-#pragma parameter ntsc_phase "NTSC Phase: Auto | 2 phase | 3 phase" 1.0 1.0 3.0 1.0
-#pragma parameter linearize "NTSC Linearize Output Gamma" 0.0 0.0 1.0 1.0 
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord - vec2(0.0, 0.5 / global.SourceSize.y); // Compensate for decimate-by-2.
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec3 fetch_offset(float offset, float one_y)
-{
-  /* A hack to insert chroma scaling. ;) (Hyllian, 2024) */
-   vec3 yiq;
-
-   yiq.y = texture(Source, vTexCoord + vec2(0.0, (offset) * (one_y))).y;
-   yiq.xz = texture(Source, vTexCoord + vec2(0.0, (offset) * (one_y / global.chroma_scale))).xz;
-
-   return yiq;
-
-   /*  Old code
-   return texture(Source, vTexCoord + vec2(0.0, (offset) * (one_y))).xyz;
-   */
-}
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-const int TAPS_2_phase = 32;
-const float luma_filter_2_phase[33] = float[33](
-   -0.000174844,
-   -0.000205844,
-   -0.000149453,
-   -0.000051693,
-   0.000000000,
-   -0.000066171,
-   -0.000245058,
-   -0.000432928,
-   -0.000472644,
-   -0.000252236,
-   0.000198929,
-   0.000687058,
-   0.000944112,
-   0.000803467,
-   0.000363199,
-   0.000013422,
-   0.000253402,
-   0.001339461,
-   0.002932972,
-   0.003983485,
-   0.003026683,
-   -0.001102056,
-   -0.008373026,
-   -0.016897700,
-   -0.022914480,
-   -0.021642347,
-   -0.008863273,
-   0.017271957,
-   0.054921920,
-   0.098342579,
-   0.139044281,
-   0.168055832,
-   0.178571429);
-
-const float chroma_filter_2_phase[33] = float[33](
-   0.001384762,
-   0.001678312,
-   0.002021715,
-   0.002420562,
-   0.002880460,
-   0.003406879,
-   0.004004985,
-   0.004679445,
-   0.005434218,
-   0.006272332,
-   0.007195654,
-   0.008204665,
-   0.009298238,
-   0.010473450,
-   0.011725413,
-   0.013047155,
-   0.014429548,
-   0.015861306,
-   0.017329037,
-   0.018817382,
-   0.020309220,
-   0.021785952,
-   0.023227857,
-   0.024614500,
-   0.025925203,
-   0.027139546,
-   0.028237893,
-   0.029201910,
-   0.030015081,
-   0.030663170,
-   0.031134640,
-   0.031420995,
-   0.031517031);
-
-const int TAPS_3_phase = 24;
-const float luma_filter_3_phase[25] = float[25](
-   -0.000012020,
-   -0.000022146,
-   -0.000013155,
-   -0.000012020,
-   -0.000049979,
-   -0.000113940,
-   -0.000122150,
-   -0.000005612,
-   0.000170516,
-   0.000237199,
-   0.000169640,
-   0.000285688,
-   0.000984574,
-   0.002018683,
-   0.002002275,
-   -0.000909882,
-   -0.007049081,
-   -0.013222860,
-   -0.012606931,
-   0.002460860,
-   0.035868225,
-   0.084016453,
-   0.135563500,
-   0.175261268,
-   0.190176552);
-
-const float chroma_filter_3_phase[25] = float[25](
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
-
-void main()
-{
-   float res = global.ntsc_scale;
-   float OriginalSize = global.OriginalSize.y; 
-   float one_y = global.SourceSize.w / res;
-   vec3 signal = vec3(0.0);
-   float phase = (global.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((global.ntsc_phase > 2.5) ? 3.0 : 2.0);
-
-   if(phase < 2.5)
-   {
-      vec3 sums = fetch_offset(0.0 - 32.0, one_y) + fetch_offset(32.0 - 0.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[0], chroma_filter_2_phase[0], chroma_filter_2_phase[0]);
-      sums = fetch_offset(1.0 - 32.0, one_y) + fetch_offset(32.0 - 1.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[1], chroma_filter_2_phase[1], chroma_filter_2_phase[1]);
-      sums = fetch_offset(2.0 - 32.0, one_y) + fetch_offset(32.0 - 2.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[2], chroma_filter_2_phase[2], chroma_filter_2_phase[2]);
-      sums = fetch_offset(3.0 - 32.0, one_y) + fetch_offset(32.0 - 3.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[3], chroma_filter_2_phase[3], chroma_filter_2_phase[3]);
-      sums = fetch_offset(4.0 - 32.0, one_y) + fetch_offset(32.0 - 4.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[4], chroma_filter_2_phase[4], chroma_filter_2_phase[4]);
-      sums = fetch_offset(5.0 - 32.0, one_y) + fetch_offset(32.0 - 5.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[5], chroma_filter_2_phase[5], chroma_filter_2_phase[5]);
-      sums = fetch_offset(6.0 - 32.0, one_y) + fetch_offset(32.0 - 6.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[6], chroma_filter_2_phase[6], chroma_filter_2_phase[6]);
-      sums = fetch_offset(7.0 - 32.0, one_y) + fetch_offset(32.0 - 7.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[7], chroma_filter_2_phase[7], chroma_filter_2_phase[7]);
-      sums = fetch_offset(8.0 - 32.0, one_y) + fetch_offset(32.0 - 8.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[8], chroma_filter_2_phase[8], chroma_filter_2_phase[8]);
-      sums = fetch_offset(9.0 - 32.0, one_y) + fetch_offset(32.0 - 9.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[9], chroma_filter_2_phase[9], chroma_filter_2_phase[9]);
-      sums = fetch_offset(10.0 - 32.0, one_y) + fetch_offset(32.0 - 10.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[10], chroma_filter_2_phase[10], chroma_filter_2_phase[10]);
-      sums = fetch_offset(11.0 - 32.0, one_y) + fetch_offset(32.0 - 11.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[11], chroma_filter_2_phase[11], chroma_filter_2_phase[11]);
-      sums = fetch_offset(12.0 - 32.0, one_y) + fetch_offset(32.0 - 12.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[12], chroma_filter_2_phase[12], chroma_filter_2_phase[12]);
-      sums = fetch_offset(13.0 - 32.0, one_y) + fetch_offset(32.0 - 13.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[13], chroma_filter_2_phase[13], chroma_filter_2_phase[13]);
-      sums = fetch_offset(14.0 - 32.0, one_y) + fetch_offset(32.0 - 14.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[14], chroma_filter_2_phase[14], chroma_filter_2_phase[14]);
-      sums = fetch_offset(15.0 - 32.0, one_y) + fetch_offset(32.0 - 15.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[15], chroma_filter_2_phase[15], chroma_filter_2_phase[15]);
-      sums = fetch_offset(16.0 - 32.0, one_y) + fetch_offset(32.0 - 16.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[16], chroma_filter_2_phase[16], chroma_filter_2_phase[16]);
-      sums = fetch_offset(17.0 - 32.0, one_y) + fetch_offset(32.0 - 17.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[17], chroma_filter_2_phase[17], chroma_filter_2_phase[17]);
-      sums = fetch_offset(18.0 - 32.0, one_y) + fetch_offset(32.0 - 18.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[18], chroma_filter_2_phase[18], chroma_filter_2_phase[18]);
-      sums = fetch_offset(19.0 - 32.0, one_y) + fetch_offset(32.0 - 19.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[19], chroma_filter_2_phase[19], chroma_filter_2_phase[19]);
-      sums = fetch_offset(20.0 - 32.0, one_y) + fetch_offset(32.0 - 20.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[20], chroma_filter_2_phase[20], chroma_filter_2_phase[20]);
-      sums = fetch_offset(21.0 - 32.0, one_y) + fetch_offset(32.0 - 21.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[21], chroma_filter_2_phase[21], chroma_filter_2_phase[21]);
-      sums = fetch_offset(22.0 - 32.0, one_y) + fetch_offset(32.0 - 22.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[22], chroma_filter_2_phase[22], chroma_filter_2_phase[22]);
-      sums = fetch_offset(23.0 - 32.0, one_y) + fetch_offset(32.0 - 23.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[23], chroma_filter_2_phase[23], chroma_filter_2_phase[23]);
-      sums = fetch_offset(24.0 - 32.0, one_y) + fetch_offset(32.0 - 24.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[24], chroma_filter_2_phase[24], chroma_filter_2_phase[24]);
-      sums = fetch_offset(25.0 - 32.0, one_y) + fetch_offset(32.0 - 25.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[25], chroma_filter_2_phase[25], chroma_filter_2_phase[25]);
-      sums = fetch_offset(26.0 - 32.0, one_y) + fetch_offset(32.0 - 26.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[26], chroma_filter_2_phase[26], chroma_filter_2_phase[26]);
-      sums = fetch_offset(27.0 - 32.0, one_y) + fetch_offset(32.0 - 27.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[27], chroma_filter_2_phase[27], chroma_filter_2_phase[27]);
-      sums = fetch_offset(28.0 - 32.0, one_y) + fetch_offset(32.0 - 28.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[28], chroma_filter_2_phase[28], chroma_filter_2_phase[28]);
-      sums = fetch_offset(29.0 - 32.0, one_y) + fetch_offset(32.0 - 29.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[29], chroma_filter_2_phase[29], chroma_filter_2_phase[29]);
-      sums = fetch_offset(30.0 - 32.0, one_y) + fetch_offset(32.0 - 30.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[30], chroma_filter_2_phase[30], chroma_filter_2_phase[30]);
-      sums = fetch_offset(31.0 - 32.0, one_y) + fetch_offset(32.0 - 31.0, one_y);
-      signal += sums * vec3(luma_filter_2_phase[31], chroma_filter_2_phase[31], chroma_filter_2_phase[31]);
-
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase]);
-   }
-   else if(phase > 2.5)
-   {
-      for (int i = 0; i < TAPS_3_phase; i++)
-      {
-         float offset = float(i);
-
-         vec3 sums = fetch_offset(offset - float(TAPS_3_phase), one_y) +
-            fetch_offset(float(TAPS_3_phase) - offset, one_y);
-         signal += sums * vec3(luma_filter_3_phase[i], chroma_filter_3_phase[i], chroma_filter_3_phase[i]);
-      }
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase]);
-   }
-
-   vec3 rgb = yiq2rgb(signal);
-   FragColor = vec4(rgb, 1.0);
-   if(global.linearize < 0.5) return;
-   else FragColor = pow(FragColor, vec4(2.2));
-} 
diff --git a/ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang b/ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang
deleted file mode 100644
index 9a442c59de..0000000000
--- a/ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang
+++ /dev/null
@@ -1,134 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-   float quality, ntsc_sat, cust_fringing, cust_artifacting, ntsc_bright, ntsc_scale, ntsc_fields, ntsc_phase, ntsc_artifacting_rainbow;
-} global;
-
-#pragma parameter quality "NTSC Preset (Svideo=0 Composite=1 RF=2 Custom=-1)" 1.0 -1.0 2.0 1.0
-#pragma parameter ntsc_fields "NTSC Merge Fields" 0.0 0.0 1.0 1.0
-#pragma parameter ntsc_phase "NTSC Phase: Auto | 2 phase | 3 phase" 1.0 1.0 3.0 1.0
-#pragma parameter ntsc_scale "NTSC Resolution Scaling" 1.0 0.20 3.0 0.05
-#pragma parameter ntsc_sat "NTSC Color Saturation" 1.0 0.0 2.0 0.01
-#pragma parameter ntsc_bright "NTSC Brightness" 1.0 0.0 1.5 0.01
-#pragma parameter cust_fringing "NTSC Custom Fringing Value" 0.0 0.0 5.0 0.1
-#pragma parameter cust_artifacting "NTSC Custom Artifacting Value" 0.0 0.0 5.0 0.1
-#pragma parameter ntsc_artifacting_rainbow "NTSC Artifacting Rainbow Effect" 0.0 -1.0 1.0 0.1
-
-#define PI 3.14159265
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 pix_no;
-layout(location = 2) out float phase;
-layout(location = 3) out float BRIGHTNESS;
-layout(location = 4) out float SATURATION;
-layout(location = 5) out float FRINGING;
-layout(location = 6) out float ARTIFACTING;
-layout(location = 7) out float CHROMA_MOD_FREQ;
-layout(location = 8) out float MERGE;
-
-void main()
-{
-	float res = global.ntsc_scale;
-	float OriginalSize = global.OriginalSize.x;
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-	if (res < 1.0) pix_no = TexCoord * global.SourceSize.xy * (res * global.OutputSize.xy / global.SourceSize.xy); else
-                   pix_no = TexCoord * global.SourceSize.xy * (      global.OutputSize.xy / global.SourceSize.xy);
-	phase = (global.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((global.ntsc_phase > 2.5) ? 3.0 : 2.0);
-	
-	res = max(res, 1.0);	
-	CHROMA_MOD_FREQ = (phase < 2.5) ? (4.0 * PI / 15.0) : (PI / 3.0);
-	ARTIFACTING = (global.quality > -0.5) ? global.quality * 0.5*(res+1.0) : global.cust_artifacting;
-	FRINGING = (global.quality > -0.5) ? global.quality : global.cust_fringing;
-	SATURATION = global.ntsc_sat;
-	BRIGHTNESS = global.ntsc_bright;	
-	pix_no.x = pix_no.x * res;
-
-	MERGE = (int(global.quality) == 2 || phase < 2.5) ? 0.0 : 1.0;
-	MERGE = (int(global.quality) == -1) ? global.ntsc_fields : MERGE;
-	
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 pix_no;
-layout(location = 2) in float phase;
-layout(location = 3) in float BRIGHTNESS;
-layout(location = 4) in float SATURATION;
-layout(location = 5) in float FRINGING;
-layout(location = 6) in float ARTIFACTING;
-layout(location = 7) in float CHROMA_MOD_FREQ;
-layout(location = 8) in float MERGE;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define mix_mat mat3(BRIGHTNESS, FRINGING, FRINGING, ARTIFACTING, 2.0 * SATURATION, 0.0, ARTIFACTING, 0.0, 2.0 * SATURATION)
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-void main()
-{
-   vec3 col = texture(Source, vTexCoord).rgb;
-   vec3 yiq = rgb2yiq(col);
-   vec3 yiq2 = yiq;	
-
-   float mod1 = 2.0;
-   float mod2 = 3.0;
-
-if (MERGE > 0.5)
-{
-   float chroma_phase2 = (phase < 2.5) ? PI * (mod(pix_no.y, mod1) + mod(global.FrameCount+1, 2.)) : 0.6667 * PI * (mod(pix_no.y, mod2) + mod(global.FrameCount+1, 2.));
-   float mod_phase2 = (global.ntsc_artifacting_rainbow + 1.0) * chroma_phase2 + pix_no.x * CHROMA_MOD_FREQ;
-   float i_mod2 = cos(mod_phase2);
-   float q_mod2 = sin(mod_phase2);
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Modulate.
-   yiq2 *= mix_mat; // Cross-talk.
-   yiq2.yz *= vec2(i_mod2, q_mod2); // Demodulate.   
-}
-   
-   float chroma_phase = (phase < 2.5) ? PI * (mod(pix_no.y, mod1) + mod(global.FrameCount, 2.)) : 0.6667 * PI * (mod(pix_no.y, mod2) + mod(global.FrameCount, 2.));
-   float mod_phase = (global.ntsc_artifacting_rainbow + 1.0) * chroma_phase + pix_no.x * CHROMA_MOD_FREQ;
-
-   float i_mod = cos(mod_phase);
-   float q_mod = sin(mod_phase);
-
-   yiq.yz *= vec2(i_mod, q_mod); // Modulate.
-   yiq *= mix_mat; // Cross-talk.
-   yiq.yz *= vec2(i_mod, q_mod); // Demodulate.
-      
-   yiq = (MERGE < 0.5) ? yiq : 0.5*(yiq+yiq2);
-   
-   FragColor = vec4(yiq, 1.0);
-} 
diff --git a/ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang b/ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang
deleted file mode 100644
index f8863b2b18..0000000000
--- a/ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang
+++ /dev/null
@@ -1,304 +0,0 @@
-#version 450
-
-// NTSC-Adaptive
-// based on Themaister's NTSC shader
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   float linearize;
-   float ntsc_scale;
-   float ntsc_phase;
-   float auto_res;
-   float chroma_scale;
-} global;
-
-#pragma parameter chroma_scale "NTSC Chroma Scaling" 1.0 0.2 4.0 0.2 
-#pragma parameter ntsc_scale "NTSC Resolution Scaling" 1.0 0.20 3.0 0.05
-#pragma parameter ntsc_phase "NTSC Phase: Auto | 2 phase | 3 phase" 1.0 1.0 3.0 1.0
-#pragma parameter linearize "NTSC Linearize Output Gamma" 0.0 0.0 1.0 1.0 
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord - vec2(0.5 / global.SourceSize.x, 0.0); // Compensate for decimate-by-2.
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-//layout(set = 0, binding = 3) uniform sampler2D orig;
-
-vec3 fetch_offset(float offset, vec2 one_x)
-{
-   /* Insert chroma scaling. Thanks to guest.r ideas. */
-
-   vec3 yiq;
-
-   yiq.x  = texture(Source, vTexCoord + vec2((offset) * (one_x.x), 0.0)).x;
-   yiq.yz = texture(Source, vTexCoord + vec2((offset) * (one_x.y), 0.0)).yz;
-
-   return yiq;
-
-/*  Old code
-   return texture(Source, vTexCoord + vec2((offset) * (one_x), 0.0)).xyz;
-*/
-}
-
-const mat3 yiq2rgb_mat = mat3(
-   1.0, 0.956, 0.6210,
-   1.0, -0.2720, -0.6474,
-   1.0, -1.1060, 1.7046);
-
-vec3 yiq2rgb(vec3 yiq)
-{
-   return yiq * yiq2rgb_mat;
-}
-
-const mat3 yiq_mat = mat3(
-      0.2989, 0.5870, 0.1140,
-      0.5959, -0.2744, -0.3216,
-      0.2115, -0.5229, 0.3114
-);
-
-vec3 rgb2yiq(vec3 col)
-{
-   return col * yiq_mat;
-}
-
-const int TAPS_2_phase = 32;
-const float luma_filter_2_phase[33] = float[33](
-   -0.000174844,
-   -0.000205844,
-   -0.000149453,
-   -0.000051693,
-   0.000000000,
-   -0.000066171,
-   -0.000245058,
-   -0.000432928,
-   -0.000472644,
-   -0.000252236,
-   0.000198929,
-   0.000687058,
-   0.000944112,
-   0.000803467,
-   0.000363199,
-   0.000013422,
-   0.000253402,
-   0.001339461,
-   0.002932972,
-   0.003983485,
-   0.003026683,
-   -0.001102056,
-   -0.008373026,
-   -0.016897700,
-   -0.022914480,
-   -0.021642347,
-   -0.008863273,
-   0.017271957,
-   0.054921920,
-   0.098342579,
-   0.139044281,
-   0.168055832,
-   0.178571429);
-
-const float chroma_filter_2_phase[33] = float[33](
-   0.001384762,
-   0.001678312,
-   0.002021715,
-   0.002420562,
-   0.002880460,
-   0.003406879,
-   0.004004985,
-   0.004679445,
-   0.005434218,
-   0.006272332,
-   0.007195654,
-   0.008204665,
-   0.009298238,
-   0.010473450,
-   0.011725413,
-   0.013047155,
-   0.014429548,
-   0.015861306,
-   0.017329037,
-   0.018817382,
-   0.020309220,
-   0.021785952,
-   0.023227857,
-   0.024614500,
-   0.025925203,
-   0.027139546,
-   0.028237893,
-   0.029201910,
-   0.030015081,
-   0.030663170,
-   0.031134640,
-   0.031420995,
-   0.031517031);
-
-const int TAPS_3_phase = 24;
-const float luma_filter_3_phase[25] = float[25](
-   -0.000012020,
-   -0.000022146,
-   -0.000013155,
-   -0.000012020,
-   -0.000049979,
-   -0.000113940,
-   -0.000122150,
-   -0.000005612,
-   0.000170516,
-   0.000237199,
-   0.000169640,
-   0.000285688,
-   0.000984574,
-   0.002018683,
-   0.002002275,
-   -0.000909882,
-   -0.007049081,
-   -0.013222860,
-   -0.012606931,
-   0.002460860,
-   0.035868225,
-   0.084016453,
-   0.135563500,
-   0.175261268,
-   0.190176552);
-
-const float chroma_filter_3_phase[25] = float[25](
-   -0.000118847,
-   -0.000271306,
-   -0.000502642,
-   -0.000930833,
-   -0.001451013,
-   -0.002064744,
-   -0.002700432,
-   -0.003241276,
-   -0.003524948,
-   -0.003350284,
-   -0.002491729,
-   -0.000721149,
-   0.002164659,
-   0.006313635,
-   0.011789103,
-   0.018545660,
-   0.026414396,
-   0.035100710,
-   0.044196567,
-   0.053207202,
-   0.061590275,
-   0.068803602,
-   0.074356193,
-   0.077856564,
-   0.079052396);
-
-void main()
-{
-   float res = global.ntsc_scale;
-   float OriginalSize = global.OriginalSize.x;
-   vec3 signal = vec3(0.0);
-   float phase = (global.ntsc_phase < 1.5) ? ((OriginalSize > 300.0) ? 2.0 : 3.0) : ((global.ntsc_phase > 2.5) ? 3.0 : 2.0);
-
-   float chroma_scale = phase > 2.5 ? min(global.chroma_scale, 2.2) : global.chroma_scale;
-   vec2 one_x = (global.SourceSize.z / res) * vec2(1.0, 1.0 / chroma_scale);
-
-
-   if(phase < 2.5)
-   {
-      vec3 sums = fetch_offset(0.0 - 32.0, one_x) + fetch_offset(32.0 - 0.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[0], chroma_filter_2_phase[0], chroma_filter_2_phase[0]);
-      sums = fetch_offset(1.0 - 32.0, one_x) + fetch_offset(32.0 - 1.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[1], chroma_filter_2_phase[1], chroma_filter_2_phase[1]);
-      sums = fetch_offset(2.0 - 32.0, one_x) + fetch_offset(32.0 - 2.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[2], chroma_filter_2_phase[2], chroma_filter_2_phase[2]);
-      sums = fetch_offset(3.0 - 32.0, one_x) + fetch_offset(32.0 - 3.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[3], chroma_filter_2_phase[3], chroma_filter_2_phase[3]);
-      sums = fetch_offset(4.0 - 32.0, one_x) + fetch_offset(32.0 - 4.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[4], chroma_filter_2_phase[4], chroma_filter_2_phase[4]);
-      sums = fetch_offset(5.0 - 32.0, one_x) + fetch_offset(32.0 - 5.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[5], chroma_filter_2_phase[5], chroma_filter_2_phase[5]);
-      sums = fetch_offset(6.0 - 32.0, one_x) + fetch_offset(32.0 - 6.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[6], chroma_filter_2_phase[6], chroma_filter_2_phase[6]);
-      sums = fetch_offset(7.0 - 32.0, one_x) + fetch_offset(32.0 - 7.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[7], chroma_filter_2_phase[7], chroma_filter_2_phase[7]);
-      sums = fetch_offset(8.0 - 32.0, one_x) + fetch_offset(32.0 - 8.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[8], chroma_filter_2_phase[8], chroma_filter_2_phase[8]);
-      sums = fetch_offset(9.0 - 32.0, one_x) + fetch_offset(32.0 - 9.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[9], chroma_filter_2_phase[9], chroma_filter_2_phase[9]);
-      sums = fetch_offset(10.0 - 32.0, one_x) + fetch_offset(32.0 - 10.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[10], chroma_filter_2_phase[10], chroma_filter_2_phase[10]);
-      sums = fetch_offset(11.0 - 32.0, one_x) + fetch_offset(32.0 - 11.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[11], chroma_filter_2_phase[11], chroma_filter_2_phase[11]);
-      sums = fetch_offset(12.0 - 32.0, one_x) + fetch_offset(32.0 - 12.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[12], chroma_filter_2_phase[12], chroma_filter_2_phase[12]);
-      sums = fetch_offset(13.0 - 32.0, one_x) + fetch_offset(32.0 - 13.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[13], chroma_filter_2_phase[13], chroma_filter_2_phase[13]);
-      sums = fetch_offset(14.0 - 32.0, one_x) + fetch_offset(32.0 - 14.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[14], chroma_filter_2_phase[14], chroma_filter_2_phase[14]);
-      sums = fetch_offset(15.0 - 32.0, one_x) + fetch_offset(32.0 - 15.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[15], chroma_filter_2_phase[15], chroma_filter_2_phase[15]);
-      sums = fetch_offset(16.0 - 32.0, one_x) + fetch_offset(32.0 - 16.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[16], chroma_filter_2_phase[16], chroma_filter_2_phase[16]);
-      sums = fetch_offset(17.0 - 32.0, one_x) + fetch_offset(32.0 - 17.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[17], chroma_filter_2_phase[17], chroma_filter_2_phase[17]);
-      sums = fetch_offset(18.0 - 32.0, one_x) + fetch_offset(32.0 - 18.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[18], chroma_filter_2_phase[18], chroma_filter_2_phase[18]);
-      sums = fetch_offset(19.0 - 32.0, one_x) + fetch_offset(32.0 - 19.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[19], chroma_filter_2_phase[19], chroma_filter_2_phase[19]);
-      sums = fetch_offset(20.0 - 32.0, one_x) + fetch_offset(32.0 - 20.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[20], chroma_filter_2_phase[20], chroma_filter_2_phase[20]);
-      sums = fetch_offset(21.0 - 32.0, one_x) + fetch_offset(32.0 - 21.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[21], chroma_filter_2_phase[21], chroma_filter_2_phase[21]);
-      sums = fetch_offset(22.0 - 32.0, one_x) + fetch_offset(32.0 - 22.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[22], chroma_filter_2_phase[22], chroma_filter_2_phase[22]);
-      sums = fetch_offset(23.0 - 32.0, one_x) + fetch_offset(32.0 - 23.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[23], chroma_filter_2_phase[23], chroma_filter_2_phase[23]);
-      sums = fetch_offset(24.0 - 32.0, one_x) + fetch_offset(32.0 - 24.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[24], chroma_filter_2_phase[24], chroma_filter_2_phase[24]);
-      sums = fetch_offset(25.0 - 32.0, one_x) + fetch_offset(32.0 - 25.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[25], chroma_filter_2_phase[25], chroma_filter_2_phase[25]);
-      sums = fetch_offset(26.0 - 32.0, one_x) + fetch_offset(32.0 - 26.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[26], chroma_filter_2_phase[26], chroma_filter_2_phase[26]);
-      sums = fetch_offset(27.0 - 32.0, one_x) + fetch_offset(32.0 - 27.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[27], chroma_filter_2_phase[27], chroma_filter_2_phase[27]);
-      sums = fetch_offset(28.0 - 32.0, one_x) + fetch_offset(32.0 - 28.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[28], chroma_filter_2_phase[28], chroma_filter_2_phase[28]);
-      sums = fetch_offset(29.0 - 32.0, one_x) + fetch_offset(32.0 - 29.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[29], chroma_filter_2_phase[29], chroma_filter_2_phase[29]);
-      sums = fetch_offset(30.0 - 32.0, one_x) + fetch_offset(32.0 - 30.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[30], chroma_filter_2_phase[30], chroma_filter_2_phase[30]);
-      sums = fetch_offset(31.0 - 32.0, one_x) + fetch_offset(32.0 - 31.0, one_x);
-      signal += sums * vec3(luma_filter_2_phase[31], chroma_filter_2_phase[31], chroma_filter_2_phase[31]);
-      
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase], chroma_filter_2_phase[TAPS_2_phase]);
-   }
-   else if(phase > 2.5)
-   {
-      for (int i = 0; i < TAPS_3_phase; i++)
-      {
-         float offset = float(i);
-
-         vec3 sums = fetch_offset(offset - float(TAPS_3_phase), one_x) +
-            fetch_offset(float(TAPS_3_phase) - offset, one_x);
-         signal += sums * vec3(luma_filter_3_phase[i], chroma_filter_3_phase[i], chroma_filter_3_phase[i]);
-      }
-      signal += texture(Source, vTexCoord).xyz *
-         vec3(luma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase], chroma_filter_3_phase[TAPS_3_phase]);
-   }
-
-   vec3 rgb = yiq2rgb(signal);
-   FragColor = vec4(rgb, 1.0);
-   if(global.linearize < 0.5) return;
-   else FragColor = pow(FragColor, vec4(2.2));
-}  
diff --git a/ntsc/shaders/ntsc-blastem.slang b/ntsc/shaders/ntsc-blastem.slang
deleted file mode 100644
index 03f5062612..0000000000
--- a/ntsc/shaders/ntsc-blastem.slang
+++ /dev/null
@@ -1,248 +0,0 @@
-#version 450
-
-// NTSC composite simulator for BlastEm, now with comb filter
-// Shader by Sik, based on BlastEm's default shader
-//
-// Now with gamma correction (NTSC = 2.5 gamma, sRGB = 2.2 gamma*)
-// *sorta, sRGB isn't exactly a gamma curve, but close enough
-//
-// It works by converting from RGB to YIQ and then encoding it into NTSC, then
-// trying to decode it back. The lossy nature of the encoding process results in
-// the rainbow effect. It also accounts for the differences between H40 and H32
-// mode as it computes the exact colorburst cycle length.
-//
-// This shader tries to work around the inability to keep track of previous
-// pixels by sampling seven points (in 0.25 colorburst cycle intervals), that
-// seems to be enough to give decent filtering (four samples are used for
-// low-pass filtering, but we need seven because decoding chroma also requires
-// four samples so we're filtering over overlapping samples... just see the
-// comments in the I/Q code to understand).
-//
-// The comb filter works by comparing against the previous scanline (which means
-// sampling twice). This is done at the composite signal step, i.e. before the
-// filtering to decode back YIQ is performed.
-//
-// Thanks to Tulio Adriano for helping compare against real hardware on a CRT.
-//******************************************************************************
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float comb_str, gamma_corr, scan_toggle;
-} params;
-
-#pragma parameter comb_str "Combing Filter Strength" 0.8 0.0 1.0 0.01
-
-// How strong is the comb filter when reducing crosstalk between Y and IQ.
-// 0% (0.0) means no separation at all, 100% (1.0) means complete filtering.
-// 80% seems to approximate a model 1, while 90% is closer to a model 2 or 32X.
-float comb_strength = params.comb_str;
-
-#pragma parameter gamma_corr "Gamma Correction (2.2 = passthru)" 2.2 1.0 4.0 0.05
-// Gamma of the TV to simulate.
-float gamma_correction = params.gamma_corr;
-
-#pragma parameter scan_toggle "Scanline Toggle" 0.0 0.0 1.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-layout(location = 1) out vec2 texsize;
-layout(location = 2) out int curfield;
-layout(location = 3) out int scanlines;
-layout(location = 4) out float width;
-layout(location = 5) out float interlaced;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord;
-   texsize = params.SourceSize.xy;
-   width = params.SourceSize.x;
-   curfield = int(mod(params.FrameCount, 2));
-   scanlines = int(params.scan_toggle);
-   interlaced = (params.OriginalSize.y > 400.0) ? 1.0 : 0.0;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 1) in vec2 texsize;
-layout(location = 2) flat in int curfield;
-layout(location = 3) flat in int scanlines;
-layout(location = 4) in float width;
-layout(location = 5) in float interlaced;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-// Converts from RGB to YIQ
-
-vec3 rgba2yiq(vec4 rgba)
-{
-	return vec3(
-		rgba[0] * 0.3 + rgba[1] * 0.59 + rgba[2] * 0.11,
-		rgba[0] * 0.599 + rgba[1] * -0.2773 + rgba[2] * -0.3217,
-		rgba[0] * 0.213 + rgba[1] * -0.5251 + rgba[2] * 0.3121
-	);
-}
-
-// Encodes YIQ into composite
-
-float yiq2raw(vec3 yiq, float phase)
-{
-	return yiq[0] + yiq[1] * sin(phase) + yiq[2] * cos(phase);
-}
-
-
-// Converts from YIQ to RGB
-
-vec4 yiq2rgba(vec3 yiq)
-{
-	return vec4(
-		yiq[0] + yiq[1] * 0.9469 + yiq[2] * 0.6236,
-		yiq[0] - yiq[1] * 0.2748 - yiq[2] * 0.6357,
-		yiq[0] - yiq[1] * 1.1 + yiq[2] * 1.7,
-		1.0
-	);
-}
-
-
-void main()
-{
-	// The coordinate of the pixel we're supposed to access
-	// In interlaced mode, the entire screen is shifted down by half a scanline,
-	// y_offset is used to account for this.
-	float y_offset = interlaced * float(curfield) * -0.5 / texsize.y;
-	float x = texcoord.x;
-	float y = texcoord.y + y_offset;
-	
-	// Horizontal distance of half a colorburst cycle
-	float factorX = (1.0 / texsize.x) / 170.667 * 0.5 * width;
-	
-	// sRGB approximates a gamma ramp of 2.2 while NTSC has a gamma of 2.5
-	// Use this value to do gamma correction of every RGB value
-	float gamma = gamma_correction / 2.2;
-	
-	// Where we store the sampled pixels.
-	// [0] = current pixel
-	// [1] = 1/4 colorburst cycles earlier
-	// [2] = 2/4 colorburst cycles earlier
-	// [3] = 3/4 colorburst cycles earlier
-	// [4] = 1 colorburst cycle earlier
-	// [5] = 1 1/4 colorburst cycles earlier
-	// [6] = 1 2/4 colorburst cycles earlier
-	float phase[7];		// Colorburst phase (in radians)
-	float raw_y[7];    // Luma isolated from raw composite signal
-	float raw_iq[7];   // Chroma isolated from raw composite signal
-	
-	// Sample all the pixels we're going to use
-	for (int n = 0; n < 7; n++, x -= factorX * 0.5) {
-		// Compute colorburst phase at this point
-		phase[n] = x / factorX * 3.1415926;
-		
-		// Y coordinate one scanline above
-		// Apparently GLSL doesn't allow a vec2 with a full expression for
-		// texture samplers? Whatever, putting it here (also makes the code
-		// below a bit easier to read I guess?)
-		float y_above = y - texcoord.y / texsize.y;
-		
-		// Get the raw composite data for this scanline
-		float raw1 = yiq2raw(rgba2yiq(
-		                     texture(Source, vec2(x, y))
-		                     ), phase[n]);
-		
-		// Get the raw composite data for scanline above
-		// Note that the colorburst phase is shifted 180°
-		float raw2 = yiq2raw(rgba2yiq(
-		                     texture(Source, vec2(x, y_above))
-		                     ), phase[n] + 3.1415926);
-		
-		// Comb filter: isolate Y and IQ using the above two.
-		// Luma is obtained by adding the two scanlines, chroma will cancel out
-		// because chroma will be on opposite phases.
-		// Chroma is then obtained by cancelling this scanline from the luma
-		// to reduce the crosstalk. We don't cancel it entirely though since the
-		// filtering isn't perfect (which is why the rainbow leaks a bit).
-		raw_y[n] = (raw1 + raw2) * 0.5;
-		raw_iq[n] = raw1 - (raw1 + raw2) * (comb_strength * 0.5);
-	}
-	
-	// Decode Y by averaging over the last whole sampled cycle (effectively
-	// filtering anything above the colorburst frequency)
-	float y_mix = (raw_y[0] + raw_y[1] + raw_y[2] + raw_y[3]) * 0.25;
-	
-	// Decode I and Q (see page below to understand what's going on)
-	// https://codeandlife.com/2012/10/09/composite-video-decoding-theory-and-practice/
-	//
-	// Retrieving I and Q out of the raw signal is done like this
-	// (use sin for I and cos for Q):
-	//
-	//    0.5 * raw[0] * sin(phase[0]) + 0.5 * raw[1] * sin(phase[1]) +
-	//    0.5 * raw[2] * sin(phase[2]) + 0.5 * raw[3] * sin(phase[3])
-	//
-	// i.e. multiply each of the sampled quarter cycles against the reference
-	// wave and average them (actually double that because for some reason
-	// that's needed to get the correct scale, hence 0.5 instead of 0.25)
-	//
-	// That turns out to be blocky tho, so we opt to filter down the chroma...
-	// which requires doing the above *four* times if we do it the same way as
-	// we did for luminance (note that 0.125 = 1/4 of 0.5):
-	//
-	//    0.125 * raw[0] * sin(phase[0]) + 0.125 * raw[1] * sin(phase[1]) +
-	//    0.125 * raw[2] * sin(phase[2]) + 0.125 * raw[3] * sin(phase[3]) +
-	//    0.125 * raw[1] * sin(phase[1]) + 0.125 * raw[2] * sin(phase[2]) +
-	//    0.125 * raw[3] * sin(phase[3]) + 0.125 * raw[4] * sin(phase[4]) +
-	//    0.125 * raw[2] * sin(phase[2]) + 0.125 * raw[3] * sin(phase[3]) +
-	//    0.125 * raw[4] * sin(phase[4]) + 0.125 * raw[5] * sin(phase[5]) +
-	//    0.125 * raw[3] * sin(phase[3]) + 0.125 * raw[4] * sin(phase[4]) +
-	//    0.125 * raw[5] * sin(phase[5]) + 0.125 * raw[6] * sin(phase[6])
-	//
-	// There are a lot of repeated values there that could be merged into one,
-	// what you see below is the resulting simplification.
-	
-	float i_mix =
-		0.125 * raw_iq[0] * sin(phase[0]) +
-		0.25  * raw_iq[1] * sin(phase[1]) +
-		0.375 * raw_iq[2] * sin(phase[2]) +
-		0.5   * raw_iq[3] * sin(phase[3]) +
-		0.375 * raw_iq[4] * sin(phase[4]) +
-		0.25  * raw_iq[5] * sin(phase[5]) +
-		0.125 * raw_iq[6] * sin(phase[6]);
-	
-	float q_mix =
-		0.125 * raw_iq[0] * cos(phase[0]) +
-		0.25  * raw_iq[1] * cos(phase[1]) +
-		0.375 * raw_iq[2] * cos(phase[2]) +
-		0.5   * raw_iq[3] * cos(phase[3]) +
-		0.375 * raw_iq[4] * cos(phase[4]) +
-		0.25  * raw_iq[5] * cos(phase[5]) +
-		0.125 * raw_iq[6] * cos(phase[6]);
-	
-	// Convert YIQ back to RGB and output it
-	FragColor = pow(yiq2rgba(vec3(y_mix, i_mix, q_mix)),
-	                   vec4(gamma, gamma, gamma, 1.0));
-	
-	// If you're curious to see what the raw composite signal looks like,
-	// comment out the above and uncomment the line below instead
-	//gl_FragColor = vec4(raw[0], raw[0], raw[0], 1.0);
-	
-	// Basic scanlines effect. This is done by multiplying the color against a
-	// "half sine" wave so the center is brighter and a narrow outer area in
-	// each scanline is noticeable darker.
-	// The weird constant in the middle line is 1-sqrt(2)/4 and it's used to
-	// make sure that the average multiplied value across the whole screen is 1
-	// to preserve the original brightness.
-	if (scanlines != 0) {
-		float mult = sin(y * texsize.y * 3.1415926);
-		mult = abs(mult) * 0.5 + 0.646446609;
-		FragColor *= vec4(mult, mult, mult, 1.0);
-	}	
-}
diff --git a/ntsc/shaders/ntsc-simple/kaizer-lp-small.slang b/ntsc/shaders/ntsc-simple/kaizer-lp-small.slang
deleted file mode 100644
index d92054d405..0000000000
--- a/ntsc/shaders/ntsc-simple/kaizer-lp-small.slang
+++ /dev/null
@@ -1,49 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-  float something;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-
-} global;
-
-#define OutputSize global.OutputSize
-#define SourceSize global.SourceSize
-#define OriginalSize global.OriginalSize
-#define FrameCount global.FrameCount
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-void main()
-{
-    vec2 ps = vec2(SourceSize.z,0.0);
-    vec3 res = texture(Source,vTexCoord).rgb*0.62;
-     res += texture(Source,vTexCoord+ps).rgb*0.39;
-     res += texture(Source,vTexCoord+3.0*ps).rgb*-0.1;
-     res += texture(Source,vTexCoord+5.0*ps).rgb*0.04;
-
-    FragColor.rgb = res;
-}
diff --git a/ntsc/shaders/ntsc-simple/ntsc-mini.slang b/ntsc/shaders/ntsc-simple/ntsc-mini.slang
deleted file mode 100644
index 4fa1322f79..0000000000
--- a/ntsc/shaders/ntsc-simple/ntsc-mini.slang
+++ /dev/null
@@ -1,121 +0,0 @@
-#version 450
-
-
-layout(push_constant) uniform Push
-{
-  float ntsc_sat,lpass,comb_filter,ofq,luma_rate,mini_hue,snes_mode;
-} params;
-
-#pragma parameter comb_filter "Chroma Comb. Filter Str." 0.6 0.0 1.0 0.05
-#pragma parameter luma_rate "Luma/Chroma Analysis Rate (typical 2.0)" 2.0 1.0 4.0 1.0
-#pragma parameter lpass "Luma Low Pass (sharpness)" 0.2 0.0 1.0 0.01
-#pragma parameter mini_hue "Hue Shift" 0.0 -6.3 6.3 0.05
-#pragma parameter ntsc_sat "Saturation" 3.0 0.0 6.0 0.05
-#pragma parameter ofq "Color Clock Frequency Mhz (typical 3.579)" 3.579 0.0 14.32 0.4473
-#pragma parameter snes_mode "Snes mode" 0.0 0.0 1.0 1.0
-
-#define comb_filter params.comb_filter
-#define lpass params.lpass
-#define ntsc_sat params.ntsc_sat
-#define ofq params.ofq
-#define luma_rate params.luma_rate
-#define mini_hue params.mini_hue
-#define snes_mode params.snes_mode
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-
-} global;
-
-
-#define OutputSize global.OutputSize
-#define SourceSize global.SourceSize
-#define OriginalSize global.OriginalSize
-#define FrameCount global.FrameCount
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-#define PI   3.14159265358979323846
-
-const mat3 RGBYUV = mat3(0.299, 0.587, 0.114,
-                        -0.299, -0.587, 0.886, 
-                         0.701, -0.587, -0.114);
-
-const mat3 YUV2RGB = mat3(1.0, 0.0, 1.13983,
-                          1.0, -0.39465, -0.58060,
-                          1.0, 2.03211, 0.0);
-vec2 dx,dy;
-float compo0 ( float p, vec3 phase)
-{
-vec3 yiq = texture(Source,vTexCoord+p*dx).rgb*RGBYUV;
-return dot(vec3(1.0),yiq*phase);
-}
-
-float compo1 ( float p, vec3 phase)
-{
-vec3 yiq = texture(Source,vTexCoord+p*dx-dy).rgb*RGBYUV;
-return dot(vec3(1.0),yiq*phase);
-}
-
-void main() {
-dx = vec2(SourceSize.z/luma_rate,0.0);
-dy = vec2(0.0,SourceSize.w*0.25);
-vec3 final = vec3(0.0);
-float sum = 0.0;
-
-for (int n=-3; n<4; n++)
-{
-float p = float(n);   
-float w = exp(-lpass*p*p);
-float snes_phase = 0.0;
-// vTexCoord is "time" variable, 52.6μs is time active pixels are displayed
-// 1000000 multiply (osc) /divide (52.6μs) are omitted as they cancel one another
-
-if (snes_mode == 1.0) snes_phase = mod(vTexCoord.y*262.0, 2.0)*PI;
-
-float carrier    =  (vTexCoord.x * ofq * 52.6 + p)*PI*0.5 + snes_phase;
-// every other NTSC line will be 180' shifted
-float carrier_up =  carrier + PI;
-
-// lineup and line will cancel chroma/luma one another on comb
-vec3 phase    = vec3(1.0,0.5*cos(carrier+mini_hue)   ,0.5*sin(carrier+mini_hue));
-vec3 phase_up = vec3(1.0,0.5*cos(carrier_up+mini_hue),0.5*sin(carrier_up+mini_hue));
-
-vec3 phasefinal  = vec3(1.0,ntsc_sat*cos(carrier)   ,ntsc_sat*sin(carrier));
-
-float line_cur = compo0(p,phase)*w;
-float line_up  = compo1(p,phase_up)*w;
-
-vec3 rgb = vec3(0.0);
-// luma comb
-rgb.r = (line_up+line_cur)/2.0;
-// chroma comb
-rgb.gb = vec2(line_cur-(line_up+line_cur)/2.0*comb_filter);
-final += rgb*phasefinal;
-sum += w;
-}
-final.r /= sum;
-final.gb /= 7.0;
-FragColor.rgb = final*YUV2RGB;
-}
diff --git a/ntsc/shaders/ntsc-simple/tiny_ntsc.slang b/ntsc/shaders/ntsc-simple/tiny_ntsc.slang
deleted file mode 100644
index e0c2409045..0000000000
--- a/ntsc/shaders/ntsc-simple/tiny_ntsc.slang
+++ /dev/null
@@ -1,109 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-  float comb,ln_delay,d_crawl,sharp_pix;
-} params;
-
-#pragma parameter comb "Comb Filter Strength" 0.8 0.0 1.0 0.05
-#pragma parameter ln_delay "NES/SNES Line Delay" 1.0 0.0 1.0 1.0
-#pragma parameter d_crawl "NES/SNES Dot Crawl" 1.0 0.0 1.0 1.0
-#pragma parameter sharp_pix "Sharper" 0.0 0.0 1.0 1.0
-
-#define comb params.comb
-#define ln_delay params.ln_delay
-#define d_crawl params.d_crawl
-#define sharp_pix params.sharp_pix
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-
-} global;
-
-#define OutputSize global.OutputSize
-#define SourceSize global.SourceSize
-#define OriginalSize global.OriginalSize
-#define FrameCount global.FrameCount
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 ogl2pos;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-   ogl2pos = vTexCoord*SourceSize.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 ogl2pos;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define PI   3.14159265358979323846
-
-mat3 RGBYUV = mat3(0.299, 0.587, 0.114,
-                        -0.299, -0.587, 0.886, 
-                         0.701, -0.587, -0.114);
-
-mat3 YUV2RGB = mat3(1.0, 0.0, 1.13983,
-                          1.0, -0.39465, -0.58060,
-                          1.0, 2.03211, 0.0);
-
-// max 170.666 color "dots" per line
-#define NTSC_RES 170.6666
-
-void main() 
-{
-float pixsize = 0.75; 
-if (sharp_pix == 1.0) pixsize = 0.5;
-vec2 dxy = vec2(SourceSize.z*pixsize,0.0);
-vec2 dy = vec2(0.0,SourceSize.w*0.125);
-vec3 final = vec3(0.0);
-float sum = 0.0;
-float timer = 0.0; if (d_crawl == 1.0) timer = mod(float(FrameCount),3.0);
-
-for (int i=0; i<2; i++)
-{
-float n = float(i);
-float w = exp(-0.15*n*n); // gaussian low pass
-
-float line_delay = 0.0;
-if (ln_delay == 1.0) line_delay = ogl2pos.y; // snes line delay
-//snes line delay deployed at 170/256, 2/3 of pi(180'), 120' or 1/3 lines as in real snes
-float phase = (ogl2pos.x + n - line_delay +timer)*PI*NTSC_RES/OriginalSize.x;
-// comb filter line
-float phaseup = phase + PI;
-
-vec3 res   = texture(Source,vTexCoord -dxy + dxy*n).rgb*RGBYUV;
-vec3 resup = texture(Source,vTexCoord -dxy + dxy*n +dy).rgb*RGBYUV;
-
-vec3 carrier   = vec3(1.0, sin(phase  ), cos(phase));
-vec3 carrierup = vec3(1.0, sin(phaseup), cos(phaseup));
-
-res    *= carrier;
-resup  *= carrierup;
-
-float line   = dot(vec3(0.5),res);
-float lineup = dot(vec3(0.5),resup);
-// comb luma is line adding previous line, chroma is cancelled!
-float luma   = line + lineup;
-// comb chroma is line subtracting luma we already have!
-float chroma = line - luma*0.5*comb;
-final.r += luma*w;
-final.gb += 2.0*vec2(chroma)*carrier.yz*w;
-sum += w;
-}
-
-final.rgb /= sum;
-FragColor.rgb = final*YUV2RGB;
-}
\ No newline at end of file
diff --git a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass1.slang b/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass1.slang
deleted file mode 100644
index 903097e7ba..0000000000
--- a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass1.slang
+++ /dev/null
@@ -1,37 +0,0 @@
-#version 450
-
-#pragma name AfterglowUpdPre
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(clamp(texture(Source, vTexCoord).rgb, 0, 1), 1.0);
-}
diff --git a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass2.slang b/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass2.slang
deleted file mode 100644
index 351546f99d..0000000000
--- a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass2.slang
+++ /dev/null
@@ -1,92 +0,0 @@
-#version 450
-
-/*
-   Phosphor Afterglow Shader pass 0
-   
-   Copyright (C) 2020 - 2022 guest(r) - guest.r@gmail.com
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 OriginalSize;
-   vec4 OutputSize;
-   uint FrameCount;
-   float PR_upd, PG_upd, PB_upd;
-} params;
-
-#pragma parameter PR_upd "Afterglow Persistence Red" 0.32 0.0 0.50 0.01
-#pragma parameter PG_upd "Afterglow Persistence Green"  0.32 0.0 0.50 0.01
-#pragma parameter PB_upd "Afterglow Persistence Blue"  0.32 0.0 0.50 0.01
-
-#define PR params.PR_upd
-#define PG params.PG_upd
-#define PB params.PB_upd
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma name AfterglowUpd
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D AfterglowUpdFeedback;
-
-#define TEX0 vTexCoord
-
-
-void main()
-{
-	vec2 dx = vec2(params.OriginalSize.z, 0.0);
-	vec2 dy = vec2(0.0, params.OriginalSize.w);
-	
-	vec3 color0  = COMPAT_TEXTURE(Source, TEX0.xy).rgb;
-	vec3 color1  = COMPAT_TEXTURE(Source, TEX0.xy - dx).rgb;
-	vec3 color2  = COMPAT_TEXTURE(Source, TEX0.xy + dx).rgb;
-	vec3 color3  = COMPAT_TEXTURE(Source, TEX0.xy - dy).rgb;
-	vec3 color4  = COMPAT_TEXTURE(Source, TEX0.xy + dy).rgb;	
-
-//	vec3 color = (2.5 * color0 + color1 + color2 + color3 + color4)/6.5;
-    vec3 color = color0;
-	
-	vec3 accumulate = COMPAT_TEXTURE(AfterglowUpdFeedback, TEX0.xy).rgb;
-
-	float w = 1.0;
-	if ((color0.r + color0.g + color0.b < 5.0/255.0)) { w = 0.0; }
-
-	vec3 result = mix( max(mix(color, accumulate, 0.49 + vec3(PR, PG, PB))- 1.25/255.0, 0.0), color, w);
-
-	FragColor = vec4(result, w);
-}
diff --git a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass3.slang b/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass3.slang
deleted file mode 100644
index a8a2571352..0000000000
--- a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update-pass3.slang
+++ /dev/null
@@ -1,374 +0,0 @@
-#version 450
-
-/*
-   CRT Advanced Afterglow, color altering
-   
-   Copyright (C) 2019-2022 guest(r) and Dr. Venom
-   
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-*/  
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 OriginalSize;
-   vec4 OutputSize;
-   uint FrameCount;
-   float TNTC;
-   float LS;
-   float LUTLOW, LUTBR;   
-   float CP, CS;
-   float WP;
-   float wp_saturation;
-   float AS_upd, sat_upd;
-   float BP;
-   float vigstr;
-   float vigdef;
-   float sega_fix;
-   float pre_bb;
-   float contr;
-} params;
-
-#pragma parameter AS_upd "Afterglow Strength" 0.20 0.0 0.60 0.01
-#define AS params.AS_upd
-
-#pragma parameter sat_upd "Afterglow saturation" 0.50 0.0 1.0 0.01
-#define sat params.sat_upd
-
-//#pragma parameter bogus_color "[ COLOR TWEAKS ]:" 0.0 0.0 1.0 1.0
-//
-//#pragma parameter CS "          Display Gamut: sRGB, Modern, DCI, Adobe, Rec.2020" 0.0 0.0 4.0 1.0 
-//
-//#pragma parameter CP "          CRT Profile: EBU | P22 | SMPTE-C | Philips | Trin." 0.0 -1.0 5.0 1.0 
-//
-//#define CP params.CP
-//#define CS params.CS
-//
-//#pragma parameter TNTC "          LUT Colors: Trin.1 | Trin.2 | Nec Mult. | NTSC" 0.0 0.0 4.0 1.0
-//#define TNTC params.TNTC
-//
-//#pragma parameter LS "          LUT Size" 32.0 16.0 64.0 16.0
-//#define LS params.LS
-//
-//#define LUTLOW 5.0  // "Fix LUT Dark - Range" from 0.0 to 50.0 - RGB singletons
-//
-//#define LUTBR 1.0   // "Fix LUT Brightness" from 0.0 to 1.0
-//
-//#pragma parameter WP "          Color Temperature %" 0.0 -100.0 100.0 5.0 
-//
-//#pragma parameter wp_saturation "          Saturation Adjustment" 1.0 0.0 2.0 0.05
-//
-//#pragma parameter pre_bb "          Brightness Adjustment" 1.0 0.0 2.0 0.01
-//
-//#pragma parameter contr "          Contrast Adjustment" 0.0 -2.0 2.0 0.05
-//
-//#pragma parameter sega_fix "          Sega Brightness Fix" 0.0 0.0 1.0 1.0
-//
-//#pragma parameter BP "          Raise Black Level" 0.0 -100.0 25.0 1.0
-//
-//#pragma parameter vigstr "          Vignette Strength" 0.0 0.0 2.0 0.05
-//
-//#pragma parameter vigdef "          Vignette Size" 1.0 0.5 3.0 0.10
-//
-//#define WP params.WP
-//#define wp_saturation params.wp_saturation
-//#define BP params.BP
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D AfterglowUpdPre;
-layout(set = 0, binding = 3) uniform sampler2D AfterglowUpd;
-//layout(set = 0, binding = 4) uniform sampler2D SamplerLUT1;
-//layout(set = 0, binding = 5) uniform sampler2D SamplerLUT2;
-//layout(set = 0, binding = 6) uniform sampler2D SamplerLUT3;
-//layout(set = 0, binding = 7) uniform sampler2D SamplerLUT4;
-
-#define COMPAT_TEXTURE(c,d) texture(c,d)
-
-
-// Color profile matrices
-
-//const mat3 Profile0 = 
-//mat3(
-// 0.412391,  0.212639,  0.019331,
-// 0.357584,  0.715169,  0.119195,
-// 0.180481,  0.072192,  0.950532
-//);
-//
-//const mat3 Profile1 = 
-//mat3(
-// 0.430554,  0.222004,  0.020182,
-// 0.341550,  0.706655,  0.129553,
-// 0.178352,  0.071341,  0.939322
-//);
-//
-//const mat3 Profile2 = 
-//mat3(
-// 0.396686,  0.210299,  0.006131,
-// 0.372504,  0.713766,  0.115356,
-// 0.181266,  0.075936,  0.967571
-//);
-//
-//const mat3 Profile3 = 
-//mat3(
-// 0.393521,  0.212376,  0.018739,
-// 0.365258,  0.701060,  0.111934,
-// 0.191677,  0.086564,  0.958385
-//);
-//
-//const mat3 Profile4 = 
-//mat3(
-// 0.392258,  0.209410,  0.016061,
-// 0.351135,  0.725680,  0.093636,
-// 0.166603,  0.064910,  0.850324
-//);
-//
-//const mat3 Profile5 = 
-//mat3(
-// 0.377923,  0.195679,  0.010514,
-// 0.317366,  0.722319,  0.097826,
-// 0.207738,  0.082002,  1.076960
-//);
-//
-//const mat3 ToSRGB = 
-//mat3(
-// 3.240970, -0.969244,  0.055630,
-//-1.537383,  1.875968, -0.203977,
-//-0.498611,  0.041555,  1.056972
-//);
-//
-//const mat3 ToModern = 
-//mat3(
-// 2.791723,	-0.894766,	0.041678,
-//-1.173165,	 1.815586, -0.130886,
-//-0.440973,	 0.032000,	1.002034
-//);
-//
-//const mat3 ToDCI = 
-//mat3(
-// 2.493497,	-0.829489,	0.035846,
-//-0.931384,	 1.762664, -0.076172,
-//-0.402711,	 0.023625,	0.956885
-//);
-//
-//const mat3 ToAdobe = 
-//mat3(
-// 2.041588, -0.969244,  0.013444,
-//-0.565007,  1.875968, -0.11836,
-//-0.344731,  0.041555,  1.015175
-//);
-//
-//const mat3 ToREC = 
-//mat3(
-// 1.716651, -0.666684,  0.017640,
-//-0.355671,  1.616481, -0.042771,
-//-0.253366,  0.015769,  0.942103
-//); 
-
-// Color temperature matrices
-
-//const mat3 D65_to_D55 = mat3 (
-//           0.4850339153,  0.2500956126,  0.0227359648,
-//           0.3488957224,  0.6977914447,  0.1162985741,
-//           0.1302823568,  0.0521129427,  0.6861537456);
-//
-//
-//const mat3 D65_to_D93 = mat3 (
-//           0.3412754080,  0.1759701322,  0.0159972847,
-//           0.3646170520,  0.7292341040,  0.1215390173,
-//           0.2369894093,  0.0947957637,  1.2481442225);
-//
-//
-//vec3 fix_lut(vec3 lutcolor, vec3 ref)
-//{
-//	float r = length(ref);
-//	float l = length(lutcolor);
-//	float m = max(max(ref.r,ref.g),ref.b);
-//	ref = normalize(lutcolor + 0.0000001) * mix(r, l, pow(m,1.25));
-//	return mix(lutcolor, ref, LUTBR);
-//}
-//
-//
-//float vignette(vec2 pos) {
-//	vec2 b = vec2(params.vigdef, params.vigdef) *  vec2(1.0, params.OriginalSize.x/params.OriginalSize.y) * 0.125;
-//	pos = clamp(pos, 0.0, 1.0);
-//	pos = abs(2.0*(pos - 0.5));
-//	vec2 res = mix(0.0.xx, 1.0.xx, smoothstep(1.0.xx, 1.0.xx-b, sqrt(pos)));
-//	res = pow(res, 0.70.xx);	
-//	return max(mix(1.0, sqrt(res.x*res.y), params.vigstr), 0.0);
-//}
-//
-//
-//vec3 plant (vec3 tar, float r)
-//{
-//	float t = max(max(tar.r,tar.g),tar.b) + 0.00001;
-//	return tar * r / t;
-//}
-//
-//float contrast(float x)
-//{
-//	return max(mix(x, smoothstep(0.0, 1.0, x), params.contr),0.0);
-//}
-
-
-void main()
-{
-   vec4 imgColor = COMPAT_TEXTURE(AfterglowUpdPre, vTexCoord.xy);
-   vec4 aftglow = COMPAT_TEXTURE(AfterglowUpd, vTexCoord.xy);
-   
-   float w = 1.0-aftglow.w;
-
-   float l = length(aftglow.rgb);
-   aftglow.rgb = AS*w*normalize(pow(aftglow.rgb + 0.01, vec3(sat)))*l;
-   
-   FragColor = vec4(imgColor.rgb + aftglow.rgb, 1.0);
-   
-//   float bp = w * BP/255.0;
-//   
-//   if (params.sega_fix > 0.5) imgColor.rgb = imgColor.rgb * (255.0 / 239.0);
-//   
-//   imgColor.rgb = min(imgColor.rgb, 1.0);
-//   
-//   vec3 color = imgColor.rgb;
-// 
-//   if (int(TNTC) == 0)
-//   {
-//      color.rgb = imgColor.rgb;
-//   }
-//   else
-//   {
-//	  float lutlow = LUTLOW/255.0; float invLS = 1.0/LS;
-//	  vec3 lut_ref = imgColor.rgb + lutlow*(1.0 - pow(imgColor.rgb, 0.333.xxx));
-//	  float lutb = lut_ref.b * (1.0-0.5*invLS);	  
-//	  lut_ref.rg    = lut_ref.rg * (1.0-invLS) + 0.5*invLS; 
-//	  float tile1 = ceil (lutb * (LS-1.0));
-//	  float tile0 = max(tile1 - 1.0, 0.0);
-//	  float f = fract(lutb * (LS-1.0)); if (f == 0.0) f = 1.0;
-//	  vec2 coord0 = vec2(tile0 + lut_ref.r, lut_ref.g)*vec2(invLS, 1.0);
-//	  vec2 coord1 = vec2(tile1 + lut_ref.r, lut_ref.g)*vec2(invLS, 1.0);
-//	  vec4 color1, color2, res;
-//	  
-//      if (int(TNTC) == 1)
-//      {
-//         color1 = COMPAT_TEXTURE(SamplerLUT1, coord0);
-//         color2 = COMPAT_TEXTURE(SamplerLUT1, coord1);
-//         res = mix(color1, color2, f);
-//      }
-//      else if (int(TNTC) == 2)
-//      {
-//         color1 = COMPAT_TEXTURE(SamplerLUT2, coord0);
-//         color2 = COMPAT_TEXTURE(SamplerLUT2, coord1);
-//         res = mix(color1, color2, f);
-//      }	
-//      else if (int(TNTC) == 3)
-//      {
-//         color1 = COMPAT_TEXTURE(SamplerLUT3, coord0);
-//         color2 = COMPAT_TEXTURE(SamplerLUT3, coord1);
-//         res = mix(color1, color2, f);
-//      }	
-//      else if (int(TNTC) == 4)
-//      {
-//         color1 = COMPAT_TEXTURE(SamplerLUT4, coord0);
-//         color2 = COMPAT_TEXTURE(SamplerLUT4, coord1);
-//         res = mix(color1, color2, f);
-//      }	
-//
-//      res.rgb = fix_lut (res.rgb, imgColor.rgb);
-//	  
-//      color = mix(imgColor.rgb, res.rgb, min(TNTC,1.0));
-//   }
-//
-//	vec3 c = clamp(color, 0.0, 1.0);
-//	
-//	float p;
-//	mat3 m_out;
-//	
-//	if (CS == 0.0) { p = 2.2; m_out =  ToSRGB;   } else
-//	if (CS == 1.0) { p = 2.2; m_out =  ToModern; } else	
-//	if (CS == 2.0) { p = 2.6; m_out =  ToDCI;    } else
-//	if (CS == 3.0) { p = 2.2; m_out =  ToAdobe;  } else
-//	if (CS == 4.0) { p = 2.4; m_out =  ToREC;    }
-//	
-//	color = pow(c, vec3(p));
-//	
-//	mat3 m_in = Profile0;
-//
-//	if (CP == 0.0) { m_in = Profile0; } else	
-//	if (CP == 1.0) { m_in = Profile1; } else
-//	if (CP == 2.0) { m_in = Profile2; } else
-//	if (CP == 3.0) { m_in = Profile3; } else
-//	if (CP == 4.0) { m_in = Profile4; } else
-//	if (CP == 5.0) { m_in = Profile5; }
-//	
-//	color = m_in*color;
-//	color = m_out*color;
-//
-//	color = clamp(color, 0.0, 1.0);
-//
-//	color = pow(color, vec3(1.0/p));	
-//	
-//	if (CP == -1.0) color = c;
-//	
-//	vec3 scolor1 = plant(pow(color, vec3(wp_saturation)), max(max(color.r,color.g),color.b));
-//	float luma = dot(color, vec3(0.299, 0.587, 0.114));
-//	vec3 scolor2 = mix(vec3(luma), color, wp_saturation);
-//	color = (wp_saturation > 1.0) ? scolor1 : scolor2;
-//
-//	color = plant(color, contrast(max(max(color.r,color.g),color.b)));
-//
-//	p = 2.2;
-//	color = clamp(color, 0.0, 1.0);	
-//	color = pow(color, vec3(p)); 
-//	
-//	vec3 warmer = D65_to_D55*color;
-//	warmer = ToSRGB*warmer;
-//	
-//	vec3 cooler = D65_to_D93*color;
-//	cooler = ToSRGB*cooler;
-//	
-//	float m = abs(WP)/100.0;
-//	
-//	vec3 comp = (WP < 0.0) ? cooler : warmer;
-//	
-//	color = mix(color, comp, m);
-//	color = pow(max(color, 0.0), vec3(1.0/p));
-//
-//	if (BP > -0.5) color = color + aftglow.rgb + bp; else
-//	{ 
-//		color = max(color + BP/255.0, 0.0) / (1.0 + BP/255.0*step(- BP/255.0, max(max(color.r,color.g),color.b))) + aftglow.rgb;
-//	}
-//	
-//	color = min(color * params.pre_bb, 1.0);
-//	
-//	FragColor = vec4(color, vignette(vTexCoord.xy)); 
-} 
diff --git a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update.slangp b/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update.slangp
deleted file mode 100644
index b4ee6fa1a5..0000000000
--- a/ntsc/shaders/patchy-ntsc/afterglow0-update/afterglow0-update.slangp
+++ /dev/null
@@ -1,34 +0,0 @@
-shaders = "3"
-shader0 = "afterglow0-update-pass1.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "afterglow0-update-pass2.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "afterglow0-update-pass3.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
diff --git a/ntsc/shaders/patchy-ntsc/generationcommands.txt b/ntsc/shaders/patchy-ntsc/generationcommands.txt
deleted file mode 100644
index c91d63a0fd..0000000000
--- a/ntsc/shaders/patchy-ntsc/generationcommands.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-./gamutthingy -i 64.png -o P22.png -g linear -s ntscjp22trinitron -d srgb --map-mode compress --gma vpr --safe-zone-type const-detail --remap-factor 0.4 --remap-limit 0.9 --knee soft --knee-factor 0.4 --di false --sc true
-
diff --git a/ntsc/tiny_ntsc.slangp b/ntsc/tiny_ntsc.slangp
deleted file mode 100644
index 1a6a52c757..0000000000
--- a/ntsc/tiny_ntsc.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 2
-
-shader0 = shaders/ntsc-simple/tiny_ntsc.slang
-
-shader1 = shaders/ntsc-simple/kaizer-lp-small.slang
\ No newline at end of file
diff --git a/pal/pal-r57shell-moire-only.slangp b/pal/pal-r57shell-moire-only.slangp
deleted file mode 100644
index 1ee7e62063..0000000000
--- a/pal/pal-r57shell-moire-only.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/pal-r57shell-moire-only.slang
-scale_type0 = source
diff --git a/pal/shaders/pal-r57shell-moire-only.slang b/pal/shaders/pal-r57shell-moire-only.slang
deleted file mode 100644
index c7419ec70d..0000000000
--- a/pal/shaders/pal-r57shell-moire-only.slang
+++ /dev/null
@@ -1,118 +0,0 @@
-#version 450
-
-// NES CRT simulation (PAL)
-// by r57shell
-// https://www.shadertoy.com/view/MlsXWM
-// WARNING: NOOB HERE :)
-// Stream RU
-// http://sc2tv.ru/channel/r57shell
-// http://cybergame.tv/r57shell
-// http://twitch.tv/elektropage
-
-// some details
-// http://forums.nesdev.com/viewtopic.php?f=3&t=12788&start=15
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00004;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define iChannel0 Source
-#define iResolution params.SourceSize
-#define fragCoord vec2(vTexCoord.xy * params.OutputSize.xy)
-
-vec2 size = params.SourceSize.xy;//vec2(320.,240.);
-const float pi = 3.141592654;
-
-vec3 monitor(vec2 p)
-{
-	vec2 pos = floor(p*size);
-	vec2 uv = vTexCoord;// floor(pos)/size;
-   	vec4 res = texture(iChannel0, uv);
-    vec3 yuv = res.xyz*mat3(
-        0.2126, 0.7152, 0.0722,
-		-0.09991, -0.33609, 0.436,
-		0.615, -0.55861, -0.05639);
-    float alpha = (floor(p.x*size.x*4.)/2.0)*pi;
-    vec2 sincv = vec2(cos(alpha), sin(alpha));
-    if (mod(pos.y + 5.,4.) < 2.)
-     sincv.x = -sincv.x;
-    if (mod(pos.y, 4.) >= 2.)
-     sincv.y = -sincv.y;
-    float mc = 1.+dot(sincv, yuv.zy)/yuv.x;
-
-    /*vec3 rgb = vec3(
-        yuv.x + 1.28033 * yuv.z,
-		yuv.x - 0.21482 * yuv.y - 0.38059 * yuv.z,
-		yuv.x + 2.12798 * yuv.y);*/
-    return res.xyz*mc;
-}
-
-// pos (left corner, sample size)
-vec4 monitor_sample(vec2 p, vec2 tex_sample)
-{
-	// linear interpolation was...
-    // now other thing.
-    // http://imgur.com/m8Z8trV
-    // AT LAST IT WORKS!!!!
-    vec2 next = vec2(.25,1.)/size;
-    vec2 f = fract(vec2(4.,1.)*size*p);
-    tex_sample *= vec2(4.,1.)*size;
-    vec2 l;
-    vec2 r;
-    if (f.x+tex_sample.x < 1.)
-    {
-       	l.x = f.x+tex_sample.x;
-        r.x = 0.;
-    }
-    else
-    {
-        l.x = 1.-f.x;
-        r.x = min(1.,f.x+tex_sample.x-1.);
-    }
-    if (f.y+tex_sample.y < 1.)
-    {
-       	l.y = f.y+tex_sample.y;
-        r.y = 0.;
-    }
-    else
-    {
-        l.y = 1.-f.y;
-        r.y = min(1.,f.y+tex_sample.y-1.);
-    }
-    vec3 top = mix(monitor(p),monitor(p+vec2(next.x,0.)),r.x/(l.x+r.x));
-    vec3 bottom = mix(monitor(p+vec2(0.,next.y)),monitor(p+next),r.x/(l.x+r.x));
-   	return vec4(mix(top,bottom,r.y/(l.y+r.y)),1.0);
-    //difference should be only on border of pixels
-    //return vec4((mix(top,bottom,r.y/(l.y+r.y)) - monitor(p))*2.+0.5,1.0);
-}
-
-void main()
-{
-	float zoom = 1.;
-	FragColor = monitor_sample(vTexCoord, vec2(1.0));
-}
diff --git a/pixel-art-scaling/bandlimit-pixel.slangp b/pixel-art-scaling/bandlimit-pixel.slangp
deleted file mode 100644
index 99f6e28228..0000000000
--- a/pixel-art-scaling/bandlimit-pixel.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 2
-shader0 = ../linear/linearize.slang
-shader1 = shaders/bandlimit-pixel.slang
-
-filter_linear0 = false 
-scale_type0 = source
-scale0 = 1.0
-srgb_framebuffer0 = true
-
-filter_linear1 = true
-scale_type1 = viewport
diff --git a/pixel-art-scaling/bilinear-adjustable.slangp b/pixel-art-scaling/bilinear-adjustable.slangp
deleted file mode 100644
index 84bd2614c6..0000000000
--- a/pixel-art-scaling/bilinear-adjustable.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = "shaders/bilinear-adjustable.slang"
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/pixel-art-scaling/cleanEdge-rotate.slangp b/pixel-art-scaling/cleanEdge-rotate.slangp
deleted file mode 100644
index fd6e3b83a9..0000000000
--- a/pixel-art-scaling/cleanEdge-rotate.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-
-shader0 = shaders/cleanEdge-rotate.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
diff --git a/pixel-art-scaling/controlled_sharpness.slangp b/pixel-art-scaling/controlled_sharpness.slangp
deleted file mode 100644
index 1dee29bc97..0000000000
--- a/pixel-art-scaling/controlled_sharpness.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ControlledSharpness.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/pixel-art-scaling/edge1pixel.slangp b/pixel-art-scaling/edge1pixel.slangp
deleted file mode 100644
index 810fcf4118..0000000000
--- a/pixel-art-scaling/edge1pixel.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/edge1pixel.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/pixel-art-scaling/edgeNpixels.slangp b/pixel-art-scaling/edgeNpixels.slangp
deleted file mode 100644
index 86db504833..0000000000
--- a/pixel-art-scaling/edgeNpixels.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/edgeNpixels.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/pixel-art-scaling/grid-blend-hybrid.slangp b/pixel-art-scaling/grid-blend-hybrid.slangp
deleted file mode 100644
index 7d532a9ad7..0000000000
--- a/pixel-art-scaling/grid-blend-hybrid.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/grid-blend-hybrid.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/pixel-art-scaling/shaders/ControlledSharpness.slang b/pixel-art-scaling/shaders/ControlledSharpness.slang
deleted file mode 100644
index 0e2dcb1186..0000000000
--- a/pixel-art-scaling/shaders/ControlledSharpness.slang
+++ /dev/null
@@ -1,55 +0,0 @@
-#version 450
-
-//https://www.desmos.com/calculator/3zhzwbfrxd
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float sharpness;
-} params;
-
-#pragma parameter sharpness "Sharpness" 0.4 0.001 0.95 0.05
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec2 f(vec2 x, float n) {
-    float c = 2 / (1-params.sharpness) - 1;
-    return pow(x,vec2(c)) / pow(n,c-1);
-}
-
-void main()
-{
-    vec2 SStep = vTexCoord * params.SourceSize.xy + 0.5;
-	vec2 SStepInt = floor(SStep);
-	vec2 SStepFra = SStep - SStepInt;
-
-
-    vec2 f0 = f(SStepFra,0.5);
-    vec2 f2 = 1-f(1-SStepFra,0.5);
-
-    SStep = ((mix(f0,f2,greaterThanEqual(SStepFra,vec2(0.5)))) + SStepInt - 0.5) * params.SourceSize.zw;
-
-    FragColor = texture(Source, SStep);
-}
diff --git a/pixel-art-scaling/shaders/SmuberStep.slang b/pixel-art-scaling/shaders/SmuberStep.slang
deleted file mode 100644
index aaf8bfbe46..0000000000
--- a/pixel-art-scaling/shaders/SmuberStep.slang
+++ /dev/null
@@ -1,44 +0,0 @@
-#version 450
-
-//SmuberStep - Like SmoothestStep but even Smoothester
-//by torridgristle
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-    vec2 SStep = vTexCoord * params.SourceSize.xy + 0.5;
-	vec2 SStepInt = floor(SStep);
-	vec2 SStepFra = SStep - SStepInt;
-
-    SStep = ((924*pow(SStepFra,vec2(13)) - 6006*pow(SStepFra,vec2(12)) + 16380*pow(SStepFra,vec2(11)) - 24024*pow(SStepFra,vec2(10)) + 20020*pow(SStepFra,vec2(9)) - 9009*pow(SStepFra,vec2(8)) + 1716*pow(SStepFra,vec2(7))) + SStepInt - 0.5) * params.SourceSize.zw;
-
-    FragColor = texture(Source, SStep);
-}
diff --git a/pixel-art-scaling/shaders/bilinear-adjustable.slang b/pixel-art-scaling/shaders/bilinear-adjustable.slang
deleted file mode 100644
index bf4cadd78b..0000000000
--- a/pixel-art-scaling/shaders/bilinear-adjustable.slang
+++ /dev/null
@@ -1,79 +0,0 @@
-#version 450
-
-/*
-   April 2023
-   Adjustable Bilinear by DariusG
-
-*/
-#pragma parameter sharp1 "Horizontal Sharpness" 1.0 1.0 10.0 0.1
-#pragma parameter sharp2 "Vertical Sharpness" 1.0 1.0 10.0 0.1
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	float sharp1;
-	float sharp2;
-
-} params;
-
-#define sharp1 params.sharp1
-#define sharp2 params.sharp2
-#define SourceSize params.SourceSize
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	vec4 FinalViewportSize;
-	vec4 OutputSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord*1.0001;
-
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-
-void main()
-{
-
-vec2 OneTexel = SourceSize.zw;
-
-vec2 OGL2Pos = vTexCoord * SourceSize.xy;
-vec2 pC4 = floor(OGL2Pos) * OneTexel + 0.5*OneTexel;
-
-vec2 coord4 = vec2 (0.0);
-vec2 coord2 = vec2 (OneTexel.x, 0.0 );
-vec2 coord1 = vec2 (0.0, OneTexel.y);
-vec2 coord3 = vec2 (OneTexel.x, OneTexel.y);
-
-
-vec4 s4 = vec4(texture(Source, pC4 + coord4));
-vec4 s2 = vec4(texture(Source, pC4 + coord2));
-vec4 s1 = vec4(texture(Source, pC4 + coord1));
-vec4 s3 = vec4(texture(Source, pC4 + coord3));
-
-float fu = pow(fract(OGL2Pos.x),sharp1);
-float fv = pow(fract(OGL2Pos.y),sharp2);
-
-vec4 tmp1 = mix(s4, s2, fu);
-vec4 tmp2 = mix(s1, s3, fu);
-
-vec4 t0 = mix(tmp1, tmp2, fv);
-
-	FragColor = t0;
-}
diff --git a/pixel-art-scaling/shaders/cleanEdge-rotate.slang b/pixel-art-scaling/shaders/cleanEdge-rotate.slang
deleted file mode 100644
index 73d03c4df7..0000000000
--- a/pixel-art-scaling/shaders/cleanEdge-rotate.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float simthresh, linewidth, ce_rotation, ce_zoom, ce_x_off, ce_y_off, ce_mode;
-} params;
-
-#pragma parameter linewidth "Line Width" 1.0 0.01 2.0 0.1
-float lineWidth = params.linewidth;
-
-// +/-3.14 = 180 degrees; +/-6.28 = 360 degrees
-#pragma parameter ce_rotation "Rotation" 0.0 -6.28 6.28 0.01
-float ROTATION = params.ce_rotation;
-
-#pragma parameter ce_zoom "Zoom" 1.0 0.0 2.0 0.01
-float ZOOM = params.ce_zoom;
-#pragma parameter ce_x_off "X Offset" 0.0 -1.0 1.0 0.002
-float X_OFF = params.ce_x_off;
-#pragma parameter ce_y_off "Y Offset" 0.0 -1.0 1.0 0.002
-float Y_OFF = params.ce_y_off;
-
-//how close two colors should be to be considered "similar".
-// can group shapes of visually similar colors, but creates
-// some artifacting and should be kept as low as possible.
-#pragma parameter simthresh "Similarity Threshold" 0.0 0.0 1.0 0.01
-float similarThreshold = params.simthresh;
-
-#pragma parameter ce_mode "cleanEdge Effect Toggle (debug)" 1.0 0.0 1.0 1.0
-bool mode = bool(params.ce_mode);
-
-#include "../../include/cleanEdge.inc"
diff --git a/pixel-art-scaling/shaders/edge1pixel.slang b/pixel-art-scaling/shaders/edge1pixel.slang
deleted file mode 100644
index 53f35834a6..0000000000
--- a/pixel-art-scaling/shaders/edge1pixel.slang
+++ /dev/null
@@ -1,77 +0,0 @@
-#version 450
-
-// Insert a single interpolated display (high-res)
-// pixel row between each pair of adjacent source (low-res) pixels.
-// by decavoid
-
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 PixelCoords;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   PixelCoords = TexCoord * params.SourceSize.xy; // NES x: [0; 256], y: [0; 240]
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 PixelCoords;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec2 inverseScaleHalf = vec2(params.OriginalSize.xy / params.OutputSize.xy) * 0.5;
-
-vec2 isInside(vec2 v, vec2 left, vec2 right)
-{
-	return step(left, v) - step(right, v);
-}
-
-// uncomment to see a red grid of modified pixels
-//#define DEBUG_DRAW_EDGES
-
-void main()
-{
-	vec2 iPixelCoords = floor(PixelCoords);
-	vec2 coordAtPixelCenter = iPixelCoords + vec2(0.5);
-	vec2 coordBetweenPixels = round(PixelCoords);
-	vec2 f = fract(PixelCoords) + vec2(1e-3);
-	vec2 isFractionInside = isInside(f, inverseScaleHalf, 1.0 - inverseScaleHalf);
-
-/*
-	Equivalent:
-	if (isFractionInside.x)
-	{
-		// shift coord to the nearest pixel center to prevent interpolation
-		newCoord.x = coordAtPixelCenter.x;
-	}
-	else
-	{
-		// shift exactly between pixels for perfect interpolation
-		newCoord.x = coordBetweenPixels.x;
-	}
-*/
-
-	vec2 newCoord = isFractionInside * coordAtPixelCenter + (1 - isFractionInside) * coordBetweenPixels;
-	vec2 newTexCoord = newCoord * params.SourceSize.zw;
-	FragColor = texture(Source, newTexCoord);
-
-#ifdef DEBUG_DRAW_EDGES
-	if (isFractionInside.x + isFractionInside.y < 2)
-		FragColor.r = 1;
-#endif
-}
diff --git a/pixel-art-scaling/shaders/edgeNpixels.slang b/pixel-art-scaling/shaders/edgeNpixels.slang
deleted file mode 100644
index e26e62477c..0000000000
--- a/pixel-art-scaling/shaders/edgeNpixels.slang
+++ /dev/null
@@ -1,74 +0,0 @@
-#version 450
-
-// Insert a configurable count (1, 2, 3...) of interpolated display (high-res)
-// pixel rows between each pair of adjacent source (low-res) pixels.
-// by decavoid
-
-
-#pragma parameter PixelCount "Pixel Count" 2.0 1.0 8.0 1.0
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float PixelCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 PixelCoords;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-	PixelCoords = TexCoord * params.SourceSize.xy; // NES x: [0; 256], y: [0; 240]
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 PixelCoords;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-// uncomment to see a red grid of modified pixels
-//#define DEBUG_DRAW_EDGES
-
-vec4 sizeScale = params.OutputSize / params.OriginalSize;
-vec2 interpolationRangeHalf = params.PixelCount * 0.5 * sizeScale.zw;
-float stepPerRow = 1.0 / (params.PixelCount + 1.0);
-
-void main()
-{
-	vec2 coordAtPixelCenter = (floor(PixelCoords) + vec2(0.5));
-	vec2 coordBetweenPixels = round(PixelCoords);
-	vec2 origOffset = PixelCoords - coordBetweenPixels + 1e-3; // [-0.5; 0.5]
-
-	vec2 needInterpolate = step(abs(origOffset), interpolationRangeHalf);
-
-	// if needInterpolate == 0, disable interpolation by choosing coordAtPixelCenter.
-	//
-	// if needInterpolate == 1, transform origOffset.x
-	// from range [-interpolationRangeHalf.x; interpolationRangeHalf.x]
-	// to range (-0.5; 0.5)
-	vec2 segmentIndex = floor((origOffset + interpolationRangeHalf) * sizeScale.xy);
-	vec2 transformedOffset = stepPerRow * (segmentIndex + 1) - 0.5;
-	vec2 interpolatedCoord = coordBetweenPixels + transformedOffset;
-
-	vec2 newCoord = (1 - needInterpolate) * coordAtPixelCenter + needInterpolate * interpolatedCoord;
-	vec2 newTexCoord = newCoord * params.SourceSize.zw;
-
-	FragColor = texture(Source, newTexCoord);
-
-#ifdef DEBUG_DRAW_EDGES
-	if (needInterpolate.x + needInterpolate.y > 0)
-		FragColor.r = 1;
-#endif
-}
diff --git a/pixel-art-scaling/shaders/grid-blend-hybrid.slang b/pixel-art-scaling/shaders/grid-blend-hybrid.slang
deleted file mode 100644
index 09f24cc80f..0000000000
--- a/pixel-art-scaling/shaders/grid-blend-hybrid.slang
+++ /dev/null
@@ -1,58 +0,0 @@
-#version 450
-
-// based on Cole Cecil's
-// Scaling Pixel ARt Without Destroying It
-// https://colececil.io/blog/2017/scaling-pixel-art-without-destroying-it/
-
-// This shader needs bilinear filtering
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 textureCoords;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.00001;
-   textureCoords = vTexCoord * params.SourceSize.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 textureCoords;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   // For the current screen pixel, find its location in relation to the nearest texels).
-   vec2 locationWithinTexel = fract(textureCoords);
-   
-   // How many texels are in each pixel
-   vec2 texelsPerPixel = params.OutputSize.zw * params.SourceSize.xy;
-   
-   // Determine how much (if at all) we need to interpolate between the colors of the nearest texels
-   // No interpolation means it’s using nearest neighbor filtering.
-   // Interpolation means it’s using bilinear filtering
-   vec2 interpolationAmount = clamp(locationWithinTexel / texelsPerPixel, 0., 0.5)
-         + clamp((locationWithinTexel - 1.) / texelsPerPixel + 0.5, 0., 0.5);
-         
-   // Given the interpolation amount, calculate and return the color of the pixel.
-   vec2 finalTextureCoords = (floor(textureCoords) + interpolationAmount) * params.SourceSize.zw;
-   FragColor = vec4(texture(Source, finalTextureCoords).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/pixel-art-scaling/shaders/smootheststep.slang b/pixel-art-scaling/shaders/smootheststep.slang
deleted file mode 100644
index 93947ae4cd..0000000000
--- a/pixel-art-scaling/shaders/smootheststep.slang
+++ /dev/null
@@ -1,62 +0,0 @@
-#version 450
-
-/*
-	Fragment shader based on "Improved texture interpolation" by Iñigo Quílez
-	Original description: http://www.iquilezles.org/www/articles/texture/texture.htm
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec2 p = vTexCoord.xy;
-
-	p = p * params.SourceSize.xy + vec2(0.5, 0.5);
-
-	vec2 i = floor(p);
-	vec2 f = p - i;
-
-	// Smoothstep - amazingly, smoothstep() is slower than calculating directly the expression!
-//	f = smoothstep(0.0, 1.0, f);
-//	f = f * f * ( -2.0 * f + 3.0);
-
-	// Quilez - This is sharper than smoothstep.
-	//f = f * f * f * (f * (f * 6.0 - vec2(15.0, 15.0)) + vec2(10.0, 10.0));
-
-	// smootheststep - This is even sharper than Quilez!
-	f = f * f * f * f * (f * (f * (-20.0 * f + vec2(70.0, 70.0)) - vec2(84.0, 84.0)) + vec2(35.0, 35.0));
-
-	p = i + f;
-
-	p = (p - vec2(0.5, 0.5)) * params.SourceSize.zw;
-
-	// final sum and weight normalization
-   FragColor = vec4(texture(Source, p).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/pixel-art-scaling/sharp-bilinear-2x-prescale.slangp b/pixel-art-scaling/sharp-bilinear-2x-prescale.slangp
deleted file mode 100644
index e17e40a5ff..0000000000
--- a/pixel-art-scaling/sharp-bilinear-2x-prescale.slangp
+++ /dev/null
@@ -1,8 +0,0 @@
-shaders = 2
-shader0 = "../stock.slang"
-filter_linear0 = false
-scale_type0 = source
-scale0 = 2.0
-shader1 = "../stock.slang"
-filter_linear1 = true
-scale_type1 = viewport
diff --git a/pixel-art-scaling/smootheststep.slangp b/pixel-art-scaling/smootheststep.slangp
deleted file mode 100644
index 91bd97d87b..0000000000
--- a/pixel-art-scaling/smootheststep.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/smootheststep.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/pixel-art-scaling/smuberstep.slangp b/pixel-art-scaling/smuberstep.slangp
deleted file mode 100644
index 9d24620e40..0000000000
--- a/pixel-art-scaling/smuberstep.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/SmuberStep.slang
-filter_linear0 = true
-scale_type0 = viewport
diff --git a/presets/c64-monitor.slangp b/presets/c64-monitor.slangp
deleted file mode 100644
index 921bc1cf5c..0000000000
--- a/presets/c64-monitor.slangp
+++ /dev/null
@@ -1,26 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-scale_x0 = "640.0"
-scale_type_x0 = absolute
-alias0 = artifact_colors_refpass
-
-shader1 = ../ntsc/shaders/artifact-colors/artifact-colors0.slang
-scale1 = 1.0
-scale_type1 = source
-filter_linear1 = false
-alias1 = Pass1
-
-shader2 = ../ntsc/shaders/artifact-colors/artifact-colors1.slang
-scale2 = 1.0
-scale_type2 = source
-filter_linear2 = false
-alias2 = Pass2
-float_framebuffer2 = true
-
-shader3 = ../ntsc/shaders/artifact-colors/artifact-colors2.slang
-scale3 = 1.0
-scale_type3 = source
-filter_linear3 = false
-
-shader4 = ../crt/shaders/crt-lottes.slang
diff --git a/presets/crt-geom-deluxe-ntsc-adaptive.slangp b/presets/crt-geom-deluxe-ntsc-adaptive.slangp
deleted file mode 100644
index deef1547ec..0000000000
--- a/presets/crt-geom-deluxe-ntsc-adaptive.slangp
+++ /dev/null
@@ -1,60 +0,0 @@
-shaders = 7
-
-shader0 = ../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang
-scale_type0 = source
-scale_x0 = 4.0
-filter_linear0 = false
-scale_y0 = 1.0
-float_framebuffer0 = true
-
-shader1 = ../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-filter_linear1 = true
-
-shader2 = ../crt/shaders/geom-deluxe/phosphor_apply.slang
-alias2 = internal1
-
-shader3 = ../crt/shaders/geom-deluxe/phosphor_update.slang
-alias3 = phosphor
-
-shader4 = ../crt/shaders/geom-deluxe/gaussx.slang
-filter_linear4 = true
-alias4 = internal2
-
-shader5 = ../crt/shaders/geom-deluxe/gaussy.slang
-filter_linear5 = true
-alias5 = blur_texture
-
-shader6 = ../crt/shaders/geom-deluxe/crt-geom-deluxe.slang
-filter_linear6 = true
-mipmap_input6 = true
-
-# ntsc-adaptive
-# These settings are meant to get correct looking transparencies and
-# dithering when emulating systems that rely on NTSC composite artifact
-# colors (like Sega Genesis/Mega Drive) without actually introducing
-# composite motion artifacts.
-quality = -1.0
-ntsc_fields = 1.0
-ntsc_phase = "2.0"
-cust_fringing = "1.00"
-cust_artifacting = "2.30"
-
-# crt-geom-deluxe
-textures = "aperture;slot;delta"
-delta = ../crt/shaders/geom-deluxe/masks/delta_2_4x1_rgb.png
-delta_filter_linear = true
-delta_repeat_mode = repeat
-slot = ../crt/shaders/geom-deluxe/masks/slot_2_5x4_bgr.png
-slot_filter_linear = true
-slot_repeat_mode = repeat
-aperture = ../crt/shaders/geom-deluxe/masks/aperture_2_4_rgb.png
-aperture_filter_linear = true
-aperture_repeat_mode = repeat
-curvature = "0.0"
-cornersmooth = "170.0"
-scanline_weight = "0.40"
-geom_lum = "0.25"
-halation = "0.05"
diff --git a/presets/crt-geom-simple.slangp b/presets/crt-geom-simple.slangp
deleted file mode 100644
index 196df4115d..0000000000
--- a/presets/crt-geom-simple.slangp
+++ /dev/null
@@ -1,27 +0,0 @@
-shaders = "3"
-feedback_pass = "0"
-shader0 = "../misc/shaders/simple_color_controls.slang"
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../misc/shaders/chromaticity.slang"
-filter_linear1 = "false"
-shader2 = "../crt/shaders/crt-simple.slang"
-filter_linear2 = "true"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "viewport"
-scale_y2 = "1.000000"
-TEMP = "7079.000000"
-SAT = "1.080000"
-BRIGHTNESS = "1.020000"
-contrast = "1.020000"
-BLACK = "0.010000"
-postbr = "1.050000"
-gamma_out_red = "2.300000"
-gamma_out_green = "2.100000"
-DISTORTION = "0.100000"
-INPUTGAMMA = "2.000000"
-OUTPUTGAMMA = "2.000000"
diff --git a/presets/crt-hyllian-sinc-smartblur-sgenpt.slangp b/presets/crt-hyllian-sinc-smartblur-sgenpt.slangp
deleted file mode 100644
index 2e7880f296..0000000000
--- a/presets/crt-hyllian-sinc-smartblur-sgenpt.slangp
+++ /dev/null
@@ -1,67 +0,0 @@
-shaders = "5"
-shader0 = "../dithering/shaders/sgenpt-mix.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "2.000000"
-scale_type_y0 = "source"
-scale_y0 = "2.000000"
-shader1 = "../blurs/shaders/smart-blur.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../stock.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.500000"
-scale_type_y2 = "source"
-scale_y2 = "0.500000"
-shader3 = "../crt/shaders/hyllian/crt-hyllian-sinc-pass0.slang"
-filter_linear3 = "false"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "viewport"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../crt/shaders/hyllian/crt-hyllian-pass1.slang"
-filter_linear4 = "false"
-wrap_mode4 = "clamp_to_edge"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "viewport"
-scale_y4 = "1.000000"
-parameters = "SGPT_BLEND_OPTION;SGPT_BLEND_LEVEL;SGPT_ADJUST_VIEW;SGPT_LINEAR_GAMMA;SB_BLUR_LEVEL;SB_RED_THRESHOLD;SB_GREEN_THRESHOLD;SB_BLUE_THRESHOLD;BEAM_PROFILE;HFILTER_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;HFILTER_SHARPNESS;PHOSPHOR_LAYOUT;MASK_INTENSITY;CRT_ANTI_RINGING;InputGamma;OutputGamma;VSCANLINES"
-SGPT_BLEND_OPTION = "1.000000"
-SGPT_BLEND_LEVEL = "0.500000"
-SGPT_ADJUST_VIEW = "0.000000"
-SGPT_LINEAR_GAMMA = "1.000000"
-SB_BLUR_LEVEL = "0.660000"
-SB_RED_THRESHOLD = "0.200000"
-SB_GREEN_THRESHOLD = "0.200000"
-SB_BLUE_THRESHOLD = "0.200000"
-PHOSPHOR_LAYOUT = "2.000000"
-BRIGHTBOOST = "1.500000"
diff --git a/presets/crt-hyllian-smartblur-sgenpt.slangp b/presets/crt-hyllian-smartblur-sgenpt.slangp
deleted file mode 100644
index 5d64db7204..0000000000
--- a/presets/crt-hyllian-smartblur-sgenpt.slangp
+++ /dev/null
@@ -1,66 +0,0 @@
-shaders = "5"
-shader0 = "../dithering/shaders/sgenpt-mix.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "2.000000"
-scale_type_y0 = "source"
-scale_y0 = "2.000000"
-shader1 = "../blurs/shaders/smart-blur.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../stock.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.500000"
-scale_type_y2 = "source"
-scale_y2 = "0.500000"
-shader3 = "../crt/shaders/hyllian/crt-hyllian-pass0.slang"
-filter_linear3 = "false"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "viewport"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../crt/shaders/hyllian/crt-hyllian-pass1.slang"
-filter_linear4 = "false"
-wrap_mode4 = "clamp_to_edge"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "viewport"
-scale_y4 = "1.000000"
-parameters = "SGPT_BLEND_OPTION;SGPT_BLEND_LEVEL;SGPT_ADJUST_VIEW;SGPT_LINEAR_GAMMA;SB_BLUR_LEVEL;SB_RED_THRESHOLD;SB_GREEN_THRESHOLD;SB_BLUE_THRESHOLD;BEAM_PROFILE;HFILTER_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;HFILTER_SHARPNESS;PHOSPHOR_LAYOUT;MASK_INTENSITY;CRT_ANTI_RINGING;InputGamma;OutputGamma;VSCANLINES"
-SGPT_BLEND_OPTION = "1.000000"
-SGPT_BLEND_LEVEL = "0.200000"
-SGPT_ADJUST_VIEW = "0.000000"
-SGPT_LINEAR_GAMMA = "1.000000"
-SB_BLUR_LEVEL = "0.660000"
-SB_RED_THRESHOLD = "0.200000"
-SB_GREEN_THRESHOLD = "0.200000"
-SB_BLUE_THRESHOLD = "0.200000"
-
diff --git a/presets/crt-lottes-multipass-interlaced-glow.slangp b/presets/crt-lottes-multipass-interlaced-glow.slangp
deleted file mode 100644
index 14f50d261a..0000000000
--- a/presets/crt-lottes-multipass-interlaced-glow.slangp
+++ /dev/null
@@ -1,62 +0,0 @@
-shaders = 11
-
-shader0 = ../stock.slang
-alias0 = "glow_trails_refpass"
-
-shader1 = ../crt/shaders/glow-trails/glow-trails0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = Trails0
-
-shader2 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear2 = "true"
-scale_type2 = "source"
-scale2 = "1.0"
-srgb_framebuffer2 = "true"
-
-shader3 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias3 = "TRAIL_BLUR"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-shader4 = ../crt/shaders/glow-trails/glow-trails1.slang
-
-shader5 = ../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang
-srgb_framebuffer5 = true
-alias5 = "ORIG_LINEARIZED"
-
-shader6 = "../crt/shaders/crt-easymode-halation/blur_horiz.slang"
-filter_linear6 = "true"
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-shader7 = "../crt/shaders/crt-easymode-halation/blur_vert.slang"
-alias7 = "GlowPass"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-
-shader8 = "../crt/shaders/crt-easymode-halation/threshold.slang"
-srgb_framebuffer8 = "true"
-
-shader9 = "../crt/shaders/crt-lottes-multipass/bloompass-glow.slang"
-filter_linear9 = "true"
-alias9 = BloomPass
-
-shader10 = "../crt/shaders/crt-lottes-multipass/scanpass-glow.slang"
-filter_linear10 = "true"
-
-parameters = "mixfactor;threshold;trail_bright;glowFactor;DIFFUSION;maskLight;maskDark;warpX"
-mixfactor = "0.75"
-threshold = "0.90"
-trail_bright = "0.07"
-glowFactor = "0.10"
-DIFFUSION = "0.10"
-maskLight = 0.9
-maskDark = 1.1
-warpX = 0.0
diff --git a/presets/crt-ntsc-sharp/composite-glow.slangp b/presets/crt-ntsc-sharp/composite-glow.slangp
deleted file mode 100644
index ff71464b5c..0000000000
--- a/presets/crt-ntsc-sharp/composite-glow.slangp
+++ /dev/null
@@ -1,361 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "4.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "0.500000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-scale_type6 = "viewport"
-scale6 = "1.000000"
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "-1.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "0.7"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/composite.slangp b/presets/crt-ntsc-sharp/composite.slangp
deleted file mode 100644
index 55d6373a3b..0000000000
--- a/presets/crt-ntsc-sharp/composite.slangp
+++ /dev/null
@@ -1,80 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "4.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.500000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "-1.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "0.7"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
diff --git a/presets/crt-ntsc-sharp/svideo-ntsc_x4-glow.slangp b/presets/crt-ntsc-sharp/svideo-ntsc_x4-glow.slangp
deleted file mode 100644
index 49b8f83027..0000000000
--- a/presets/crt-ntsc-sharp/svideo-ntsc_x4-glow.slangp
+++ /dev/null
@@ -1,361 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "4.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "0.500000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-scale_type6 = "viewport"
-scale6 = "1.000000"
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/svideo-ntsc_x4.slangp b/presets/crt-ntsc-sharp/svideo-ntsc_x4.slangp
deleted file mode 100644
index 638b1bdd12..0000000000
--- a/presets/crt-ntsc-sharp/svideo-ntsc_x4.slangp
+++ /dev/null
@@ -1,80 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "4.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.5"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
diff --git a/presets/crt-ntsc-sharp/svideo-ntsc_x5-glow.slangp b/presets/crt-ntsc-sharp/svideo-ntsc_x5-glow.slangp
deleted file mode 100644
index 8f501d3c0e..0000000000
--- a/presets/crt-ntsc-sharp/svideo-ntsc_x5-glow.slangp
+++ /dev/null
@@ -1,361 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "5.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "0.400000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-scale_type6 = "viewport"
-scale6 = "1.000000"
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/svideo-ntsc_x5.slangp b/presets/crt-ntsc-sharp/svideo-ntsc_x5.slangp
deleted file mode 100644
index f7f2160193..0000000000
--- a/presets/crt-ntsc-sharp/svideo-ntsc_x5.slangp
+++ /dev/null
@@ -1,80 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "5.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.4"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
diff --git a/presets/crt-ntsc-sharp/svideo-ntsc_x6-glow.slangp b/presets/crt-ntsc-sharp/svideo-ntsc_x6-glow.slangp
deleted file mode 100644
index aa9497494b..0000000000
--- a/presets/crt-ntsc-sharp/svideo-ntsc_x6-glow.slangp
+++ /dev/null
@@ -1,361 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "6.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "0.333333"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-scale_type6 = "viewport"
-scale6 = "1.000000"
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/svideo-ntsc_x6.slangp b/presets/crt-ntsc-sharp/svideo-ntsc_x6.slangp
deleted file mode 100644
index d25025aca5..0000000000
--- a/presets/crt-ntsc-sharp/svideo-ntsc_x6.slangp
+++ /dev/null
@@ -1,80 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "6.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive/ntsc-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "0.333333"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "1.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
diff --git a/presets/crt-ntsc-sharp/tate-composite-glow.slangp b/presets/crt-ntsc-sharp/tate-composite-glow.slangp
deleted file mode 100644
index 59ff6c2b7b..0000000000
--- a/presets/crt-ntsc-sharp/tate-composite-glow.slangp
+++ /dev/null
@@ -1,362 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "4.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "0.500000"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-scale_type6 = "viewport"
-scale6 = "1.000000"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "-1.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "0.7"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.000000"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/tate-composite.slangp b/presets/crt-ntsc-sharp/tate-composite.slangp
deleted file mode 100644
index ceb7f94675..0000000000
--- a/presets/crt-ntsc-sharp/tate-composite.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "4.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "0.500000"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "-1.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "0.7"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.000000"
diff --git a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x4-glow.slangp b/presets/crt-ntsc-sharp/tate-svideo-ntsc_x4-glow.slangp
deleted file mode 100644
index c73acf1d1a..0000000000
--- a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x4-glow.slangp
+++ /dev/null
@@ -1,362 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "4.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "0.500000"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-scale_type6 = "viewport"
-scale6 = "1.000000"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.000000"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x4.slangp b/presets/crt-ntsc-sharp/tate-svideo-ntsc_x4.slangp
deleted file mode 100644
index ed34909f14..0000000000
--- a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x4.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "4.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "0.5"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.0"
diff --git a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x5-glow.slangp b/presets/crt-ntsc-sharp/tate-svideo-ntsc_x5-glow.slangp
deleted file mode 100644
index a08d764e21..0000000000
--- a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x5-glow.slangp
+++ /dev/null
@@ -1,362 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "5.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "0.4"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-scale_type6 = "viewport"
-scale6 = "1.000000"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.000000"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x5.slangp b/presets/crt-ntsc-sharp/tate-svideo-ntsc_x5.slangp
deleted file mode 100644
index 8de25088c5..0000000000
--- a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x5.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "5.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "0.4"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.0"
diff --git a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x6-glow.slangp b/presets/crt-ntsc-sharp/tate-svideo-ntsc_x6-glow.slangp
deleted file mode 100644
index bbc0150847..0000000000
--- a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x6-glow.slangp
+++ /dev/null
@@ -1,362 +0,0 @@
-shaders = "31"
-feedback_pass = "0"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-frame_count_mod2 = "2"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "true"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "6.000000"
-shader3 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "0.333333"
-shader4 = "../../warp/shaders/smart-morph.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../../crt/shaders/crt-geom.slang"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-scale_type6 = "viewport"
-scale6 = "1.000000"
-shader7 = "../../blurs/shaders/kawase/linearize.slang"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "Input"
-float_framebuffer7 = "true"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../../blurs/shaders/dual_filter/downsample_bloom.slang"
-filter_linear8 = "true"
-wrap_mode8 = "mirrored_repeat"
-mipmap_input8 = "false"
-alias8 = ""
-float_framebuffer8 = "true"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.700000"
-scale_type_y8 = "viewport"
-scale_y8 = "0.700000"
-shader9 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear9 = "true"
-wrap_mode9 = "mirrored_repeat"
-mipmap_input9 = "false"
-alias9 = ""
-float_framebuffer9 = "true"
-srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
-scale_x9 = "1.000000"
-scale_type_y9 = "source"
-scale_y9 = "1.000000"
-shader10 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear10 = "true"
-wrap_mode10 = "mirrored_repeat"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "true"
-srgb_framebuffer10 = "false"
-scale_type_x10 = "source"
-scale_x10 = "0.500000"
-scale_type_y10 = "source"
-scale_y10 = "0.500000"
-shader11 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear11 = "true"
-wrap_mode11 = "mirrored_repeat"
-mipmap_input11 = "false"
-alias11 = "Scale1"
-float_framebuffer11 = "true"
-srgb_framebuffer11 = "false"
-scale_type_x11 = "source"
-scale_x11 = "2.000000"
-scale_type_y11 = "source"
-scale_y11 = "2.000000"
-shader12 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear12 = "true"
-wrap_mode12 = "mirrored_repeat"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "true"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "source"
-scale_x12 = "0.500000"
-scale_type_y12 = "source"
-scale_y12 = "0.500000"
-shader13 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear13 = "true"
-wrap_mode13 = "mirrored_repeat"
-mipmap_input13 = "false"
-alias13 = ""
-float_framebuffer13 = "true"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "source"
-scale_x13 = "0.500000"
-scale_type_y13 = "source"
-scale_y13 = "0.500000"
-shader14 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear14 = "true"
-wrap_mode14 = "mirrored_repeat"
-mipmap_input14 = "false"
-alias14 = "Scale2"
-float_framebuffer14 = "true"
-srgb_framebuffer14 = "false"
-scale_type_x14 = "source"
-scale_x14 = "2.000000"
-scale_type_y14 = "source"
-scale_y14 = "2.000000"
-shader15 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear15 = "true"
-wrap_mode15 = "mirrored_repeat"
-mipmap_input15 = "false"
-alias15 = ""
-float_framebuffer15 = "true"
-srgb_framebuffer15 = "false"
-scale_type_x15 = "source"
-scale_x15 = "0.500000"
-scale_type_y15 = "source"
-scale_y15 = "0.500000"
-shader16 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear16 = "true"
-wrap_mode16 = "mirrored_repeat"
-mipmap_input16 = "false"
-alias16 = ""
-float_framebuffer16 = "true"
-srgb_framebuffer16 = "false"
-scale_type_x16 = "source"
-scale_x16 = "0.500000"
-scale_type_y16 = "source"
-scale_y16 = "0.500000"
-shader17 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear17 = "true"
-wrap_mode17 = "mirrored_repeat"
-mipmap_input17 = "false"
-alias17 = "Scale3"
-float_framebuffer17 = "true"
-srgb_framebuffer17 = "false"
-scale_type_x17 = "source"
-scale_x17 = "2.000000"
-scale_type_y17 = "source"
-scale_y17 = "2.000000"
-shader18 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear18 = "true"
-wrap_mode18 = "mirrored_repeat"
-mipmap_input18 = "false"
-alias18 = ""
-float_framebuffer18 = "true"
-srgb_framebuffer18 = "false"
-scale_type_x18 = "source"
-scale_x18 = "0.500000"
-scale_type_y18 = "source"
-scale_y18 = "0.500000"
-shader19 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear19 = "true"
-wrap_mode19 = "mirrored_repeat"
-mipmap_input19 = "false"
-alias19 = ""
-float_framebuffer19 = "true"
-srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
-scale_x19 = "0.500000"
-scale_type_y19 = "source"
-scale_y19 = "0.500000"
-shader20 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear20 = "true"
-wrap_mode20 = "mirrored_repeat"
-mipmap_input20 = "false"
-alias20 = "Scale4"
-float_framebuffer20 = "true"
-srgb_framebuffer20 = "false"
-scale_type_x20 = "source"
-scale_x20 = "2.000000"
-scale_type_y20 = "source"
-scale_y20 = "2.000000"
-shader21 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear21 = "true"
-wrap_mode21 = "mirrored_repeat"
-mipmap_input21 = "false"
-alias21 = ""
-float_framebuffer21 = "true"
-srgb_framebuffer21 = "false"
-scale_type_x21 = "source"
-scale_x21 = "0.500000"
-scale_type_y21 = "source"
-scale_y21 = "0.500000"
-shader22 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear22 = "true"
-wrap_mode22 = "mirrored_repeat"
-mipmap_input22 = "false"
-alias22 = ""
-float_framebuffer22 = "true"
-srgb_framebuffer22 = "false"
-scale_type_x22 = "source"
-scale_x22 = "0.500000"
-scale_type_y22 = "source"
-scale_y22 = "0.500000"
-shader23 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear23 = "true"
-wrap_mode23 = "mirrored_repeat"
-mipmap_input23 = "false"
-alias23 = "Scale5"
-float_framebuffer23 = "true"
-srgb_framebuffer23 = "false"
-scale_type_x23 = "source"
-scale_x23 = "2.000000"
-scale_type_y23 = "source"
-scale_y23 = "2.000000"
-shader24 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear24 = "true"
-wrap_mode24 = "mirrored_repeat"
-mipmap_input24 = "false"
-alias24 = ""
-float_framebuffer24 = "true"
-srgb_framebuffer24 = "false"
-scale_type_x24 = "source"
-scale_x24 = "0.500000"
-scale_type_y24 = "source"
-scale_y24 = "0.500000"
-shader25 = "../../blurs/shaders/dual_filter/downsample.slang"
-filter_linear25 = "true"
-wrap_mode25 = "mirrored_repeat"
-mipmap_input25 = "false"
-alias25 = ""
-float_framebuffer25 = "true"
-srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
-scale_x25 = "0.500000"
-scale_type_y25 = "source"
-scale_y25 = "0.500000"
-shader26 = "../../blurs/shaders/dual_filter/upsample.slang"
-filter_linear26 = "true"
-wrap_mode26 = "mirrored_repeat"
-mipmap_input26 = "false"
-alias26 = "Scale6"
-float_framebuffer26 = "true"
-srgb_framebuffer26 = "false"
-scale_type_x26 = "source"
-scale_x26 = "2.000000"
-scale_type_y26 = "source"
-scale_y26 = "2.000000"
-shader27 = "../../blurs/shaders/dual_filter/naive_resample.slang"
-filter_linear27 = "true"
-wrap_mode27 = "mirrored_repeat"
-mipmap_input27 = "false"
-alias27 = ""
-float_framebuffer27 = "true"
-srgb_framebuffer27 = "false"
-scale_type_x27 = "absolute"
-scale_x27 = "128"
-scale_type_y27 = "absolute"
-scale_y27 = "128"
-shader28 = "../../blurs/shaders/dual_filter/moving_avg.slang"
-filter_linear28 = "true"
-wrap_mode28 = "clamp_to_border"
-mipmap_input28 = "true"
-alias28 = "MovingAverage"
-float_framebuffer28 = "true"
-srgb_framebuffer28 = "false"
-scale_type_x28 = "absolute"
-scale_x28 = "2"
-scale_type_y28 = "absolute"
-scale_y28 = "2"
-shader29 = "../../blurs/shaders/dual_filter/bloom_blend.slang"
-filter_linear29 = "true"
-wrap_mode29 = "clamp_to_border"
-mipmap_input29 = "false"
-alias29 = ""
-float_framebuffer29 = "true"
-srgb_framebuffer29 = "false"
-scale_type_x29 = "viewport"
-scale_x29 = "1.000000"
-scale_type_y29 = "viewport"
-scale_y29 = "1.000000"
-shader30 = "../../blurs/shaders/kawase/delinearize.slang"
-filter_linear30 = "true"
-wrap_mode30 = "clamp_to_border"
-mipmap_input30 = "false"
-alias30 = ""
-float_framebuffer30 = "true"
-srgb_framebuffer30 = "false"
-scale_type_x30 = "viewport"
-scale_x30 = "1.000000"
-scale_type_y30 = "viewport"
-scale_y30 = "1.000000"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.000000"
-
-BLUR_RADIUS = "3.500000"
-MIN_EXP_INTENSITY = "0.700001"
-BLOOM_THRESHOLD = "2.500001"
-ADAPT_SPEED = "0.020000"
-MAX_EXP = "1.000000"
-SCALE_EMPH = "1.200000"
-SCALE_SPREAD = "1.000000"
\ No newline at end of file
diff --git a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x6.slangp b/presets/crt-ntsc-sharp/tate-svideo-ntsc_x6.slangp
deleted file mode 100644
index c32beebd85..0000000000
--- a/presets/crt-ntsc-sharp/tate-svideo-ntsc_x6.slangp
+++ /dev/null
@@ -1,81 +0,0 @@
-shaders = "6"
-shader0 = "../../misc/shaders/ntsc-colors.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass1.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "true"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "6.000000"
-shader2 = "../../ntsc/shaders/ntsc-adaptive-tate/ntsc-tate-pass2.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "0.333333"
-shader3 = "../../warp/shaders/smart-morph.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-shader4 = "../../sharpen/shaders/fast-sharpen.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../../crt/shaders/crt-geom.slang"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "false"
-
-intensity = "0.0"
-quality = "0.0"
-cust_fringing = "1.0"
-cust_artifacting = "1.0"
-
-SM_RANGE = "2.0"
-SM_PWR = "1.1"
-CONTR = "0.15"
-
-CRTgamma = "2.2"
-CURVATURE = "1.0"
-d = "1.5"
-R = "1.8"
-cornersize = "0.0155"
-y_tilt = "-0.05"
-scanline_weight = "0.25"
-DOTMASK = "0.0"
-lum = "0.08"
-interlace_detect = "0.0"
-vertical_scanlines = "1.0"
diff --git a/presets/crt-royale-downsample.slangp b/presets/crt-royale-downsample.slangp
deleted file mode 100644
index bbe2ac0bcc..0000000000
--- a/presets/crt-royale-downsample.slangp
+++ /dev/null
@@ -1,192 +0,0 @@
-shaders = "14"
-feedback_pass = "0"
-
-shader0 = "../interpolation/shaders/b-spline-4-taps.slang"
-filter_linear0 = "true"
-wrap_mode0 = "clamp_to_edge"
-srgb_framebuffer0 = "true"
-scale_type_x0 = "viewport"
-scale_x0 = "1.000000"
-scale_type_y0 = "absolute"
-scale_y0 = "240"
-
-shader1 = "../reshade/shaders/LUT/multiLUT.slang"
-scale_type1 = source
-srgb_framebuffer1 = "true"
-
-SamplerLUT1 = "../reshade/shaders/LUT/grade-composite.png"
-SamplerLUT1_linear = true
-SamplerLUT2 = "../reshade/shaders/LUT/grade-rgb.png"
-SamplerLUT2_linear = true
-
-shader2 = "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = "ORIG_LINEARIZED"
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-shader3 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = "VERTICAL_SCANLINES"
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "viewport"
-scale_y3 = "1.000000"
-shader4 = "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-filter_linear4 = "true"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = "BLOOM_APPROX"
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "true"
-scale_type_x4 = "absolute"
-scale_x4 = "320"
-scale_type_y4 = "absolute"
-scale_y4 = "240"
-shader5 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear5 = "true"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = ""
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-filter_linear6 = "true"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = "HALATION_BLUR"
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "true"
-scale_type_x6 = "source"
-scale_x6 = "1.000000"
-scale_type_y6 = "source"
-scale_y6 = "1.000000"
-shader7 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear7 = "true"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = ""
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "absolute"
-scale_x7 = "64"
-scale_type_y7 = "viewport"
-scale_y7 = "0.062500"
-shader8 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_border"
-mipmap_input8 = "false"
-alias8 = "MASK_RESIZE"
-float_framebuffer8 = "false"
-srgb_framebuffer8 = "false"
-scale_type_x8 = "viewport"
-scale_x8 = "0.062500"
-scale_type_y8 = "source"
-scale_y8 = "1.000000"
-shader9 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-mipmap_input9 = "false"
-alias9 = "MASKED_SCANLINES"
-float_framebuffer9 = "false"
-srgb_framebuffer9 = "true"
-scale_type_x9 = "viewport"
-scale_x9 = "1.000000"
-scale_type_y9 = "viewport"
-scale_y9 = "1.000000"
-shader10 = "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-filter_linear10 = "true"
-wrap_mode10 = "clamp_to_border"
-mipmap_input10 = "false"
-alias10 = "BRIGHTPASS"
-float_framebuffer10 = "false"
-srgb_framebuffer10 = "true"
-scale_type_x10 = "viewport"
-scale_x10 = "1.000000"
-scale_type_y10 = "viewport"
-scale_y10 = "1.000000"
-shader11 = "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear11 = "true"
-wrap_mode11 = "clamp_to_border"
-mipmap_input11 = "false"
-alias11 = ""
-float_framebuffer11 = "false"
-srgb_framebuffer11 = "true"
-scale_type_x11 = "source"
-scale_x11 = "1.000000"
-scale_type_y11 = "source"
-scale_y11 = "1.000000"
-shader12 = "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear12 = "true"
-wrap_mode12 = "clamp_to_border"
-mipmap_input12 = "false"
-alias12 = ""
-float_framebuffer12 = "false"
-srgb_framebuffer12 = "true"
-scale_type_x12 = "source"
-scale_x12 = "1.000000"
-scale_type_y12 = "source"
-scale_y12 = "1.000000"
-shader13 = "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear13 = "true"
-texture_wrap_mode13 = "clamp_to_edge"
-mipmap_input13 = "true"
-alias13 = ""
-float_framebuffer13 = "false"
-srgb_framebuffer13 = "false"
-scale_type_x13 = "viewport"
-scale_x13 = "1.000000"
-scale_type_y13 = "viewport"
-scale_y13 = "1.000000"
-
-LUT_selector_param = "2.000000"
-crt_gamma = "2.400000"
-diffusion_weight = "0.000000"
-beam_min_sigma = "0.115000"
-beam_max_sigma = "0.285000"
-beam_spot_power = "0.010000"
-mask_type = "0.000000"
-border_size = "0.000000"
-border_darkness = "0.750000"
-border_compress = "3.000000"
-interlace_detect_toggle = "0.000000"
-
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;SamplerLUT1;SamplerLUT2"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
diff --git a/presets/crt-royale-fast-ntsc-composite.slangp b/presets/crt-royale-fast-ntsc-composite.slangp
deleted file mode 100644
index 926884f2f2..0000000000
--- a/presets/crt-royale-fast-ntsc-composite.slangp
+++ /dev/null
@@ -1,122 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../stock.slang
-alias0 = PrePass0
-
-shader1 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-genesis-rainbow-effect.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-genesis-rainbow-effect.slangp
deleted file mode 100644
index 62ced1da00..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-genesis-rainbow-effect.slangp
+++ /dev/null
@@ -1,133 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "4.000000"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "1.000000"
-ntsc_rainbow1 = "1.000000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-genesis.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-genesis.slangp
deleted file mode 100644
index 4c66c1f494..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-genesis.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "4.000000"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "1.000000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-psx.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-psx.slangp
deleted file mode 100644
index 7cf53c88d5..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-psx.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "4.000000"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.000000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-snes.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-snes.slangp
deleted file mode 100644
index d19620c3f9..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture-snes.slangp
+++ /dev/null
@@ -1,131 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "4.000000"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture.slangp
deleted file mode 100644
index c2a334c26f..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-aperture.slangp
+++ /dev/null
@@ -1,126 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "4.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-genesis-rainbow-effect.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-genesis-rainbow-effect.slangp
deleted file mode 100644
index 4af83bb992..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-genesis-rainbow-effect.slangp
+++ /dev/null
@@ -1,137 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_rainbow1 = "1.000000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "4.000000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-genesis.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-genesis.slangp
deleted file mode 100644
index 5b97fab2dc..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-genesis.slangp
+++ /dev/null
@@ -1,136 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "4.000000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-psx.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-psx.slangp
deleted file mode 100644
index 86a3ffde73..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-psx.slangp
+++ /dev/null
@@ -1,136 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.000000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "4.000000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-snes.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-snes.slangp
deleted file mode 100644
index 935db8b594..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask-snes.slangp
+++ /dev/null
@@ -1,136 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "4.000000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask.slangp
deleted file mode 100644
index 3c3f8b184c..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-composite-slotmask.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "4.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-rf-slotmask-nes.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-rf-slotmask-nes.slangp
deleted file mode 100644
index 3050b4823a..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-ntsc-rf-slotmask-nes.slangp
+++ /dev/null
@@ -1,143 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = "../../../film/shaders/film-grain.slang"
-filter_linear0 = "false"
-alias0 = PrePass0
-scale_type3 = source
-scale3 = 1.0
-
-shader1 = "../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang"
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = "../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang"
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = "../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang"
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-GRAIN_AMOUNT = "0.020000"
-GRAIN_SIZE = "1.500000"
-COLOR_AMOUNT = "0.000000"
-
-cust_artifacting = "1.000000"
-cust_fringing = "1.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "0.750000"
-ntsc_cscale1 = "0.500000"
-ntsc_sharp = "0.000000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "4.000000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-rgb-aperture.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-rgb-aperture.slangp
deleted file mode 100644
index cb409396bd..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-rgb-aperture.slangp
+++ /dev/null
@@ -1,95 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "4.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-fast-rgb-slot.slangp b/presets/crt-royale-fast/4k/crt-royale-fast-rgb-slot.slangp
deleted file mode 100644
index bb500ed68d..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-fast-rgb-slot.slangp
+++ /dev/null
@@ -1,99 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "4.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-genesis-rainbow-effect.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-genesis-rainbow-effect.slangp
deleted file mode 100644
index 531f4c5073..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-genesis-rainbow-effect.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_rainbow1 = "1.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-genesis.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-genesis.slangp
deleted file mode 100644
index 2e809d914f..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-genesis.slangp
+++ /dev/null
@@ -1,131 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-psx.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-psx.slangp
deleted file mode 100644
index cd4aa42975..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-psx.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.000000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-snes.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-snes.slangp
deleted file mode 100644
index 7a64fd15ba..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite-snes.slangp
+++ /dev/null
@@ -1,133 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-
-
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite.slangp
deleted file mode 100644
index 574f738e2c..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-ntsc-composite.slangp
+++ /dev/null
@@ -1,126 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-rgb-blend.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-rgb-blend.slangp
deleted file mode 100644
index 2821267c11..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-rgb-blend.slangp
+++ /dev/null
@@ -1,100 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-beam_max_sigma = "0.200000"
-beam_max_shape = "2.000000"
-
-beam_horiz_filter = "2.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-rgb-shmup.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-rgb-shmup.slangp
deleted file mode 100644
index c6c349b6dd..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-rgb-shmup.slangp
+++ /dev/null
@@ -1,104 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-beam_max_sigma = "0.200000"
-beam_max_shape = "2.000000"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-geom_curvature = "1.000000"
-geom_R = "6.000000"
-geom_d = "0.600000"
-geom_invert_aspect = "1.000000"
-geom_x_tilt = "0.500000"
-geom_overscany = "75.000000"
diff --git a/presets/crt-royale-fast/4k/crt-royale-pvm-rgb.slangp b/presets/crt-royale-fast/4k/crt-royale-pvm-rgb.slangp
deleted file mode 100644
index 0f3299e94a..0000000000
--- a/presets/crt-royale-fast/4k/crt-royale-pvm-rgb.slangp
+++ /dev/null
@@ -1,98 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-beam_max_sigma = "0.200000"
-beam_max_shape = "2.000000"
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-genesis-rainbow-effect.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-genesis-rainbow-effect.slangp
deleted file mode 100644
index 79464c8d13..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-genesis-rainbow-effect.slangp
+++ /dev/null
@@ -1,133 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "1.000000"
-ntsc_rainbow1 = "1.000000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-genesis.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-genesis.slangp
deleted file mode 100644
index 3977432ebc..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-genesis.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "1.000000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-psx.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-psx.slangp
deleted file mode 100644
index 250a723d37..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-psx.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.000000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-snes.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-snes.slangp
deleted file mode 100644
index d68156d4e5..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture-snes.slangp
+++ /dev/null
@@ -1,131 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture.slangp
deleted file mode 100644
index 5427f1f933..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-aperture.slangp
+++ /dev/null
@@ -1,126 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-genesis-rainbow-effect.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-genesis-rainbow-effect.slangp
deleted file mode 100644
index 772cfe4e14..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-genesis-rainbow-effect.slangp
+++ /dev/null
@@ -1,137 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_rainbow1 = "1.000000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "3.000000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-genesis.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-genesis.slangp
deleted file mode 100644
index c84e4d5fee..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-genesis.slangp
+++ /dev/null
@@ -1,136 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "3.000000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-psx.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-psx.slangp
deleted file mode 100644
index c31ce9ad8c..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-psx.slangp
+++ /dev/null
@@ -1,136 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.000000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "3.000000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-snes.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-snes.slangp
deleted file mode 100644
index 51683aa774..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask-snes.slangp
+++ /dev/null
@@ -1,136 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "3.000000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask.slangp
deleted file mode 100644
index 09a218af13..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-composite-slotmask.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "3.000000"
diff --git a/presets/crt-royale-fast/crt-royale-fast-ntsc-rf-slotmask-nes.slangp b/presets/crt-royale-fast/crt-royale-fast-ntsc-rf-slotmask-nes.slangp
deleted file mode 100644
index 162cc54dec..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-ntsc-rf-slotmask-nes.slangp
+++ /dev/null
@@ -1,143 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = "../../film/shaders/film-grain.slang"
-filter_linear0 = "false"
-alias0 = PrePass0
-scale_type3 = source
-scale3 = 1.0
-
-shader1 = "../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang"
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = "../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang"
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = "../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang"
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-GRAIN_AMOUNT = "0.020000"
-GRAIN_SIZE = "1.500000"
-COLOR_AMOUNT = "0.000000"
-
-cust_artifacting = "1.000000"
-cust_fringing = "1.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "0.750000"
-ntsc_cscale1 = "0.500000"
-ntsc_sharp = "0.000000"
-ntsc_shape = "0.750000"
-
-beam_horiz_filter = "3.000000"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "3.000000"
-
diff --git a/presets/crt-royale-fast/crt-royale-fast-rgb-aperture.slangp b/presets/crt-royale-fast/crt-royale-fast-rgb-aperture.slangp
deleted file mode 100644
index 8ab656c974..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-rgb-aperture.slangp
+++ /dev/null
@@ -1,95 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "3.000000"
diff --git a/presets/crt-royale-fast/crt-royale-fast-rgb-slot.slangp b/presets/crt-royale-fast/crt-royale-fast-rgb-slot.slangp
deleted file mode 100644
index 9f4d657fb2..0000000000
--- a/presets/crt-royale-fast/crt-royale-fast-rgb-slot.slangp
+++ /dev/null
@@ -1,99 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-lcd_gamma = "2.400000"
-bloom_underestimate_levels = "1.000000"
-beam_min_sigma = "0.150000"
-beam_max_sigma = "0.270000"
-mask_type = "1.000000"
-mask_triad_size_desired = "3.000000"
diff --git a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-genesis-rainbow-effect.slangp b/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-genesis-rainbow-effect.slangp
deleted file mode 100644
index cbb52826a1..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-genesis-rainbow-effect.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_rainbow1 = "1.000000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
-
diff --git a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-genesis.slangp b/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-genesis.slangp
deleted file mode 100644
index 4f2c6e15ab..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-genesis.slangp
+++ /dev/null
@@ -1,131 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "1.000000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
-
diff --git a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-psx.slangp b/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-psx.slangp
deleted file mode 100644
index bdd3910c7e..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-psx.slangp
+++ /dev/null
@@ -1,132 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.000000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
-
-
diff --git a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-snes.slangp b/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-snes.slangp
deleted file mode 100644
index b71abb56c4..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite-snes.slangp
+++ /dev/null
@@ -1,133 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-
-cust_artifacting = "0.500000"
-cust_fringing = "0.500000"
-ntsc_taps = "24.000000"
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
-
-
-
diff --git a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite.slangp b/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite.slangp
deleted file mode 100644
index a263a28d0e..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-ntsc-composite.slangp
+++ /dev/null
@@ -1,126 +0,0 @@
-# NTSC version
-
-shaders = "12"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-shader0 = ../../stock.slang
-alias0 = PrePass0
-
-shader1 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-
-# Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-srgb_framebuffer5 = "true"
-
-
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Compute a brightpass.  This will require reading the final mask.
-shader9 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Blur the brightpass vertically
-shader10 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-wrap_mode11 = "clamp_to_edge"
-
-ntsc_cscale = "4.000000"
-ntsc_cscale1 = "2.250000"
-ntsc_sharp = "3.500000"
-ntsc_shape = "0.750000"
-beam_horiz_filter = "3.000000"
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
diff --git a/presets/crt-royale-fast/crt-royale-pvm-rgb-blend.slangp b/presets/crt-royale-fast/crt-royale-pvm-rgb-blend.slangp
deleted file mode 100644
index 46a431ae71..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-rgb-blend.slangp
+++ /dev/null
@@ -1,100 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
-
-beam_max_sigma = "0.200000"
-beam_max_shape = "2.000000"
-
-beam_horiz_filter = "2.000000"
diff --git a/presets/crt-royale-fast/crt-royale-pvm-rgb-shmup.slangp b/presets/crt-royale-fast/crt-royale-pvm-rgb-shmup.slangp
deleted file mode 100644
index fce4c51c51..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-rgb-shmup.slangp
+++ /dev/null
@@ -1,104 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-beam_max_sigma = "0.200000"
-beam_max_shape = "2.000000"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
-geom_curvature = "1.000000"
-geom_R = "6.000000"
-geom_d = "0.600000"
-geom_invert_aspect = "1.000000"
-geom_x_tilt = "0.500000"
-geom_overscany = "75.000000"
diff --git a/presets/crt-royale-fast/crt-royale-pvm-rgb.slangp b/presets/crt-royale-fast/crt-royale-pvm-rgb.slangp
deleted file mode 100644
index 27d909f65a..0000000000
--- a/presets/crt-royale-fast/crt-royale-pvm-rgb.slangp
+++ /dev/null
@@ -1,98 +0,0 @@
-# crt-royale-fast: a fast crt-royale adapted from original sources by Hyllian (2024).
-
-shaders = "8"
-
-textures = "mask_grille_texture_small;mask_slot_texture_small;mask_shadow_texture_small"
-mask_grille_texture_small = "../../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64BGR.png"
-mask_slot_texture_small = "../../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64BGRshifted.png"
-mask_shadow_texture_small = "../../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../../crt/shaders/crt-royale/src-fast/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-
-# Pass1: Resample interlaced scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resize the phosphor mask vertically.
-shader2 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-vertical.slang"
-filter_linear2 = "true"
-scale_type_x2 = "absolute"
-scale_x2 = "64"
-scale_type_y2 = "viewport"
-scale_y2 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer2 = "false" # mask_texture is already assumed linear
-
-# Pass3: Resize the phosphor mask horizontally.  scale_x3 = scale_y5.
-shader3 = "../../crt/shaders/crt-royale/src-fast/crt-royale-mask-resize-horizontal.slang"
-alias3 = "MASK_RESIZE"
-filter_linear3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "0.0625"
-scale_type_y3 = "source"
-scale_y3 = "1.0"
-#srgb_framebuffer3 = "false" # mask_texture is already assumed linear
-
-# Pass4: Resample scanlines horizontally, apply the phosphor mask.
-shader4 = "../../crt/shaders/crt-royale/src-fast/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias4 = "MASKED_SCANLINES"
-filter_linear4 = "true" # This could just as easily be nearest neighbor.
-scale_type4 = "viewport"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Compute a brightpass.  This will require reading the final mask.
-shader5 = "../../crt/shaders/crt-royale/src-fast/crt-royale-brightpass.slang"
-alias5 = "BRIGHTPASS"
-filter_linear5 = "true" # This could just as easily be nearest neighbor.
-scale_type5 = "viewport"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Blur the brightpass vertically
-shader6 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-vertical.slang"
-filter_linear6 = "true" # This could just as easily be nearest neighbor.
-scale_type6 = "source"
-scale6 = "1.0"
-srgb_framebuffer6 = "true"
-
-# Pass7: Blur the brightpass horizontally and combine it with the dimpass:
-shader7 = "../../crt/shaders/crt-royale/src-fast/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-wrap_mode7 = "clamp_to_edge"
-
-mask_type = "0.000000"
-mask_triad_size_desired = "1.000000"
-
-beam_max_sigma = "0.200000"
-beam_max_shape = "2.000000"
diff --git a/presets/crt-royale-kurozumi.slangp b/presets/crt-royale-kurozumi.slangp
deleted file mode 100755
index eb621eda3a..0000000000
--- a/presets/crt-royale-kurozumi.slangp
+++ /dev/null
@@ -1,259 +0,0 @@
-shaders = "13"
-shader0 = "../misc/shaders/grade.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-shader1 = "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "ORIG_LINEARIZED"
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-filter_linear2 = "true"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = "VERTICAL_SCANLINES"
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "viewport"
-scale_y2 = "1.000000"
-shader3 = "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-filter_linear3 = "true"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = "BLOOM_APPROX"
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "true"
-scale_type_x3 = "absolute"
-scale_x3 = "320"
-scale_type_y3 = "absolute"
-scale_y3 = "240"
-shader4 = "../blurs/shaders/royale/blur5fast-vertical.slang"
-filter_linear4 = "true"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "true"
-scale_type_x4 = "source"
-scale_x4 = "1.000000"
-scale_type_y4 = "source"
-scale_y4 = "1.000000"
-shader5 = "../blurs/shaders/royale/blur5fast-horizontal.slang"
-filter_linear5 = "true"
-wrap_mode5 = "clamp_to_border"
-mipmap_input5 = "false"
-alias5 = "HALATION_BLUR"
-float_framebuffer5 = "false"
-srgb_framebuffer5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.000000"
-scale_type_y5 = "source"
-scale_y5 = "1.000000"
-shader6 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-wrap_mode6 = "clamp_to_border"
-mipmap_input6 = "false"
-alias6 = ""
-float_framebuffer6 = "false"
-srgb_framebuffer6 = "false"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.062500"
-shader7 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_border"
-mipmap_input7 = "false"
-alias7 = "MASK_RESIZE"
-float_framebuffer7 = "false"
-srgb_framebuffer7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.062500"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-shader8 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-filter_linear8 = "true"
-wrap_mode8 = "clamp_to_border"
-mipmap_input8 = "false"
-alias8 = "MASKED_SCANLINES"
-float_framebuffer8 = "false"
-srgb_framebuffer8 = "true"
-scale_type_x8 = "viewport"
-scale_x8 = "1.000000"
-scale_type_y8 = "viewport"
-scale_y8 = "1.000000"
-shader9 = "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-filter_linear9 = "true"
-wrap_mode9 = "clamp_to_border"
-mipmap_input9 = "false"
-alias9 = "BRIGHTPASS"
-float_framebuffer9 = "false"
-srgb_framebuffer9 = "true"
-scale_type_x9 = "viewport"
-scale_x9 = "1.000000"
-scale_type_y9 = "viewport"
-scale_y9 = "1.000000"
-shader10 = "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true"
-wrap_mode10 = "clamp_to_border"
-mipmap_input10 = "false"
-alias10 = ""
-float_framebuffer10 = "false"
-srgb_framebuffer10 = "true"
-scale_type_x10 = "source"
-scale_x10 = "1.000000"
-scale_type_y10 = "source"
-scale_y10 = "1.000000"
-shader11 = "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-wrap_mode11 = "clamp_to_border"
-mipmap_input11 = "false"
-alias11 = ""
-float_framebuffer11 = "false"
-srgb_framebuffer11 = "true"
-scale_type_x11 = "source"
-scale_x11 = "1.000000"
-scale_type_y11 = "source"
-scale_y11 = "1.000000"
-shader12 = "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear12 = "true"
-wrap_mode12 = "clamp_to_border"
-mipmap_input12 = "true"
-alias12 = ""
-float_framebuffer12 = "false"
-srgb_framebuffer12 = "false"
-scale_type_x12 = "viewport"
-scale_x12 = "1.000000"
-scale_type_y12 = "viewport"
-scale_y12 = "1.000000"
-parameters = "g_gamma_in;g_signal_type;g_gamma_type;g_crtgamut;g_space_out;g_hue_degrees;g_I_SHIFT;g_Q_SHIFT;g_I_MUL;g_Q_MUL;g_lum_fix;g_vignette;g_vstr;g_vpower;g_lum;g_cntrst;g_mid;wp_temperature;g_sat;g_vibr;g_satr;g_satg;g_satb;g_lift;blr;blg;blb;wlr;wlg;wlb;rg;rb;gr;gb;br;bg;LUT_Size1;LUT1_toggle;LUT_Size2;LUT2_toggle;crt_gamma;lcd_gamma;levels_contrast;halation_weight;diffusion_weight;bloom_underestimate_levels;bloom_excess;beam_min_sigma;beam_max_sigma;beam_spot_power;beam_min_shape;beam_max_shape;beam_shape_power;beam_horiz_filter;beam_horiz_sigma;beam_horiz_linear_rgb_weight;convergence_offset_x_r;convergence_offset_x_g;convergence_offset_x_b;convergence_offset_y_r;convergence_offset_y_g;convergence_offset_y_b;mask_type;mask_sample_mode_desired;mask_specify_num_triads;mask_triad_size_desired;mask_num_triads_desired;aa_subpixel_r_offset_x_runtime;aa_subpixel_r_offset_y_runtime;aa_cubic_c;aa_gauss_sigma;geom_mode_runtime;geom_radius;geom_view_dist;geom_tilt_angle_x;geom_tilt_angle_y;geom_aspect_ratio_x;geom_aspect_ratio_y;geom_overscan_x;geom_overscan_y;border_size;border_darkness;border_compress;interlace_detect_toggle;interlace_bff;interlace_1080i"
-g_gamma_in = "2.400000"
-g_signal_type = "0.000000"
-g_gamma_type = "1.000000"
-g_crtgamut = "1.000000"
-g_space_out = "-1.000000"
-g_hue_degrees = "0.000000"
-g_I_SHIFT = "0.000000"
-g_Q_SHIFT = "0.000000"
-g_I_MUL = "1.000000"
-g_Q_MUL = "1.000000"
-g_lum_fix = "0.000000"
-g_vignette = "0.000000"
-g_vstr = "40.000000"
-g_vpower = "0.200000"
-g_lum = "0.000000"
-g_cntrst = "0.000000"
-g_mid = "0.500000"
-wp_temperature = "6504.000000"
-g_sat = "0.000000"
-g_vibr = "0.000000"
-g_satr = "0.000000"
-g_satg = "0.000000"
-g_satb = "0.000000"
-g_lift = "0.000000"
-blr = "0.000000"
-blg = "0.000000"
-blb = "0.000000"
-wlr = "1.000000"
-wlg = "1.000000"
-wlb = "1.000000"
-rg = "0.000000"
-rb = "0.000000"
-gr = "0.000000"
-gb = "0.000000"
-br = "0.000000"
-bg = "0.000000"
-crt_gamma = "2.400000"
-lcd_gamma = "2.400000"
-levels_contrast = "0.670000"
-halation_weight = "0.003700"
-diffusion_weight = "0.001100"
-bloom_underestimate_levels = "0.680000"
-bloom_excess = "0.000000"
-beam_min_sigma = "0.020000"
-beam_max_sigma = "0.160000"
-beam_spot_power = "0.380000"
-beam_min_shape = "2.000000"
-beam_max_shape = "4.000000"
-beam_shape_power = "0.250000"
-beam_horiz_filter = "1.000000"
-beam_horiz_sigma = "0.320000"
-beam_horiz_linear_rgb_weight = "1.000000"
-convergence_offset_x_r = "-0.050000"
-convergence_offset_x_g = "0.000000"
-convergence_offset_x_b = "0.000000"
-convergence_offset_y_r = "0.050000"
-convergence_offset_y_g = "-0.050000"
-convergence_offset_y_b = "0.050000"
-mask_type = "0.000000"
-mask_sample_mode_desired = "0.000000"
-mask_specify_num_triads = "0.000000"
-mask_triad_size_desired = "1.000000"
-mask_num_triads_desired = "900.000000"
-aa_subpixel_r_offset_x_runtime = "-0.333333"
-aa_subpixel_r_offset_y_runtime = "0.000000"
-aa_cubic_c = "0.500000"
-aa_gauss_sigma = "0.500000"
-geom_mode_runtime = "0.000000"
-geom_radius = "3.000000"
-geom_view_dist = "2.000000"
-geom_tilt_angle_x = "0.000000"
-geom_tilt_angle_y = "0.000000"
-geom_aspect_ratio_x = "432.000000"
-geom_aspect_ratio_y = "329.000000"
-geom_overscan_x = "1.000000"
-geom_overscan_y = "1.000000"
-border_size = "0.005000"
-border_darkness = "0.000000"
-border_compress = "2.500000"
-interlace_detect_toggle = "1.000000"
-interlace_bff = "0.000000"
-interlace_1080i = "0.000000"
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;SamplerLUT1;SamplerLUT2;SamplerLUT3"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_small_mipmap = "false"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_grille_texture_large_linear = "true"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_grille_texture_large_mipmap = "true"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_small_mipmap = "false"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_slot_texture_large_linear = "true"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_slot_texture_large_mipmap = "true"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_small_mipmap = "false"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_shadow_texture_large_linear = "true"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_large_mipmap = "true"
-SamplerLUT1 = "../crt/shaders/guest/advanced/lut/trinitron-lut.png"
-SamplerLUT1_linear = "true"
-SamplerLUT1_wrap_mode = "clamp_to_border"
-SamplerLUT1_mipmap = "false"
-SamplerLUT2 = "../crt/shaders/guest/advanced/lut/inv-trinitron-lut.png"
-SamplerLUT2_linear = "true"
-SamplerLUT2_wrap_mode = "clamp_to_border"
-SamplerLUT2_mipmap = "false"
-SamplerLUT3 = "../crt/shaders/guest/advanced/lut/ntsc-lut.png"
-SamplerLUT3_linear = "true"
-SamplerLUT3_wrap_mode = "clamp_to_border"
-SamplerLUT3_mipmap = "false"
diff --git a/presets/crt-royale-ntsc-composite.slangp b/presets/crt-royale-ntsc-composite.slangp
deleted file mode 100644
index c7cfde8089..0000000000
--- a/presets/crt-royale-ntsc-composite.slangp
+++ /dev/null
@@ -1,235 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y7 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "16"
-
-# NTSC Shader Passes
-shader0 = ../stock.slang
-alias0 = PrePass0
-
-shader1 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
-
-# Pass 4: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass 5: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-#float_framebuffer5 = "true"
-srgb_framebuffer5 = "true"
-
-# Pass 6: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:5 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:5 aspect ratio).
-shader6 = "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias6 = "BLOOM_APPROX"
-filter_linear6 = "true"
-scale_type6 = "absolute"
-scale_x6 = "320"
-scale_y6 = "240"
-srgb_framebuffer6 = "true"
-
-# Pass 7: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader7 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-
-# Pass 8: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader8 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias8 = "HALATION_BLUR"
-filter_linear8 = "true"
-scale_type8 = "source"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x9 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.7 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y7 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y9 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x10 = scale_y7
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y9 = 4.0/3.0 * 2.0/(341.33335 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-cgp-constants.h!
-shader9 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear9 = "true"
-scale_type_x9 = "absolute"
-scale_x9 = "64"
-scale_type_y9 = "viewport"
-scale_y9 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer9 = "false" # mask_texture is already assumed linear
-
-# Pass 10: Lanczos-resize the phosphor mask horizontally.  scale_x10 = scale_y7.
-# TODO: Check again if the shaders actually require equal scales.
-shader10 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias10 = "MASK_RESIZE"
-filter_linear10 = "false"
-scale_type_x10 = "viewport"
-scale_x10 = "0.0625"
-scale_type_y10 = "source"
-scale_y10 = "1.0"
-#srgb_framebuffer10 = "false" # mask_texture is already assumed linear
-
-# Pass 11: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader11 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias11 = "MASKED_SCANLINES"
-filter_linear11 = "true" # This could just as easily be nearest neighbor.
-scale_type11 = "viewport"
-scale11 = "1.0"
-#float_framebuffer11 = "true"
-srgb_framebuffer11 = "true"
-
-# Pass 12: Compute a brightpass.  This will require reading the final mask.
-shader12 = "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias12 = "BRIGHTPASS"
-filter_linear12 = "true" # This could just as easily be nearest neighbor.
-scale_type12 = "viewport"
-scale12 = "1.0"
-srgb_framebuffer12 = "true"
-
-# Pass 13: Blur the brightpass vertically
-shader13 = "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear13 = "true" # This could just as easily be nearest neighbor.
-scale_type13 = "source"
-scale13 = "1.0"
-srgb_framebuffer13 = "true"
-
-# Pass 14: Blur the brightpass horizontally and combine it with the dimpass:
-shader14 = "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear14 = "true"
-scale_type14 = "source"
-scale14 = "1.0"
-srgb_framebuffer14 = "true"
-
-# Pass 15: Compute curvature/AA:
-shader15 = "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear15 = "true"
-scale_type15 = "viewport"
-mipmap_input15 = "true"
-texture_wrap_mode15 = "clamp_to_edge"
-
-parameters = "quality"
-quality = 1.0
-
diff --git a/presets/crt-royale-ntsc-svideo.slangp b/presets/crt-royale-ntsc-svideo.slangp
deleted file mode 100644
index 4b28f515df..0000000000
--- a/presets/crt-royale-ntsc-svideo.slangp
+++ /dev/null
@@ -1,235 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y7 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "16"
-
-# NTSC Shader Passes
-shader0 = ../stock.slang
-alias0 = PrePass0
-
-shader1 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
-
-# Pass 4: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader4 = "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias4 = "ORIG_LINEARIZED"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass 5: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader5 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias5 = "VERTICAL_SCANLINES"
-filter_linear5 = "true"
-scale_type_x5 = "source"
-scale_x5 = "1.0"
-scale_type_y5 = "viewport"
-scale_y5 = "1.0"
-#float_framebuffer5 = "true"
-srgb_framebuffer5 = "true"
-
-# Pass 6: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:5 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:5 aspect ratio).
-shader6 = "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias6 = "BLOOM_APPROX"
-filter_linear6 = "true"
-scale_type6 = "absolute"
-scale_x6 = "320"
-scale_y6 = "240"
-srgb_framebuffer6 = "true"
-
-# Pass 7: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader7 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "1.0"
-srgb_framebuffer7 = "true"
-
-# Pass 8: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader8 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias8 = "HALATION_BLUR"
-filter_linear8 = "true"
-scale_type8 = "source"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x9 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.7 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y7 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y9 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x10 = scale_y7
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y9 = 4.0/3.0 * 2.0/(341.33335 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-cgp-constants.h!
-shader9 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear9 = "true"
-scale_type_x9 = "absolute"
-scale_x9 = "64"
-scale_type_y9 = "viewport"
-scale_y9 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer9 = "false" # mask_texture is already assumed linear
-
-# Pass 10: Lanczos-resize the phosphor mask horizontally.  scale_x10 = scale_y7.
-# TODO: Check again if the shaders actually require equal scales.
-shader10 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias10 = "MASK_RESIZE"
-filter_linear10 = "false"
-scale_type_x10 = "viewport"
-scale_x10 = "0.0625"
-scale_type_y10 = "source"
-scale_y10 = "1.0"
-#srgb_framebuffer10 = "false" # mask_texture is already assumed linear
-
-# Pass 11: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader11 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias11 = "MASKED_SCANLINES"
-filter_linear11 = "true" # This could just as easily be nearest neighbor.
-scale_type11 = "viewport"
-scale11 = "1.0"
-#float_framebuffer11 = "true"
-srgb_framebuffer11 = "true"
-
-# Pass 12: Compute a brightpass.  This will require reading the final mask.
-shader12 = "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias12 = "BRIGHTPASS"
-filter_linear12 = "true" # This could just as easily be nearest neighbor.
-scale_type12 = "viewport"
-scale12 = "1.0"
-srgb_framebuffer12 = "true"
-
-# Pass 13: Blur the brightpass vertically
-shader13 = "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear13 = "true" # This could just as easily be nearest neighbor.
-scale_type13 = "source"
-scale13 = "1.0"
-srgb_framebuffer13 = "true"
-
-# Pass 14: Blur the brightpass horizontally and combine it with the dimpass:
-shader14 = "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear14 = "true"
-scale_type14 = "source"
-scale14 = "1.0"
-srgb_framebuffer14 = "true"
-
-# Pass 15: Compute curvature/AA:
-shader15 = "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear15 = "true"
-scale_type15 = "viewport"
-mipmap_input15 = "true"
-texture_wrap_mode15 = "clamp_to_edge"
-
-parameters = "quality"
-quality = 0.0
-
diff --git a/presets/crt-royale-pal-r57shell.slangp b/presets/crt-royale-pal-r57shell.slangp
deleted file mode 100644
index e53bcb53ce..0000000000
--- a/presets/crt-royale-pal-r57shell.slangp
+++ /dev/null
@@ -1,219 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x3
-# 2.) mask_resize_viewport_scale = float2(scale_x7, scale_y6)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "13"
-
-shader0 = "../pal/shaders/pal-r57shell.slang"
-
-nes_lut = "../pal/resources/nes_lut.png"
-nes_lut_linear = "false"
-nes_lut_wrap_mode = "repeat"
-nes_lut_mipmap = "false" 
-
-filter_linear0 = false
-scale_type_x0 = absolute
-scale_type_y0 = source
-scale_x0 = 1024
-scale_y0 = 1.0
-frame_count_mod0 = 2
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "nes_lut;mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-
-
-# Pass1: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader1 = "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias1 = "ORIG_LINEARIZED"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass2: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader2 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias2 = "VERTICAL_SCANLINES"
-filter_linear2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.0"
-scale_type_y2 = "viewport"
-scale_y2 = "1.0"
-#float_framebuffer2 = "true"
-srgb_framebuffer2 = "true"
-
-# Pass3: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader3 = "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias3 = "BLOOM_APPROX"
-filter_linear3 = "true"
-scale_type3 = "absolute"
-scale_x3 = "320"
-scale_y3 = "240"
-srgb_framebuffer3 = "true"
-
-# Pass4: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader4 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader5 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias5 = "HALATION_BLUR"
-filter_linear5 = "true"
-scale_type5 = "source"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass6: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x5 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.5 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y5 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y6 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x7 = scale_y6
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y6 = 4.0/3.0 * 2.0/(341.33333 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-cgp-constants.h!
-shader6 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Pass7: Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y6.
-# TODO: Check again if the shaders actually require equal scales.
-shader7 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Pass8: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-#float_framebuffer8 = "true"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Compute a brightpass.  This will require reading the final mask.
-shader9 = "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Pass 10: Blur the brightpass vertically
-shader10 = "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Pass 11: Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-
-# Pass 12: Compute curvature/AA:
-shader12 = "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear12 = "true"
-scale_type12 = "viewport"
-mipmap_input12 = "true"
-texture_wrap_mode12 = "clamp_to_edge"
diff --git a/presets/crt-royale-smooth.slangp b/presets/crt-royale-smooth.slangp
deleted file mode 100644
index 6d7931b6d5..0000000000
--- a/presets/crt-royale-smooth.slangp
+++ /dev/null
@@ -1,191 +0,0 @@
-shaders = "19"
-
-feedback_pass = "0"
-
-shader0 = "../stock.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-alias0 = "refpass"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-shader1 = "../edge-smoothing/scalefx/shaders/scalefx-pass0.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-alias1 = "scalefx_pass0"
-float_framebuffer1 = "true"
-scale_type1 = "source"
-scale1 = "1.000000"
-
-shader2 = "../edge-smoothing/scalefx/shaders/scalefx-pass1.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-float_framebuffer2 = "true"
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../edge-smoothing/scalefx/shaders/scalefx-pass2.slang"
-filter_linear3 = "false"
-wrap_mode3 = "clamp_to_border"
-scale_type3 = "source"
-scale3 = "1.000000"
-
-shader4 = "../edge-smoothing/scalefx/shaders/scalefx-pass3.slang"
-filter_linear4 = "false"
-wrap_mode4 = "clamp_to_border"
-scale_type4 = "source"
-scale4 = "1.000000"
-
-shader5 = "../edge-smoothing/scalefx/shaders/scalefx-pass4.slang"
-filter_linear5 = "false"
-wrap_mode5 = "clamp_to_border"
-srgb_framebuffer5 = "true"
-scale_type5 = "source"
-scale5 = "3.000000"
-
-shader6 =  "../interpolation/shaders/b-spline-4-taps.slang"
-filter_linear6 =  "true"
-wrap_mode6 =  "clamp_to_edge"
-srgb_framebuffer6 =  "true"
-scale_type_x6 =  "viewport"
-scale_x6 =  "1.000000"
-scale_type_y6 =  "source"
-scale_y6 =  "0.333333"
-
-shader7 =  "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-filter_linear7 =  "false"
-wrap_mode7 =  "clamp_to_border"
-alias7 =  "ORIG_LINEARIZED"
-srgb_framebuffer7 =  "true"
-scale_type7 =  "source"
-scale7 =  "1.000000"
-
-shader8 =  "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-filter_linear8 =  "true"
-wrap_mode8 =  "clamp_to_border"
-alias8 =  "VERTICAL_SCANLINES"
-float_framebuffer8 =  "false"
-srgb_framebuffer8 =  "true"
-scale_type_x8 =  "source"
-scale_x8 =  "1.000000"
-scale_type_y8 =  "viewport"
-scale_y8 =  "1.000000"
-
-shader9 =  "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-filter_linear9 =  "true"
-wrap_mode9 =  "clamp_to_border"
-alias9 =  "BLOOM_APPROX"
-srgb_framebuffer9 =  "true"
-scale_type_x9 =  "absolute"
-scale_x9 =  "320"
-scale_type_y9 =  "absolute"
-scale_y9 =  "240"
-
-shader10 =  "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear10 =  "true"
-wrap_mode10 =  "clamp_to_border"
-srgb_framebuffer10 =  "true"
-scale_type10 =  "source"
-scale10 =  "1.000000"
-
-shader11 =  "../blurs/shaders/royale/blur9fast-horizontal.slang"
-filter_linear11 =  "true"
-wrap_mode11 =  "clamp_to_border"
-alias11 =  "HALATION_BLUR"
-srgb_framebuffer11 =  "true"
-scale_type11 =  "source"
-scale11 =  "1.000000"
-
-shader12 =  "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear12 =  "true"
-wrap_mode12 =  "clamp_to_border"
-scale_type_x12 =  "absolute"
-scale_x12 =  "64"
-scale_type_y12 =  "viewport"
-scale_y12 =  "0.062500"
-
-shader13 =  "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-filter_linear13 =  "false"
-wrap_mode13 =  "clamp_to_border"
-alias13 =  "MASK_RESIZE"
-scale_type_x13 =  "viewport"
-scale_x13 =  "0.062500"
-scale_type_y13 =  "source"
-scale_y13 =  "1.000000"
-
-shader14 =  "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-filter_linear14 =  "true"
-wrap_mode14 =  "clamp_to_border"
-alias14 =  "MASKED_SCANLINES"
-srgb_framebuffer14 =  "true"
-scale_type14 =  "viewport"
-scale14 =  "1.000000"
-
-shader15 =  "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-filter_linear15 =  "true"
-wrap_mode15 =  "clamp_to_border"
-alias15 =  "BRIGHTPASS"
-srgb_framebuffer15 =  "true"
-scale_type15 =  "viewport"
-scale15 =  "1.000000"
-
-shader16 =   "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear16 =   "true"
-wrap_mode16 =   "clamp_to_border"
-srgb_framebuffer16 =   "true"
-scale_type16 =   "source"
-scale16 =   "1.000000"
-
-shader17 =   "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear17 =   "true"
-wrap_mode17 =   "clamp_to_border"
-srgb_framebuffer17 =   "true"
-scale_type17 =   "source"
-scale17 =   "1.000000"
-
-shader18 =   "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear18 =   "true"
-wrap_mode18 =   "clamp_to_border"
-mipmap_input18 =   "true"
-scale_type18 =   "viewport"
-scale18 =   "1.000000"
-
-SFX_CLR = "0.500000"
-SFX_SAA = "0.000000"
-SFX_SCN = "0.000000"
-crt_gamma = "2.400000"
-diffusion_weight = "0.000000"
-beam_min_sigma = "0.115000"
-beam_max_sigma = "0.285000"
-beam_spot_power = "0.010000"
-mask_type = "0.000000"
-border_size = "0.000000"
-border_darkness = "0.750000"
-border_compress = "3.000000"
-interlace_detect_toggle = "0.000000"
-
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
diff --git a/presets/crt-royale-xm29plus.slangp b/presets/crt-royale-xm29plus.slangp
deleted file mode 100755
index 0a450d128f..0000000000
--- a/presets/crt-royale-xm29plus.slangp
+++ /dev/null
@@ -1,255 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-cgp-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this .slangp, but their
-# compilation model doesn't currently allow the .slangp file to tell them.  Make
-# sure to set the following constants in user-cgp-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = float2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y6 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "13"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;SamplerLUT"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-SamplerLUT = "../reshade/shaders/LUT/NEC_XM29plus_capture.png"
-SamplerLUT_linear = true
-
-shader0 = "../reshade/shaders/LUT/LUT.slang"
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader1 = "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias1 = "ORIG_LINEARIZED"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-srgb_framebuffer1 = "true"
-
-# Pass1: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader2 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias2 = "VERTICAL_SCANLINES"
-filter_linear2 = "true"
-scale_type_x2 = "source"
-scale_x2 = "1.0"
-scale_type_y2 = "viewport"
-scale_y2 = "1.0"
-#float_framebuffer2 = "true"
-srgb_framebuffer2 = "true"
-
-# Pass2: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:4 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:4 aspect ratio).
-shader3 = "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias3 = "BLOOM_APPROX"
-filter_linear3 = "true"
-scale_type3 = "absolute"
-scale_x3 = "320"
-scale_y3 = "240"
-srgb_framebuffer3 = "true"
-
-# Pass3: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader4 = "../blurs/shaders/royale/blur5fast-vertical.slang"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass4: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x10 blur is about 1% slower.
-shader5 = "../blurs/shaders/royale/blur5fast-horizontal.slang"
-alias5 = "HALATION_BLUR"
-filter_linear5 = "true"
-scale_type5 = "source"
-scale5 = "1.0"
-srgb_framebuffer5 = "true"
-
-# Pass5: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x6 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.6 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y6 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y6 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x7 = scale_y5
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y6 = 4.0/3.0 * 2.0/(341.33334 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-cgp-constants.h!
-shader6 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear6 = "true"
-scale_type_x6 = "absolute"
-scale_x6 = "64"
-scale_type_y6 = "viewport"
-scale_y6 = "0.0625" # Safe for >= 341.334 horizontal triads at viewport size
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Pass6: Lanczos-resize the phosphor mask horizontally.  scale_x7 = scale_y5.
-# TODO: Check again if the shaders actually require equal scales.
-shader7 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias7 = "MASK_RESIZE"
-filter_linear7 = "false"
-scale_type_x7 = "viewport"
-scale_x7 = "0.0625"
-scale_type_y7 = "source"
-scale_y7 = "1.0"
-#srgb_framebuffer7 = "false" # mask_texture is already assumed linear
-
-# Pass7: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader8 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias8 = "MASKED_SCANLINES"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-#float_framebuffer8 = "true"
-srgb_framebuffer8 = "true"
-
-# Pass 8: Compute a brightpass.  This will require reading the final mask.
-shader9 = "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias9 = "BRIGHTPASS"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "viewport"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Pass 9: Blur the brightpass vertically
-shader10 = "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear10 = "true" # This could just as easily be nearest neighbor.
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Pass 10: Blur the brightpass horizontally and combine it with the dimpass:
-shader11 = "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear11 = "true"
-scale_type11 = "source"
-scale11 = "1.0"
-srgb_framebuffer11 = "true"
-
-# Pass 11: Compute curvature/AA:
-shader12 = "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear12 = "true"
-scale_type12 = "viewport"
-mipmap_input12 = "true"
-texture_wrap_mode12 = "clamp_to_edge"
-
-parameters = "crt_gamma;lcd_gamma;levels_contrast;halation_weight;diffusion_weight;bloom_underestimate_levels;bloom_excess;beam_min_sigma;beam_max_sigma;beam_spot_power;beam_min_shape;beam_max_shape;beam_shape_power;beam_horiz_filter;beam_horiz_sigma;beam_horiz_linear_rgb_weight;convergence_offset_x_r;convergence_offset_x_g;convergence_offset_x_b;convergence_offset_y_r;convergence_offset_y_g;convergence_offset_y_b;mask_type;mask_sample_mode_desired;mask_specify_num_triads;mask_triad_size_desired;mask_num_triads_desired;aa_subpixel_r_offset_x_runtime;aa_subpixel_r_offset_y_runtime;aa_cubic_c;aa_gauss_sigma;geom_mode_runtime;geom_radius;geom_view_dist;geom_tilt_angle_x;geom_tilt_angle_y;geom_aspect_ratio_x;geom_aspect_ratio_y;geom_overscan_x;geom_overscan_y;border_size;border_darkness;border_compress;interlace_bff;interlace_1080i;LUT_Size"
-beam_horiz_filter = "0.000000"
-beam_horiz_linear_rgb_weight = "1.000000"
-beam_horiz_sigma = "0.555000"
-beam_max_shape = "2.000000"
-beam_max_sigma = "0.250000"
-beam_min_shape = "2.000000"
-beam_min_sigma = "0.075000"
-beam_shape_power = "0.250000"
-beam_spot_power = "0.330000"
-bloom_excess = "0.335000"
-bloom_underestimate_levels = "1.20"
-border_compress = "2.500000"
-border_darkness = "0.000000"
-border_size = "0.005000"
-convergence_offset_x_b = "0.000000"
-convergence_offset_x_g = "0.000000"
-convergence_offset_x_r = "0.000000"
-convergence_offset_y_b = "-0.200000"
-convergence_offset_y_g = "0.000000"
-convergence_offset_y_r = "0.200000"
-crt_gamma = "2.400000"
-diffusion_weight = "0.075000"
-geom_aspect_ratio_x = "432.000000"
-geom_aspect_ratio_y = "329.000000"
-geom_mode_runtime = "0.000000"
-geom_overscan_x = "1.000000"
-geom_overscan_y = "1.000000"
-geom_radius = "3.000000"
-geom_tilt_angle_x = "0.000000"
-geom_tilt_angle_y = "0.000000"
-geom_view_dist = "2.000000"
-halation_weight = "0.000000"
-interlace_1080i = "0.000000"
-interlace_bff = "0.000000"
-lcd_gamma = "2.400000"
-levels_contrast = "0.750000"
-mask_specify_num_triads = "0.000000"
-mask_triad_size_desired = "3.000000"
-mask_sample_mode_desired = "1.000000"
-mask_type = "1.000000"
-aa_cubic_c = "0.500000"
-aa_gauss_sigma = "0.500000"
-aa_subpixel_r_offset_x_runtime = "-0.333333"
-aa_subpixel_r_offset_y_runtime = "0.000000"
-LUT_Size = "32.0"
diff --git a/presets/crtglow_gauss_ntsc.slangp b/presets/crtglow_gauss_ntsc.slangp
deleted file mode 100644
index 4bee1cc7b0..0000000000
--- a/presets/crtglow_gauss_ntsc.slangp
+++ /dev/null
@@ -1,53 +0,0 @@
-shaders = 8
-
-shader0 = ../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
-filter_linear0 = false
-scale_type0 = source
-scale_x0 = 4.0
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-shader1 = ../ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-filter_linear1 = false
-srgb_framebuffer1 = true
-
-shader2 = ../crt/shaders/glow/gauss_horiz.slang
-filter_linear2 = false
-scale_type_x2 = viewport
-scale_type_y2 = source
-scale_x2 = 1.0
-scale_y2 = 1.0
-srgb_framebuffer2 = true
-
-shader3 = ../crt/shaders/glow/gauss_vert.slang
-filter_linear3 = false
-scale_type3 = viewport
-scale3 = 1.0
-srgb_framebuffer3 = true
-alias3 = "CRTPass"
-
-shader4 = ../crt/shaders/glow/threshold.slang
-filter_linear4 = false
-srgb_framebuffer4 = true
-
-shader5 = ../crt/shaders/glow/blur_horiz.slang
-mipmap_input5 = true
-filter_linear5 = true
-scale_type5 = source
-scale5 = 0.25
-srgb_framebuffer5 = true
-
-shader6 = ../crt/shaders/glow/blur_vert.slang
-filter_linear6 = true
-srgb_framebuffer6 = true
-
-shader7 = ../crt/shaders/glow/resolve.slang
-filter_linear7 = true
-
-parameters = "quality"
-quality = 1.0
-
diff --git a/presets/imgborder-royale-kurozumi.slangp b/presets/imgborder-royale-kurozumi.slangp
deleted file mode 100644
index 70ebecba8e..0000000000
--- a/presets/imgborder-royale-kurozumi.slangp
+++ /dev/null
@@ -1,256 +0,0 @@
-# IMPORTANT:
-# Shader passes need to know details about the image in the mask_texture LUT
-# files, so set the following constants in user-preset-constants.h accordingly:
-# 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-# 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-# 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-# 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-# 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-# 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-# Shader passes also need to know certain scales set in this preset, but their
-# compilation model doesn't currently allow the preset file to tell them.  Make
-# sure to set the following constants in user-preset-constants.h accordingly too:
-# 1.) bloom_approx_scale_x = scale_x2
-# 2.) mask_resize_viewport_scale = vec2(scale_x6, scale_y5)
-# Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-# calculate scale_y5 (among other values):
-# 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-shaders = "13"
-
-# Set an identifier, filename, and sampling traits for the phosphor mask texture.
-# Load an aperture grille, slot mask, and an EDP shadow mask, and load a small
-# non-mipmapped version and a large mipmapped version.
-# TODO: Test masks in other directories.
-textures = "mask_grille_texture_small;mask_grille_texture_large;mask_slot_texture_small;mask_slot_texture_large;mask_shadow_texture_small;mask_shadow_texture_large;BORDER"
-mask_grille_texture_small = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png"
-mask_grille_texture_large = "../crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png"
-mask_slot_texture_small = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png"
-mask_slot_texture_large = "../crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png"
-mask_shadow_texture_small = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png"
-mask_shadow_texture_large = "../crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png"
-mask_grille_texture_small_wrap_mode = "repeat"
-mask_grille_texture_large_wrap_mode = "repeat"
-mask_slot_texture_small_wrap_mode = "repeat"
-mask_slot_texture_large_wrap_mode = "repeat"
-mask_shadow_texture_small_wrap_mode = "repeat"
-mask_shadow_texture_large_wrap_mode = "repeat"
-mask_grille_texture_small_linear = "true"
-mask_grille_texture_large_linear = "true"
-mask_slot_texture_small_linear = "true"
-mask_slot_texture_large_linear = "true"
-mask_shadow_texture_small_linear = "true"
-mask_shadow_texture_large_linear = "true"
-mask_grille_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_grille_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-mask_slot_texture_small_mipmap = "false"    # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_slot_texture_large_mipmap = "true"     # Essential for hardware-resized masks
-mask_shadow_texture_small_mipmap = "false"  # Mipmapping causes artifacts with manually resized masks without tex2Dlod
-mask_shadow_texture_large_mipmap = "true"   # Essential for hardware-resized masks
-BORDER = ../border/textures/pvm.png
-
-
-# Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-# (Bobbing ensures we can immediately blur without getting artifacts.)
-shader0 = "../crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang"
-alias0 = "ORIG_LINEARIZED"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-srgb_framebuffer0 = "true"
-
-# Pass1: Resample interlaced (and misconverged) scanlines vertically.
-# Separating vertical/horizontal scanline sampling is faster: It lets us
-# consider more scanlines while calculating weights for fewer pixels, and
-# it reduces our samples from vertical*horizontal to vertical+horizontal.
-# This has to come right after ORIG_LINEARIZED, because there's no
-# "original_source" scale_type we can use later.
-shader1 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang"
-alias1 = "VERTICAL_SCANLINES"
-filter_linear1 = "true"
-scale_type_x1 = "source"
-scale_x1 = "1.0"
-scale_type_y1 = "viewport"
-scale_y1 = "1.0"
-#float_framebuffer1 = "true"
-srgb_framebuffer1 = "true"
-
-# Pass2: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-# account for convergence offsets.  We want to blur a predictable portion of the
-# screen to match the phosphor bloom, and absolute scale works best for
-# reliable results with a fixed-size bloom.  Picking a scale is tricky:
-# a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-#     to blur high-res/interlaced sources but high enough that resampling
-#     doesn't smear low-res sources too much.
-# b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-#     the only noticeable visual difference is a larger halation spread (which
-#     may be a good thing for people who like to crank it up).
-# Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-# *intended* for an ~4:3 aspect ratio).
-shader2 = "../crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang"
-alias2 = "BLOOM_APPROX"
-filter_linear2 = "true"
-scale_type2 = "absolute"
-scale_x2 = "320"
-scale_y2 = "240"
-srgb_framebuffer2 = "true"
-
-# Pass3: Vertically blur the input for halation and refractive diffusion.
-# Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-# a constant portion of the screen is probably physically correct if the
-# viewport resolution is proportional to the simulated CRT size.
-shader3 = "../blurs/shaders/royale/blur9fast-vertical.slang"
-filter_linear3 = "true"
-scale_type3 = "source"
-scale3 = "1.0"
-srgb_framebuffer3 = "true"
-
-# Pass4: Horizontally blur the input for halation and refractive diffusion.
-# Note: Using a one-pass 9x9 blur is about 1% slower.
-shader4 = "../blurs/shaders/royale/blur9fast-horizontal.slang"
-alias4 = "HALATION_BLUR"
-filter_linear4 = "true"
-scale_type4 = "source"
-scale4 = "1.0"
-srgb_framebuffer4 = "true"
-
-# Pass5: Lanczos-resize the phosphor mask vertically.  Set the absolute
-# scale_x5 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-# will blur, and smaller scales could get nasty.  The vertical size must be
-# based on the viewport size and calculated carefully to avoid artifacts later.
-# First calculate the minimum number of mask tiles we need to draw.
-# Since curvature is computed after the scanline masking pass:
-#   num_resized_mask_tiles = 2.0;
-# If curvature were computed in the scanline masking pass (it's not):
-#   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.5 + 1.0);
-#   max_mask_tile_border = max_mask_texel_border/
-#       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-#   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-#   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-#       num_resized_mask_tiles = ~3.8
-# Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-# to relate them to vertical resolution.  The widest we expect is:
-#   geom_max_aspect_ratio = 4.0/3.0  # Note: Shader passes need to know this!
-# The fewer triads we tile across the screen, the larger each triad will be as a
-# fraction of the viewport size, and the larger scale_y5 must be to draw a full
-# num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-# triads we'll guarantee can be displayed on screen.  We'll set this according
-# to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-#   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-# Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-#   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-#       min_allowed_viewport_triads
-#   scale_y5 = geom_max_aspect_ratio * min_scale_x
-#   # Some code might depend on equal scales:
-#   scale_x6 = scale_y5
-# Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-#   scale_y5 = 4.0/3.0 * 2.0/(341.33333 / 8.0) = 0.0625
-# IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-# geom_max_aspect_ratio, update that constant in user-preset-constants.h!
-shader5 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang"
-filter_linear5 = "true"
-scale_type_x5 = "absolute"
-scale_x5 = "64"
-scale_type_y5 = "viewport"
-scale_y5 = "0.0625" # Safe for >= 341.333 horizontal triads at viewport size
-#srgb_framebuffer5 = "false" # mask_texture is already assumed linear
-
-# Pass6: Lanczos-resize the phosphor mask horizontally.  scale_x6 = scale_y5.
-# TODO: Check again if the shaders actually require equal scales.
-shader6 = "../crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang"
-alias6 = "MASK_RESIZE"
-filter_linear6 = "false"
-scale_type_x6 = "viewport"
-scale_x6 = "0.0625"
-scale_type_y6 = "source"
-scale_y6 = "1.0"
-#srgb_framebuffer6 = "false" # mask_texture is already assumed linear
-
-# Pass7: Resample (misconverged) scanlines horizontally, apply halation, and
-# apply the phosphor mask.
-shader7 = "../crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang"
-alias7 = "MASKED_SCANLINES"
-filter_linear7 = "true" # This could just as easily be nearest neighbor.
-scale_type7 = "viewport"
-scale7 = "1.0"
-#float_framebuffer7 = "true"
-srgb_framebuffer7 = "true"
-
-# Pass 8: Compute a brightpass.  This will require reading the final mask.
-shader8 = "../crt/shaders/crt-royale/src/crt-royale-brightpass.slang"
-alias8 = "BRIGHTPASS"
-filter_linear8 = "true" # This could just as easily be nearest neighbor.
-scale_type8 = "viewport"
-scale8 = "1.0"
-srgb_framebuffer8 = "true"
-
-# Pass 9: Blur the brightpass vertically
-shader9 = "../crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang"
-filter_linear9 = "true" # This could just as easily be nearest neighbor.
-scale_type9 = "source"
-scale9 = "1.0"
-srgb_framebuffer9 = "true"
-
-# Pass 10: Blur the brightpass horizontally and combine it with the dimpass:
-shader10 = "../crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang"
-filter_linear10 = "true"
-scale_type10 = "source"
-scale10 = "1.0"
-srgb_framebuffer10 = "true"
-
-# Pass 11: Compute curvature/AA:
-shader11 = "../crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
-filter_linear11 = "true"
-scale_type11 = "viewport"
-mipmap_input11 = "true"
-texture_wrap_mode11 = "clamp_to_edge"
-scale11 = 4.0
-
-shader12 = ../border/shaders/imgborder.slang
-
-parameters = "crt_gamma;lcd_gamma;levels_contrast;halation_weight;diffusion_weight;bloom_underestimate_levels;bloom_excess;beam_min_sigma;beam_max_sigma;beam_spot_power;beam_min_shape;beam_max_shape;beam_shape_power;beam_horiz_filter;beam_horiz_sigma;beam_horiz_linear_rgb_weight;convergence_offset_x_r;convergence_offset_x_g;convergence_offset_x_b;convergence_offset_y_r;convergence_offset_y_g;convergence_offset_y_b;mask_type;mask_sample_mode_desired;mask_specify_num_triads;mask_triad_size_desired;mask_num_triads_desired;aa_subpixel_r_offset_x_runtime;aa_subpixel_r_offset_y_runtime;aa_cubic_c;aa_gauss_sigma;geom_mode_runtime;geom_radius;geom_view_dist;geom_tilt_angle_x;geom_tilt_angle_y;geom_aspect_ratio_x;geom_aspect_ratio_y;geom_overscan_x;geom_overscan_y;border_size;border_darkness;border_compress;interlace_bff;interlace_1080i"
-crt_gamma = "2.500000"
-lcd_gamma = "2.400000"
-levels_contrast = "0.840000"
-halation_weight = "0.000000"
-diffusion_weight = "0.010000"
-bloom_underestimate_levels = "0.800000"
-bloom_excess = "0.000000"
-beam_min_sigma = "0.02000"
-beam_max_sigma = "0.200000"
-beam_spot_power = "0.370000"
-beam_min_shape = "2.000000"
-beam_max_shape = "4.000000"
-beam_shape_power = "0.250000"
-beam_horiz_filter = "0.000000"
-beam_horiz_sigma = "0.545000"
-beam_horiz_linear_rgb_weight = "1.000000"
-convergence_offset_x_r = "0.000000"
-convergence_offset_x_g = "0.000000"
-convergence_offset_x_b = "0.000000"
-convergence_offset_y_r = "0.100000"
-convergence_offset_y_g = "-0.100000"
-convergence_offset_y_b = "0.100000"
-mask_type = "0.000000"
-mask_sample_mode_desired = "1.000000"
-mask_specify_num_triads = "1.000000"
-mask_triad_size_desired = "3.000000"
-mask_num_triads_desired = "900.000000"
-aa_subpixel_r_offset_x_runtime = "-0.333333"
-aa_subpixel_r_offset_y_runtime = "0.000000"
-aa_cubic_c = "0.500000"
-aa_gauss_sigma = "0.500000"
-geom_mode = "3.000000"
-geom_radius = "3.000000"
-geom_view_dist = "2.000000"
-geom_tilt_angle_x = "0.000000"
-geom_tilt_angle_y = "0.000000"
-geom_aspect_ratio_x = "432.000000"
-geom_aspect_ratio_y = "329.000000"
-geom_overscan_x = "1.000000"
-geom_overscan_y = "1.000000"
-border_size = "0.005000"
-border_darkness = "0.000000"
-border_compress = "2.500000"
-interlace_bff = "0.000000"
-interlace_1080i = "0.000000"
diff --git a/presets/mdapt+fast-bilateral+super-4xbr+scanlines.slangp b/presets/mdapt+fast-bilateral+super-4xbr+scanlines.slangp
deleted file mode 100644
index 3e56b35b8c..0000000000
--- a/presets/mdapt+fast-bilateral+super-4xbr+scanlines.slangp
+++ /dev/null
@@ -1,99 +0,0 @@
-shaders = 16
-
-shader0 = ../stock.slang
-alias0 = mdapt_refpass
-
-shader1 = ../dithering/shaders/mdapt/passes/mdapt-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-
-shader2 = ../dithering/shaders/mdapt/passes/mdapt-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-
-shader3 = ../dithering/shaders/mdapt/passes/mdapt-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../dithering/shaders/mdapt/passes/mdapt-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../dithering/shaders/mdapt/passes/mdapt-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-
-shader6 = ../dithering/shaders/mdapt/passes/mdapt-pass4.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = "../denoisers/shaders/fast-bilateral.slang"
-filter_linear7 = "false"
-wrap_mode7 = "clamp_to_edge"
-scale_type_x7 = "source"
-scale_x7 = "1.000000"
-scale_type_y7 = "source"
-scale_y7 = "1.000000"
-alias7 = XbrSource
-
-shader8 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear8 = "false"
-wrap_mode8 = "clamp_to_edge"
-scale_type_x8 = "source"
-scale_x8 = "1.000000"
-scale_type_y8 = "source"
-scale_y8 = "1.000000"
-
-shader9 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear9 = "false"
-wrap_mode9 = "clamp_to_edge"
-scale_type_x9 = "source"
-scale_x9 = "2.000000"
-scale_type_y9 = "source"
-scale_y9 = "2.000000"
-alias9 = "PassPrev2"
-
-shader10 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear10 = "false"
-wrap_mode10 = "clamp_to_edge"
-scale_type_x10 = "source"
-scale_x10 = "1.000000"
-scale_type_y10 = "source"
-scale_y10 = "1.000000"
-
-shader11 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear11 = "false"
-wrap_mode11 = "clamp_to_edge"
-scale_type_x11 = "source"
-scale_x11 = "1.000000"
-scale_type_y11 = "source"
-scale_y11 = "1.000000"
-
-shader12 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang"
-filter_linear12 = "false"
-wrap_mode12 = "clamp_to_edge"
-scale_type_x12 = "source"
-scale_x12 = "2.000000"
-scale_type_y12 = "source"
-scale_y12 = "2.000000"
-
-shader13 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear13 = "false"
-wrap_mode13 = "clamp_to_edge"
-scale_type_x13 = "source"
-scale_x13 = "1.000000"
-scale_type_y13 = "source"
-scale_y13 = "1.000000"
-
-shader14 = ../stock.slang
-
-shader15 = ../scanlines/shaders/scanline.slang
-filter_linear15 = false
-scale_type15 = source
-scale15 = 1.0
diff --git a/presets/nes-color-decoder+colorimetry+pixellate.slangp b/presets/nes-color-decoder+colorimetry+pixellate.slangp
deleted file mode 100644
index f9d72aa2a6..0000000000
--- a/presets/nes-color-decoder+colorimetry+pixellate.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-shaders = "3"
-shader0 = ../nes_raw_palette/shaders/nes-color-decoder.slang
-shader1 = ../misc/shaders/colorimetry.slang
-shader2 = ../pixel-art-scaling/shaders/pixellate.slang
-
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.000000"
-
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.000000"
diff --git a/presets/nes-color-decoder+pixellate.slangp b/presets/nes-color-decoder+pixellate.slangp
deleted file mode 100644
index 5289f7fe63..0000000000
--- a/presets/nes-color-decoder+pixellate.slangp
+++ /dev/null
@@ -1,7 +0,0 @@
-shaders = "2"
-shader0 = ../nes_raw_palette/shaders/nes-color-decoder.slang
-shader1 = ../pixel-art-scaling/shaders/pixellate.slang
-
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.000000"
diff --git a/presets/ntsc-phosphorlut.slangp b/presets/ntsc-phosphorlut.slangp
deleted file mode 100644
index 05c23a6031..0000000000
--- a/presets/ntsc-phosphorlut.slangp
+++ /dev/null
@@ -1,68 +0,0 @@
-shaders = 9
-
-shader0 = ../stock.slang
-alias0 = PrePass0
-
-shader1 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass1.slang
-alias1 = NPass1
-scale_type_x1 = source
-scale_type_y1 = source
-scale_x1 = 4.0
-scale_y1 = 1.0
-float_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass2.slang
-filter_linear2 = true
-float_framebuffer2 = true
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-shader3 = ../crt/shaders/guest/advanced/ntsc/ntsc-pass3.slang
-filter_linear3 = true
-scale_type3 = source
-scale_x3 = 1.0
-scale_y3 = 1.0
-
-shader4 = ../crt/shaders/phosphorlut/scanlines-interlace-linearize.slang
-alias4 = firstPass
-scale4 = 2.0
-scale_type4 = source
-srgb_framebuffer4 = true
-filter_linear4 = false
-
-shader5 = ../blurs/shaders/royale/blur5fast-vertical.slang
-scale_type5 = source
-scale5 = 1.0
-srgb_framebuffer5 = true
-filter_linear5 = true
-alias5 = blurPassV
-
-shader6 = ../blurs/shaders/royale/blur5fast-horizontal.slang
-alias6 = blurPass
-filter_linear6 = true
-scale6 = 1.0
-scale_type6 = source
-srgb_framebuffer6 = true
-
-shader7 = ../crt/shaders/phosphorlut/phosphorlut-pass0.slang
-alias7 = phosphorPass
-filter_linear7 = true
-scale_type7 = source
-scale_x7 = 4.0
-scale_y7 = 2.0
-srgb_framebuffer7 = true
-
-shader8 = ../crt/shaders/phosphorlut/phosphorlut-pass1.slang
-filter_linear8 = true
-
-parameters = "diffusion;PHOSPHOR_SCALE_X"
-diffusion = 0.6
-PHOSPHOR_SCALE_X = 4.0
-quality = 1.0
-
-textures = "shadow;aperture;slot"
-shadow = ../crt/shaders/phosphorlut/luts/shadowmask.png
-aperture = ../crt/shaders/phosphorlut/luts/aperture-grille.png
-slot = ../crt/shaders/phosphorlut/luts/slotmask.png
diff --git a/presets/ntsclut-phosphorlut.slangp b/presets/ntsclut-phosphorlut.slangp
deleted file mode 100644
index d787557530..0000000000
--- a/presets/ntsclut-phosphorlut.slangp
+++ /dev/null
@@ -1,43 +0,0 @@
-shaders = 6
-
-shader0 = ../crt/shaders/crtsim/composite.slang
-filter_linear0 = false
-
-shader1 = ../crt/shaders/phosphorlut/scanlines-interlace-linearize.slang
-alias1 = firstPass
-scale1 = 2.0
-scale_type1 = source
-srgb_framebuffer1 = true
-filter_linear1 = false
-
-shader2 = ../blurs/shaders/royale/blur5fast-vertical.slang
-scale_type2 = source
-scale2 = 1.0
-srgb_framebuffer2 = true
-filter_linear2 = true
-alias2 = blurPassV
-
-shader3 = ../blurs/shaders/royale/blur5fast-horizontal.slang
-alias3 = blurPass
-filter_linear3 = true
-scale3 = 1.0
-scale_type3 = source
-srgb_framebuffer3 = true
-
-shader4 = ../crt/shaders/phosphorlut/phosphorlut-pass0.slang
-alias4 = phosphorPass
-filter_linear4 = true
-scale_type4 = source
-scale_x4 = 4.0
-scale_y4 = 2.0
-srgb_framebuffer4 = true
-
-shader5 = ../crt/shaders/phosphorlut/phosphorlut-pass1.slang
-filter_linear5 = true
-
-textures = "NTSCArtifactSampler;shadow;aperture;slot"
-NTSCArtifactSampler = "../crt/shaders/crtsim/artifacts.png"
-NTSCArtifactSampler_linear = true
-shadow = ../crt/shaders/phosphorlut/luts/shadowmask.png
-aperture = ../crt/shaders/phosphorlut/luts/aperture-grille.png
-slot = ../crt/shaders/phosphorlut/luts/slotmask.png
diff --git a/presets/scalefx+rAA+aa-fast.slangp b/presets/scalefx+rAA+aa-fast.slangp
deleted file mode 100644
index 593ad38ebc..0000000000
--- a/presets/scalefx+rAA+aa-fast.slangp
+++ /dev/null
@@ -1,67 +0,0 @@
-shaders = 11
-
-shader0 = ../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-
-shader6 = ../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = ../anti-aliasing/shaders/fxaa.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 2.0
-
-shader10 = ../deblur/shaders/deblur.slang
-filter_linear10 = true
-scale_type10 = viewport
-scale10 = 1.0
-
-parameters = "SFX_CLR;SFX_SAA;SFX_SCN;AAOFFSET2;OFFSET;DEBLUR;SMART"
-SFX_CLR = "0.500000"
-SFX_SAA = "0.000000"
-SFX_SCN = "0.000000"
-AAOFFSET2 = "0.400000"
-OFFSET = "2.000000"
-DEBLUR = "3.500000"
-SMART = "0.400000"
diff --git a/presets/scalefx+rAA+aa.slangp b/presets/scalefx+rAA+aa.slangp
deleted file mode 100644
index d5f5e08bfa..0000000000
--- a/presets/scalefx+rAA+aa.slangp
+++ /dev/null
@@ -1,77 +0,0 @@
-shaders = 12
-
-shader0 = ../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-
-shader6 = ../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = ../anti-aliasing/shaders/fxaa.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../edge-smoothing/xsoft/shaders/4xsoft.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 2.0
-
-shader10 = ../sharpen/shaders/fast-sharpen.slang
-filter_linear10 = true
-scale_type10 = source
-scale10 = 1.0
-
-shader11 = ../deblur/shaders/deblur.slang
-filter_linear11 = true
-scale_type11 = viewport
-scale11 = 1.0
-
-parameters = "SFX_CLR;SFX_SAA;SFX_SCN;RESOLUTION_X;RESOLUTION_Y;CONTRAST;SHARPEN;CONTR;DETAILS;OFFSET;DEBLUR;SMART"
-SFX_CLR = "0.600000"
-SFX_SAA = "1.000000"
-SFX_SCN = "0.000000"
-RESOLUTION_X = "0.000000"
-RESOLUTION_Y = "0.000000"
-CONTRAST = "3.000000"
-SHARPEN = "0.90000"
-CONTR = "0.100000"
-DETAILS = "0.500000"
-OFFSET = "1.750000"
-DEBLUR = "5.000000"
-SMART = "0.500000"  
diff --git a/presets/scalefx-aa-fast.slangp b/presets/scalefx-aa-fast.slangp
deleted file mode 100644
index c10ca9a9b0..0000000000
--- a/presets/scalefx-aa-fast.slangp
+++ /dev/null
@@ -1,57 +0,0 @@
-shaders = 9
-
-shader0 = ../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-
-shader6 = ../anti-aliasing/shaders/fxaa.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 2.0
-
-shader8 = ../deblur/shaders/deblur.slang
-filter_linear8 = true
-scale_type8 = viewport
-scale8 = 1.0
-
-parameters = "SFX_CLR;SFX_SAA;SFX_SCN;AAOFFSET2;OFFSET;DEBLUR;SMART"
-SFX_CLR = "0.500000"
-SFX_SAA = "1.000000"
-SFX_SCN = "0.000000"
-AAOFFSET2 = "0.400000"
-OFFSET = "2.000000"
-DEBLUR = "3.500000"
-SMART = "0.300000"
diff --git a/presets/scalefx-aa.slangp b/presets/scalefx-aa.slangp
deleted file mode 100644
index 2e4007ccf1..0000000000
--- a/presets/scalefx-aa.slangp
+++ /dev/null
@@ -1,67 +0,0 @@
-shaders = 10
-
-shader0 = ../stock.slang
-alias0 = refpass
-filter_linear0 = "false"
-
-shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-
-shader6 = ../anti-aliasing/shaders/fxaa.slang
-filter_linear6 = true
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../edge-smoothing/xsoft/shaders/4xsoft.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 2.0
-
-shader8 = ../sharpen/shaders/fast-sharpen.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../deblur/shaders/deblur.slang
-filter_linear9 = true
-scale_type9 = viewport
-scale9 = 1.0
-
-parameters = "SFX_CLR;SFX_SAA;SFX_SCN;RESOLUTION_X;RESOLUTION_Y;CONTRAST;SHARPEN;CONTR;DETAILS;OFFSET;DEBLUR;SMART"
-SFX_CLR = "0.600000"
-SFX_SAA = "1.000000"
-SFX_SCN = "0.000000"
-RESOLUTION_X = "0.000000"
-RESOLUTION_Y = "0.000000"
-CONTRAST = "3.000000"
-SHARPEN = "1.200000"
-CONTR = "0.100000"
-DETAILS = "1.000000"
-OFFSET = "1.750000"
-DEBLUR = "5.000000"
-SMART = "0.300000" 
diff --git a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp
deleted file mode 100644
index 0167e4a236..0000000000
--- a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp
+++ /dev/null
@@ -1,96 +0,0 @@
-shaders = 17
-
-shader0 = ../stock.slang
-alias0 = scalefx_old_refpass
-
-shader1 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = sfxp0
-
-shader2 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-alias2 = sfxp1
-
-shader3 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = sfxp2
-
-shader4 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 3.0
-alias4 = sfxp3
-
-shader5 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-alias5 = sfxp4
-
-shader6 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = sfxp5
-
-shader7 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = sfxp6
-
-shader8 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass7.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 3.0
-alias8 = sfxp7
-
-shader9 = ../misc/shaders/image-adjustment.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-
-shader10 = ../anti-aliasing/shaders/aa-shader-4.0.slang
-filter_linear10 = true
-scale_type10 = viewport
-scale10 = 1.0
-
-shader11 = ../reshade/shaders/scanlines.slang
-filter_linear11 = false
-scale_type11 = source
-scale11 = 1.0
-alias11 = scanpass
-
-shader12 = ../reshade/shaders/bloom-pass-sh1nra358.slang
-filter_linear12 = false
-scale_type12 = source
-scale12 = 1.0
-
-shader13 = ../blurs/shaders/blur-gauss-h.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-
-shader14 = ../blurs/shaders/blur-gauss-v.slang
-filter_linear14 = true
-scale_type14 = source
-scale14 = 1.0
-
-shader15 = ../reshade/shaders/blur-haze-sh1nra358.slang
-filter_linear15 = true
-scale_type15 = source
-scale15 = 1.0
-
-shader16 = ../misc/shaders/ntsc-colors.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-
-parameters = "INTERNAL_RES"
-INTERNAL_RES = 6.0
diff --git a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp
deleted file mode 100644
index ae5a2f3ae5..0000000000
--- a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp
+++ /dev/null
@@ -1,96 +0,0 @@
-shaders = 17
-
-shader0 = ../stock.slang
-alias0 = scalefx_old_refpass
-
-shader1 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-alias1 = sfxp0
-
-shader2 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-alias2 = sfxp1
-
-shader3 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-alias3 = sfxp2
-
-shader4 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 3.0
-alias4 = sfxp3
-
-shader5 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 1.0
-alias5 = sfxp4
-
-shader6 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-alias6 = sfxp5
-
-shader7 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 1.0
-alias7 = sfxp6
-
-shader8 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass7.slang
-filter_linear8 = false
-scale_type8 = source
-scale8 = 3.0
-alias8 = sfxp7
-
-shader9 = ../misc/shaders/image-adjustment.slang
-filter_linear9 = false
-scale_type9 = source
-scale9 = 1.0
-
-shader10 = ../anti-aliasing/shaders/aa-shader-4.0.slang
-filter_linear10 = true
-scale_type10 = viewport
-scale10 = 1.0
-
-shader11 = ../reshade/shaders/scanlines.slang
-filter_linear11 = false
-scale_type11 = source
-scale11 = 1.0
-alias11 = scanpass
-
-shader12 = ../reshade/shaders/bloom-pass-sh1nra358.slang
-filter_linear12 = false
-scale_type12 = source
-scale12 = 1.0
-
-shader13 = ../blurs/shaders/blur-gauss-h.slang
-filter_linear13 = true
-scale_type13 = source
-scale13 = 1.0
-
-shader14 = ../blurs/shaders/blur-gauss-v.slang
-filter_linear14 = true
-scale_type14 = source
-scale14 = 1.0
-
-shader15 = ../reshade/shaders/blur-haze-sh1nra358.slang
-filter_linear15 = true
-scale_type15 = source
-scale15 = 1.0
-
-shader16 = ../reshade/shaders/vibrance-pass-sh1nra358.slang
-filter_linear16 = false
-scale_type16 = source
-scale16 = 1.0
-
-parameters = "INTERNAL_RES"
-INTERNAL_RES = 6.0
diff --git a/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.slangp b/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.slangp
deleted file mode 100644
index fbdf16479f..0000000000
--- a/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-#tvout preset for 480p CRTs
-
-shaders = "4"
-shader0 = "../../nes_raw_palette/shaders/nes-color-decoder.slang"
-shader1 = "../../crt/shaders/tvout-tweaks.slang"
-shader2 = "../../misc/shaders/image-adjustment.slang"
-shader3 = "../../misc/shaders/interlacing.slang"
-
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
-
-scale_type_x1 = "viewport"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "320.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "0.000000"
-target_gamma = "2.200000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp
deleted file mode 100644
index fc8e658d89..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1024"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp
deleted file mode 100644
index 56d8e3465c..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1536"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp
deleted file mode 100644
index 8ed617cb74..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp
deleted file mode 100644
index 2e067f9b4c..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "6.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp
deleted file mode 100644
index 689ec74f4f..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1280"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp
deleted file mode 100644
index 59896442a1..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1920"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp
deleted file mode 100644
index 88ba6ac457..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp
deleted file mode 100644
index b12d00656c..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp
+++ /dev/null
@@ -1,48 +0,0 @@
-shaders = "5"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "6.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-shader4 = "../../misc/shaders/interlacing.slang"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
-percent = "0.000000"
diff --git a/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp
deleted file mode 100644
index 60af34cd09..0000000000
--- a/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp
+++ /dev/null
@@ -1,46 +0,0 @@
-shaders = 6
-shader0 = ../../nes_raw_palette/shaders/nes-color-decoder.slang
-shader1 = ../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
-shader2 = ../../ntsc/shaders/maister/ntsc-pass2-3phase.slang
-shader3 = ../../crt/shaders/tvout-tweaks.slang
-shader4 = ../../misc/shaders/image-adjustment.slang
-shader5 = ../../misc/shaders/interlacing.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-
-scale_type0 = source
-scale0 = 1.0
-
-scale_type_x1 = absolute
-scale_type_y1 = source
-scale_x1 = 1024
-scale_y1 = 1.0
-frame_count_mod1 = 2
-float_framebuffer1 = true
-
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-scale_type_x3 = "viewport"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "0.000000"
-target_gamma = "2.200000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+nes-color-decoder.slangp b/presets/tvout/tvout+nes-color-decoder.slangp
deleted file mode 100644
index e30dcbb435..0000000000
--- a/presets/tvout/tvout+nes-color-decoder.slangp
+++ /dev/null
@@ -1,31 +0,0 @@
-#tvout preset for 240p CRTs
-
-shaders = "3"
-shader0 = "../../nes_raw_palette/shaders/nes-color-decoder.slang"
-shader1 = "../../crt/shaders/tvout-tweaks.slang"
-shader2 = "../../misc/shaders/image-adjustment.slang"
-
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
-
-scale_type_x1 = "viewport"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "320.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "0.000000"
-target_gamma = "2.200000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-256px-composite.slangp b/presets/tvout/tvout+ntsc-256px-composite.slangp
deleted file mode 100644
index 4147307b24..0000000000
--- a/presets/tvout/tvout+ntsc-256px-composite.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1024"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-256px-svideo.slangp b/presets/tvout/tvout+ntsc-256px-svideo.slangp
deleted file mode 100644
index 6bff3f908d..0000000000
--- a/presets/tvout/tvout+ntsc-256px-svideo.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1536"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-2phase-composite.slangp b/presets/tvout/tvout+ntsc-2phase-composite.slangp
deleted file mode 100644
index cef1c01f45..0000000000
--- a/presets/tvout/tvout+ntsc-2phase-composite.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-2phase-svideo.slangp b/presets/tvout/tvout+ntsc-2phase-svideo.slangp
deleted file mode 100644
index 3c63eff845..0000000000
--- a/presets/tvout/tvout+ntsc-2phase-svideo.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "6.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-320px-composite.slangp b/presets/tvout/tvout+ntsc-320px-composite.slangp
deleted file mode 100644
index 678a4ee437..0000000000
--- a/presets/tvout/tvout+ntsc-320px-composite.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1280"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-320px-svideo.slangp b/presets/tvout/tvout+ntsc-320px-svideo.slangp
deleted file mode 100644
index cc43956816..0000000000
--- a/presets/tvout/tvout+ntsc-320px-svideo.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "absolute"
-scale_x0 = "1920"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-3phase-composite.slangp b/presets/tvout/tvout+ntsc-3phase-composite.slangp
deleted file mode 100644
index 9240787cc0..0000000000
--- a/presets/tvout/tvout+ntsc-3phase-composite.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "4.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-3phase-svideo.slangp b/presets/tvout/tvout+ntsc-3phase-svideo.slangp
deleted file mode 100644
index bdd9575d89..0000000000
--- a/presets/tvout/tvout+ntsc-3phase-svideo.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = "4"
-
-shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
-filter_linear0 = "false"
-frame_count_mod0 = "2"
-float_framebuffer0 = "true"
-scale_type_x0 = "source"
-scale_x0 = "6.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
-filter_linear1 = "false"
-float_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "0.500000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "../../crt/shaders/tvout-tweaks.slang"
-filter_linear2 = "false"
-float_framebuffer2 = "false"
-scale_type_x2 = "viewport"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "../../misc/shaders/image-adjustment.slang"
-float_framebuffer3 = "false"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+ntsc-nes.slangp b/presets/tvout/tvout+ntsc-nes.slangp
deleted file mode 100644
index e1bfe5d798..0000000000
--- a/presets/tvout/tvout+ntsc-nes.slangp
+++ /dev/null
@@ -1,45 +0,0 @@
-shaders = 5
-shader0 = ../../nes_raw_palette/shaders/nes-color-decoder.slang
-shader1 = ../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
-shader2 = ../../ntsc/shaders/maister/ntsc-pass2-3phase.slang
-shader3 = ../../crt/shaders/tvout-tweaks.slang
-shader4 = ../../misc/shaders/image-adjustment.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-
-scale_type0 = source
-scale0 = 1.0
-
-scale_type_x1 = absolute
-scale_type_y1 = source
-scale_x1 = 1024
-scale_y1 = 1.0
-frame_count_mod1 = 2
-float_framebuffer1 = true
-
-scale_type2 = source
-scale_x2 = 0.5
-scale_y2 = 1.0
-
-scale_type_x3 = "viewport"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "0.000000"
-target_gamma = "2.200000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout+snes-hires-blend.slangp b/presets/tvout/tvout+snes-hires-blend.slangp
deleted file mode 100644
index ba2f08adbd..0000000000
--- a/presets/tvout/tvout+snes-hires-blend.slangp
+++ /dev/null
@@ -1,31 +0,0 @@
-#tvout preset for 240p CRTs
-
-shaders = "3"
-shader0 = "../../crt/shaders/snes-hires-blend.slang"
-shader1 = "../../crt/shaders/tvout-tweaks.slang"
-shader2 = "../../misc/shaders/image-adjustment.slang"
-
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-
-scale_type_x1 = "viewport"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "512.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
diff --git a/presets/tvout/tvout-pixelsharp.slangp b/presets/tvout/tvout-pixelsharp.slangp
deleted file mode 100644
index db2310c2c1..0000000000
--- a/presets/tvout/tvout-pixelsharp.slangp
+++ /dev/null
@@ -1,32 +0,0 @@
-shaders = "3"
-shader0 = "../../crt/shaders/tvout-tweaks.slang"
-shader1 = "../../misc/shaders/image-adjustment.slang"
-shader2 = "../../stock.slang"
-
-scale_type_x0 = "viewport"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "4.000000"
-
-filter_linear2 = "true"
-
-parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
-TVOUT_RESOLUTION = "1024.000000"
-TVOUT_COMPOSITE_CONNECTION = "0.000000"
-TVOUT_TV_COLOR_LEVELS = "1.000000"
-target_gamma = "2.400000"
-monitor_gamma = "2.200000"
-overscan_percent_x = "0.000000"
-overscan_percent_y = "0.000000"
-saturation = "1.000000"
-contrast = "1.000000"
-luminance = "1.000000"
-bright_boost = "0.000000"
-R = "1.000000"
-G = "1.000000"
-B = "1.000000"
\ No newline at end of file
diff --git a/presets/xbr-xsal/xbr-lv3-2xsal-lv2-aa-soft.slangp b/presets/xbr-xsal/xbr-lv3-2xsal-lv2-aa-soft.slangp
deleted file mode 100644
index f1052b51d6..0000000000
--- a/presets/xbr-xsal/xbr-lv3-2xsal-lv2-aa-soft.slangp
+++ /dev/null
@@ -1,43 +0,0 @@
-shaders = 6
-
-shader0 = ../../edge-smoothing/xbr/shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-scale_type2 = "source"
-scale2 = "4.000000"
-filter_linear2 = "false"
-
-shader3 = ../../edge-smoothing/xsal/shaders/2xsal-level2-xbr.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../../anti-aliasing/shaders/aa-shader-4.0.slang
-filter_linear4 = false
-scale_type4 = viewport
-scale4 = 1.0
-
-shader5 = ../../edge-smoothing/xbr/shaders/support/delinearize.slang
-scale_type5 = "source"
-scale5 = "1.000000"
-filter_linear5 = "false"
-
-INTERNAL_RES = 2.0
-AAOFFSET = 0.675
-XBR_BLENDING = 0.0
-WP4 = "0.8"
-InputGamma = "1.000000"
-SMALL_DETAILS = "0.000000"
-KA = "0.950000"
-XBR_EQ_THRESHOLD = "0.450000"
-OutputGamma = "1.000000"
-
diff --git a/presets/xbr-xsal/xbr-lv3-2xsal-lv2-aa.slangp b/presets/xbr-xsal/xbr-lv3-2xsal-lv2-aa.slangp
deleted file mode 100644
index bf1c0914bc..0000000000
--- a/presets/xbr-xsal/xbr-lv3-2xsal-lv2-aa.slangp
+++ /dev/null
@@ -1,42 +0,0 @@
-shaders = "6"
-
-shader0 = ../../edge-smoothing/xbr/shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-scale_type2 = "source"
-scale2 = "5.000000"
-filter_linear2 = "false"
-
-shader3 = ../../edge-smoothing/xsal/shaders/2xsal-level2-xbr.slang
-filter_linear3 = true
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../../anti-aliasing/shaders/aa-shader-4.0.slang
-filter_linear4 = false
-scale_type4 = viewport
-scale4 = 1.0
-
-shader5 = ../../edge-smoothing/xbr/shaders/support/delinearize.slang
-scale_type5 = "source"
-scale5 = "1.000000"
-filter_linear5 = "false"
-
-INTERNAL_RES = 2.0
-XBR_BLENDING = 0.0
-WP4 = "0.8"
-InputGamma = "1.000000"
-SMALL_DETAILS = "0.000000"
-KA = "0.950000"
-XBR_EQ_THRESHOLD = "0.450000"
-OutputGamma = "1.000000"
-
diff --git a/presets/xbr-xsal/xbr-lv3-aa-fast.slangp b/presets/xbr-xsal/xbr-lv3-aa-fast.slangp
deleted file mode 100644
index d10985d33c..0000000000
--- a/presets/xbr-xsal/xbr-lv3-aa-fast.slangp
+++ /dev/null
@@ -1,38 +0,0 @@
-shaders = 4
-
-shader0 = ../../edge-smoothing/xbr/shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-scale_type2 = "source"
-scale2 = "5.000000"
-filter_linear2 = "false"
-
-shader3 = ../../anti-aliasing/shaders/aa-shader-4.0.slang
-filter_linear3 = false
-scale_type3 = viewport
-scale3 = 1.0
-
-shader4 = ../../edge-smoothing/xbr/shaders/support/delinearize.slang
-scale_type4 = "source"
-scale4 = "1.000000"
-filter_linear4 = "false"
-
-parameters = "INTERNAL_RES"
-
-INTERNAL_RES = 4.0
-XBR_BLENDING = 0.0
-WP4 = "0.8"
-InputGamma = "1.000000"
-SMALL_DETAILS = "0.000000"
-KA = "0.950000"
-XBR_EQ_THRESHOLD = "0.450000"
-OutputGamma = "1.000000"
diff --git a/presets/xbr-xsal/xbr-lv3-aa-soft-fast.slangp b/presets/xbr-xsal/xbr-lv3-aa-soft-fast.slangp
deleted file mode 100644
index 2150f403a4..0000000000
--- a/presets/xbr-xsal/xbr-lv3-aa-soft-fast.slangp
+++ /dev/null
@@ -1,38 +0,0 @@
-shaders = 4
-
-shader0 = ../../edge-smoothing/xbr/shaders/support/linearize.slang
-scale_type0 = "source"
-scale0 = "1.000000"
-filter_linear0 = "false"
-alias0 = XbrSource
-
-shader1 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang
-scale_type1 = "source"
-scale1 = "1.000000"
-filter_linear1 = "false"
-
-shader2 = ../../edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang
-scale_type2 = "source"
-scale2 = "4.000000"
-filter_linear2 = "false"
-
-shader3 = ../../anti-aliasing/shaders/aa-shader-4.0.slang
-filter_linear3 = false
-scale_type3 = viewport
-scale3 = 1.0
-
-shader4 = ../../edge-smoothing/xbr/shaders/support/delinearize.slang
-scale_type4 = "source"
-scale4 = "1.000000"
-filter_linear4 = "false"
-
-parameters = "INTERNAL_RES"
-
-INTERNAL_RES = 4.0
-XBR_BLENDING = 0.0
-WP4 = "0.8"
-InputGamma = "1.000000"
-SMALL_DETAILS = "0.000000"
-KA = "0.950000"
-XBR_EQ_THRESHOLD = "0.450000"
-OutputGamma = "1.000000"
diff --git a/presets/xsoft+scalefx-level2aa+sharpsmoother.slangp b/presets/xsoft+scalefx-level2aa+sharpsmoother.slangp
deleted file mode 100644
index bacf994864..0000000000
--- a/presets/xsoft+scalefx-level2aa+sharpsmoother.slangp
+++ /dev/null
@@ -1,62 +0,0 @@
-shaders = 10
-
-shader0 = ../interpolation/shaders/jinc2.slang
-filter_linear0 = false
-scale_type0 = source
-scale0 = 1.0
-alias0 = refpass
-
-shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.0
-
-shader6 = ../blurs/shaders/sharpsmoother.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 1.0
-
-shader7 = ../stock.slang
-filter_linear7 = false
-scale_type7 = source
-scale7 = 2.0
-
-shader8 = ../anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-
-shader9 = ../anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.slang
-filter_linear9 = true
-scale_type9 = source
-scale9 = 1.0
-
-parameters = "JINC2_AR_STRENGTH;JINC2_WINDOW_SINC;JINC2_SINC;SFX_SAA;SFX_CLR"
-JINC2_AR_STRENGTH = 0.30
-JINC2_WINDOW_SINC = 0.55
-JINC2_SINC        = 0.95
-SFX_SAA = 0.00
-SFX_CLR = 0.60
diff --git a/presets/xsoft+scalefx-level2aa.slangp b/presets/xsoft+scalefx-level2aa.slangp
deleted file mode 100644
index 3228d5d405..0000000000
--- a/presets/xsoft+scalefx-level2aa.slangp
+++ /dev/null
@@ -1,51 +0,0 @@
-shaders = 9
-
-shader0 = ../stock.slang
-alias0 = refpass
-
-shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang
-filter_linear1 = false
-scale_type1 = source
-scale1 = 1.0
-float_framebuffer1 = true
-alias1 = scalefx_pass0
-
-shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang
-filter_linear2 = false
-scale_type2 = source
-scale2 = 1.0
-float_framebuffer2 = true
-
-shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang
-filter_linear3 = false
-scale_type3 = source
-scale3 = 1.0
-
-shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang
-filter_linear4 = false
-scale_type4 = source
-scale4 = 1.0
-
-shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang
-filter_linear5 = false
-scale_type5 = source
-scale5 = 3.1 
-
-shader6 = ../stock.slang
-filter_linear6 = false
-scale_type6 = source
-scale6 = 2.0
-
-shader7 = ../anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1.slang
-filter_linear7 = true
-scale_type7 = source
-scale7 = 1.0
-
-shader8 = ../anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.slang
-filter_linear8 = true
-scale_type8 = source
-scale8 = 1.0
-
-parameters = "SFX_CLR;SFX_SAA"
-SFX_SAA = 0.00
-SFX_CLR = 0.60
diff --git a/procedural/2vs-pbr-test.slang b/procedural/2vs-pbr-test.slang
deleted file mode 100644
index 5d5e368b14..0000000000
--- a/procedural/2vs-pbr-test.slang
+++ /dev/null
@@ -1,324 +0,0 @@
-#version 450
-// PBR_Test -  2v_S - 2015-05-24
-// https://www.shadertoy.com/view/MIB3DV
-
-// Physically Based Rendering Tes
-
-/*
-* References : 
-*
-* http://renderwonk.com/publications/s2010-shading-course/hoffman/s2010_physically_based_shading_hoffman_b_notes.pdf
-* 
-* http://www.frostbite.com/wp-content/uploads/2014/11/course_notes_moving_frostbite_to_pbr.pdf
-*
-* http://graphicrants.blogspot.fr/2013/08/specular-brdf-reference.html
-*
-* http://www.filmicworlds.com/2014/04/21/optimizing-ggx-shaders-with-dotlh/
-*
-* http://blog.selfshadow.com/publications/s2013-shading-course/#course_content
-*
-*	Ray marching code from iq
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define NB_LIGHTS 3
-
-// Metals values in linear space
-#define GOLD vec3(1.0, 0.71, 0.29)
-#define COPPER vec3(0.95, 0.64, 0.54)
-#define IRON vec3(0.56, 0.57, 0.58)
-#define ALUMINIUM vec3(0.91, 0.92, 0.92)
-#define SILVER vec3(0.95, 0.93, 0.88)
-
-
-
-float fPlane( vec3 p, vec4 n )
-{
-  // n must be normalized
-  return dot(p,n.xyz) + n.w;
-}
-
-float fSphere( vec3 p, float s )
-{
-    return length(p)-s;
-}
-float opS( float d1, float d2 )
-{
-    return max(-d2,d1);
-}
-
-vec2 opU( vec2 d1, vec2 d2 )
-{
-	return (d1.x<d2.x) ? d1 : d2;
-}
-
-vec3 opRep( vec3 p, vec3 c )
-{
-    return mod(p,c)-0.5*c;
-}
-// ---- Scene definition
-vec2 fScene(vec3 p) {
-    
-    vec3 pSphere = p/*opRep(p, vec3( 2.0, 0.0, 2.0))*/;
-    
- 	vec2 sphere0 = vec2(fSphere(p, 1.0), 0.5); 	
-    vec2 sphere1 = vec2(fSphere(p+vec3(2.1, 0.0, 2.0), 1.0), 2.5);
-	vec2 sphere2 = vec2(fSphere(p+vec3(-2.1, 0.0, 2.0), 1.0), 3.5);
-    vec2 sphere3 = vec2(fSphere(p+vec3(2.1, 0.0, -2.0), 1.0), 4.5);
-    vec2 sphere4 = vec2(fSphere(p+vec3(-2.1, 0.0, -2.0), 1.0), 5.5);
-	
-
-
-    vec2 plane = vec2(fPlane(p, vec4(0, 1, 0, 1.0)), 1.5);
-    
-    return opU(opU(opU(opU(opU(plane, sphere0), sphere1), sphere2), sphere3), sphere4);
-}
-// -----
-
-vec2 castRay( in vec3 ro, in vec3 rd )
-{
-    float tmin = 1.0;
-    float tmax = 100.0;
-    
-    
-	float precis = 0.00001;
-    float t = tmin;
-    float m = -1.0;
-    for( int i=0; i<50; i++ )
-    {
-	    vec2 res = fScene( ro+rd*t );
-        if( res.x<precis || t>tmax ) break;
-        t += res.x;
-	    m = res.y;
-    }
-
-    if( t>tmax ) m=-1.0;
-    return vec2( t, m );
-}
-
-
-float softshadow( in vec3 ro, in vec3 rd, in float mint, in float tmax )
-{
-	float res = 1.0;
-    float t = mint;
-    for( int i=0; i<16; i++ )
-    {
-		float h = fScene( ro + rd*t ).x;
-        res = min( res, 8.0*h/t );
-        t += clamp( h, 0.02, 0.10 );
-        if( h<0.001 || t>tmax ) break;
-    }
-    return clamp( res, 0.0, 1.0 );
-
-}
-
-vec3 calcNormal( in vec3 pos )
-{
-	vec3 eps = vec3( 0.001, 0.0, 0.0 );
-	vec3 nor = vec3(
-	    fScene(pos+eps.xyy).x - fScene(pos-eps.xyy).x,
-	    fScene(pos+eps.yxy).x - fScene(pos-eps.yxy).x,
-	    fScene(pos+eps.yyx).x - fScene(pos-eps.yyx).x );
-	return normalize(nor);
-}
-
-
-struct Light {
- 	vec3 pos;
-    vec3 color;
-};
-Light lights[NB_LIGHTS];
-
-
-float G1V ( float dotNV, float k ) {
-	return 1.0 / (dotNV*(1.0 - k) + k);
-}
-
-vec3 computePBRLighting ( in Light light, in vec3 position, in vec3 N, in vec3 V, in vec3 albedo, in float roughness, in vec3 F0 ) {
-
-	float alpha = roughness*roughness;
-	vec3 L = normalize(light.pos.xyz - position);
-	vec3 H = normalize (V + L);
-
-	float dotNL = clamp (dot (N, L), 0.0, 1.0);
-	float dotNV = clamp (dot (N, V), 0.0, 1.0);
-	float dotNH = clamp (dot (N, H), 0.0, 1.0);
-	float dotLH = clamp (dot (L, H), 0.0, 1.0);
-
-	float D, vis;
-	vec3 F;
-
-	// NDF : GGX
-	float alphaSqr = alpha*alpha;
-	float pi = 3.1415926535;
-	float denom = dotNH * dotNH *(alphaSqr - 1.0) + 1.0;
-	D = alphaSqr / (pi * denom * denom);
-
-	// Fresnel (Schlick)
-	float dotLH5 = pow (1.0 - dotLH, 5.0);
-	F = F0 + (1.0 - F0)*(dotLH5);
-
-	// Visibility term (G) : Smith with Schlick's approximation
-	float k = alpha / 2.0;
-	vis = G1V (dotNL, k) * G1V (dotNV, k);
-
-	vec3 specular = /*dotNL **/ D * F * vis;
-
-	vec3 ambient = vec3(.01);
-
-	float invPi = 0.31830988618;
-	vec3 diffuse = (albedo * invPi);
-
-
-	return ambient + (diffuse + specular) * light.color.xyz * dotNL ;
-}
-
-vec3 addPBR( in vec3 position, in vec3 N, in vec3 V, in vec3 baseColor, in float metalMask, in float smoothness, in float reflectance) {
-	vec3 color = vec3(0.0);
-
-    float roughness = 1.0 - smoothness*smoothness;
-    vec3 F0 = 0.16*reflectance*reflectance * (1.0-metalMask) + baseColor*metalMask;
-    vec3 albedo = baseColor;
-    
-    float s = 0.0;
-    
-    
-	for ( int i = 0; i < NB_LIGHTS; ++i ) {
-		vec3 col = computePBRLighting ( lights[i], position, N, V, albedo, roughness, F0);
-		color += col;	
-        s += softshadow( position, normalize(lights[i].pos.xyz - position), 0.02, 2.5 );
-	}
-
-	return color*s;
-}
-
-vec3 render( in vec3 ro, in vec3 rd )
-{ 
-    vec3 col = vec3(0.8, 0.9, 1.0)*8.0; // Sky color
-    
-    vec2 res = castRay( ro, rd );
-    float t = res.x;
-    float m = res.y;
-    vec3 p = ro + t*rd;
-    
-    if(m>-0.5) { // Intersection found
-        if( m < 1.0 ) {
-           // float f = mod( floor( 5.0*p.z ) + floor( 5.0*p.x ), 2.0 );
-            vec3 sur = vec3(1.0,1.0,1.0)*smoothstep(-1.0,-0.6,sin(16.0*p.x));
-            col = addPBR( p, calcNormal( p ), -rd, GOLD*sur, sur.x, 0.3+0.6*sur.x, 0.5 );
-        } 
-        else if( m < 2.0 ) {
-            float f = mod( floor( 5.0*p.z ) + floor( 5.0*p.x ), 2.0 );
-            col = addPBR(p, calcNormal( p ), -rd, vec3(0.5), 0.0, 0.3+0.6*f, 0.5 );
-        }
-        else if( m < 3.0 ) {
-            vec3 sur = vec3(1.0,1.0,1.0)*smoothstep(-1.0,-0.4,sin(18.0*p.x));
-            col = addPBR( p, calcNormal( p ), -rd, COPPER*sur, sur.x, 0.3+0.6*sur.x, 0.5 );
-        }
-        else if( m < 4.0 ) {
-            vec3 sur = vec3(1.0,1.0,1.0)*smoothstep(-1.0,-0.0995,sin(106.0*p.x))*smoothstep(-1.0,-0.9,sin(47.0*p.z));
-            col = addPBR( p, calcNormal( p ), -rd, vec3(0.2), 1.0-sur.x, 0.9*sur.x, 0.5 );
-        }
-        else if( m < 5.0 ) {
-            vec3 sur = vec3(1.0)*smoothstep(-1.0,-0.765,sin(24.0*p.x))*smoothstep(-1.0,-0.4,sin(70.9*p.z));
-            col = addPBR( p, calcNormal( p ), -rd, GOLD*(1.0-sur), sur.x, 0.3+0.6*sur.x, 0.5 );
-        }
-        else if( m < 6.0 ) {
-            vec3 sur = vec3(1.0,1.0,1.0)*smoothstep(-1.0,-0.4,sin(18.0*p.x));
-            col = addPBR( p, calcNormal( p ), -rd, ALUMINIUM*sur, sur.x, 0.3+0.6*sur.x, 0.5 );
-        }
-    }
-    
-	return col;
-}
-
-mat3 setCamera( in vec3 ro, in vec3 ta, float cr )
-{
-	vec3 cw = normalize(ta-ro);
-	vec3 cp = vec3(sin(cr), cos(cr),0.0);
-	vec3 cu = normalize( cross(cw,cp) );
-	vec3 cv = normalize( cross(cu,cw) );
-    return mat3( cu, cv, cw );
-}
-
-vec4 hejlToneMapping (in vec4 color) {
- 	vec4 x = max(vec4(0.0), color-vec4(0.004)); 
-	return (x * ((6.2*x)+vec4(0.5))) / max(x * ((6.2*x)+vec4(1.7))+vec4(0.06), vec4(1e-8));
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    
-    float time = 0.25*iGlobalTime;
-    
-    lights[0] = Light(vec3(0.0, 5.0, .0), vec3(1.0));   
-	lights[1] = Light(vec3(12.0*sin(iGlobalTime), 8.0, 12.0*cos(iGlobalTime)), vec3(1.0));   	
-    lights[2] = Light(vec3(-12.0*cos(-iGlobalTime), 8.0, 12.0*sin(-iGlobalTime)), vec3(.05));   
-
-   
-
-	vec2 q = fragCoord.xy/iResolution.xy;
-    vec2 p = -1.0+2.0*q;
-	p.x *= iResolution.x/iResolution.y;
-#ifdef MOUSE
-    vec2 mo = iMouse.xy/iResolution.xy;
-#else
-    vec2 mo = 0.0/iResolution.xy;
-#endif
-		 
-	
-
-	// camera	
-	vec3 ro = vec3( 7.0*sin(time), 3.6 , -7.0*cos(time) );
-	vec3 ta = vec3( 0.0 );
-	
-	// camera-to-world transformation
-    mat3 ca = setCamera( ro, ta, 0.0 );
-    
-    // ray direction
-	vec3 rd = ca * normalize( vec3(p.xy,2.5) );
-
-    // render	
-    vec3 col = render( ro, rd );
-
-    #if 0
-        col = pow( col, vec3(0.4545) );
-        fragColor=vec4( col, 1.0 );
-    #else 
-    	float exposure = 0.032 + 0.023*sin(time-3.14);
-   		fragColor = hejlToneMapping(vec4(col, 1.0) * exposure) ;
-    #endif
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/bergi-cave-quest.slang b/procedural/bergi-cave-quest.slang
deleted file mode 100644
index fa7d658c1b..0000000000
--- a/procedural/bergi-cave-quest.slang
+++ /dev/null
@@ -1,332 +0,0 @@
-#version 450
-// Cave Quest -  Bergi - 2016-06-25
-// https://www.shadertoy.com/view/XdGXD3
-
-// Lot's of finetuning to get a nice cave fly-through. 
-// Greetings to Kali and Shane
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/** Cave Quest 
-	https://www.shadertoy.com/view/XdGXD3
-
-	(cc) 2016, stefan berke
-
-	Based on "Kali Trace" https://www.shadertoy.com/view/4sKXWG
-
-	Interesting things here might be:
-	- the distance formula in itself
-	- wrapping 3d-space using sin() for endless kali-set patterns
-	- kali-set used for normals, micro-normals and texturing
-	- epsilon in normal estimation for artistic tuning
-
-*/
-
-
-// minimum distance to axis-aligned planes in kali-space
-// uses eiffie's mod (/p.w) https://www.shadertoy.com/view/XtlGRj
-// to keep the result close to a true distance function
-vec3 kali_set(in vec3 pos, in vec3 param)
-{
-    vec4 p = vec4(pos, 1.);
-    vec3 d = vec3(100.);
-    for (int i=0; i<9; ++i)
-    {
-        p = abs(p) / dot(p.xyz,p.xyz);
-        d = min(d, p.xyz/p.w);
-        p.xyz = p.zxy - param;
-    }
-    return d;
-}
-
-// average of all iterations in kali-set
-vec3 kali_set_av(in vec3 p, in vec3 param)
-{
-    vec3 d = vec3(0.);
-    for (int i=0; i<13; ++i)
-    {
-        p = abs(p) / dot(p,p);
-        d += exp(-p*8.);
-        p.xyz = p.zxy - param;
-    }
-    return d / 8.;
-}
-
-// endless texture  
-vec3 kali_tex(in vec3 p, in vec3 par)
-{
-    vec3 k = kali_set_av(sin(p*3.)*.3, par);
-    return 3.*k;
-}
-
-// endless texture normal
-vec3 kali_tex_norm(in vec3 p, in vec3 param, vec3 mask, float eps)
-{
-    vec2 e = vec2(eps, 0.);
-    return normalize(vec3(
-        dot(kali_tex(p+e.xyy, param),mask) - dot(kali_tex(p-e.xyy, param),mask),
-        dot(kali_tex(p+e.yxy, param),mask) - dot(kali_tex(p-e.yxy, param),mask),
-        dot(kali_tex(p+e.yyx, param),mask) - dot(kali_tex(p-e.yyx, param),mask)));
-}
-
-
-
-// camera path
-vec3 path(in float z)
-{
-    float t = z;
-    vec3 p = vec3(sin(t)*.5, 
-                  .26*sin(t*3.16), 
-                  z);
-    return p;
-}
-
-
-float DE(in vec3 p, in vec3 param)
-{
-    // tube around path
-    float r = .13+.1*sin(p.z*.89);
-    vec3 pp = p - path(p.z); float d = r-max(abs(pp.x), abs(pp.y));
-    
-    // displacement
-    vec3 k = kali_set(sin(p), param);
-    d += k.x+k.y+k.z;
-    //d += max(k.x,max(k.y,k.z));
-    //d += min(k.x,min(k.y,k.z));
-    return d;
-}
-
-vec3 DE_norm(in vec3 p, in vec3 param, in float eps)
-{
-    vec2 e = vec2(eps, 0.);
-    return normalize(vec3(
-        DE(p+e.xyy, param) - DE(p-e.xyy, param),
-        DE(p+e.yxy, param) - DE(p-e.yxy, param),
-        DE(p+e.yyx, param) - DE(p-e.yyx, param)));
-}
-
-
-// lighting/shading currently depends on this beeing 1.
-const float max_t = 1.;
-
-// common sphere tracing
-// note the check against abs(d) to get closer to surface
-// in case of overstepping
-float trace(in vec3 ro, in vec3 rd, in vec3 param)
-{
-    float t = 0.001, d = max_t;
-    for (int i=0; i<50; ++i)
-    {
-        vec3 p = ro + rd * t;
-        d = DE(p, param);
-        if (abs(d) <= 0.00001 || t >= max_t)
-            break;
-        t += d * .5; // above kali-distance still needs a lot of fudging
-    }
-    return t;
-}
-
-// "Enhanced Sphere Tracing"
-// Benjamin Keinert(1) Henry Schäfer(1) Johann Korndörfer Urs Ganse(2) Marc Stamminger(1)
-// 1 University of Erlangen-Nuremberg, 2 University of Helsinki
-// 
-// It was a try... disabled by default (see rayColor() below)
-// Just here for experimentation
-// Obviously the algorithm does not like "fudging" which is needed for my distance field..
-// It renders more stuff close to edges but creates a lot of artifacts elsewhere
-float trace_enhanced(in vec3 ro, in vec3 rd, in vec3 param)
-{
-    float omega = 1.2; // overstepping
-    float t = 0.001;
-    float candidate_error = 100000.;
-    float candidate_t = t;
-    float previousRadius = 0.;
-    float stepLength = .0;
-    float signedRadius;
-    float pixelRadius = .012;
-    float fudge = 0.6;
-    for (int i = 0; i < 50; ++i) 
-    {
-        signedRadius = DE(rd*t + ro, param);
-        float radius = abs(signedRadius);
-        bool sorFail = omega > 1. && (radius + previousRadius) < stepLength;
-        if (sorFail) 
-        {
-        	stepLength -= omega * stepLength;
-        	omega = 1.;
-        } 
-        else 
-        {
-        	stepLength = signedRadius * omega;
-        }
-        previousRadius = radius;
-        float error = radius / t;
-        if (!sorFail && error < candidate_error) 
-        {
-        	candidate_t = t;
-        	candidate_error = error;
-    	}
-    	if (!sorFail && error < pixelRadius || t > max_t)
-    		break;
-    	t += stepLength * fudge;
-    }
-    return (t > max_t || candidate_error > pixelRadius)
-        ? max_t : candidate_t;
-}
-
-// common ambient occlusion
-float traceAO(in vec3 ro, in vec3 rd, in vec3 param)
-{
-    float a = 0., t = 0.01;
-    for (int i=0; i<5; ++i)
-    {
-        float d = DE(ro+t*rd, param);
-       	a += d / t;
-        t += abs(d);
-    }
-    return clamp(a / 8., 0., 1.);
-}
-
-// environment map, also drawn from kaliset
-vec3 skyColor(in vec3 rd)
-{
-    //vec3 par = vec3(0.075, 0.565, .03);
-    vec3 par = vec3(.9, .81, .71);
-    
-    vec3 c = kali_set(sin(rd*6.), par);
-    c = pow(min(vec3(1.), c*2.+vec3(1.,.86,.6)), 1.+114.*c);
-    
-    return clamp(c, 0., 1.);
-}
-
-
-// trace and color
-vec3 rayColor(in vec3 ro, in vec3 rd)
-{
-    // magic params for kali-set
-    vec3 par1 = vec3(.9, .6+.5*sin(ro.z/50.), 1.),	// scene geometry 
-         par2 = vec3(.63, .55, .73),				// normal/bump map
-         par3 = vec3(1.02, 0.82, 0.77); 			// normal/texture
-    
-#if 1
-    float t = trace(ro, rd, par1);
-#else    
-    float t = trace_enhanced(ro, rd, par1);
-#endif    
-    vec3 p = ro + t * rd;
-    float d = DE(p, par1);
-    
-    vec3 col = vec3(0.);
-
-    // did ray hit?
-    if (d < 0.03) 
-    {
-        float scr_eps = max(0.001, (t-0.1)*0.025);
-        // "some" texture values
-        vec3 kt = kali_tex(p, par3);
-        // surface normal
-        vec3 n = DE_norm(p, par1, 0.5*scr_eps), nn = n;
-        // normal displacement
-        n = normalize(n + 0.3*kali_tex_norm(p, par3+0.1*n, vec3(1), scr_eps));
-        n = normalize(n + 0.3*DE_norm(sin(n*3.+kt), par2, 2.*scr_eps)); // micro-bumps
-        // reflected ray
-        vec3 rrd = reflect(rd,n);
-		// normal towards light
-        vec3 ln = normalize(path(p.z+.1) - p);
-		// 1. - occlusion
-        float ao = pow(traceAO(p, n, par1), 1.+3.*t);
-        // surface color
-        vec3 col1 = .45 * (vec3(.7,1.,.4) + kali_tex(p, par3));
-        vec3 col2 = vec3(1.,.8,.6) + .3 * vec3(1.,.7,-.6) * kali_tex(p, par3);
-        vec3 k = kali_set_av(sin(p*(1.+3.*ao))*.3, par3);
-        vec3 surf = (.1 + .9 * ao) 
-            		//* vec3(1.);
-            		* mix(col1, col2, min(1., pow(ao*2.2-.8*kt.x,5.)));
-		// desaturate
-        surf += .24 * (dot(surf,vec3(.3,.6,.1)) - surf);
-
-        // -- lighting --
-        
-        float fres = pow(max(0., 1.-dot(rrd, n)), 1.) / (1.+2.*t);
-
-        // phong
-        surf += .25 * ao * max(0., dot(n, ln));
-        // spec
-        float d = max(0., dot(rrd, ln));
-        surf += .4 * pow(ao*1.2,5.) * (.5 * d + .7 * pow(d, 8.));
-
-        // fresnel highlight
-        surf += clamp((t-.06)*8., 0.,1.6) * 
-            	(.2+.8*ao) * vec3(.7,.8,1.) * fres;
-        
-        // environment map
-        surf += .2 * (1.-fres) * ao * skyColor(rrd);
-    
-        // distance fog
-    	col = surf * pow(1.-t / max_t, 1.3);
-    }
-    
-    return col;
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	vec2 suv = fragCoord.xy / iResolution.xy;
-	vec2 uv = (fragCoord.xy - iResolution.xy*.5) / iResolution.y * 2.;
-        
-    float ti = (iGlobalTime-14.)/8.;
-    
-    vec3 ro = path(ti);
-    vec3 look = path(ti+.5);
-    float turn = (ro.x-look.x)*1.; 
-        
-    // lazily copied from Shane
-    // (except the hacky turn param)
-    float FOV = .7; // FOV - Field of view.
-    vec3 fwd = normalize(look-ro);
-    vec3 rgt = normalize(vec3(fwd.z, turn, -fwd.x));
-    vec3 up = cross(fwd, rgt);
-    
-    vec3 rd = normalize(fwd + FOV*(uv.x*rgt + uv.y*up));
-    
-    
-    vec3 col = rayColor(ro, rd);
-    //col = skyColor(rd);
-    
-    col *= pow(1.-dot(suv-.5,suv-.5)/.5, .6);
-    
-	fragColor = vec4(pow(col,vec3(.8)),1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/ciberxtrem-portal-highquality.slang b/procedural/ciberxtrem-portal-highquality.slang
deleted file mode 100644
index ef9b1d3119..0000000000
--- a/procedural/ciberxtrem-portal-highquality.slang
+++ /dev/null
@@ -1,848 +0,0 @@
-#version 450
-// Portal Gameplay
-// ciberxtrem - https://www.shadertoy.com/view/XlsSzM
-
-// Inspired in Portal, Chamber 8.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// Thanks iq and the Shadertoy comunity for all the shared knowledge! :)
-
-#define PI 3.14159265359
-
-struct LightStruct {
-  vec3 pos;
-  vec3 color;
-};
-
-struct PortalStruct {
-  vec3 pos;
-  vec3 front;
-  float rotateY;
-  float time;
-};
-
-struct StateStruct
-{
-  vec3 posStart;
-  vec3 posEnd;
-  float lerptime;
-  float duration;
-  float isEnterTime;
-  float enterPortal;
-  float exitPortal;
-};
-    
-struct OrientationStruct
-{
-  vec3 orientation;
-  float lerptime;
-  float duration;
-};
-    
-PortalStruct portalA;
-PortalStruct portalB;
-
-PortalStruct portalsA[8];
-StateStruct states[10];
-OrientationStruct orientations[15];
-LightStruct lights[3];
-
-float t;
-vec3 position;
-vec3 orientation;
-float ambient = 0.05;
-vec3 ambientcolor;
-
-vec3 rotateY(vec3 p, float a){
-    return vec3(
-        p.x*cos(a) + p.z*sin(a),
-        p.y,
-        p.z*cos(a) - p.x*sin(a)
-    );
-}
-
-float hash( float n ) {
-    return fract(sin(n)*43758.5453123);
-}
-
-float noise( in vec2 x ) {
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float n = p.x + p.y*157.0;
-    return mix(mix( hash(n+  0.0), hash(n+  1.0),f.x),
-               mix( hash(n+157.0), hash(n+158.0),f.x),f.y);
-}
-
-const mat2 m2 = mat2( 0.80, -0.60, 0.60, 0.80 );
-
-float fbm( vec2 p ) {
-    float f = 0.0;
-    f += 0.5000*noise( p ); p = m2*p*2.02;
-    f += 0.2500*noise( p ); p = m2*p*2.03;
-    f += 0.1250*noise( p ); p = m2*p*2.01;
-    f += 0.0625*noise( p );
-    
-    return f/0.9375;
-}
-
-float dBox(vec3 p, vec3 hsize)
-{
-    return length(max(abs(p)-hsize,0.0));
-}
-
-float udRoundBox( vec3 p, vec3 b, float r )
-{
-  return length(max(abs(p)-b,0.0))-r;
-}
-
-float sdCappedCylinder( vec3 p, vec2 h )
-{
-  vec2 d = abs(vec2(length(p.xz),p.y)) - h;
-  return min(max(d.x,d.y),0.0) + length(max(d,0.0));
-}
-//-------------------------------
-
-// Scene
-float dElipse(vec3 p, vec3 hsize, float globalSize)
-{
-    float d = length(max(abs(p)-hsize,0.0));
-    vec3 q = p;
-    q.y *= 0.6;
-    return max(d, length(q)-max(max(hsize.x, hsize.y)*globalSize, hsize.z));
-}
-
-vec2 dStructure(vec3 p)
-{  
-    // Front
-    vec2 res = vec2(-1., -1.);
-    vec3 q = p - vec3(0., 0.5, 28.25);
-    vec2 c = vec2(3., 6.2);
-    vec3 q2 = q; q2.xy = mod(q2.xy,c.xy)-0.5*c.xy;
-    float d = udRoundBox(q2, vec3(1.35, 3., 1.0), 0.25);
-    q = p - vec3(0.0, 9.5, 28.); // Hole for exit
-    float d2 = udRoundBox(q, vec3(3.0, 3.25, 2.0), 0.1);
-    d = max(d,-d2);
-    res = vec2(d, 24.);
-    //Back
-    q = p - vec3(0., 3.5, -28.0);
-    c = vec2(3., 6.2);
-    q.x = mod(q.x,c.x)-0.5*c.x;
-    d = udRoundBox(q, vec3(1.35, 3., 1.0), 0.25);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    q = p - vec3(0., 0.6, -28.01); // Brown block
-    c = vec2(3., 3.0);
-    q.xy = mod(q.xy,c.xy)-0.5*c.xy;
-    d = udRoundBox(q, vec3(1.35, 1.35, 1.0), 0.25);
-    q = p - vec3(0.0, 9.5, -28.); // Hole for exit
-    d2 = udRoundBox(q, vec3(3.0, 3.25, 2.0), 0.1);
-    d = max(d,-d2);
-    res = mix(vec2(d, 20.), res, step(res.x, d));
-    //Exit
-    vec3 p2 = p; p2.z = abs(p.z);
-    q = p2 - vec3(0.0, 9.5, 30.5);
-    d = udRoundBox(q, vec3(3.0, 3.25, 0.1), 0.1);
-    if(d<res.x){res = vec2(d, 10.);} // magic panel
-    q2 = q - vec3(4.5, 0., -1.); q2.x += abs(sin(length(1.5+abs(q2.y)*0.36)));
-    d = udRoundBox(q2, vec3(1.5, 4.5, 2.0), 0.1);
-    q2 = q - vec3(-4.5, 0., -1.); q2.x -= abs(sin(length(1.5+abs(q2.y)*0.36)));
-    d2 = udRoundBox(q2, vec3(1.5, 4.5, 2.0), 0.1);
-    d = min(d, d2);
-    res = mix(vec2(d, 11.), res, step(res.x, d));
-    //Left
-    q = p - vec3(-16., 0.5, 0.0);
-    c = vec2(3.0, 6.2);
-    q2 = q; q2.zy = mod(q2.zy,c)-0.5*c;
-    d = udRoundBox(q2, vec3(1., 3., 1.35), 0.25);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    //Right
-    q = p - vec3(16.0, 0.5, 0.0);
-    c = vec2(3.0, 6.2);
-    q.zy = mod(q.zy,c)-0.5*c;
-    d = udRoundBox(q, vec3(1., 3., 1.35), 0.25);
-    // Hole for window
-    q = p - vec3(15.0, 15.5, -9.0);
-    d2 = udRoundBox(q, vec3(2.0, 3., 6.0), 0.02);
-    d = max(d, -d2);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    // Column
-    q = p - vec3(0., 0.6, -23.90);
-    c = vec2(3., 3.0);
-    q.xy = mod(q.xy,c)-0.5*c;
-    d = udRoundBox(q, vec3(1.35, 1.35, 2.70), 0.25);
-    d = max(d, -(p.x-6.1));
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    // Ceiling
-    q = p - vec3(0., 20.4, .0);
-    c = vec2(3.0, 3.0);
-    q2 = q; q2.xz = mod(q2.xz,c)-0.5*c;
-    d = udRoundBox(q2, vec3(1.35, 1., 1.35), 0.25);
-    d2 = length(q)-6.;
-    d = max(d, -d2);
-    res = mix(vec2(d, 23.), res, step(res.x, d));
-    //Window
-    q = p - vec3(16.0, 15.5, -9.0);
-    d = udRoundBox(q, vec3(1.25, 3., 6.0), 0.02); // framework
-    d2 = udRoundBox(q, vec3(1.5, 2.6, 5.6), 0.02);
-    d = max(d, -d2);
-    d = min(d, udRoundBox(q, vec3(1.2, 3., 0.2), 0.02)); // bars
-    res = mix(vec2(d, 7.), res, step(res.x, d));
-    d = udRoundBox(q, vec3(1.0, 2.6, 5.6), 0.1);
-    d -= smoothstep(-1., 1., cos(p.y*15.)) * 0.0025;
-    res = mix(vec2(d, 5.), res, step(res.x, d));
-    // Dome
-    q = p-vec3(0., 21.5, 0.);
-    q.y *= 1.0;
-    d = length(q) - 6.;
-    res = mix(vec2(d, 9.), res, step(res.x, d));
-    //Turbina
-    q = p - vec3(0.0, 15.0, 0.0);
-    q = rotateY(q, t);
-    d = dBox(q, vec3(5.5, 0.05, 0.4));
-    d2 = dBox(q, vec3(0.4, 0.05, 5.5));
-    d = min(d, d2);
-    d2 = sdCappedCylinder(q-vec3(0., 0.5, 0.), vec2(0.4, 0.5));
-    d = min(d, d2);
-    res = mix(vec2(d, 4.), res, step(res.x, d));
-    // Front railing
-    q = p - vec3(-5.5, 6.5, 23.2);
-    d = dBox(q, vec3(9.0, 0.1, 4.0));
-    res = mix(vec2(d, 8.), res, step(res.x, d));
-    d = udRoundBox(q-vec3(0., 1.6, -4.0), vec3(9.0, 1.7, 0.05), 0.02);
-    d2 = udRoundBox(q-vec3(0., 1.6, -4.0), vec3(8.8, 1.5, 0.5), 0.02);
-    d = max(d, -d2);
-    d = min(d, udRoundBox(q-vec3(8.9, 3.2, 0.0), vec3(0.10, 0.10, 4.0), 0.01));
-    res = mix(vec2(d, 7.), res, step(res.x, d));
-    
-    // Back railing
-    q = p - vec3(-0.5, 6.5, -24.2);
-    d = dBox(q, vec3(6.0, 0.1, 3.0));
-    res = mix(vec2(d, 8.), res, step(res.x, d));
-    d = udRoundBox(q-vec3(0.5, 1.6, 3.2), vec3(6.0, 1.7, 0.1), 0.02);
-    d2 = udRoundBox(q-vec3(0.5, 1.6, 3.2), vec3(5.8, 1.5, 1.0), 0.02);
-    d = max(d, -d2);
-    res = mix(vec2(d, 7.), res, step(res.x, d));
-
-    return res;
-}
-
-vec2 dWater(vec3 p)
-{
-    vec3 q = p - vec3(0., -0., .0);
-    float d = dBox(q, vec3(20., 0.2, 40.));
-    d-=smoothstep(-1., 1., cos(p.x*2.1+t*2.)*cos(p.z*3.5+t*1.6))*0.01;
-    float d2 = smoothstep(-1., 1., cos(length(p.xz)*2.-t))*0.05;
-    d2 = mix(0., d2, smoothstep(1.0, 10., length(q.xz)));
-    d -= d2;
-    
-    return vec2(d, 3.);
-}
-
-vec2 dPlatforms(vec3 p)
-{
-    // Front Right Platform
-    vec2 res = vec2(-1, -1.);
-    vec3 q = p - vec3(11.5, 7., 7.0);
-    vec2 c = vec2(3.0);
-    vec3 q2 = q; q2.xz = mod(q2.xz+vec2(0., 1.0),c)-0.5*c;
-    float d = udRoundBox(q2, vec3(1.415, 0.2, 1.415), 0.1);
-    d = max(d, q.z-5.); d = max(d, -(q.z+4.)); d = max(d, -(q.x+6.));
-    res = vec2(d, 21.);
-    //Tube
-    d = sdCappedCylinder(q-vec3(0., -4., 0.), vec2(0.65, 3.));
-    d = min(d, sdCappedCylinder(q-vec3(0., -7.5, 0.), vec2(1.0, 2.)));
-    res = mix(vec2(d, 6.), res, step(res.x, d));
-    // Front Left Platform
-    vec3 leftPlatPos = vec3(-10.0, 7., -2.0);
-    if(t > 29.0){
-        float phase = (t-29.)/7.;
-    	float seq = mod(phase, 2.);
-    	leftPlatPos =mix(vec3(-10, 7., -2.), vec3(-11.6, 7., -23.0), fract(phase));
-    }
-    q = p - leftPlatPos;
-    d = udRoundBox(q, vec3(3.8, 0.02, 3.8), 0.01);
-    res = mix(vec2(d, 22.), res, step(res.x, d));
-    // Border
-    d = udRoundBox(q, vec3(4.0, 0.05, 4.0), 0.1);
-    float d2 = udRoundBox(q, vec3(3.5, 0.1, 3.5), 0.1);
-    d = max(d, -d2);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    // Crosses
-    d = udRoundBox(q-vec3(0., -0.05, 0.), vec3(4.0, 0.08, 0.1), 0.05);
-    d = min(d, udRoundBox(q-vec3(0., -0.05, 0.), vec3(0.1, 0.08, 4.0), 0.05));
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    //Tube
-    d = sdCappedCylinder(q-vec3(0., -1.5, 0.), vec2(0.65, 1.6));
-    d = min(d, sdCappedCylinder(q-vec3(0., -5.0, 0.), vec2(1.0, 2.)));
-    res = mix(vec2(d, 6.), res, step(res.x, d));
-    
-    return res;
-}
-
-vec4 dBloomObjects(vec3 p)
-{
-    vec4 res = vec4(-1, -1, 999., 0.);
-    //Lamp
-    vec3 q = p - vec3(0.0, 14.6, 0.0);
-    q.y *= 1.4;
-    float d = length(q)-0.8;
-    res.zw = vec2(d, 1.);
-    res.xy = vec2(d, 7.);
-    // FireballBaseStart
-    q = p - vec3(10.5, 9.5, 27.5);
-    d = length(vec3(q.x, q.y, q.z))-2.5;
-    d = max(d, -(q.z+1.5));
-    float d2 = (length((vec3(q.x, q.y, (q.z+1.5)*0.8)))-1.5); d2 += cos((p.z+0.5)*4.5)*0.1;
-    d = min(d, d2);
-    d += mix(0., 1., smoothstep(0.6, 1., cos(q.x*2.)*cos(q.y*2.)*cos(q.z+1.)))*1.0;
-    res.xy = mix(vec2(d, 12.), res.xy, step(res.x, d));
-    // FireballBaseEnd
-    q = p - vec3(-15.9, 9.5, -12.0);
-    q = rotateY(q, PI*0.5);
-    d = length(vec3(q.x, q.y, q.z))-2.5;
-    d = max(d, -(q.z+1.5));
-    d = max(d, -(length(q-vec3(0., 0., -5.6))-4.5));
-    d += mix(0., 1., smoothstep(0.5, 1., cos(q.x*2.)*cos(q.y*2.)*cos(q.z+1.)))*1.0;
-    res.xy = mix(vec2(d, 12.), res.xy, step(res.x, d));
-    // Redpoint
-    q = p - vec3(-15.4, 9.5, -12.0);
-    d = length(q)-0.9;
-    res.xy = mix(vec2(d, 22.), res.xy, step(res.x, d));
-    res.zw = mix(vec2(d, 0.),res.zw, step(res.z, d));
-    // RedPoint
-   	q = p - vec3(14.8, 9.5, -12.0);
-    d = length(q)-0.01;
-    res.xy = mix(vec2(d, 22.), res.xy, step(res.x, d));
-    res.zw = mix(vec2(d, 0.),res.zw, step(res.z, d));
-    // Fireball
-    vec3 firePos = vec3(0.);
-    if(t < 20.) {
-        float phase = t/4.;
-        float phasePart = fract(phase);
-        float phaseSeq = mod(phase, 2.);
-        firePos = mix( mix(vec3(10., 9.5, 20.5), vec3(10., 9.5, -19.0), phasePart), mix(vec3(10., 9.5, -19.0), vec3(10., 9.5, 20.5), phasePart), step(1.0, phaseSeq));
-    } else if(t < 22.3) {
-        firePos = mix(vec3(14.5, 10., 7.5), vec3(-14.5, 10., 7.5), smoothstep(20., 22.3, t));
-    } else if(t < 24.3) {
-        firePos = mix(vec3(-14.5, 10., 7.5), vec3(14.5, 10., 7.5), smoothstep(22.3, 24.3, t));
-    } else {
-        firePos = mix(vec3(14.5, 9.5, -12.0), vec3(-15.0, 9.5, -12.0), smoothstep(24.3, 27.5, t));
-    }
-        
-    q = p - firePos;
-    d = length(vec3(q.x, q.y, q.z))-0.15;
-    d += cos(q.x*15.+t*2.)*cos(q.y*12.)*cos(q.z*10.)*0.05;
-    res.xy = mix(vec2(d, 13.), res.xy, step(res.x, d));
-    res.zw = mix(vec2(d, 0.),res.zw, step(res.z, d));
-
-    return res;
-}
-
-vec2 dPortalA(vec3 p)
-{
-    vec3 q = rotateY(p - portalA.pos, portalA.rotateY);
-    float d = dElipse(q, vec3(1.6, 2.6, 0.05), smoothstep(0., 0.15, t-portalA.time)*0.6);
-    return vec2(d, 1.);
-}
-
-vec2 dPortalB(vec3 p)
-{
-    vec3 q = rotateY(p - portalB.pos, portalB.rotateY);
-    float d = dElipse(q, vec3(1.6, 2.6, 0.05), smoothstep(0., 0.15, t-portalB.time)*0.6);
-    return vec2(d, 2.);
-}
-
-vec4 map(vec3 p)
-{
-    vec4 res = dBloomObjects(p);
-    vec2 res2 = dStructure(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dWater(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dPortalA(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dPortalB(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dPlatforms(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    return res;
-}
-
-vec4 intersect(vec3 o, vec3 rd, float tmin, float tmax)
-{
-    float k = tmin;
-    vec4 res = vec4(tmax, -1, 999., 0.);
-    for(int i=0; i<120; ++i)
-    {
-        vec4 r = map(o + rd*k); 
-        res.zw = mix(r.zw, res.zw, step(res.z, r.z));
-        if(r.x < 0.01)
-        {
-            res.x = k;
-            res.y = r.y;
-            break;
-        }
-        
-        k+=r.x;
-        if(k > tmax)
-        {
-            break;
-        }
-    }
-    
-    return res;
-}
-
-vec3 calcnormal(vec3 p)
-{
-    vec2 e = vec2(0.001, 0.);
-    return normalize(
-        vec3(map(p+e.xyy).x-map(p-e.xyy).x,
-        	 map(p+e.yxy).x-map(p-e.yxy).x,
-        	 map(p+e.yyx).x-map(p-e.yyx).x)
-    );
-}
-
-float calcshadow(vec3 o, vec3 rd, float tmin, float tmax)
-{
-    float k = tmin;
-    float shadow = 1.;
-    for(int i = 0; i < 20; ++i)
-    {
-        vec4 res = map(o + rd*k);
-        shadow = min(shadow, res.x*1.5);
-        
-        k+=res.x;
-        
-        if(k > tmax)
-        {
-            break;
-        }
-    }
-    
-    return shadow;
-}
-
-vec4 mapPortalColor(vec3 p, vec3 portalPos, float rotY, vec4 cristalcolor, vec4 fxcolor)
-{
-    vec2 q = rotateY(p-portalPos, rotY).xy; q.y *= 0.55;
-    float d = length(q) - 1.4 + sin(q.x*10.+t*2.)*cos(q.y*10.+t*2.) * 0.05;
-    return mix(cristalcolor, fxcolor, smoothstep(-0.5, 0.2, d));
-}
-
-void calculatePosRayDirFromPortals(in PortalStruct portalO, in PortalStruct portalD, in vec3 p, in vec3 rd, out vec3 refpos, out vec3 refdir)
-{
-    vec3 oRight = cross(vec3(0., 1., 0.), portalO.front);
-    vec3 oUp = cross(portalO.front, oRight);
-    
-    vec3 dRight = cross(vec3(0., 1., 0.), portalD.front);
-    vec3 dUp = cross(portalD.front, dRight);
-    
-    vec3 projRD=vec3(dot(oRight, rd), dot(oUp, rd), dot(portalO.front, rd));
-    vec3 localPos = p-portalO.pos;
-    vec3 projPos = vec3(dot(localPos, oRight), dot(localPos, oUp), dot(localPos, portalO.front));
-
-    refdir = normalize(-portalD.front*projRD.z + -dRight*projRD.x + dUp*projRD.y);
-    refpos = portalD.pos + -dRight*projPos.x + dUp*projPos.y + -portalD.front*projPos.z;
-}
-
-vec4 texcube( sampler2D sam, in vec3 p, in vec3 n )
-{
-	vec4 x = texture( sam, p.yz );
-	vec4 y = texture( sam, p.zx );
-	vec4 z = texture( sam, p.xy );
-	return x*abs(n.x) + y*abs(n.y) + z*abs(n.z);
-}
-
-vec2 point2plane( in vec3 p, in vec3 n )
-{
-	return p.zy*abs(n.x) + p.xz*abs(n.y) + p.xy*abs(n.z);
-}
-
-vec4 mapcolor(inout vec3 p, in vec4 res, inout vec3 normal, in vec3 rd, out vec3 refpos, out vec3 refdir, out vec4 lparams)
-{
-    vec4 color = vec4(0.498, 0.584, 0.619, 1.0); lparams = vec4(1.0, 10., 0., 0.);
-    refdir = reflect(rd, normal); refpos = p;
-
-    if(res.y < 1.1) { // PortalA
-        color = mapPortalColor(p, portalA.pos, portalA.rotateY, vec4(1., 1., 1., 0.1), vec4(0.0, 0.35, 1.0, 1.));
-        calculatePosRayDirFromPortals(portalA, portalB, p, rd, refpos, refdir);
-    }
-    else if(res.y < 2.1) { // PortalB
-        color = mapPortalColor(p, portalB.pos, portalB.rotateY, vec4(0.0, 1., 1.0, 0.1), vec4(0.91, 0.46, 0.07, 1.));
-        calculatePosRayDirFromPortals(portalB, portalA, p, rd, refpos, refdir);
-    }
-    else if(res.y < 3.1) { // Water
-        color = vec4(0.254, 0.239, 0.007, 1.0); lparams.xy = vec2(2.0, 50.);
-        color.rgb = mix(color.rgb, vec3(0.254, 0.023, 0.007), 1.-smoothstep(0.2, 1., fbm((p.xz+vec2(cos(t+p.x*2.)*0.2, cos(t+p.y*2.)*0.2))*0.5)));
-        color.rgb = mix(color.rgb, vec3(0.007, 0.254, 0.058), smoothstep(0.5, 1., fbm((p.xz*0.4+vec2(cos(t+p.x*2.)*0.2, cos(t+p.y*2.)*0.2))*0.5)));
-    }
-    else if(res.y < 4.1) { // Turbina
-        color = vec4(0.447, 0.490, 0.513, 1.0);
-    }
-    else if(res.y < 5.1) { //Window
-        color = vec4(0.662, 0.847, 0.898, 0.6); lparams=vec4(3., 5., 0., 0.9);
-    }
-    else if(res.y < 6.1) { // Metal tube
-        color = vec4(0.431, 0.482, 0.650, 0.6); lparams.xy=vec2(2., 5.);
-    }
-    else if(res.y < 7.1) {// Plastic
-        color = vec4(0.8, 0.8, 0.8, 1.); lparams.xy=vec2(0.5, 1.);
-    }
-    else if(res.y < 8.1) { //Railing
-        color = mix(vec4(1.), vec4(1., 1., 1., 0.), smoothstep(0.2, 0.21, fract(p.x)));
-        color = mix(vec4(1.), color, smoothstep(0.2, 0.21, fract(p.z)));
-        lparams.xy=vec2(1.0, 1.); refdir = rd;
-    }
-    else if(res.y < 9.1) { // Reflectance -> can be plastic
-        color = vec4(1., 1., 1., 0.1); lparams.xy=vec2(1.0, 10.);
-    }
-    else if(res.y < 10.1) { // Exit
-        vec3 q = p - vec3(1.5, 11.0, -31.);
-        color = vec4(0.6, 0.6, 0.6, 0.65);
-        color.rgb = mix(vec3(0.749, 0.898, 0.909), color.rgb, smoothstep(2., 10., length(q.xy)));        
-        color.rgb += mix(vec3(0.1), vec3(0.), smoothstep(2., 5., length(q.xy)));
-
-        vec3 q2 = q;
-        vec2 c = vec2(2., 1.5);
-        float velsign = mix(-1., 1., step(0.5, fract(q2.y*0.5)));
-        q2.x = mod(velsign*t+q2.x+cos(q2.y*3.)*0.5, 1.8);
-        q2.y = mod(q2.y, 1.15);
-		float d = max(abs(q2.x)-0.9, abs(q2.y)-0.1);
-        color.rgb += mix(vec3(0.286, 0.941, 0.992)*1.6, vec3(0.), smoothstep(-0.1, 0.1, d));
-        
-        vec3 localp = p - vec3(1.5, 11.0, -31.);
-        refpos = vec3(1.5, 11.0, 28.0) + localp;
-        lparams=vec4(1.0, 10., 0., 0.1); refdir = rd;
-    }
-    else if(res.y < 11.1) { // Exit border
-        vec3 q = p; q.z = abs(q.z); q = q - vec3(0.0, 9.5, 31.);
-        color = vec4(0.8, 0.8, 0.8, 1.);
-        float d =length(abs(q.x+cos(q.y*0.5)*0.6 -3.0))-0.06;
-        d = min(d, length(abs(q.x+cos(PI+q.y*0.5)*0.6 +3.0))-0.06);        
-        color.rgb = mix(vec3(0.286, 0.941, 0.992), color.rgb, smoothstep(0., 0.01, d));
-        lparams = mix(vec4(0., 0., 0., 1.), lparams, smoothstep(0., 0.2, d));
-    }
-    else if(res.y < 12.1) { // Fireball base
-        vec3 q = p - vec3(10., 9.5, 26.5);
-        color = vec4(1.0, 1.0, 1.0, 1.);
-        float d = length(q-vec3(0., 0., -2.5)) - 2.0;
-        color = mix(vec4(0.976, 0.423, 0.262, 1.), color, smoothstep(-2., 0.01, d));
-    }
-    else if(res.y < 13.1) { // Fireball
-        color = vec4(1., 0.0, 0.0, 1.0);
-        color.rgb = mix(color.rgb, vec3(0.75, 0.94, 0.28), smoothstep(26.5, 27.0, t));
-    }
-    
-    else if(res.y > 19. && res.y < 25.) { // Walls
-        
-        float rand = fbm(point2plane(p, normal));
-        vec3 col = vec3(0.498, 0.584, 0.619);
-        color = vec4(vec3(col), 1.0);
-        color = mix(color, vec4(col*0.75, 1.0), smoothstep(0.2, 1.0, rand));
-        color = mix(color, vec4(col*0.80, 1.0), smoothstep(0.4, 1.0, fbm(point2plane(p*1.5, normal))));
-        color = mix(color, vec4(col*0.7, 1.0), smoothstep(0.6, 1.0, fbm(point2plane(p*4.5, normal))));
-        
-        vec3 dirtcolor = mix(vec3(0., 0., 0.), vec3(0.403, 0.380, 0.274)*0.2, rand);
-        float dirtheight = 0.1+rand*1.0;
-        dirtcolor = mix(dirtcolor, vec3(0.243, 0.223, 0.137), smoothstep(dirtheight, dirtheight + 0.5, p.y));
-        dirtheight = rand*2.;
-        color.rgb = mix(dirtcolor, color.rgb, smoothstep(dirtheight, dirtheight+2.0, p.y));
-        
-#ifdef TEXTURE
-        vec4 noise = mix(vec4(0.), texture(iChannel0, point2plane(p*0.037, normal)) * 0.2, smoothstep(0.2, 1., rand));
-#else
-        vec4 noise = vec4(0.0, 0.0, 0.0, 0.0);
-#endif
-        normal = normalize(normal + vec3(noise.x, 0., noise.z));
-        refdir = normalize(reflect(rd, normal));
-        
-        if(res.y < 20.1) { // BROWN_WALL_BLOCK
-            float d = -(p.x-6.1);
-            d = max(d, p.y-12.6); d = min(d, p.y-6.5);
-            color *= mix(vec4(1.), vec4(0.227, 0.137, 0.011, 1.0), smoothstep(0.0, 0.1, d));
-        }
-        else if(res.y < 21.1) { // WHITE_PLATFORM_BLOCK
-            color *= vec4(0.529, 0.572, 0.709, 1.0);
-            vec3 q = p - vec3(11.5, 6.85, 7.0);
-            float d = abs(q.y)-0.05;
-            color.rgb = mix(vec3(0.945, 0.631, 0.015), color.rgb, smoothstep(0., 0.01, d));
-            lparams.w = mix(1., 0., smoothstep(0., 0.2, d));
-        }
-        else if(res.y < 22.1) { // TRANSPARENT_PLATFORM_BLOCK
-            color *= vec4(0.431, 0.482, 0.650, 0.1);
-            refdir = rd; lparams.xy=vec2(2., 5.);
-        }
-        else if(res.y < 23.1) { // CEILING_BLOCK
-            color *= mix(vec4(0.227, 0.137, 0.011, 1.0), vec4(1.), smoothstep(0., 0.01, p.z+6.));
-        }
-    }
-    return color;
-}
-
-void initLights()
-{
-    vec3 col = vec3(0.925, 0.968, 0.972);
-    
-    ambientcolor = col;
-    
-    // Center Up
-    lights[0].pos = vec3(0., 13.0, 0.);
-    lights[0].color = col*0.25;
-    
-    // Window
-    lights[1].pos = vec3(14.0, 15.5, -12.0);
-    lights[1].color = col*0.25;
-    
-    lights[2].pos = vec3(14.0, 15.5, -6.0);
-    lights[2].color = col*0.25;
-}
-
-void initPortals()
-{
-    portalsA[0].pos = vec3(-140.5, 10., 23.0);		portalsA[0].front = vec3(1., 0., 0.);	portalsA[0].rotateY = PI*0.5; portalsA[0].time = 0.;
-    portalsA[1].pos = vec3(-14.5, 10., 23.0);		portalsA[1].front = vec3(1., 0., 0.);	portalsA[1].rotateY = PI*0.5; portalsA[1].time = 6.0;
-    portalsA[2].pos = vec3(-14.5, 10., -2.5);		portalsA[2].front = vec3(1., 0., 0.);	portalsA[2].rotateY = PI*0.5; portalsA[2].time = 13.5;
-    portalsA[3].pos = vec3(10.5, 9.6, -20.5);		portalsA[3].front = vec3(0., 0., 1.);	portalsA[3].rotateY = 0.; 	  portalsA[3].time = 18.;
-    portalsA[4].pos = vec3(14.5, 9.5, -12.0);		portalsA[4].front = vec3(-1., 0., 0.);	portalsA[4].rotateY = PI*0.5; portalsA[4].time = 23.5;
-    
-    portalA = portalsA[0]; 
-
-    portalB.pos = vec3(14.5, 10., 7.5);
-    portalB.front = vec3(-1., 0., 0.);
-    portalB.rotateY = -PI*0.5; portalB.time = 0.;
-}
-
-void initState()
-{  
-    states[0].posStart = vec3(0., 11.0, 26.0); states[0].posEnd = vec3(0., 11.0, 26.0); states[0].duration = 0.; states[0].lerptime = 0.; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[1].posStart = vec3(0., 11.0, 26.0); states[1].posEnd = vec3(0., 11.0, 23.0); states[1].duration = 6.75; states[1].lerptime = 0.5; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[2].posStart = vec3(0., 11.0, 23.0); states[2].posEnd = vec3(-12.6, 11.0, 23.0); states[2].duration = 4.0; states[2].lerptime = 1.0; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    // Go to Portal B
-    states[3].posStart = vec3(-12.6, 11.0, 23.0); states[3].posEnd = vec3(-14.5, 11., 23.0); states[3].duration = 0.1; states[3].lerptime = 0.1; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[4].posStart = vec3(14.5, 11., 7.5); states[4].posEnd = vec3(13.5, 11., 7.5); states[4].duration = 3.0; states[4].lerptime = 0.5; states[0].isEnterTime = 1.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    // Go to Portal A
-    states[5].posStart = vec3(13.5, 11., 7.5); states[5].posEnd = vec3(14.5, 11., 7.5); states[5].duration = 0.1; states[5].lerptime = 1.25; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[6].posStart = vec3(-14.5, 11., -2.5); states[6].posEnd = vec3(-11.6, 11., -2.5); states[6].duration = 15.; states[6].lerptime = 1.0; states[0].isEnterTime = 1.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    states[7].posStart = vec3(-11.6, 11., -2.5); states[7].posEnd = vec3(-11.6, 11., -23.0); states[7].duration = 7.5; states[7].lerptime = 7.0; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[8].posStart = vec3(-11.6, 11., -23.0); states[8].posEnd = vec3(0.5, 11., -23.0); states[8].duration = 3.0; states[8].lerptime = 2.5; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[9].posStart = vec3(0.5, 11., -23.0); states[9].posEnd = vec3(0.5, 11., -28.0); states[9].duration = 10.; states[9].lerptime = 0.5; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    t = mod(t, 40.);
-}
-
-void initOrientations()
-{
-    orientations[0].orientation = vec3(0., 0., -1.); 				orientations[0].lerptime = 0.; orientations[0].duration = 0.;
-    orientations[1].orientation = vec3(0., 0., -1.); 				orientations[1].lerptime = 0.0; orientations[1].duration = 1.0;
-    orientations[2].orientation = normalize(vec3(0.1, 0.25, -0.5)); orientations[2].lerptime = 1.50; orientations[2].duration = 2.0;
-    orientations[3].orientation = normalize(vec3(1., 0., -1.5)); 	orientations[3].lerptime = 0.75; orientations[3].duration = 2.0;
-    orientations[4].orientation = vec3(0., 0., -1.); 				orientations[4].lerptime = 1.25; orientations[4].duration = 1.25;
-    orientations[4].orientation = vec3(-1., 0., 0.); 				orientations[4].lerptime = 1.0; orientations[4].duration = 6.25;
-    orientations[5].orientation = vec3(0., 0., -1.); 				orientations[5].lerptime = 0.75; orientations[5].duration = 1.25;
-    orientations[6].orientation = vec3(-1., 0., -0.4);				orientations[6].lerptime = 0.60; orientations[6].duration = 3.25;
-    orientations[7].orientation = vec3(0., 0., 1.);					orientations[7].lerptime = 0.75; orientations[7].duration = 0.75;
-    orientations[8].orientation = vec3(1., 0., -0.65);				orientations[8].lerptime = 0.75; orientations[8].duration = 3.8;
-    orientations[9].orientation = vec3(0.0, 0., 1.);				orientations[9].lerptime = 1.0; orientations[9].duration = 1.5;
-    orientations[10].orientation = vec3(1.0, 0., -0.2);				orientations[10].lerptime = 0.75; orientations[10].duration = 3.2;
-    orientations[11].orientation = vec3(-0.2, 0., -1.);				orientations[11].lerptime = 2.0; orientations[11].duration = 5.0;
-    orientations[12].orientation = normalize(vec3(0.6, -0.5, -1.));	orientations[12].lerptime = 0.5; orientations[12].duration = 5.0;
-    orientations[13].orientation = vec3(1., 0., 0.);				orientations[13].lerptime = 0.5; orientations[13].duration = 3.5;
-    orientations[14].orientation = vec3(0., 0., -1.);				orientations[14].lerptime = 0.5; orientations[14].duration = 10.0;
-
-    orientation = orientations[0].orientation;
-}
-
-vec3 modOrientationToPortals(vec3 or, vec3 enterFront, vec3 exitFront)
-{
-    vec3 enterRight = cross(vec3(0., 1., 0.), enterFront);
-    vec3 enterUp = cross(enterFront, enterRight);
-    
-    vec3 exitRight = cross(vec3(0., 1., 0.), exitFront);
-    vec3 exitUp = cross(exitFront, exitRight);
-    
-    vec3 enterProjection = vec3
-    (
-        dot(or, enterRight),
-        dot(or, enterUp),
-        dot(or, enterFront)
-    );
-    
-    return exitFront*enterProjection.z + exitRight*enterProjection.x + exitUp*enterProjection.y;
-}
-
-void updateState()
-{   
-    vec3 axisEnterFront = vec3(0., 0., -1.);
-	vec3 axisExitFront = vec3(0., 0., -1.);
-    float portalEnterTime = 0.;
-    float at = 0.;
-    position = vec3(-5., 11.0, 26.);
-    
-    for(int i = 4; i >= 0; i--) { // Set current Portal
-        if(t > portalsA[i].time) {
-            portalA = portalsA[i];
-            break;
-        }
-    }
-    for(int i = 1; i < 10; ++i) { // Set Camera position
-        at += states[i].duration;
-        portalEnterTime = mix(portalEnterTime, at-states[i].duration, step(0.5, states[i].isEnterTime));
-        
-        vec3 axisEnterFrontA = -mix(portalA.front, portalB.front, step(0.5, states[i].enterPortal));
-        axisEnterFront = mix(axisEnterFront, axisEnterFrontA, step(0.5, states[i].isEnterTime));
-        
-        vec3 axisExitFrontA = mix(portalA.front, portalB.front, step(0.5, states[i].exitPortal));
-        axisExitFront = mix(axisExitFront, axisExitFrontA, step(0.5, states[i].isEnterTime));
-        if(t < at) {
-            position = mix(states[i].posStart, states[i].posEnd, clamp((t - (at-states[i].duration)) / (states[i].lerptime), 0., 1.));
-            break;
-        }
-    }
-    at = 0.;
-    for(int i = 1; i < 15; ++i) { // Set Camera orientation
-        at += orientations[i].duration;
-        if(t < at) {
-            vec3 prevOrientation = mix(modOrientationToPortals(orientations[i-1].orientation, axisEnterFront, axisExitFront), orientations[i-1].orientation, step(portalEnterTime, at-orientations[i].duration-orientations[i-1].duration));
-            vec3 currentOrientation = mix(modOrientationToPortals(orientations[i].orientation, axisEnterFront, axisExitFront), orientations[i].orientation, step(portalEnterTime, at-orientations[i].duration));
-            orientation = normalize(mix(prevOrientation, currentOrientation, clamp((t - (at-orientations[i].duration)) / (orientations[i].lerptime), 0., 1.)));
-            break;
-        }
-    }
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    t = iGlobalTime;
-
-    initState();
-    initPortals();
-    initOrientations();
-    initLights();
-    
-    updateState();
-    
-	vec2 uv = fragCoord.xy / iResolution.xy;
-    vec2 p = (uv * 2. -1.) * vec2(iResolution.x/iResolution.y, 1.);
-#ifdef MOUSE
-    vec2 mo = mix(vec2(0.), iMouse.xy / iResolution.xy, step(0.001, length(iMouse.zw)));
-#else
-    vec2 mo = mix(vec2(0.), 0.0 / iResolution.xy, step(0.001, length(0.0)));
-#endif
-    
-    vec3 right = cross(vec3(0., 1., 0.), orientation);
-    orientation += right*mo.x + vec3(0., 1., 0)*mo.y;
-    
-    vec3 ww = normalize(orientation);
-    vec3 uu = normalize(cross(vec3(0., 1., 0.), ww));
-	vec3 vv = normalize(cross(ww, uu));
-    
-    vec3 rd = normalize(p.x*uu*0.7 + p.y*vv + 1.*ww);
-    
-    float fov = tan(0.46);
-    rd = normalize(p.x*uu*fov + p.y*vv*fov + 1.*ww);
-    vec3 color = vec3(0.);
-    float att = 1.;
-    for(int i = 0; i < 3; ++i)
-    {
-        vec4 res = intersect(position, rd, 0.40, 9999.);
-        if(res.y > 0.0)
-        {
-            vec3 point = position + rd*res.x;
-            
-            vec3 normal = calcnormal(point);
-            vec3 refposition;
-            vec3 refdir;
-            vec4 lparams;
-            vec4 colorrgba = mapcolor(point, res, normal, rd, refposition, refdir, lparams);
-            
-            float latt = 1.-ambient;
-            vec3 acolor = colorrgba.rgb*ambientcolor*ambient;            
-            for(int lidx = 0; lidx < 3; ++lidx)
-            {
-                vec3 ldir = lights[lidx].pos - point;
-                float ldirLength = length(ldir);
-                ldir /= ldirLength;
-                latt *= 1.-clamp((ldirLength-5.)/35., 0., 1.);
-                
-                vec3 diffuse = colorrgba.rgb;
-                float diffactor = max(0., pow(dot(ldir, normal), 1.0))*latt;
-
-                vec3 reflec = reflect(rd, normal);
-                float specfactor = pow(max(0., dot(ldir, reflec)), lparams.y) * lparams.x;
-
-                float shadow = 1.;
-                shadow =  max(calcshadow(point, ldir, 0.8, ldirLength), 0.01);
-                
-                acolor += diffuse * diffactor * lights[lidx].color* shadow;
-                acolor += specfactor * lights[lidx].color* shadow;
-                color += (acolor*colorrgba.a*att);
-            }
-            
-            color = lparams.w*colorrgba.rgb + (1.-lparams.w)*color.rgb;;
-            vec3 fireballcolor = mix(vec3(0.91, 0.46, 0.07), vec3(0.42, 0.90, 0.00), smoothstep(26.5, 27.0, t));
-            vec3 bloomcolor = mix(fireballcolor, vec3(1.6, 1.65, 1.65), step(0.5, res.w));
-    		color.rgb = mix(mix(bloomcolor, color.rgb, 0.5), color.rgb, smoothstep(0., 1.0, res.z));
-            
-            att = max(att*(1.-colorrgba.a), 0.);
-            if(att < 0.01)
-            {
-                break;
-            }
-            
-            rd = refdir;
-            position = refposition;
-        }
-        else
-        {
-            att = 0.;
-            break;
-        }
-    }
-    
-    float fadeFactor = mix(0., 1., smoothstep(39., 40., t));
-    fadeFactor = mix(1., fadeFactor, smoothstep(0., 1., t));
-    
-	fragColor = mix(vec4(color, 1.), vec4(0.), fadeFactor);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/ciberxtrem-portal.slang b/procedural/ciberxtrem-portal.slang
deleted file mode 100644
index 69847c496b..0000000000
--- a/procedural/ciberxtrem-portal.slang
+++ /dev/null
@@ -1,862 +0,0 @@
-#version 450
-// Portal Gameplay
-// ciberxtrem - https://www.shadertoy.com/view/XlsSzM
-
-// Inspired in Portal, Chamber 8.
-
-// Note: Set the APPLY_COLORS and APPLY_SHADOW to 1 to see all colors and shadows
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// Thanks iq and the Shadertoy comunity for all the shared knowledge! :)
-
-// Set this to 1 to enable colors!
-#define APPLY_COLORS 0
-#define APPLY_SHADOW 0
-//---------------------------
-
-#define PI 3.14159265359
-
-struct LightStruct {
-  vec3 pos;
-  vec3 color;
-};
-
-struct PortalStruct {
-  vec3 pos;
-  vec3 front;
-  float rotateY;
-  float time;
-};
-
-struct StateStruct
-{
-  vec3 posStart;
-  vec3 posEnd;
-  float lerptime;
-  float duration;
-  float isEnterTime;
-  float enterPortal;
-  float exitPortal;
-};
-    
-struct OrientationStruct
-{
-  vec3 orientation;
-  float lerptime;
-  float duration;
-};
-    
-PortalStruct portalA;
-PortalStruct portalB;
-
-PortalStruct portalsA[8];
-StateStruct states[10];
-OrientationStruct orientations[15];
-LightStruct lights[3];
-
-float t;
-vec3 position;
-vec3 orientation;
-float ambient = 0.05;
-vec3 ambientcolor;
-
-vec3 rotateY(vec3 p, float a){
-    return vec3(
-        p.x*cos(a) + p.z*sin(a),
-        p.y,
-        p.z*cos(a) - p.x*sin(a)
-    );
-}
-
-float hash( float n ) {
-    return fract(sin(n)*43758.5453123);
-}
-
-float noise( in vec2 x ) {
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float n = p.x + p.y*157.0;
-    return mix(mix( hash(n+  0.0), hash(n+  1.0),f.x),
-               mix( hash(n+157.0), hash(n+158.0),f.x),f.y);
-}
-
-const mat2 m2 = mat2( 0.80, -0.60, 0.60, 0.80 );
-
-float fbm( vec2 p ) {
-    float f = 0.0;
-    f += 0.5000*noise( p ); p = m2*p*2.02;
-    f += 0.2500*noise( p ); p = m2*p*2.03;
-    f += 0.1250*noise( p ); p = m2*p*2.01;
-    f += 0.0625*noise( p );
-    
-    return f/0.9375;
-}
-
-float dBox(vec3 p, vec3 hsize)
-{
-    return length(max(abs(p)-hsize,0.0));
-}
-
-float udRoundBox( vec3 p, vec3 b, float r )
-{
-  return length(max(abs(p)-b,0.0))-r;
-}
-
-float sdCappedCylinder( vec3 p, vec2 h )
-{
-  vec2 d = abs(vec2(length(p.xz),p.y)) - h;
-  return min(max(d.x,d.y),0.0) + length(max(d,0.0));
-}
-//-------------------------------
-
-// Scene
-float dElipse(vec3 p, vec3 hsize, float globalSize)
-{
-    float d = length(max(abs(p)-hsize,0.0));
-    vec3 q = p;
-    q.y *= 0.6;
-    return max(d, length(q)-max(max(hsize.x, hsize.y)*globalSize, hsize.z));
-}
-
-vec2 dStructure(vec3 p)
-{  
-    // Front
-    vec2 res = vec2(-1., -1.);
-    vec3 q = p - vec3(0., 0.5, 28.25);
-    vec2 c = vec2(3., 6.2);
-    vec3 q2 = q; q2.xy = mod(q2.xy,c.xy)-0.5*c.xy;
-    float d = udRoundBox(q2, vec3(1.35, 3., 1.0), 0.25);
-    q = p - vec3(0.0, 9.5, 28.); // Hole for exit
-    float d2 = udRoundBox(q, vec3(3.0, 3.25, 2.0), 0.1);
-    d = max(d,-d2);
-    res = vec2(d, 24.);
-    //Back
-    q = p - vec3(0., 3.5, -28.0);
-    c = vec2(3., 6.2);
-    q.x = mod(q.x,c.x)-0.5*c.x;
-    d = udRoundBox(q, vec3(1.35, 3., 1.0), 0.25);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    q = p - vec3(0., 0.6, -28.01); // Brown block
-    c = vec2(3., 3.0);
-    q.xy = mod(q.xy,c.xy)-0.5*c.xy;
-    d = udRoundBox(q, vec3(1.35, 1.35, 1.0), 0.25);
-    q = p - vec3(0.0, 9.5, -28.); // Hole for exit
-    d2 = udRoundBox(q, vec3(3.0, 3.25, 2.0), 0.1);
-    d = max(d,-d2);
-    res = mix(vec2(d, 20.), res, step(res.x, d));
-    //Exit
-    vec3 p2 = p; p2.z = abs(p.z);
-    q = p2 - vec3(0.0, 9.5, 30.5);
-    d = udRoundBox(q, vec3(3.0, 3.25, 0.1), 0.1);
-    if(d<res.x){res = vec2(d, 10.);} // magic panel
-    q2 = q - vec3(4.5, 0., -1.); q2.x += abs(sin(length(1.5+abs(q2.y)*0.36)));
-    d = udRoundBox(q2, vec3(1.5, 4.5, 2.0), 0.1);
-    q2 = q - vec3(-4.5, 0., -1.); q2.x -= abs(sin(length(1.5+abs(q2.y)*0.36)));
-    d2 = udRoundBox(q2, vec3(1.5, 4.5, 2.0), 0.1);
-    d = min(d, d2);
-    res = mix(vec2(d, 11.), res, step(res.x, d));
-    //Left
-    q = p - vec3(-16., 0.5, 0.0);
-    c = vec2(3.0, 6.2);
-    q2 = q; q2.zy = mod(q2.zy,c)-0.5*c;
-    d = udRoundBox(q2, vec3(1., 3., 1.35), 0.25);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    //Right
-    q = p - vec3(16.0, 0.5, 0.0);
-    c = vec2(3.0, 6.2);
-    q.zy = mod(q.zy,c)-0.5*c;
-    d = udRoundBox(q, vec3(1., 3., 1.35), 0.25);
-    // Hole for window
-    q = p - vec3(15.0, 15.5, -9.0);
-    d2 = udRoundBox(q, vec3(2.0, 3., 6.0), 0.02);
-    d = max(d, -d2);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    // Column
-    q = p - vec3(0., 0.6, -23.90);
-    c = vec2(3., 3.0);
-    q.xy = mod(q.xy,c)-0.5*c;
-    d = udRoundBox(q, vec3(1.35, 1.35, 2.70), 0.25);
-    d = max(d, -(p.x-6.1));
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    // Ceiling
-    q = p - vec3(0., 20.4, .0);
-    c = vec2(3.0, 3.0);
-    q2 = q; q2.xz = mod(q2.xz,c)-0.5*c;
-    d = udRoundBox(q2, vec3(1.35, 1., 1.35), 0.25);
-    d2 = length(q)-6.;
-    d = max(d, -d2);
-    res = mix(vec2(d, 23.), res, step(res.x, d));
-    //Window
-    q = p - vec3(16.0, 15.5, -9.0);
-    d = udRoundBox(q, vec3(1.25, 3., 6.0), 0.02); // framework
-    d2 = udRoundBox(q, vec3(1.5, 2.6, 5.6), 0.02);
-    d = max(d, -d2);
-    d = min(d, udRoundBox(q, vec3(1.2, 3., 0.2), 0.02)); // bars
-    res = mix(vec2(d, 7.), res, step(res.x, d));
-    d = udRoundBox(q, vec3(1.0, 2.6, 5.6), 0.1);
-    d -= smoothstep(-1., 1., cos(p.y*15.)) * 0.0025;
-    res = mix(vec2(d, 5.), res, step(res.x, d));
-    // Dome
-    q = p-vec3(0., 21.5, 0.);
-    q.y *= 1.0;
-    d = length(q) - 6.;
-    res = mix(vec2(d, 9.), res, step(res.x, d));
-    //Turbina
-    q = p - vec3(0.0, 15.0, 0.0);
-    q = rotateY(q, t);
-    d = dBox(q, vec3(5.5, 0.05, 0.4));
-    d2 = dBox(q, vec3(0.4, 0.05, 5.5));
-    d = min(d, d2);
-    d2 = sdCappedCylinder(q-vec3(0., 0.5, 0.), vec2(0.4, 0.5));
-    d = min(d, d2);
-    res = mix(vec2(d, 4.), res, step(res.x, d));
-    // Front railing
-    q = p - vec3(-5.5, 6.5, 23.2);
-    d = dBox(q, vec3(9.0, 0.1, 4.0));
-    res = mix(vec2(d, 8.), res, step(res.x, d));
-    d = udRoundBox(q-vec3(0., 1.6, -4.0), vec3(9.0, 1.7, 0.05), 0.02);
-    d2 = udRoundBox(q-vec3(0., 1.6, -4.0), vec3(8.8, 1.5, 0.5), 0.02);
-    d = max(d, -d2);
-    d = min(d, udRoundBox(q-vec3(8.9, 3.2, 0.0), vec3(0.10, 0.10, 4.0), 0.01));
-    res = mix(vec2(d, 7.), res, step(res.x, d));
-    
-    // Back railing
-    q = p - vec3(-0.5, 6.5, -24.2);
-    d = dBox(q, vec3(6.0, 0.1, 3.0));
-    res = mix(vec2(d, 8.), res, step(res.x, d));
-    d = udRoundBox(q-vec3(0.5, 1.6, 3.2), vec3(6.0, 1.7, 0.1), 0.02);
-    d2 = udRoundBox(q-vec3(0.5, 1.6, 3.2), vec3(5.8, 1.5, 1.0), 0.02);
-    d = max(d, -d2);
-    res = mix(vec2(d, 7.), res, step(res.x, d));
-
-    return res;
-}
-
-vec2 dWater(vec3 p)
-{
-    vec3 q = p - vec3(0., -0., .0);
-    float d = dBox(q, vec3(20., 0.2, 40.));
-    d-=smoothstep(-1., 1., cos(p.x*2.1+t*2.)*cos(p.z*3.5+t*1.6))*0.01;
-    float d2 = smoothstep(-1., 1., cos(length(p.xz)*2.-t))*0.05;
-    d2 = mix(0., d2, smoothstep(1.0, 10., length(q.xz)));
-    d -= d2;
-    
-    return vec2(d, 3.);
-}
-
-vec2 dPlatforms(vec3 p)
-{
-    // Front Right Platform
-    vec2 res = vec2(-1, -1.);
-    vec3 q = p - vec3(11.5, 7., 7.0);
-    vec2 c = vec2(3.0);
-    vec3 q2 = q; q2.xz = mod(q2.xz+vec2(0., 1.0),c)-0.5*c;
-    float d = udRoundBox(q2, vec3(1.415, 0.2, 1.415), 0.1);
-    d = max(d, q.z-5.); d = max(d, -(q.z+4.)); d = max(d, -(q.x+6.));
-    res = vec2(d, 21.);
-    //Tube
-    d = sdCappedCylinder(q-vec3(0., -4., 0.), vec2(0.65, 3.));
-    d = min(d, sdCappedCylinder(q-vec3(0., -7.5, 0.), vec2(1.0, 2.)));
-    res = mix(vec2(d, 6.), res, step(res.x, d));
-    // Front Left Platform
-    vec3 leftPlatPos = vec3(-10.0, 7., -2.0);
-    if(t > 29.0){
-        float phase = (t-29.)/7.;
-    	float seq = mod(phase, 2.);
-    	leftPlatPos =mix(vec3(-10, 7., -2.), vec3(-11.6, 7., -23.0), fract(phase));
-    }
-    q = p - leftPlatPos;
-    d = udRoundBox(q, vec3(3.8, 0.02, 3.8), 0.01);
-    res = mix(vec2(d, 22.), res, step(res.x, d));
-    // Border
-    d = udRoundBox(q, vec3(4.0, 0.05, 4.0), 0.1);
-    float d2 = udRoundBox(q, vec3(3.5, 0.1, 3.5), 0.1);
-    d = max(d, -d2);
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    // Crosses
-    d = udRoundBox(q-vec3(0., -0.05, 0.), vec3(4.0, 0.08, 0.1), 0.05);
-    d = min(d, udRoundBox(q-vec3(0., -0.05, 0.), vec3(0.1, 0.08, 4.0), 0.05));
-    res = mix(vec2(d, 24.), res, step(res.x, d));
-    //Tube
-    d = sdCappedCylinder(q-vec3(0., -1.5, 0.), vec2(0.65, 1.6));
-    d = min(d, sdCappedCylinder(q-vec3(0., -5.0, 0.), vec2(1.0, 2.)));
-    res = mix(vec2(d, 6.), res, step(res.x, d));
-    
-    return res;
-}
-
-vec4 dBloomObjects(vec3 p)
-{
-    vec4 res = vec4(-1, -1, 999., 0.);
-    //Lamp
-    vec3 q = p - vec3(0.0, 14.6, 0.0);
-    q.y *= 1.4;
-    float d = length(q)-0.8;
-    res.zw = vec2(d, 1.);
-    res.xy = vec2(d, 7.);
-    // FireballBaseStart
-    q = p - vec3(10.5, 9.5, 27.5);
-    d = length(vec3(q.x, q.y, q.z))-2.5;
-    d = max(d, -(q.z+1.5));
-    float d2 = (length((vec3(q.x, q.y, (q.z+1.5)*0.8)))-1.5); d2 += cos((p.z+0.5)*4.5)*0.1;
-    d = min(d, d2);
-    d += mix(0., 1., smoothstep(0.6, 1., cos(q.x*2.)*cos(q.y*2.)*cos(q.z+1.)))*1.0;
-    res.xy = mix(vec2(d, 12.), res.xy, step(res.x, d));
-    // FireballBaseEnd
-    q = p - vec3(-15.9, 9.5, -12.0);
-    q = rotateY(q, PI*0.5);
-    d = length(vec3(q.x, q.y, q.z))-2.5;
-    d = max(d, -(q.z+1.5));
-    d = max(d, -(length(q-vec3(0., 0., -5.6))-4.5));
-    d += mix(0., 1., smoothstep(0.5, 1., cos(q.x*2.)*cos(q.y*2.)*cos(q.z+1.)))*1.0;
-    res.xy = mix(vec2(d, 12.), res.xy, step(res.x, d));
-    // Redpoint
-    q = p - vec3(-15.4, 9.5, -12.0);
-    d = length(q)-0.9;
-    res.xy = mix(vec2(d, 22.), res.xy, step(res.x, d));
-    res.zw = mix(vec2(d, 0.),res.zw, step(res.z, d));
-    // RedPoint
-   	q = p - vec3(14.8, 9.5, -12.0);
-    d = length(q)-0.01;
-    res.xy = mix(vec2(d, 22.), res.xy, step(res.x, d));
-    res.zw = mix(vec2(d, 0.),res.zw, step(res.z, d));
-    // Fireball
-    vec3 firePos = vec3(0.);
-    if(t < 20.) {
-        float phase = t/4.;
-        float phasePart = fract(phase);
-        float phaseSeq = mod(phase, 2.);
-        firePos = mix( mix(vec3(10., 9.5, 20.5), vec3(10., 9.5, -19.0), phasePart), mix(vec3(10., 9.5, -19.0), vec3(10., 9.5, 20.5), phasePart), step(1.0, phaseSeq));
-    } else if(t < 22.3) {
-        firePos = mix(vec3(14.5, 10., 7.5), vec3(-14.5, 10., 7.5), smoothstep(20., 22.3, t));
-    } else if(t < 24.3) {
-        firePos = mix(vec3(-14.5, 10., 7.5), vec3(14.5, 10., 7.5), smoothstep(22.3, 24.3, t));
-    } else {
-        firePos = mix(vec3(14.5, 9.5, -12.0), vec3(-15.0, 9.5, -12.0), smoothstep(24.3, 27.5, t));
-    }
-        
-    q = p - firePos;
-    d = length(vec3(q.x, q.y, q.z))-0.15;
-    d += cos(q.x*15.+t*2.)*cos(q.y*12.)*cos(q.z*10.)*0.05;
-    res.xy = mix(vec2(d, 13.), res.xy, step(res.x, d));
-    res.zw = mix(vec2(d, 0.),res.zw, step(res.z, d));
-
-    return res;
-}
-
-vec2 dPortalA(vec3 p)
-{
-    vec3 q = rotateY(p - portalA.pos, portalA.rotateY);
-    float d = dElipse(q, vec3(1.6, 2.6, 0.05), smoothstep(0., 0.15, t-portalA.time)*0.6);
-    return vec2(d, 1.);
-}
-
-vec2 dPortalB(vec3 p)
-{
-    vec3 q = rotateY(p - portalB.pos, portalB.rotateY);
-    float d = dElipse(q, vec3(1.6, 2.6, 0.05), smoothstep(0., 0.15, t-portalB.time)*0.6);
-    return vec2(d, 2.);
-}
-
-vec4 map(vec3 p)
-{
-    vec4 res = dBloomObjects(p);
-    vec2 res2 = dStructure(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dWater(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dPortalA(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dPortalB(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    res2 = dPlatforms(p);
-    if(res2.x < res.x) res.xy = res2.xy;
-    
-    return res;
-}
-
-vec4 intersect(vec3 o, vec3 rd, float tmin, float tmax)
-{
-    float k = tmin;
-    vec4 res = vec4(tmax, -1, 999., 0.);
-    for(int i=0; i<120; ++i)
-    {
-        vec4 r = map(o + rd*k); 
-        res.zw = mix(r.zw, res.zw, step(res.z, r.z));
-        if(r.x < 0.01)
-        {
-            res.x = k;
-            res.y = r.y;
-            break;
-        }
-        
-        k+=r.x;
-        if(k > tmax)
-        {
-            break;
-        }
-    }
-    
-    return res;
-}
-
-vec3 calcnormal(vec3 p)
-{
-    vec2 e = vec2(0.001, 0.);
-    return normalize(
-        vec3(map(p+e.xyy).x-map(p-e.xyy).x,
-        	 map(p+e.yxy).x-map(p-e.yxy).x,
-        	 map(p+e.yyx).x-map(p-e.yyx).x)
-    );
-}
-
-#if APPLY_SHADOW == 1
-float calcshadow(vec3 o, vec3 rd, float tmin, float tmax)
-{
-    float k = tmin;
-    float shadow = 1.;
-    for(int i = 0; i < 20; ++i)
-    {
-        vec4 res = map(o + rd*k);
-        shadow = min(shadow, res.x*1.5);
-        
-        k+=res.x;
-        
-        if(k > tmax)
-        {
-            break;
-        }
-    }
-    
-    return shadow;
-}
-
-#endif
-
-vec4 mapPortalColor(vec3 p, vec3 portalPos, float rotY, vec4 cristalcolor, vec4 fxcolor)
-{
-    vec2 q = rotateY(p-portalPos, rotY).xy; q.y *= 0.55;
-    float d = length(q) - 1.4 + sin(q.x*10.+t*2.)*cos(q.y*10.+t*2.) * 0.05;
-    return mix(cristalcolor, fxcolor, smoothstep(-0.5, 0.2, d));
-}
-
-void calculatePosRayDirFromPortals(in PortalStruct portalO, in PortalStruct portalD, in vec3 p, in vec3 rd, out vec3 refpos, out vec3 refdir)
-{
-    vec3 oRight = cross(vec3(0., 1., 0.), portalO.front);
-    vec3 oUp = cross(portalO.front, oRight);
-    
-    vec3 dRight = cross(vec3(0., 1., 0.), portalD.front);
-    vec3 dUp = cross(portalD.front, dRight);
-    
-    vec3 projRD=vec3(dot(oRight, rd), dot(oUp, rd), dot(portalO.front, rd));
-    vec3 localPos = p-portalO.pos;
-    vec3 projPos = vec3(dot(localPos, oRight), dot(localPos, oUp), dot(localPos, portalO.front));
-
-    refdir = normalize(-portalD.front*projRD.z + -dRight*projRD.x + dUp*projRD.y);
-    refpos = portalD.pos + -dRight*projPos.x + dUp*projPos.y + -portalD.front*projPos.z;
-}
-
-vec4 texcube( sampler2D sam, in vec3 p, in vec3 n )
-{
-	vec4 x = texture( sam, p.yz );
-	vec4 y = texture( sam, p.zx );
-	vec4 z = texture( sam, p.xy );
-	return x*abs(n.x) + y*abs(n.y) + z*abs(n.z);
-}
-
-vec2 point2plane( in vec3 p, in vec3 n )
-{
-	return p.zy*abs(n.x) + p.xz*abs(n.y) + p.xy*abs(n.z);
-}
-
-vec4 mapcolor(inout vec3 p, in vec4 res, inout vec3 normal, in vec3 rd, out vec3 refpos, out vec3 refdir, out vec4 lparams)
-{
-    vec4 color = vec4(0.498, 0.584, 0.619, 1.0); lparams = vec4(1.0, 10., 0., 0.);
-    refdir = reflect(rd, normal); refpos = p;
-
-    if(res.y < 1.1) { // PortalA
-        color = mapPortalColor(p, portalA.pos, portalA.rotateY, vec4(1., 1., 1., 0.1), vec4(0.0, 0.35, 1.0, 1.));
-        calculatePosRayDirFromPortals(portalA, portalB, p, rd, refpos, refdir);
-    }
-    else if(res.y < 2.1) { // PortalB
-        color = mapPortalColor(p, portalB.pos, portalB.rotateY, vec4(0.0, 1., 1.0, 0.1), vec4(0.91, 0.46, 0.07, 1.));
-        calculatePosRayDirFromPortals(portalB, portalA, p, rd, refpos, refdir);
-    }
-#if APPLY_COLORS == 1
-    else if(res.y < 3.1) { // Water
-        color = vec4(0.254, 0.239, 0.007, 1.0); lparams.xy = vec2(2.0, 50.);
-        color.rgb = mix(color.rgb, vec3(0.254, 0.023, 0.007), 1.-smoothstep(0.2, 1., fbm((p.xz+vec2(cos(t+p.x*2.)*0.2, cos(t+p.y*2.)*0.2))*0.5)));
-        color.rgb = mix(color.rgb, vec3(0.007, 0.254, 0.058), smoothstep(0.5, 1., fbm((p.xz*0.4+vec2(cos(t+p.x*2.)*0.2, cos(t+p.y*2.)*0.2))*0.5)));
-    }
-    else if(res.y < 4.1) { // Turbina
-        color = vec4(0.447, 0.490, 0.513, 1.0);
-    }
-    else if(res.y < 5.1) { //Window
-        color = vec4(0.662, 0.847, 0.898, 0.6); lparams=vec4(3., 5., 0., 0.9);
-    }
-    else if(res.y < 6.1) { // Metal tube
-        color = vec4(0.431, 0.482, 0.650, 0.6); lparams.xy=vec2(2., 5.);
-    }
-    else if(res.y < 7.1) {// Plastic
-        color = vec4(0.8, 0.8, 0.8, 1.); lparams.xy=vec2(0.5, 1.);
-    }
-    else if(res.y < 8.1) { //Railing
-        color = mix(vec4(1.), vec4(1., 1., 1., 0.), smoothstep(0.2, 0.21, fract(p.x)));
-        color = mix(vec4(1.), color, smoothstep(0.2, 0.21, fract(p.z)));
-        lparams.xy=vec2(1.0, 1.); refdir = rd;
-    }
-    else if(res.y < 9.1) { // Reflectance -> can be plastic
-        color = vec4(1., 1., 1., 0.1); lparams.xy=vec2(1.0, 10.);
-    }
-    else if(res.y < 10.1) { // Exit
-        vec3 q = p - vec3(1.5, 11.0, -31.);
-        color = vec4(0.6, 0.6, 0.6, 0.65);
-        color.rgb = mix(vec3(0.749, 0.898, 0.909), color.rgb, smoothstep(2., 10., length(q.xy)));        
-        color.rgb += mix(vec3(0.1), vec3(0.), smoothstep(2., 5., length(q.xy)));
-
-        vec3 q2 = q;
-        vec2 c = vec2(2., 1.5);
-        float velsign = mix(-1., 1., step(0.5, fract(q2.y*0.5)));
-        q2.x = mod(velsign*t+q2.x+cos(q2.y*3.)*0.5, 1.8);
-        q2.y = mod(q2.y, 1.15);
-		float d = max(abs(q2.x)-0.9, abs(q2.y)-0.1);
-        color.rgb += mix(vec3(0.286, 0.941, 0.992)*1.6, vec3(0.), smoothstep(-0.1, 0.1, d));
-        
-        vec3 localp = p - vec3(1.5, 11.0, -31.);
-        refpos = vec3(1.5, 11.0, 28.0) + localp;
-        lparams=vec4(1.0, 10., 0., 0.1); refdir = rd;
-    }
-    else if(res.y < 11.1) { // Exit border
-        vec3 q = p; q.z = abs(q.z); q = q - vec3(0.0, 9.5, 31.);
-        color = vec4(0.8, 0.8, 0.8, 1.);
-        float d =length(abs(q.x+cos(q.y*0.5)*0.6 -3.0))-0.06;
-        d = min(d, length(abs(q.x+cos(PI+q.y*0.5)*0.6 +3.0))-0.06);        
-        color.rgb = mix(vec3(0.286, 0.941, 0.992), color.rgb, smoothstep(0., 0.01, d));
-        lparams = mix(vec4(0., 0., 0., 1.), lparams, smoothstep(0., 0.2, d));
-    }
-    else if(res.y < 12.1) { // Fireball base
-        vec3 q = p - vec3(10., 9.5, 26.5);
-        color = vec4(1.0, 1.0, 1.0, 1.);
-        float d = length(q-vec3(0., 0., -2.5)) - 2.0;
-        color = mix(vec4(0.976, 0.423, 0.262, 1.), color, smoothstep(-2., 0.01, d));
-    }
-    else if(res.y < 13.1) { // Fireball
-        color = vec4(1., 0.0, 0.0, 1.0);
-        color.rgb = mix(color.rgb, vec3(0.75, 0.94, 0.28), smoothstep(26.5, 27.0, t));
-    }
-    
-    else if(res.y > 19. && res.y < 25.) { // Walls
-        
-        float rand = fbm(point2plane(p, normal));
-        vec3 col = vec3(0.498, 0.584, 0.619);
-        color = vec4(vec3(col), 1.0);
-        color = mix(color, vec4(col*0.75, 1.0), smoothstep(0.2, 1.0, rand));
-        color = mix(color, vec4(col*0.80, 1.0), smoothstep(0.4, 1.0, fbm(point2plane(p*1.5, normal))));
-        color = mix(color, vec4(col*0.7, 1.0), smoothstep(0.6, 1.0, fbm(point2plane(p*4.5, normal))));
-        
-        vec3 dirtcolor = mix(vec3(0., 0., 0.), vec3(0.403, 0.380, 0.274)*0.2, rand);
-        float dirtheight = 0.1+rand*1.0;
-        dirtcolor = mix(dirtcolor, vec3(0.243, 0.223, 0.137), smoothstep(dirtheight, dirtheight + 0.5, p.y));
-        dirtheight = rand*2.;
-        color.rgb = mix(dirtcolor, color.rgb, smoothstep(dirtheight, dirtheight+2.0, p.y));
-        
-#ifdef TEXTURE
-        vec4 noise = mix(vec4(0.), texture(iChannel0, point2plane(p*0.037, normal)) * 0.2, smoothstep(0.2, 1., rand));
-#else
-        vec4 noise = vec4(0.0, 0.0, 0.0, 0.0);
-#endif
-        normal = normalize(normal + vec3(noise.x, 0., noise.z));
-        refdir = normalize(reflect(rd, normal));
-        
-        if(res.y < 20.1) { // BROWN_WALL_BLOCK
-            float d = -(p.x-6.1);
-            d = max(d, p.y-12.6); d = min(d, p.y-6.5);
-            color *= mix(vec4(1.), vec4(0.227, 0.137, 0.011, 1.0), smoothstep(0.0, 0.1, d));
-        }
-        else if(res.y < 21.1) { // WHITE_PLATFORM_BLOCK
-            color *= vec4(0.529, 0.572, 0.709, 1.0);
-            vec3 q = p - vec3(11.5, 6.85, 7.0);
-            float d = abs(q.y)-0.05;
-            color.rgb = mix(vec3(0.945, 0.631, 0.015), color.rgb, smoothstep(0., 0.01, d));
-            lparams.w = mix(1., 0., smoothstep(0., 0.2, d));
-        }
-        else if(res.y < 22.1) { // TRANSPARENT_PLATFORM_BLOCK
-            color *= vec4(0.431, 0.482, 0.650, 0.1);
-            refdir = rd; lparams.xy=vec2(2., 5.);
-        }
-        else if(res.y < 23.1) { // CEILING_BLOCK
-            color *= mix(vec4(0.227, 0.137, 0.011, 1.0), vec4(1.), smoothstep(0., 0.01, p.z+6.));
-        }
-    }
-#endif    
-    return color;
-}
-
-void initLights()
-{
-    vec3 col = vec3(0.925, 0.968, 0.972);
-    
-    ambientcolor = col;
-    
-    // Center Up
-    lights[0].pos = vec3(0., 13.0, 0.);
-    lights[0].color = col*0.25;
-    
-    // Window
-    lights[1].pos = vec3(14.0, 15.5, -12.0);
-    lights[1].color = col*0.25;
-    
-    lights[2].pos = vec3(14.0, 15.5, -6.0);
-    lights[2].color = col*0.25;
-}
-
-void initPortals()
-{
-    portalsA[0].pos = vec3(-140.5, 10., 23.0);		portalsA[0].front = vec3(1., 0., 0.);	portalsA[0].rotateY = PI*0.5; portalsA[0].time = 0.;
-    portalsA[1].pos = vec3(-14.5, 10., 23.0);		portalsA[1].front = vec3(1., 0., 0.);	portalsA[1].rotateY = PI*0.5; portalsA[1].time = 6.0;
-    portalsA[2].pos = vec3(-14.5, 10., -2.5);		portalsA[2].front = vec3(1., 0., 0.);	portalsA[2].rotateY = PI*0.5; portalsA[2].time = 13.5;
-    portalsA[3].pos = vec3(10.5, 9.6, -20.5);		portalsA[3].front = vec3(0., 0., 1.);	portalsA[3].rotateY = 0.; 	  portalsA[3].time = 18.;
-    portalsA[4].pos = vec3(14.5, 9.5, -12.0);		portalsA[4].front = vec3(-1., 0., 0.);	portalsA[4].rotateY = PI*0.5; portalsA[4].time = 23.5;
-    
-    portalA = portalsA[0]; 
-
-    portalB.pos = vec3(14.5, 10., 7.5);
-    portalB.front = vec3(-1., 0., 0.);
-    portalB.rotateY = -PI*0.5; portalB.time = 0.;
-}
-
-void initState()
-{  
-    states[0].posStart = vec3(0., 11.0, 26.0); states[0].posEnd = vec3(0., 11.0, 26.0); states[0].duration = 0.; states[0].lerptime = 0.; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[1].posStart = vec3(0., 11.0, 26.0); states[1].posEnd = vec3(0., 11.0, 23.0); states[1].duration = 6.75; states[1].lerptime = 0.5; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[2].posStart = vec3(0., 11.0, 23.0); states[2].posEnd = vec3(-12.6, 11.0, 23.0); states[2].duration = 4.0; states[2].lerptime = 1.0; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    // Go to Portal B
-    states[3].posStart = vec3(-12.6, 11.0, 23.0); states[3].posEnd = vec3(-14.5, 11., 23.0); states[3].duration = 0.1; states[3].lerptime = 0.1; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[4].posStart = vec3(14.5, 11., 7.5); states[4].posEnd = vec3(13.5, 11., 7.5); states[4].duration = 3.0; states[4].lerptime = 0.5; states[0].isEnterTime = 1.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    // Go to Portal A
-    states[5].posStart = vec3(13.5, 11., 7.5); states[5].posEnd = vec3(14.5, 11., 7.5); states[5].duration = 0.1; states[5].lerptime = 1.25; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[6].posStart = vec3(-14.5, 11., -2.5); states[6].posEnd = vec3(-11.6, 11., -2.5); states[6].duration = 15.; states[6].lerptime = 1.0; states[0].isEnterTime = 1.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    states[7].posStart = vec3(-11.6, 11., -2.5); states[7].posEnd = vec3(-11.6, 11., -23.0); states[7].duration = 7.5; states[7].lerptime = 7.0; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[8].posStart = vec3(-11.6, 11., -23.0); states[8].posEnd = vec3(0.5, 11., -23.0); states[8].duration = 3.0; states[8].lerptime = 2.5; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    states[9].posStart = vec3(0.5, 11., -23.0); states[9].posEnd = vec3(0.5, 11., -28.0); states[9].duration = 10.; states[9].lerptime = 0.5; states[0].isEnterTime = 0.; states[0].enterPortal = 0.;  states[0].exitPortal = 1.;
-    
-    t = mod(t, 40.);
-}
-
-void initOrientations()
-{
-    orientations[0].orientation = vec3(0., 0., -1.); 				orientations[0].lerptime = 0.; orientations[0].duration = 0.;
-    orientations[1].orientation = vec3(0., 0., -1.); 				orientations[1].lerptime = 0.0; orientations[1].duration = 1.0;
-    orientations[2].orientation = normalize(vec3(0.1, 0.25, -0.5)); orientations[2].lerptime = 1.50; orientations[2].duration = 2.0;
-    orientations[3].orientation = normalize(vec3(1., 0., -1.5)); 	orientations[3].lerptime = 0.75; orientations[3].duration = 2.0;
-    orientations[4].orientation = vec3(0., 0., -1.); 				orientations[4].lerptime = 1.25; orientations[4].duration = 1.25;
-    orientations[4].orientation = vec3(-1., 0., 0.); 				orientations[4].lerptime = 1.0; orientations[4].duration = 6.25;
-    orientations[5].orientation = vec3(0., 0., -1.); 				orientations[5].lerptime = 0.75; orientations[5].duration = 1.25;
-    orientations[6].orientation = vec3(-1., 0., -0.4);				orientations[6].lerptime = 0.60; orientations[6].duration = 3.25;
-    orientations[7].orientation = vec3(0., 0., 1.);					orientations[7].lerptime = 0.75; orientations[7].duration = 0.75;
-    orientations[8].orientation = vec3(1., 0., -0.65);				orientations[8].lerptime = 0.75; orientations[8].duration = 3.8;
-    orientations[9].orientation = vec3(0.0, 0., 1.);				orientations[9].lerptime = 1.0; orientations[9].duration = 1.5;
-    orientations[10].orientation = vec3(1.0, 0., -0.2);				orientations[10].lerptime = 0.75; orientations[10].duration = 3.2;
-    orientations[11].orientation = vec3(-0.2, 0., -1.);				orientations[11].lerptime = 2.0; orientations[11].duration = 5.0;
-    orientations[12].orientation = normalize(vec3(0.6, -0.5, -1.));	orientations[12].lerptime = 0.5; orientations[12].duration = 5.0;
-    orientations[13].orientation = vec3(1., 0., 0.);				orientations[13].lerptime = 0.5; orientations[13].duration = 3.5;
-    orientations[14].orientation = vec3(0., 0., -1.);				orientations[14].lerptime = 0.5; orientations[14].duration = 10.0;
-
-    orientation = orientations[0].orientation;
-}
-
-vec3 modOrientationToPortals(vec3 or, vec3 enterFront, vec3 exitFront)
-{
-    vec3 enterRight = cross(vec3(0., 1., 0.), enterFront);
-    vec3 enterUp = cross(enterFront, enterRight);
-    
-    vec3 exitRight = cross(vec3(0., 1., 0.), exitFront);
-    vec3 exitUp = cross(exitFront, exitRight);
-    
-    vec3 enterProjection = vec3
-    (
-        dot(or, enterRight),
-        dot(or, enterUp),
-        dot(or, enterFront)
-    );
-    
-    return exitFront*enterProjection.z + exitRight*enterProjection.x + exitUp*enterProjection.y;
-}
-
-void updateState()
-{   
-    vec3 axisEnterFront = vec3(0., 0., -1.);
-	vec3 axisExitFront = vec3(0., 0., -1.);
-    float portalEnterTime = 0.;
-    float at = 0.;
-    position = vec3(-5., 11.0, 26.);
-    
-    for(int i = 4; i >= 0; i--) { // Set current Portal
-        if(t > portalsA[i].time) {
-            portalA = portalsA[i];
-            break;
-        }
-    }
-    for(int i = 1; i < 10; ++i) { // Set Camera position
-        at += states[i].duration;
-        portalEnterTime = mix(portalEnterTime, at-states[i].duration, step(0.5, states[i].isEnterTime));
-        
-        vec3 axisEnterFrontA = -mix(portalA.front, portalB.front, step(0.5, states[i].enterPortal));
-        axisEnterFront = mix(axisEnterFront, axisEnterFrontA, step(0.5, states[i].isEnterTime));
-        
-        vec3 axisExitFrontA = mix(portalA.front, portalB.front, step(0.5, states[i].exitPortal));
-        axisExitFront = mix(axisExitFront, axisExitFrontA, step(0.5, states[i].isEnterTime));
-        if(t < at) {
-            position = mix(states[i].posStart, states[i].posEnd, clamp((t - (at-states[i].duration)) / (states[i].lerptime), 0., 1.));
-            break;
-        }
-    }
-    at = 0.;
-    for(int i = 1; i < 15; ++i) { // Set Camera orientation
-        at += orientations[i].duration;
-        if(t < at) {
-            vec3 prevOrientation = mix(modOrientationToPortals(orientations[i-1].orientation, axisEnterFront, axisExitFront), orientations[i-1].orientation, step(portalEnterTime, at-orientations[i].duration-orientations[i-1].duration));
-            vec3 currentOrientation = mix(modOrientationToPortals(orientations[i].orientation, axisEnterFront, axisExitFront), orientations[i].orientation, step(portalEnterTime, at-orientations[i].duration));
-            orientation = normalize(mix(prevOrientation, currentOrientation, clamp((t - (at-orientations[i].duration)) / (orientations[i].lerptime), 0., 1.)));
-            break;
-        }
-    }
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    t = iGlobalTime;
-
-    initState();
-    initPortals();
-    initOrientations();
-    initLights();
-    
-    updateState();
-    
-	vec2 uv = fragCoord.xy / iResolution.xy;
-    vec2 p = (uv * 2. -1.) * vec2(iResolution.x/iResolution.y, 1.);
-#ifdef MOUSE
-    vec2 mo = mix(vec2(0.), iMouse.xy / iResolution.xy, step(0.001, length(iMouse.zw)));
-#else
-    vec2 mo = mix(vec2(0.), 0.0 / iResolution.xy, step(0.001, length(0.0)));
-#endif
-    
-    vec3 right = cross(vec3(0., 1., 0.), orientation);
-    orientation += right*mo.x + vec3(0., 1., 0)*mo.y;
-    
-    vec3 ww = normalize(orientation);
-    vec3 uu = normalize(cross(vec3(0., 1., 0.), ww));
-	vec3 vv = normalize(cross(ww, uu));
-    
-    vec3 rd = normalize(p.x*uu*0.7 + p.y*vv + 1.*ww);
-    
-    float fov = tan(0.46);
-    rd = normalize(p.x*uu*fov + p.y*vv*fov + 1.*ww);
-    vec3 color = vec3(0.);
-    float att = 1.;
-    for(int i = 0; i < 3; ++i)
-    {
-        vec4 res = intersect(position, rd, 0.40, 9999.);
-        if(res.y > 0.0)
-        {
-            vec3 point = position + rd*res.x;
-            
-            vec3 normal = calcnormal(point);
-            vec3 refposition;
-            vec3 refdir;
-            vec4 lparams;
-            vec4 colorrgba = mapcolor(point, res, normal, rd, refposition, refdir, lparams);
-            
-            float latt = 1.-ambient;
-            vec3 acolor = colorrgba.rgb*ambientcolor*ambient;            
-            for(int lidx = 0; lidx < 3; ++lidx)
-            {
-                vec3 ldir = lights[lidx].pos - point;
-                float ldirLength = length(ldir);
-                ldir /= ldirLength;
-                latt *= 1.-clamp((ldirLength-5.)/35., 0., 1.);
-                
-                vec3 diffuse = colorrgba.rgb;
-                float diffactor = max(0., pow(dot(ldir, normal), 1.0))*latt;
-
-                vec3 reflec = reflect(rd, normal);
-                float specfactor = pow(max(0., dot(ldir, reflec)), lparams.y) * lparams.x;
-
-                float shadow = 1.;
-                #if APPLY_SHADOW == 1
-                shadow =  max(calcshadow(point, ldir, 0.8, ldirLength), 0.01);
-                #endif
-                
-                acolor += diffuse * diffactor * lights[lidx].color* shadow;
-                acolor += specfactor * lights[lidx].color* shadow;
-                color += (acolor*colorrgba.a*att);
-            }
-            
-            color = lparams.w*colorrgba.rgb + (1.-lparams.w)*color.rgb;;
-            vec3 fireballcolor = mix(vec3(0.91, 0.46, 0.07), vec3(0.42, 0.90, 0.00), smoothstep(26.5, 27.0, t));
-            vec3 bloomcolor = mix(fireballcolor, vec3(1.6, 1.65, 1.65), step(0.5, res.w));
-    		color.rgb = mix(mix(bloomcolor, color.rgb, 0.5), color.rgb, smoothstep(0., 1.0, res.z));
-            
-            att = max(att*(1.-colorrgba.a), 0.);
-            if(att < 0.01)
-            {
-                break;
-            }
-            
-            rd = refdir;
-            position = refposition;
-        }
-        else
-        {
-            att = 0.;
-            break;
-        }
-    }
-    
-    float fadeFactor = mix(0., 1., smoothstep(39., 40., t));
-    fadeFactor = mix(1., fadeFactor, smoothstep(0., 1., t));
-    
-	fragColor = mix(vec4(color, 1.), vec4(0.), fadeFactor);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/dave_hoskins-frozen-wasteland.slang b/procedural/dave_hoskins-frozen-wasteland.slang
deleted file mode 100644
index 58275aff14..0000000000
--- a/procedural/dave_hoskins-frozen-wasteland.slang
+++ /dev/null
@@ -1,398 +0,0 @@
-#version 450
-// Frozen Wasteland - 2015-03-02
-// https://www.shadertoy.com/view/Xls3D2
-// Frozen wasteland. Built on nimitz's model, although I didn't use his fog stuff afterall. It uses fog ray tracing included within the main ray march.
-
-// Frozen wasteland
-// https://www.shadertoy.com/view/Xls3D2
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-// By Dave Hoskins
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define ITR 90
-#define FAR 110.
-#define time iGlobalTime
-#define MOD3 vec3(.16532,.17369,.15787)
-#define SUN_COLOUR  vec3(1., .95, .85)
-
-#define TRIANGLE_NOISE	// .. This
-//#define FOUR_D_NOISE	// ...Or this
-//#define TEXTURE_NOISE		// .. Or this (faster, but not as sharp edged)
-//#define VALUE_NOISE 		// .. or more normal noise.
-
-
-float height(in vec2 p)
-{
-    float h = sin(p.x*.1+p.y*.2)+sin(p.y*.1-p.x*.2)*.5;
-    h += sin(p.x*.04+p.y*.01+3.0)*4.;
-    h -= sin(h*10.0)*.1;
-    return h;
-}
-
-float camHeight(in vec2 p)
-{
-    float h = sin(p.x*.1+p.y*.2)+sin(p.y*.1-p.x*.2)*.5;
-    h += sin(p.x*.04+p.y*.01+3.0)*4.;
-    return h;
-}
-
-float smin( float a, float b)
-{
-	const float k = 2.7;
-	float h = clamp( 0.5 + 0.5*(b-a)/k, 0.0, 1.0 );
-	return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-#define MOD2 vec2(.16632,.17369)
-#define MOD3 vec3(.16532,.17369,.15787)
-float tri(in float x){return abs(fract(x)-.5);}
-
-float hash12(vec2 p)
-{
-	p  = fract(p * MOD2);
-    p += dot(p.xy, p.yx+19.19);
-    return fract(p.x * p.y);
-}
-float vine(vec3 p, in float c, in float h)
-{
-    p.y += sin(p.z*.5625+1.3)*3.5-.5;
-    p.x += cos(p.z*2.)*1.;
-    vec2 q = vec2(mod(p.x, c)-c/2., p.y);
-    return length(q) - h*1.4 -sin(p.z*3.+sin(p.x*7.)*0.5)*0.1;
-}
-
-//========================================================================
-// ################ DIFFERENT NOISE FUNCTIONS ################
-#ifdef TRIANGLE_NOISE
-vec3 tri3(in vec3 p){return vec3( tri(p.z+tri(p.y)), tri(p.z+tri(p.x)), tri(p.y+tri(p.x)));}
-float Noise3d(in vec3 p)
-{
-    float z=1.4;
-	float rz = 0.;
-    vec3 bp = p;
-	for (float i=0.; i<= 2.; i++ )
-	{
-        vec3 dg = tri3(bp);
-        p += (dg);
-
-        bp *= 2.;
-		z *= 1.5;
-		p *= 1.3;
-        
-        rz+= (tri(p.z+tri(p.x+tri(p.y))))/z;
-        bp += 0.14;
-	}
-	return rz;
-}
-#endif
-
-//--------------------------------------------------------------------------------
-#ifdef FOUR_D_NOISE
-
-vec4 quad(in vec4 p){return abs(fract(p.yzwx+p.wzxy)-.5);}
-
-float Noise3d(in vec3 q)
-{
-    float z=1.4;
-    vec4 p = vec4(q, iGlobalTime*.1);
-	float rz = 0.;
-    vec4 bp = p;
-	for (float i=0.; i<= 2.; i++ )
-	{
-        vec4 dg = quad(bp);
-        p += (dg);
-
-		z *= 1.5;
-		p *= 1.3;
-        
-        rz+= (tri(p.z+tri(p.w+tri(p.y+tri(p.x)))))/z;
-        
-        bp = bp.yxzw*2.0+.14;
-	}
-	return rz;
-}
-#endif
-
-//--------------------------------------------------------------------------------
-#ifdef TEXTURE_NOISE
-float Noise3d(in vec3 x)
-{
-
-    x*=10.0;
-    float h = 0.0;
-    float a = .34;
-    for (int i = 0; i < 4; i++)
-    {
-        vec3 p = floor(x);
-        vec3 f = fract(x);
-        f = f*f*(3.0-2.0*f);
-
-        vec2 uv = (p.xy+vec2(37.0,17.0)*p.z) + f.xy;
-        vec2 rg = textureLod( iChannel0, (uv+ 0.5)/256.0, 0.0 ).yx;
-        h += mix( rg.x, rg.y, f.z )*a;
-        a*=.5;
-        x+=x;
-    }
-    return h;
-}
-#endif
-
-
-//--------------------------------------------------------------------------------
-#ifdef VALUE_NOISE
-float Hash(vec3 p)
-{
-	p  = fract(p * MOD3);
-    p += dot(p.xyz, p.yzx + 19.19);
-    return fract(p.x * p.y * p.z);
-}
-
-float Noise3d(in vec3 p)
-{
-    vec2 add = vec2(1.0, 0.0);
-	p *= 10.0;
-    float h = 0.0;
-    float a = .3;
-    for (int n = 0; n < 4; n++)
-    {
-        vec3 i = floor(p);
-        vec3 f = fract(p); 
-        f *= f * (3.0-2.0*f);
-
-        h += mix(
-            mix(mix(Hash(i), Hash(i + add.xyy),f.x),
-                mix(Hash(i + add.yxy), Hash(i + add.xxy),f.x),
-                f.y),
-            mix(mix(Hash(i + add.yyx), Hash(i + add.xyx),f.x),
-                mix(Hash(i + add.yxx), Hash(i + add.xxx),f.x),
-                f.y),
-            f.z)*a;
-         a*=.5;
-        p += p;
-    }
-    return h;
-}
-#endif
-
-//--------------------------------------------------------------------------------
-float map(vec3 p)
-{
-    p.y += height(p.zx);
-    float d = p.y+.5;
-    
-    d = smin(d, vine(p+vec3(.8,0.,0),30.,3.3) );
-    d = smin(d, vine(p.zyx+vec3(0.,0,17.),33.,1.4) );
-    d += Noise3d(p*.05)*(p.y*1.2);
-    p.xz *=.2;
-    d+= Noise3d(p*.3);
-    return d;
-}
-float fogmap(in vec3 p, in float d)
-{
-    p.xz -= time*7.+sin(p.z*.3)*3.;
-    p.y -= time*.5;
-    return (max(Noise3d(p*.008+.1)-.1,0.0)*Noise3d(p*.1))*.3;
-}
-
-float march(in vec3 ro, in vec3 rd, out float drift, in vec2 scUV)
-{
-	float precis = 0.01;
-    float h=precis*2.0;
-    float d = hash12(scUV);
-    drift = 0.0;
-    for( int i=0; i<ITR; i++ )
-    {
-        vec3 p = ro+rd*d;
-        if(h < precis || d > FAR) break;
-        h = map(p);
-        drift +=  fogmap(p, d);
-        d += min(h*.65 + d * .002, 8.0);
-	 }
-    drift = min(drift, 1.0);
-	return d;
-}
-
-vec3 normal( in vec3 pos, in float d )
-{
-	vec2 eps = vec2( d *d* .003+.01, 0.0);
-	vec3 nor = vec3(
-	    map(pos+eps.xyy) - map(pos-eps.xyy),
-	    map(pos+eps.yxy) - map(pos-eps.yxy),
-	    map(pos+eps.yyx) - map(pos-eps.yyx) );
-	return normalize(nor);
-}
-
-float bnoise(in vec3 p)
-{
-    p.xz*=.4;
-    float n = Noise3d(p*3.)*0.4;
-    n += Noise3d(p*1.5)*0.2;
-    return n*n*.2;
-}
-
-vec3 bump(in vec3 p, in vec3 n, in float ds)
-{
-    p.xz *= .4;
-    //p *= 1.0;
-    vec2 e = vec2(.01,0);
-    float n0 = bnoise(p);
-    vec3 d = vec3(bnoise(p+e.xyy)-n0, bnoise(p+e.yxy)-n0, bnoise(p+e.yyx)-n0)/e.x;
-    n = normalize(n-d*10./(ds));
-    return n;
-}
-
-float shadow(in vec3 ro, in vec3 rd, in float mint)
-{
-	float res = 1.0;
-    
-    float t = mint;
-    for( int i=0; i<12; i++ )
-    {
-		float h = map(ro + rd*t);
-        res = min( res, 4.*h/t );
-        t += clamp( h, 0.1, 1.5 );
-            }
-    return clamp( res, 0., 1.0 );
-}
-
-vec3 Clouds(vec3 sky, vec3 rd)
-{
-    
-    rd.y = max(rd.y, 0.0);
-    float ele = rd.y;
-    float v = (200.0)/rd.y;
-
-    rd.y = v;
-    rd.xz = rd.xz * v - time*8.0;
-	rd.xz *= .0004;
-    
-	float f = Noise3d(rd.xzz*3.) * Noise3d(rd.zxx*1.3)*2.5;
-    f = f*pow(ele, .5)*2.;
-  	f = clamp(f-.15, 0.01, 1.0);
-
-    return  mix(sky, vec3(1),f );
-}
-
-
-vec3 Sky(vec3 rd, vec3 ligt)
-{
-    rd.y = max(rd.y, 0.0);
-    
-    vec3 sky = mix(vec3(.1, .15, .25), vec3(.8), pow(.8-rd.y, 3.0));
-    return  mix(sky, SUN_COLOUR, min(pow(max(dot(rd,ligt), 0.0), 4.5)*1.2, 1.0));
-}
-float Occ(vec3 p)
-{
-    float h = 0.0;
-    h  = clamp(map(p), 0.5, 1.0);
- 	return sqrt(h);   
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{	
-	vec2 p = fragCoord.xy/iResolution.xy-0.5;
-    vec2 q = fragCoord.xy/iResolution.xy;
-	p.x*=iResolution.x/iResolution.y;
-#ifdef MOUSE
-    vec2 mo = iMouse.xy / iResolution.xy-.5;
-#else
-    vec2 mo = 0.0 / iResolution.xy-.5;
-#endif
-    mo = (mo==vec2(-.5))?mo=vec2(-0.1,0.07):mo;
-	mo.x *= iResolution.x/iResolution.y;
-	
-	vec3 ro = vec3(0.+smoothstep(0.,1.,tri(time*1.5)*.3)*1.5, smoothstep(0.,1.,tri(time*3.)*3.)*0.08, -time*3.5-130.0);
-    ro.y -= camHeight(ro.zx)-.4;
-    mo.x += smoothstep(0.7,1.,sin(time*.35))*.5-1.5 - smoothstep(-.7,-1.,sin(time*.35))*.5;
- 
-    vec3 eyedir = normalize(vec3(cos(mo.x),mo.y*2.-.05+sin(time*.5)*0.1,sin(mo.x)));
-    vec3 rightdir = normalize(vec3(cos(mo.x+1.5708),0.,sin(mo.x+1.5708)));
-    vec3 updir = normalize(cross(rightdir,eyedir));
-	vec3 rd=normalize((p.x*rightdir+p.y*updir)*1.+eyedir);
-	
-    vec3 ligt = normalize( vec3(1.5, .9, -.5) );
-    float fg;
-	float rz = march(ro,rd, fg, fragCoord);
-	vec3 sky = Sky(rd, ligt);
-    
-    vec3 col = sky;
-   
-    if ( rz < FAR )
-    {
-        vec3 pos = ro+rz*rd;
-        vec3 nor= normal( pos, rz);
-        float d = distance(pos,ro);
-        nor = bump(pos,nor,d);
-        float shd = (shadow(pos,ligt,.04));
-        
-        float dif = clamp( dot( nor, ligt ), 0.0, 1.0 );
-        vec3 ref = reflect(rd,nor);
-        float spe = pow(clamp( dot( ref, ligt ), 0.0, 1.0 ),5.)*2.;
-
-        float fre = pow( clamp(1.+dot(rd, nor),0.0,1.0), 3. );
-        col = vec3(.8);
-	    col = col*dif*shd + fre*spe*shd*SUN_COLOUR +abs(nor.y)*vec3(.12, .13, .13);
-        // Fake the red absorption of ice...
-        d = Occ(pos+nor*3.);
-        col *= vec3(d, d, min(d*1.4, 1.0));
-        // Fog from ice storm...
-        col = mix(col, sky, smoothstep(FAR-25.,FAR,rz));
-        
-    }
-    else
-    {
-        col = Clouds(col, rd);
-    }
-    
-
-    // Fog mix...
-    col = mix(col, vec3(0.7, .7, .7), fg);
-  
-    // Post...
-    col = mix(col, vec3(.5), -.1);
-	//col = clamp(pow(col*1.,vec3(0.4)),0.0, 1.0);
-
-	col = sqrt(col);
-    
-    
-    // Borders...
-    float f = smoothstep(0.0, 3.0, iGlobalTime)*.5;
-    col *= f+f*pow(70. *q.x*q.y*(1.0-q.x)*(1.0-q.y), .2);
-    
-    
-	fragColor = vec4( col, 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dave_hoskins-galaxy-of-universes.slang b/procedural/dave_hoskins-galaxy-of-universes.slang
deleted file mode 100644
index 2e7c43baa0..0000000000
--- a/procedural/dave_hoskins-galaxy-of-universes.slang
+++ /dev/null
@@ -1,81 +0,0 @@
-#version 450
-// Galaxy of Universes -  2014-06-19
-// https://www.shadertoy.com/view/MdXSzS
-// Big Bang? *pfft* It's just a small explosion somewhere in a rotating Galaxy of Universes!
-// Thanks to Kali for his fractal formula.
-
-// https://www.shadertoy.com/view/MdXSzS
-// The Big Bang - just a small explosion somewhere in a massive Galaxy of Universes.
-// Outside of this there's a massive galaxy of 'Galaxy of Universes'... etc etc. :D
-
-// To fake a perspective it takes advantage of the screen being wider than it is tall.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	vec2 uv = (fragCoord.xy / iResolution.xy) - .5;
-	float t = iGlobalTime * .1 + ((.25 + .05 * sin(iGlobalTime * .1))/(length(uv.xy) + .07)) * 2.2;
-	float si = sin(t);
-	float co = cos(t);
-	mat2 ma = mat2(co, si, -si, co);
-
-	float v1, v2, v3;
-	v1 = v2 = v3 = 0.0;
-	
-	float s = 0.0;
-	for (int i = 0; i < 90; i++)
-	{
-		vec3 p = s * vec3(uv, 0.0);
-		p.xy *= ma;
-		p += vec3(.22, .3, s - 1.5 - sin(iGlobalTime * .13) * .1);
-		for (int i = 0; i < 8; i++)	p = abs(p) / dot(p,p) - 0.659;
-		v1 += dot(p,p) * .0015 * (1.8 + sin(length(uv.xy * 13.0) + .5  - iGlobalTime * .2));
-		v2 += dot(p,p) * .0013 * (1.5 + sin(length(uv.xy * 14.5) + 1.2 - iGlobalTime * .3));
-		v3 += length(p.xy*10.) * .0003;
-		s  += .035;
-	}
-	
-	float len = length(uv);
-	v1 *= smoothstep(.7, .0, len);
-	v2 *= smoothstep(.5, .0, len);
-	v3 *= smoothstep(.9, .0, len);
-	
-	vec3 col = vec3( v3 * (1.5 + sin(iGlobalTime * .2) * .4),
-					(v1 + v3) * .3,
-					 v2) + smoothstep(0.2, .0, len) * .85 + smoothstep(.0, .6, v3) * .3;
-
-	fragColor=vec4(min(pow(abs(col), vec3(1.2)), 1.0), 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dave_hoskins-ray-q-bert.slang b/procedural/dave_hoskins-ray-q-bert.slang
deleted file mode 100644
index ad290c0db0..0000000000
--- a/procedural/dave_hoskins-ray-q-bert.slang
+++ /dev/null
@@ -1,645 +0,0 @@
-#version 450
-// Ray * Bert -  2013-03-08
-// https://www.shadertoy.com/view/4sl3RH
-
-//					  --------
-// Ray*Bert!!!       ( @!#?@! ) 
-//					  --| |---
-//						|/
-// By       Dave Hoskins
-// Finished for now... may come back later to put the other characters in.
-// V. 0.8  - Added colour changes and a fixed path for Q*Bert.
-// V. 0.7  - Better fur and ambient lighting.
-// V. 0.64 - Moving Q*bert.Behaves differently on different machines! :(
-// V. 0.63 - Pupil watching.
-// V. 0.62 - Asynchronous bounces.
-// V. 0.61 - Fur.
-// V. 0.60 - In the middle of getting old Q to move about.
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define REFLECTIONS_ON
-							
-#define PI  3.1415926535
-
-vec3 areaPlane = normalize(vec3(-1.0, 1.0, 1.0));
-vec3 lightDir = normalize(vec3(-1437.0, 1743.0, 430.0));
-
-vec3 QbertPos;
-float QbertRotation;
-vec3 balls[3];
-float squish[4];
-float radius[3];
-
-const vec3 ballStart1 = vec3(-.0, 2.6, -1.);
-const vec3 ballStart2 = vec3( 1.0, 2.6, 0.);
-
-
-const vec3 addLeft  = vec3(-1.0, -1.0, 0.0);
-const vec3 addRight = vec3(.0, -1.0, 1.0);
-
-const vec3  QbertStart = vec3(-3.0, -1.3, .00);
-
-
-float time;
-
-float rand( float n )
-{
-    return fract(sin(n*1233.23)*43758.5453);
-}
-
-float hash( float n )
-{
-    return fract(sin(n)*43758.5453123);
-}
-
-float noise( in vec3 x )
-{
-    vec3 p = floor(x);
-    vec3 f = fract(x);
-
-    f = f*f*(3.0-2.0*f);
-
-    float n = p.x + p.y*57.0 + 113.0*p.z;
-
-    float res = mix(mix(mix( hash(n+  0.0), hash(n+  1.0),f.x),
-                        mix( hash(n+ 57.0), hash(n+ 58.0),f.x),f.y),
-                    mix(mix( hash(n+113.0), hash(n+114.0),f.x),
-                        mix( hash(n+170.0), hash(n+171.0),f.x),f.y),f.z);
-    return res;
-}
-
-
-vec2 rotate2D(vec2 p, float a)
-{
-    float sa = sin(a);
-    float ca = cos(a);
-    vec2 r;
-    r.x = ca*p.x + sa*p.y;
-    r.y = -sa*p.x + ca*p.y;
-    return r;
-}
-
-// Finding the movement location at a set time. Loopy IF-tastic!!...
-void GetLocation(int i, float s, out vec3 outPos1, out vec3 outPos2)
-{
-	int end = int(mod(s, 8.0))-1;
-	float r = floor(s/8.0) + float(i*547);
-	vec3 pos;
-	if (rand(float(r)) > .5)
-	{
-		pos = ballStart1;
-	}else
-	{
-		pos = ballStart2;
-	}
-
-	for (int t = 0; t < 9; t++)
-	{
-		if (t == 0)
-		{
-			outPos1 = pos + vec3(0.0, 3.5, 0.0);
-		}
-		if (t == end)
-		{
-			outPos1 = pos;
-		}
-		if (t == end+1)
-		{
-			outPos2 = pos;
-			if (t == 7)
-			{
-				outPos2 = outPos1 + vec3(0.0, -8.5, 0.0);
-			}
-		}
-
-		if (rand(float(t)+r) > .5)
-		{
-			pos += addLeft;
-		}else
-		{
-			pos += addRight;
-		}
-	}
-}
-
-//--------------------------------------------------------------------------------------------
-vec3 MoveQbert(int n, in vec3 pos, out float dir)
-{
-	if (n == 0)
-	{
-		pos -= addLeft;
-		dir = -90.0;
-	}else
-	if (n == 1)
-	{
-		pos -= addRight;
-		dir = 180.0;
-	}else
-	if (n == 3)
-	{
-		pos += addLeft;
-		dir = 90.0;
-	}else
-	{
-		pos += addRight;
-		dir = 0.0;
-	}
-	return pos;
-}
-
-
-//--------------------------------------------------------------------------------------------
-int DirTable[19];
-float GetQbertLocation(float s, out vec3 out1, out vec3 out2)
-{
-	int end = int(mod(s, 18.0));
-	float r = floor(s/18.0);
-	vec3 pos = QbertStart;
-	float dir = 0.0;
-	float outDir;
-	vec3 newPos;
-
-	for (int t = 0; t < 19; t++)
-	{
-		if (t == end)
-		{
-			out1 = pos;
-		}
-		if (t == end+1)
-		{
-			out2 = pos;
-			outDir = dir / 180.0 * PI;
-		}
-		int val = DirTable[t];
-		pos = MoveQbert(val, pos, dir);
-	}
-	return outDir;
-
-}
-
-//----------------------- Distance Estimation fields -------------------
-float deTorus( vec3 p, vec2 t )
-{
-  vec2 q = vec2(length(p.xy)-t.x,p.z);
-  return length(q)-t.y;
-}
-
-float deQBertEyes(vec3 p)
-{
-	float t = squish[3];//clamp(fra*.25, 0.0, 0.2)-.2;
-	p.y -= t;
-	p.xz = rotate2D(p.xz, QbertRotation);
-	vec3 pos = p + vec3(-.08, -.17, -.18);
-	
-    float d = length(pos)-.12;
-	pos = p + vec3(.08, -.17, -.18);
-    d = min(d, length(pos)-.12);
-	return d;	
-}
-
-float deQBert(vec3 pos)
-{
-	pos.xz = rotate2D(pos.xz, QbertRotation);
-	vec3 p = pos;
-	
-	// Torso...
-	float t = squish[3];//clamp(fra*.25, 0.0, 0.2)-.2;
-	p.y -=t;
-	p.y *= .9;
-	float d = length(p)-.32;
-	p = pos * vec3(1.0, 1.0, .3);
-	p.z -= .1;
-	p.y -= t;
-	d = min(d, deTorus(p, vec2(.07, .06)));
-
-	// Vertical legs...
-	p = (pos * vec3(1.0, .4, 1.0))- vec3(-.13, -.2, -.1);
-	d = min(d, length(p)-.06);
-	p = (pos * vec3(1.0, .4, 1.0))- vec3(.13, -.2, -.1);
-	d = min(d, length(p)-.06);
-	// Feet...
-	p = (pos * vec3(.4, .8, .3))- vec3(-.05, -.5, .01);
-	d = min(d, length(p)-.03);
-	p = (pos * vec3(.4, .8, .3))- vec3(.05, -.5, .01);
-	d = min(d, length(p)-.03);
-	return d;	
-}
-
-float deBall(vec3 p, float s)
-{
-    return length(p)-s;
-}
-
-float dePlane(vec3 p, vec3 planeN)
-{
-    return dot(p, planeN);
-}
-
-float PlayArea(vec3 p)
-{	
-    float d;
-    d = dePlane(p, areaPlane);
-    return d;
-}
-
-//--------------------------------------------------------------------------------------------
-float Scene(in vec3 p, out int which)
-{	
-    float d = 1000.0, f;
-	
-	for (int i =0; i < 3; i++)
-	{
-		vec3 pos = p-balls[i];
-
-		// Squish it...
-		pos.xz /= squish[i];
-		pos.y *= squish[i];
-		f = deBall(pos, radius[i]);
-		if (f < d)
-		{
-			d = f;
-			which = i;
-		}
-	}
-	
-	f = deQBert(p - QbertPos);
-	if (f < d)
-	{
-		d = f;
-		which = 4;
-	}
-
-	f = deQBertEyes(p - QbertPos);
-	if (f < d)
-	{
-		d = f;
-		which = 5;
-	}
-
-    return d;
-}
-
-//------------------------------ Lighting ------------------------------------
-// Calculate scene normal
-vec3 SceneNormal(vec3 pos )
-{
-    float eps = 0.001;
-    vec3 n;
-	int m;
-    float d = Scene(pos, m);
-    n.x = Scene( vec3(pos.x+eps, pos.y, pos.z), m ) - d;
-    n.y = Scene( vec3(pos.x, pos.y+eps, pos.z),m ) - d;
-    n.z = Scene( vec3(pos.x, pos.y, pos.z+eps),m ) - d;
-    return normalize(n);
-}
-
-vec3 HueGradient(float t)
-{
-	t += .4;
-    vec3 p = abs(fract(t + vec3(1.0, 2.0 / 3.0, 1.0 / 3.0)) * 6.0 - 3.0);
-	return (clamp(p - 1.0, 0.0, 1.0));
-}
-// Colouring in the fragments...
-vec3 LightCubes(vec3 pos, vec3 n)
-{
-	vec3 qpos = QbertStart;
-	float dir;
-	ivec3 ipos = ivec3(floor(pos+.5));
-	float foundHit = 0.0;
-	int end = int(mod(time*.8, 18.0));
-	
-	vec3 areaColour = vec3(.53, .7, .85);
-	for (int t = 0; t < 18; t++)
-	{
-		qpos = MoveQbert(DirTable[t], qpos, dir);
-		ivec3 ip = ivec3(floor(qpos+.5));
-		if (ip == ipos && n.y >= .8)
-		{
-			if (t >= end) 
-			foundHit = .5;	
-			else
-			foundHit = 1.5;
-		}
-	}
-	if (foundHit > 0.0) areaColour = HueGradient((floor((time*.8/18.0))+foundHit)/4.23);
-	
-    float diff = dot(n, lightDir);
-    diff = max(diff, 0.0);
-    return diff * areaColour;	
-}
-
-vec3 LightCharacters(vec3 pos, vec3 norm, vec3 dir, int m)
-{
-	float specular = 0.0;
-	vec3 ballColour;
-	float specSize = 8.0;
-	vec3 specColour = vec3(1.0, 1.0, 1.0);
-	if (m == 7)
-	{
-		ballColour = vec3(1.0, 1.0, 1.0);
-		specColour = vec3(0.0, 0.0, 0.0);
-		specSize = 2.0;
-	}
-	
-	if (m == 6)
-	{
-		norm += (noise((pos-QbertPos)*42.0)*.5)-.5;
-		ballColour = vec3(1.2, 0.42, 0.);
-	}
-	else 
-	{
-		vec3 reflect = ((-2.0*(dot(dir, norm))*norm)+dir);
-		specular = pow(max(dot(reflect, lightDir), 0.0), specSize);
-		
-		if (m == 2)
-		{
-			ballColour = vec3(1.0, 0.0, 1.0);
-		}else
-		if (m == 3)
-		{
-			ballColour = vec3(1.0, 0.0, 0.0);
-		}else
-		if (m == 4)
-		{
-			ballColour = vec3(0.0, 1.0, 0.0);
-		}
-	}
-
-	float diff = dot(norm, lightDir);
-    diff = max(diff, 0.3);
-
-	return mix(diff * ballColour, specColour, specular);	
-}
-
-//--------------------------------------------------------------------------------------------
-float DistanceFields(vec3 ro, vec3 rd, out int hit, out vec3 pos)
-{
-	float len = .0;
-	float d;
-	hit = 0;
-	int m = 0;
-	for (int st = 0; st < 22; st++)
-	{
-		pos = ro + rd * len;
-		d = Scene(pos, m);
-		if (d < 0.01)
-		{
-			hit = m+1;
-			break;
-		}
-			len += d;
-	}
-	return len;
-}
- 
-//--------------------------------------------------------------------------------------------
-// Voxel grid search that I found in 1994 in Graphics Gems IV - "Voxel Traversal along a 3D Line"!
-// This (Amanatides & Woo) varient is from another shader on here, but with some calculations removed,
-// and the distance value fixed.
-// I had to use voxels as standard distance fields don't work for perfectly aligned cubes.
-
-float VoxelTrace(vec3 ro, vec3 rd, out bool hit, out vec3 hitNormal, out vec3 pos)
-{
-    const int maxSteps = 41;
-    vec3 voxel = floor(ro)+.5001;
-    vec3 step = sign(rd);
-	//voxel = voxel - vec3(rd.x > 0.0, rd.y > 0.0, rd.z > 0.0);
-    vec3 tMax = (voxel - ro) / rd;
-    vec3 tDelta = 1.0 / abs(rd);
-    vec3 hitVoxel = voxel;
-    
-	
-    hit = false;
-	
-    float hitT = 0.0;
-    for(int i=0; i < maxSteps; i++)
-	{
-		if (!hit)
-		{
-			float d = PlayArea(voxel);        
-			if (d <= 0.0 && !hit)
-			{
-				hit = true;
-				hitVoxel = voxel;
-				break;
-			}
-			bool c1 = tMax.x < tMax.y;
-			bool c2 = tMax.x < tMax.z;
-			bool c3 = tMax.y < tMax.z;
-			if (c1 && c2) 
-			{ 
-				voxel.x += step.x;
-				tMax.x += tDelta.x;
-				if (!hit) 
-				{
-					hitNormal = vec3(-step.x, 0.0, 0.0);
-					hitT = tMax.x-tDelta.x;
-                    
-				}
-			} else if (c3 && !c1) 
-			{
-				voxel.y += step.y;
-				tMax.y += tDelta.y;
-				if (!hit) 
-				{
-					hitNormal = vec3(0.0, -step.y, 0.0);	
-					hitT = tMax.y-tDelta.y;
-				}
-			} else
-			{
-				voxel.z += step.z;
-				tMax.z += tDelta.z;
-				if (!hit) 
-				{
-					hitNormal = vec3(0.0, 0.0, -step.z);		
-					hitT = tMax.z-tDelta.z;
-				}
-			}
-		}
-    }
-	
-	if (hit)
-	{
-		if (hitVoxel.x > 1.75 || hitVoxel.z < -1.75 || hitVoxel.y < -3.5)
-		{
-			hit = false;
-			hitT = 1000.0;
-		}
-	}
-	pos = ro + hitT * rd;
-	return hitT;
-}
-
-//--------------------------------------------------------------------------------------------
-// Do all the ray casting for voxels and normal distance fields...
-float TraceEverything(vec3 ro,vec3 rd, out int material, out vec3 hitNormal, out vec3 pos)
-{
-	bool hit1;
-	int hit2;
-	vec3 pos2;
-    float dist = VoxelTrace(ro, rd, hit1, hitNormal, pos);
-	float dist2 = DistanceFields(ro, rd, hit2, pos2);
-	if (hit2 > 0 && dist2 < dist)
-	{
-		hitNormal = SceneNormal(pos2);
-		pos = pos2;
-		material = hit2+1;
-	}else
-	if (hit1)
-	{
-		material = 1;
-	}else
-	{
-		material = 0;
-	}
-	return dist;
-}
-
-//--------------------------------------------------------------------------------------------
-int TraceShadow(vec3 ro, vec3 rd)
-{
-	int hit;
-	vec3 pos;
-	float dist2 = DistanceFields(ro, rd, hit, pos);
-	return hit;
-}
-
-//--------------------------------------------------------------------------------------------
-vec3 DoMaterialRGB(int m, vec3 pos, vec3 norm, vec3 rd)
-{
-	vec3 rgb;
-	if (m == 1)
-	{
-		rgb = LightCubes(pos, norm);
-	}else
-	if (m >= 2)
-	{
-		rgb = LightCharacters(pos, norm, rd, m);
-	}else
-	{
-		rgb = mix(vec3(.0, .05, .1), vec3(0.4, 0.6, .8), abs(rd.y*1.));
-    }
-	return rgb;
-}
-
-//--------------------------------------------------------------------------------------------
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	// For Q*Bert's movement to loop properly they needed a direction table...
-	//	1	0
-	//	 \ /
-	//	  @
-	//	 / \
-	//	3	2
-	
-	DirTable[0] = 0; DirTable[1] = 2; DirTable[2] = 0; DirTable[3] = 2;
-	DirTable[4] = 0; DirTable[5] = 2; DirTable[6] = 0; DirTable[7] = 1;  DirTable[8] = 1; DirTable[9] = 3;  DirTable[10] = 1;
-	DirTable[11] = 1; DirTable[12] = 3; DirTable[13] = 3; DirTable[14] = 3;
-	DirTable[15] = 3; DirTable[16] = 2; DirTable[17] = 0; DirTable[18] = 0;
-	
-    time = iGlobalTime*1.8878;;
-        
-	vec2 pixel = (fragCoord.xy / iResolution.xy)*2.0-1.0;
-    float asp = iResolution.x / iResolution.y;
-    vec3 rd = normalize(vec3(asp*pixel.x, pixel.y-1.23, -3.5));
-    vec3 ro = vec3(-14.0, 6.3, 14.0);
-	// Rotate it to look at the plane
-	rd.xz = rotate2D(rd.xz, -(PI/4.0));
-
-	float sec, fra;
-	vec3 rgb;
-    vec3 norm, pos;
-	int material; 
-	vec3 pos1, pos2;
-	radius[0] = .4;
-	radius[1] = .33;
-	radius[2] = .25;
-	for (int i = 0; i < 3; i++)
-	{
-		sec = time * float(i+3) * .2;
-		fra = fract(sec);
-		sec = floor(sec);
-	
-		GetLocation(i, sec, pos1, pos2);
-		balls[i] = mix(pos1, pos2, fra);
-		balls[i].y += sin(fra*PI);
-		if (balls[i].y > -2.5)
-		{
-			float t = clamp(-fra*.75+1.3, 1.0, 1.3);
-			squish[i] = t;
-		}else
-		{
-			squish[i] = 1.0;
-		}
-	}
-	
-		
-	fra = fract(time*.8);
-	sec = floor(time*.8);
-	QbertRotation = GetQbertLocation(sec, pos1, pos2);
-	
-	float t = clamp(fra*.5, 0.0, 0.2)-.3;
-	squish[3] = t;
-	QbertPos = mix(pos1, pos2, fra); 
-	QbertPos.y += sin(fra*PI)+.5;
-
-
-	TraceEverything(ro, rd, material, norm, pos);
-	rgb = DoMaterialRGB(material, pos, norm, rd);
-	
-	// Do the shadow casting of the balls...
-	if (dot(norm, lightDir) > 0.1 && material > 0 && TraceShadow(pos+lightDir*.04, lightDir) != 0)
-	{
-		rgb *= .4;
-	}
-	
-	
-#ifdef REFLECTIONS_ON
-	if (material > 0 && material != 6)
-	{
-		ro = pos;
-		rd = ((-2.0*(dot(rd, norm))*norm)+rd);
-		TraceEverything(ro+rd*0.04, rd, material, norm, pos);
-		rgb = mix(rgb, DoMaterialRGB(material, pos, norm, rd), .13);
-	}
-#endif	
-	
-	// Curve the brightness a little...
-	rgb = pow(rgb, vec3(.8, .8, .8));
-
-    fragColor=vec4(rgb, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dave_hoskins-ribbon-assault.slang b/procedural/dave_hoskins-ribbon-assault.slang
deleted file mode 100644
index 35155fb38b..0000000000
--- a/procedural/dave_hoskins-ribbon-assault.slang
+++ /dev/null
@@ -1,74 +0,0 @@
-#version 450
-// Ribbon Assault -  2014-02-26
-// https://www.shadertoy.com/view/MdBGDK
-
-// Inspired by the 'Kali2 scope' - https://www.shadertoy.com/view/lsBGWK
-// Should be fast full-screen for everybody. : )
-// Use mouse for manual movement.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    float gTime = iGlobalTime+11.0;
-
-    float f = 3., g = 3.;
-	vec2 res = iResolution.xy;
-#ifdef MOUSE
-	vec2 mou = iMouse.xy;
-	if (iMouse.z < 0.5)
-	{
-		mou = vec2(sin(gTime * .3)*sin(gTime * .17) * 1. + sin(gTime * .3),(1.0-cos(gTime * .632))*sin(gTime * .131)*1.0+cos(gTime * .3));
-		mou = (mou+1.0) * res;
-	}
-#else
-   vec2 mou = vec2(0.0, 0.0);
-   mou = vec2(sin(gTime * .3)*sin(gTime * .17) * 1. + sin(gTime * .3),(1.0-cos(gTime * .632))*sin(gTime * .131)*1.0+cos(gTime * .3));
-   mou = (mou+1.0) * res;
-#endif
-	vec2 z = ((-res+2.0 * fragCoord.xy) / res.y);
-	vec2 p = ((-res+2.0+mou) / res.y);
-	for( int i = 0; i < 20; i++) 
-	{
-		float d = dot(z,z);
-		z = (vec2( z.x, -z.y ) / d) + p; 
-		z.x =  abs(z.x);
-		f = max( f, (dot(z-p,z-p) ));
-		g = min( g, sin(dot(z+p,z+p))+1.0);
-	}
-	f = abs(-log(f) / 3.5);
-	g = abs(-log(g) / 8.0);
-	fragColor = vec4(min(vec3(g, g*f, f), 1.0),1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dave_hoskins-rolling-hills.slang b/procedural/dave_hoskins-rolling-hills.slang
deleted file mode 100644
index 0a5deea8ba..0000000000
--- a/procedural/dave_hoskins-rolling-hills.slang
+++ /dev/null
@@ -1,425 +0,0 @@
-#version 450
-// Rolling Hills -  2013-07-29
-// https://www.shadertoy.com/view/Xsf3zX
-// Grassy fields. Ray marches a ray to a smooth hill, then enters detailed stepping through a grass like distance, erm, field. 
-// Now uses eiffie's 'Circle of Confusion' function for blurred ray marching into the grass.
-// Thanks eiffie!
-
-// Rolling hills. By David Hoskins, November 2013.
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-// https://www.shadertoy.com/view/Xsf3zX
-
-// v.2.00 Uses eiffie's 'Circle of Confusion' function
-//		  for blurred ray marching into the grass.
-// v.1.02 Camera aberrations.
-// v.1.01 Added better grass, with wind movement.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// For red/cyan 3D...
-//#define STEREO
-
-#define MOD2 vec2(3.07965, 7.4235)
-float PI  = 4.0*atan(1.0);
-vec3 sunLight  = normalize( vec3(  0.35, 0.2,  0.3 ) );
-vec3 cameraPos;
-vec3 sunColour = vec3(1.0, .75, .6);
-const mat2 rotate2D = mat2(1.932, 1.623, -1.623, 1.952);
-float gTime = 0.0;
-
-//--------------------------------------------------------------------------
-// Noise functions...
-float Hash( float p )
-{
-	vec2 p2 = fract(vec2(p) / MOD2);
-    p2 += dot(p2.yx, p2.xy+19.19);
-	return fract(p2.x * p2.y);
-}
-
-//--------------------------------------------------------------------------
-float Hash(vec2 p)
-{
-	p  = fract(p / MOD2);
-    p += dot(p.xy, p.yx+19.19);
-    return fract(p.x * p.y);
-}
-
-
-//--------------------------------------------------------------------------
-float Noise( in vec2 x )
-{
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float n = p.x + p.y*57.0;
-    float res = mix(mix( Hash(n+  0.0), Hash(n+  1.0),f.x),
-                    mix( Hash(n+ 57.0), Hash(n+ 58.0),f.x),f.y);
-    return res;
-}
-
-vec2 Voronoi( in vec2 x )
-{
-	vec2 p = floor( x );
-	vec2 f = fract( x );
-	float res=100.0,id;
-	for( int j=-1; j<=1; j++ )
-	for( int i=-1; i<=1; i++ )
-	{
-		vec2 b = vec2( float(i), float(j) );
-		vec2 r = vec2( b ) - f  + Hash( p + b );
-		float d = dot(r,r);
-		if( d < res )
-		{
-			res = d;
-			id  = Hash(p+b);
-		}			
-    }
-	return vec2(max(.4-sqrt(res), 0.0),id);
-}
-
-
-//--------------------------------------------------------------------------
-vec2 Terrain( in vec2 p)
-{
-	float type = 0.0;
-	vec2 pos = p*0.003;
-	float w = 50.0;
-	float f = .0;
-	for (int i = 0; i < 3; i++)
-	{
-		f += Noise(pos) * w;
-		w = w * 0.62;
-		pos *= 2.5;
-	}
-
-	return vec2(f, type);
-}
-
-//--------------------------------------------------------------------------
-vec2 Map(in vec3 p)
-{
-	vec2 h = Terrain(p.xz);
-    return vec2(p.y - h.x, h.y);
-}
-
-//--------------------------------------------------------------------------
-float FractalNoise(in vec2 xy)
-{
-	float w = .7;
-	float f = 0.0;
-
-	for (int i = 0; i < 3; i++)
-	{
-		f += Noise(xy) * w;
-		w = w*0.6;
-		xy = 2.0 * xy;
-	}
-	return f;
-}
-
-//--------------------------------------------------------------------------
-// Grab all sky information for a given ray from camera
-vec3 GetSky(in vec3 rd)
-{
-	float sunAmount = max( dot( rd, sunLight), 0.0 );
-	float v = pow(1.0-max(rd.y,0.0),6.);
-	vec3  sky = mix(vec3(.1, .2, .3), vec3(.32, .32, .32), v);
-	sky = sky + sunColour * sunAmount * sunAmount * .25;
-	sky = sky + sunColour * min(pow(sunAmount, 800.0)*1.5, .3);
-	return clamp(sky, 0.0, 1.0);
-}
-
-//--------------------------------------------------------------------------
-// Merge grass into the sky background for correct fog colouring...
-vec3 ApplyFog( in vec3  rgb, in float dis, in vec3 dir)
-{
-	float fogAmount = clamp(dis*dis* 0.0000012, 0.0, 1.0);
-	return mix( rgb, GetSky(dir), fogAmount );
-}
-
-//--------------------------------------------------------------------------
-vec3 DE(vec3 p)
-{
-	float base = Terrain(p.xz).x - 1.9;
-	float height = Noise(p.xz*2.0)*.75 + Noise(p.xz)*.35 + Noise(p.xz*.5)*.2;
-	//p.y += height;
-	float y = p.y - base-height;
-	y = y*y;
-	vec2 ret = Voronoi((p.xz*2.5+sin(y*4.0+p.zx*12.3)*.12+vec2(sin(iGlobalTime*2.3+1.5*p.z),sin(iGlobalTime*3.6+1.5*p.x))*y*.5));
-	float f = ret.x * .6 + y * .58;
-	return vec3( y - f*1.4, clamp(f * 1.5, 0.0, 1.0), ret.y);
-}
-
-//--------------------------------------------------------------------------
-// eiffie's code for calculating the aperture size for a given distance...
-float CircleOfConfusion(float t)
-{
-	return max(t * .04, (2.0 / iResolution.y) * (1.0+t));
-}
-
-//--------------------------------------------------------------------------
-float Linstep(float a, float b, float t)
-{
-	return clamp((t-a)/(b-a),0.,1.);
-}
-
-//--------------------------------------------------------------------------
-vec3 GrassBlades(in vec3 rO, in vec3 rD, in vec3 mat, in float dist)
-{
-	float d = 0.0;
-	// Only calculate cCoC once is enough here...
-	float rCoC = CircleOfConfusion(dist*.3);
-	float alpha = 0.0;
-	
-	vec4 col = vec4(mat*0.15, 0.0);
-
-	for (int i = 0; i < 15; i++)
-	{
-		if (col.w > .99) break;
-		vec3 p = rO + rD * d;
-		
-		vec3 ret = DE(p);
-		ret.x += .5 * rCoC;
-
-		if (ret.x < rCoC)
-		{
-			alpha = (1.0 - col.y) * Linstep(-rCoC, rCoC, -ret.x);//calculate the mix like cloud density
-			// Mix material with white tips for grass...
-			vec3 gra = mix(mat, vec3(.35, .35, min(pow(ret.z, 4.0)*35.0, .35)), pow(ret.y, 9.0)*.7) * ret.y;
-			col += vec4(gra * alpha, alpha);
-		}
-		d += max(ret.x * .7, .1);
-	}
-	if(col.w < .2)
-		col.xyz = vec3(0.1, .15, 0.05);
-	return col.xyz;
-}
-
-//--------------------------------------------------------------------------
-// Calculate sun light...
-void DoLighting(inout vec3 mat, in vec3 pos, in vec3 normal, in vec3 eyeDir, in float dis)
-{
-	float h = dot(sunLight,normal);
-	mat = mat * sunColour*(max(h, 0.0)+.2);
-}
-
-//--------------------------------------------------------------------------
-vec3 TerrainColour(vec3 pos, vec3 dir,  vec3 normal, float dis, float type)
-{
-	vec3 mat;
-	if (type == 0.0)
-	{
-		// Random colour...
-		mat = mix(vec3(.0,.3,.0), vec3(.2,.3,.0), Noise(pos.xz*.025));
-		// Random shadows...
-		float t = FractalNoise(pos.xz * .1)+.5;
-		// Do grass blade tracing...
-		mat = GrassBlades(pos, dir, mat, dis) * t;
-		DoLighting(mat, pos, normal,dir, dis);
-	}
-	mat = ApplyFog(mat, dis, dir);
-	return mat;
-}
-
-//--------------------------------------------------------------------------
-// Home in on the surface by dividing by two and split...
-float BinarySubdivision(in vec3 rO, in vec3 rD, float t, float oldT)
-{
-	float halfwayT = 0.0;
-	for (int n = 0; n < 5; n++)
-	{
-		halfwayT = (oldT + t ) * .5;
-		if (Map(rO + halfwayT*rD).x < .05)
-		{
-			t = halfwayT;
-		}else
-		{
-			oldT = halfwayT;
-		}
-	}
-	return t;
-}
-
-//--------------------------------------------------------------------------
-bool Scene(in vec3 rO, in vec3 rD, out float resT, out float type )
-{
-    float t = 5.;
-	float oldT = 0.0;
-	float delta = 0.;
-	vec2 h = vec2(1.0, 1.0);
-	bool hit = false;
-	for( int j=0; j < 70; j++ )
-	{
-	    vec3 p = rO + t*rD;
-		h = Map(p); // ...Get this position's height mapping.
-
-		// Are we inside, and close enough to fudge a hit?...
-		if( h.x < 0.05)
-		{
-			hit = true;
-            break;
-		}
-	        
-		delta = h.x + (t*0.03);
-		oldT = t;
-		t += delta;
-	}
-    type = h.y;
-    resT = BinarySubdivision(rO, rD, t, oldT);
-	return hit;
-}
-
-//--------------------------------------------------------------------------
-vec3 CameraPath( float t )
-{
-	//t = time + t;
-    vec2 p = vec2(200.0 * sin(3.54*t), 200.0 * cos(2.0*t) );
-	return vec3(p.x+55.0,  12.0+sin(t*.3)*6.5, -94.0+p.y);
-} 
-
-//--------------------------------------------------------------------------
-vec3 PostEffects(vec3 rgb, vec2 xy)
-{
-	// Gamma first...
-	rgb = pow(rgb, vec3(0.45));
-	
-	// Then...
-	#define CONTRAST 1.1
-	#define SATURATION 1.3
-	#define BRIGHTNESS 1.3
-	rgb = mix(vec3(.5), mix(vec3(dot(vec3(.2125, .7154, .0721), rgb*BRIGHTNESS)), rgb*BRIGHTNESS, SATURATION), CONTRAST);
-	// Vignette...
-	rgb *= .4+0.5*pow(40.0*xy.x*xy.y*(1.0-xy.x)*(1.0-xy.y), 0.2 );	
-	return rgb;
-}
-
-//--------------------------------------------------------------------------
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-#ifdef MOUSE
-	float m = (iMouse.x/iResolution.x)*300.0;
-##else
-	float m = (0.0/iResolution.x)*300.0;
-#endif
-	float gTime = (iGlobalTime*5.0+m+2352.0)*.006;
-    vec2 xy = fragCoord.xy / iResolution.xy;
-	vec2 uv = (-1.0 + 2.0 * xy) * vec2(iResolution.x/iResolution.y,1.0);
-	vec3 camTar;
-	
-	if (xy.y < .13 || xy.y >= .87)
-	{
-		// Top and bottom cine-crop - what a waste! :)
-		fragColor=vec4(vec4(0.0));
-		return;
-	}
-
-	#ifdef STEREO
-	float isCyan = mod(fragCoord.x + mod(fragCoord.y,2.0),2.0);
-	#endif
-
-	cameraPos = CameraPath(gTime + 0.0);
-    cameraPos.x -= 3.0;
-	camTar	 = CameraPath(gTime + .009);
-	cameraPos.y += Terrain(CameraPath(gTime + .009).xz).x;
-	camTar.y = cameraPos.y;
-	
-	float roll = .4*sin(gTime+.5);
-	vec3 cw = normalize(camTar-cameraPos);
-	vec3 cp = vec3(sin(roll), cos(roll),0.0);
-	vec3 cu = cross(cw,cp);
-	vec3 cv = cross(cu,cw);
-	vec3 dir = normalize(uv.x*cu + uv.y*cv + 1.3*cw);
-	mat3 camMat = mat3(cu, cv, cw);
-
-	#ifdef STEREO
-	cameraPos += .85*cu*isCyan; // move camera to the right - the rd vector is still good
-	#endif
-
-	vec3 col;
-	float distance;
-	float type;
-	if( !Scene(cameraPos, dir, distance, type) )
-	{
-		// Missed scene, now just get the sky...
-		col = GetSky(dir);
-	}
-	else
-	{
-		// Get world coordinate of landscape...
-		vec3 pos = cameraPos + distance * dir;
-		// Get normal from sampling the high definition height map
-		// Use the distance to sample larger gaps to help stop aliasing...
-		vec2 p = vec2(0.1, 0.0);
-		vec3 nor  	= vec3(0.0,		Terrain(pos.xz).x, 0.0);
-		vec3 v2		= nor-vec3(p.x,	Terrain(pos.xz+p).x, 0.0);
-		vec3 v3		= nor-vec3(0.0,	Terrain(pos.xz-p.yx).x, -p.x);
-		nor = cross(v2, v3);
-		nor = normalize(nor);
-
-		// Get the colour using all available data...
-		col = TerrainColour(pos, dir, nor, distance, type);
-	}
-	
-	// bri is the brightness of sun at the centre of the camera direction.
-	// Yeah, the lens flares is not exactly subtle, but it was good fun making it.
-	float bri = dot(cw, sunLight)*.75;
-	if (bri > 0.0)
-	{
-		vec2 sunPos = vec2( dot( sunLight, cu ), dot( sunLight, cv ) );
-		vec2 uvT = uv-sunPos;
-		uvT = uvT*(length(uvT));
-		bri = pow(bri, 6.0)*.8;
-
-		// glare = the red shifted blob...
-		float glare1 = max(dot(normalize(vec3(dir.x, dir.y+.3, dir.z)),sunLight),0.0)*1.4;
-		// glare2 is the yellow ring...
-		float glare2 = max(1.0-length(uvT+sunPos*.5)*4.0, 0.0);
-		uvT = mix (uvT, uv, -2.3);
-		// glare3 is a purple splodge...
-		float glare3 = max(1.0-length(uvT+sunPos*5.0)*1.2, 0.0);
-
-		col += bri * vec3(1.0, .0, .0)  * pow(glare1, 12.5)*.05;
-		col += bri * vec3(1.0, 1.0, 0.2) * pow(glare2, 2.0)*2.5;
-		col += bri * sunColour * pow(glare3, 2.0)*3.0;
-	}
-	col = PostEffects(col, xy);	
-	
-	#ifdef STEREO	
-	col *= vec3( isCyan, 1.0-isCyan, 1.0-isCyan );	
-	#endif
-	
-	fragColor=vec4(col,1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dave_hoskins-skin-peeler.slang b/procedural/dave_hoskins-skin-peeler.slang
deleted file mode 100644
index 27faf1ee8e..0000000000
--- a/procedural/dave_hoskins-skin-peeler.slang
+++ /dev/null
@@ -1,283 +0,0 @@
-#version 450
-// Skin peeler -  2015-08-19
-// https://www.shadertoy.com/view/XtfSWX
-
-// Skin peeler
-// by Dave Hoskins
-// Originally from Xyptonjtroz by nimitz (twitter: @stormoid)
-// Edited by Dave Hoskins, by changing atmosphere with quite a few lighting changes & added audio
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define ITR 100
-#define FAR 30.
-#define time iGlobalTime
-
-/*
-	Believable animated volumetric dust storm in 7 samples,
-	blending each layer in based on geometry distance allows to
-	render it without visible seams. 3d Triangle noise is 
-	used for the dust volume.
-
-	Further explanation of the dust generation...
-		
-	The basic idea is to have layers of gradient shaded volumetric
-	animated noise. The problem is when geometry is intersected
-	before the ray reaches the far plane. A way to smoothly blend
-	the low sampled noise is needed.  So I am blending (smoothstep)
-	each dust layer based on current ray distance and the solid 
-	interesction distance. I am also scaling the noise taps	as a 
-	function of the current distance so that the distant dust doesn't
-	appear too noisy and as a function of current height to get some
-	"ground hugging" effect.
-	
-*/
-
-#define MOD3 vec3(.16532,.17369,.15787)
-mat2 mm2(in float a){float c = cos(a), s = sin(a);return mat2(c,s,-s,c);}
-
-float height(in vec2 p)
-{
-    p *= 0.2;
-    return sin(p.y)*0.4 + sin(p.x)*0.4;
-}
-
-//smooth min form iq
-float smin( float a, float b)
-{
-    const float k = 0.7;
-	float h = clamp( 0.5 + 0.5*(b-a)/k, 0.0, 1.0 );
-	return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-///  2 out, 2 in...
-vec2 hash22(vec2 p)
-{
-	vec3 p3 = fract(vec3(p.xyx) * MOD3);
-    p3 += dot(p3.zxy, p3.yxz+19.19);
-    return fract(vec2(p3.x * p3.y, p3.z*p3.x));
-}
-
-float vine(vec3 p, in float c, in float h)
-{
-    p.y += sin(p.z*.5625+1.3)*1.5-.5;
-    p.x += cos(p.z*.4575)*1.;
-    //p.z -=.3;
-    vec2 q = vec2(mod(p.x, c)-c/2., p.y);
-    return length(q) - h -sin(p.z*3.+sin(p.x*7.)*0.5+time)*0.13;
-}
-
-float map(vec3 p)
-{
-    p.y += height(p.zx);
-    
-    vec3 bp = p;
-    vec2 hs = hash22(floor(p.zx/4.));
-    p.zx = mod(p.zx,4.)-2.;
-    
-    float d = p.y+0.5;
-    p.y -= hs.x*0.4-0.15;
-    p.zx += hs*1.3;
-    d = smin(d, length(p)-hs.x*0.4);
-    
-    d = smin(d, vine(bp+vec3(1.8,0.,0),15.,.8) );
-    d = smin(d, vine(bp.zyx+vec3(0.,0,17.),20.,0.75) );
-    
-    return d*1.1;
-}
-
-float march(in vec3 ro, in vec3 rd)
-{
-	float precis = 0.002;
-    float h=precis*2.0;
-    float d = 0.;
-    for( int i=0; i<ITR; i++ )
-    {
-        if( abs(h)<precis || d>FAR ) break;
-        d += h;
-	   	h = map(ro+rd*d);
-        
-    }
-	return d;
-}
-
-float tri(in float x){return abs(fract(x)-.5);}
-vec3 tri3(in vec3 p){return vec3( tri(p.z+tri(p.y*1.)), tri(p.z+tri(p.x*1.)), tri(p.y+tri(p.x*1.)));}
-                                 
-mat2 m2 = mat2(0.970,  0.242, -0.242,  0.970);
-
-float triNoise3d(in vec3 p)
-{
-    float z=1.4;
-	float rz = 0.;
-    vec3 bp = p;
-	for (float i=0.; i<=3.; i++ )
-	{
-        vec3 dg = tri3(bp);
-        p += (dg);
-
-        bp *= 2.;
-		z *= 1.5;
-		p *= 1.2;
-        //p.xz*= m2;
-        
-        rz+= (tri(p.z+tri(p.x+tri(p.y))))/z;
-        bp += 0.14;
-	}
-	return rz;
-}
-
-float fogmap(in vec3 p, in float d)
-{
-   p.x += time;
-   p.z += time*.5;
-    
-    return triNoise3d(p*2.2/(d+8.0))*(smoothstep(.7,.0,p.y));
-}
-
-vec3 fog(in vec3 col, in vec3 ro, in vec3 rd, in float mt)
-{
-    float d = .5;
-    for(int i=0; i<7; i++)
-    {
-        vec3  pos = ro + rd*d;
-        float rz = fogmap(pos, d);
-        col = mix(col,vec3(.85, .65, .5),clamp(rz*smoothstep(d,d*1.8,mt),0.,1.) );
-        d *= 1.8;
-        if (d>mt)break;
-    }
-    return col;
-}
-
-vec3 normal(in vec3 p)
-{  
-    vec2 e = vec2(-1., 1.)*0.005;   
-	return normalize(e.yxx*map(p + e.yxx) + e.xxy*map(p + e.xxy) + 
-					 e.xyx*map(p + e.xyx) + e.yyy*map(p + e.yyy) );   
-}
-
-float bnoise(in vec3 p)
-{
-    float n = sin(triNoise3d(p*3.)*7.)*0.4;
-    n += sin(triNoise3d(p*1.5)*7.)*0.2;
-    return (n*n)*0.01;
-}
-
-vec3 bump(in vec3 p, in vec3 n, in float ds)
-{
-    vec2 e = vec2(.005,0);
-    float n0 = bnoise(p);
-    vec3 d = vec3(bnoise(p+e.xyy)-n0, bnoise(p+e.yxy)-n0, bnoise(p+e.yyx)-n0)/e.x;
-    n = normalize(n-d*2.5/sqrt(ds));
-    return n;
-}
-
-float shadow(in vec3 ro, in vec3 rd, in float mint, in float tmax)
-{
-	float res = 1.0;
-    float t = mint;
-    for( int i=0; i<20; i++ )
-    {
-		float h = map(ro + rd*t);
-        res = min( res, 4.*h/t );
-        t += clamp( h, 0.2, 1.5 );
-            }
-    return clamp( res, 0.0, 1.0 );
-
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-
-{	
-	vec2 p = fragCoord.xy/iResolution.xy-0.5;
-    vec2 q = fragCoord.xy/iResolution.xy;
-	p.x*=iResolution.x/iResolution.y;
-#ifdef MOUSE
-    vec2 mo = iMouse.xy / iResolution.xy-.5;
-#else
-    vec2 mo = 0.0 / iResolution.xy-.5;
-#endif
-    mo = (mo==vec2(-.5))?mo=vec2(-0.1,0.07):mo;
-	mo.x *= iResolution.x/iResolution.y;
-	
-	vec3 ro = vec3(smoothstep(0.,1.,tri(time*.6)*2.)*0.1, smoothstep(0.,1.,tri(time*1.2)*2.)*0.05, -time*0.6);
-    ro.y -= height(ro.zx)+0.07;
-    mo.x += smoothstep(0.7,1.,sin(time*.35))-1.5 - smoothstep(-.7,-1.,sin(time*.35));
- 
-    vec3 eyedir = normalize(vec3(cos(mo.x),mo.y*2.-0.2+sin(time*.75*1.37)*0.15,sin(mo.x)));
-    vec3 rightdir = normalize(vec3(cos(mo.x+1.5708),0.,sin(mo.x+1.5708)));
-    vec3 updir = normalize(cross(rightdir,eyedir));
-	vec3 rd=normalize((p.x*rightdir+p.y*updir)*1.+eyedir);
-	
-    vec3 ligt = normalize( vec3(.5, .5, -.2) );
-    
-	float rz = march(ro,rd);
-	
-    vec3 fogb = mix(vec3(.5, .4,.4), vec3(1.,.9,.8), min(pow(max(dot(rd,ligt), 0.0), 1.5)*1.25, 1.0));
-    vec3 col = fogb;
-    
-    if ( rz < FAR )
-    {
-        vec3 pos = ro+rz*rd;
-        vec3 nor= normal( pos );
-        float d = distance(pos,ro);
-        nor = bump(pos,nor,d);
-        float shd = shadow(pos,ligt,0.1,3.);
-        float dif = clamp( dot( nor, ligt ), 0.0, 1.0 )*shd;
-        float spe = pow(clamp( dot( reflect(rd,nor), ligt ), 0.0, 1.0 ),3.)*shd;
-        float fre = pow( clamp(1.0+dot(nor,rd),0.0,1.0), 1.5 );
-        vec3 brdf = dif*vec3(1.00)+abs(nor.y)*.4;
-        col = clamp(mix(vec3(.7,0.4,.3),vec3(.3, 0.1, 0.1),(pos.y+.5)*.25), .0, 1.0);
-        col *= (sin(bnoise(pos*.1)*250.)*0.5+0.5);
-        col = col*brdf + spe*fre;// + fre*vec3(.4,.4,0.4)*.5*crv;
-    }
-    
-    //ordinary distance fog first
-    col = mix(col, fogb, smoothstep(FAR-10.,FAR,rz));
-    
-    //then volumetric fog
-    col = fog(col, ro, rd, rz);
-    
-    //post...
-
-	col = pow(col,vec3(0.8));
-    col = smoothstep(0.0, 1.0, col);
-    
-    col *= .5+.5*pow(70. *q.x*q.y*(1.0-q.x)*(1.0-q.y), .2);
-    
-    
-	fragColor = vec4( col  * smoothstep(0.0, 3.0, time), 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/davidbargo-sg15-midgar.slang b/procedural/davidbargo-sg15-midgar.slang
deleted file mode 100644
index 898074d520..0000000000
--- a/procedural/davidbargo-sg15-midgar.slang
+++ /dev/null
@@ -1,812 +0,0 @@
-#version 450
-// Fully procedural Midgar city from Final Fantasy VII
-// Created by David Bargo - davidbargo/2015
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define ITR 100
-#define FAR 150.
-#define PI 3.141592
-#define precis 0.001
-#define time iGlobalTime
-
-mat3 rot_x(float a)
-{
-    float sa = sin(a); 
-    float ca = cos(a); 
-    return mat3(1.,0.,0., 0.,ca,sa, 0.,-sa,ca);
-}
-
-mat3 rot_z(float a)
-{
-    float sa = sin(a); 
-    float ca = cos(a); 
-    return mat3(ca,sa,0., -sa,ca,0., 0.,0.,1.);
-}
-
-//----------------------------------------------------------------------------------------
-// From Dave_Hoskins
-vec2 hash22(vec2 p){
-    p  = fract(p * vec2(5.3983, 5.4427));
-    p += dot(p.yx, p.xy +  vec2(21.5351, 14.3137));
-    return fract(vec2(p.x * p.y * 95.4337, p.x * p.y * 97.597));
-}
-
-vec3 hash33(vec3 p){
-    p  = fract(p * vec3(5.3983, 5.4427, 6.9371));
-    p += dot(p.yzx, p.xyz  + vec3(21.5351, 14.3137, 15.3219));
-    return fract(vec3(p.x * p.z * 95.4337, p.x * p.y * 97.597, p.y * p.z * 93.8365));
-}
-
-float hash12(vec2 p)
-{
-    p  = fract(p * vec2(443.8975,397.2973));
-    p += dot(p.xy, p.yx+19.19);
-    return fract(p.x * p.y);
-}
-//----------------------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------------------
-// Distance functions by iq
-float ssphere( vec3 p, float s )
-{
-  return length(p)-s;
-}
-
-float sbox( vec3 p, vec3 b )
-{
-  vec3 d = abs(p) - b;
-  return min(max(d.x,max(d.y,d.z)),0.0) + length(max(d,0.0));
-}
-
-float ubox( vec3 p, vec3 b )
-{
-  return length(max(abs(p)-b,0.0));
-}
-
-float urbox( vec3 p, vec3 b, float r )
-{
-  return length(max(abs(p)-b,0.0))-r;
-}
-
-float cyl( vec3 p, vec2 h )
-{
-  vec2 d = abs(vec2(length(p.xz),p.y)) - h;
-  return min(max(d.x,d.y),0.0) + length(max(d,0.0));
-}
-
-float caps( vec3 p, vec3 a, vec3 b, float r )
-{
-    vec3 pa = p - a, ba = b - a;
-    float h = clamp( dot(pa,ba)/dot(ba,ba), 0.0, 1.0 );
-    return length( pa - ba*h ) - r;
-}
-
-float torus( vec3 p, vec2 t )
-{
-  return length( vec2(length(p.xz)-t.x,p.y) )-t.y;
-}
-
-float length8(vec2 p)
-{
-    p *= p;
-    p *= p;
-    return pow(dot(p, p), 0.125);
-}
-
-float tube( vec3 p, vec2 t )
-{
-  return length(vec2(length8(p.xz)-t.x,p.y))-t.y;
-}
-
-//----------------------------------------------------------------------------------------
-// From iq
-mat3 m = mat3( 0.00,  0.80,  0.60,
-              -0.80,  0.36, -0.48,
-              -0.60, -0.48,  0.64 );
-
-float hash( float n )
-{
-    return fract(sin(n)*43758.5453);
-}
-
-float noise( in vec3 x )
-{
-    vec3 p = floor(x);
-    vec3 f = fract(x);
-
-    f = f*f*(3.0-2.0*f);
-
-    float n = p.x + p.y*57.0 + 113.0*p.z;
-
-    float res = mix(mix(mix( hash(n+  0.0), hash(n+  1.0),f.x),
-                        mix( hash(n+ 57.0), hash(n+ 58.0),f.x),f.y),
-                    mix(mix( hash(n+113.0), hash(n+114.0),f.x),
-                        mix( hash(n+170.0), hash(n+171.0),f.x),f.y),f.z);
-    return res;
-}
-//----------------------------------------------------------------------------------------
-
-float fbm(vec3 p) 
-{
-    return 0.65*noise(p) + 0.35*noise(m*p*2.02);
-}
-
-
-float matid = 0.;
-float light = 0.;
-
-float map(vec3 p)
-{    
-    // center bottom
-    float mn2 = cyl(p+vec3(p.x*0.35, 0.0, 0.2-0.1*p.y), vec2(0.64,0.98));
-    matid = 1.;
-    
-    // center middle
-    float mn = cyl(p+vec3(p.x*0.5,-1.,0.2-0.1*p.y), vec2(0.4,0.45));
-    matid += step(mn, mn2);
-    mn2 = min(mn, mn2);
-    
-    // side towers
-    float signx = sign(-p.x);
-    float stw = mix(0.2, 0.24, smoothstep(0.65, 0.7, p.y));
-    stw = mix(stw, 0.2, smoothstep(0.9, 0.95, p.y));
-    stw = mix(stw, 0.24, smoothstep(1.15, 1.22, p.y));
-    mn = caps(p + vec3( signx*0.75, 2.,0.3), vec3(0.,0.0,0.), vec3(0.0,3.2,0.), stw);   
-    matid = mix(matid, 3., step(mn, mn2));
-    mn2 = min(mn, mn2);
-    
-    // top main
-    mn = urbox(p+vec3(0.,-2.64,-0.09), vec3(0.06, 0.39, 0.2), 0.1);
-    
-    // top support
-    mn = min(mn, urbox(p+ vec3(0.12*signx, -1.8,-0.21 - 0.2*smoothstep(2.2, 1.8,p.y)), vec3(-0.01, 1., 0.06), 0.05));
-    matid = mix(matid, 4., step(mn, mn2));
-    mn2 = min(mn, mn2);
-    
-    // polar coords
-    vec3 pc = vec3(length(p.xz)*0.5, p.y*0.5, atan(p.z,p.x) - PI/16.);
-    
-    // mini towers
-    vec3 ps = pc;
-    float mtl = step(-3.22, pc.z)*step(pc.z, -2.67);
-    ps.z = (0.5+0.5*sin((ps.z)*48. - 1.))*0.15;
-    ps.x += -.87;
-    ps.x*=2.;
-    mn = caps(ps, vec3(0.), mtl*vec3(0.0,0.23,0.0), 0.07*mtl);
-    ps.x += -.17;
-    mn = min(mn, caps(ps, vec3(0.), mtl*vec3(0.0,0.17,0.0), 0.07*mtl));
-    matid = mix(matid, 5., mtl*step(mn, mn2));
-    mn2 = min(mn, mn2);
-    
-    // small wall lights
-    ps = pc;
-    ps.z = (0.5+0.5*sin((ps.z)*40. - 2.3))*0.06;
-    ps.y -= 0.14;
-    float wlc = smoothstep(0.78, 0.68, ps.x);
-    ps.x += -0.69;
-    float ss = 0.06*smoothstep(0.06, 0.03, ps.x) - 0.025*wlc;
-    float sls = step(-1.65, pc.z)*step(pc.z, -1.46) + step(-2.45, pc.z)*step(pc.z, -1.95);
-    mn = ssphere(ps, ss*sls);
-    
-    // big wall lights
-    ps = pc;
-    ps.z = (0.5+0.5*sin((ps.z)*48. + 1.))*0.12;
-    ps.y -= 0.27;
-    float wl = smoothstep(2.01, 1.9, ps.x);
-    ps.x += -2. + 0.08*wl;
-    float sb = 0.1*smoothstep(0.08, 0.03, ps.x) - 0.025*wl;
-    float slb = step(2.215, abs(pc.z))*step(abs(pc.z), 2.495) + step(-0.14, pc.z)*step(pc.z, 0.15);
-    mn = min(mn, ssphere(ps, sb*slb) + FAR*(1. - slb));
-    
-    matid = mix(matid, 6., step(mn, mn2));
-    mn2 = min(mn, mn2);
-    
-    // platforms
-    vec3 pl = pc;
-    float plr = step(abs(pl.z + 0.6), 0.33);
-    pl.z = 0.5+0.5*sin((pl.z)*8. + PI);
-    
-    vec3 hashp = hash33(floor(p*7.)/7.);
-    vec2 polarhash = hash22(floor(pc.zz*8.)/8. + 0.75)*0.6;
-    float bra = smoothstep(0., 1.2, pc.x);
-    bra *= bra; bra *= bra; bra *= bra;
-    float br = step(0.15*bra*bra, abs(pc.z + 0.55 + 0.1*hashp.z));
-    float bdgs = hash12(floor(pc.xz*32.)/32.);
-    bdgs *= step(bdgs, 0.5)*0.04;
-    mn = sbox(pl + vec3(-2.8+mix(polarhash.x, 1.5, plr),0.0,-0.3),
-              br*vec3(2.15 - mix(polarhash.x, 1.5, plr), 0.05 + step(pc.x, 1.9)*bdgs, 0.6));
-    matid = mix(matid, 7., step(mn, mn2));
-    mn2 = min(mn, mn2);
-    
-    // wall columns
-    ps = pc;
-    ps.z = 0.5+0.5*sin((ps.z)*8.);
-    float w = smoothstep(0.57, 0., pc.y);
-    ps.x += -2.;
-    mn = max(urbox(ps, vec3(0.075+0.025*w,0.38,-0.06 + 0.05*w), 0.1), -urbox(ps, vec3(0.07, 1.,-0.048), 0.05));
-	matid = mix(matid, 8., step(mn, mn2));
-    mn2 = min(mn, mn2);
-    
-    // back main building
-    mn = sbox(p+vec3(0.,0.0,-0.25+0.1*p.y), vec3(0.472, 0.98, 0.34));
-    mn = min(mn, sbox(p+vec3(0.,-.81,-0.4+0.1*p.y), vec3(0.262, 0.64, 0.36)));
-    
-    // building center tubes
-    mn = min(mn, cyl(p+ vec3(0.34*signx, -1.1+0.6*abs(p.x), 0.3), vec2(0.07, 0.5)));
-    mn = min(mn, cyl(p+ vec3(0.35*signx, -1.05+0.6*abs(p.x), 0.15), vec2(0.07, 0.5)));
-    mn = min(mn, cyl(p+ vec3(0.36*signx, -1.+0.6*abs(p.x), 0.), vec2(0.07, 0.5)));
-    
-    // building center cylinder
-    float sinpx = sin(p.x*100.);
-    float tw = mix(0.2, 0.25 + 0.005*sinpx, smoothstep( -0.4, -0.35, p.x));
-    tw =       mix( tw, 0.3,                smoothstep(-0.25, -0.15, p.x));
-    tw =       mix( tw, 0.3  + 0.005*sinpx, smoothstep( 0.15,   0.3, p.x));
-    tw =       mix( tw, 0.2,                smoothstep(  0.3,  0.42, p.x));
-    
-    mn = min(mn, cyl(p.yxz+vec3(-1.8, 0., 0.1), vec2(tw, 0.45)));
-    
-    mn = min(mn, torus((p.xzy+vec3(-0.04, 0.1, -1.8))*rot_z(1.2), vec2(0.32, 0.044)));
-    
-    // building back
-    float ba = smoothstep(0.925, 0., p.y);
-    mn = min(mn, max( urbox(p+ vec3(0.2*signx, -0.9,-1.2 + ba*1.5),
-                             vec3(0.1-p.y*0.08, 0.45, 0.2 + ba*0.88), 0.1),
-                     -urbox(p+vec3(0.2*signx, -1.2, -1.2), vec3(0.02, 0.3, 0.15), 0.01))); // bottom back
-    mn = min(mn, cyl(p.yxz+vec3(-0.6, 0.28*signx, -1.), vec2(0.12,0.2))); // back tube
-    
-    vec3 pos = (p+ vec3(0.4*signx, -1.1,-0.58))*rot_x(-PI*0.22);
-    mn = min(mn, urbox(pos, vec3(-0.01, 0.66, 0.04 + 0.16*smoothstep(-0.85, 0.85, pos.y)), 0.05));
-       
-    pos = (p+vec3(0.,-1.95,-0.4))*rot_x(PI*0.15);
-    pos.z -= 0.2*smoothstep(0.5,0.0,pos.y);
-    mn = min(mn, urbox(pos, vec3(0.01, 0.76, 0.1 + 0.12*smoothstep(0.5,0.0, pos.y)), 0.1)); // top back
-    
-    mn = min(mn, urbox(p+vec3(0.,-2.94,-0.2), vec3(0.01, 0.4, 0.01), 0.001)); // antenna
-    
-    mn = min(mn, tube(p+vec3(-signx*0.25,-2.34 - 0.3*p.z*step(0., p.z),-0.2), vec2(0.5, 0.05)));
-    
-    // center tubes
-    mn = min(mn, tube(p.zxy+vec3(1.43 ,0., -0.1), vec2(0.4, 0.1))); //center
-    mn = min(mn, cyl(p+vec3(0.,0.,1.85), vec2(0.46, 0.22)));
-    mn = min(mn, cyl(p+vec3(0.,0.,1.85), vec2(0.24, 0.3)));
-    
-    mn = min(mn, tube((p.zxy+vec3(0.25 ,1.2, -0.1))*rot_z(PI/6.), vec2(0.4, 0.14))); // right 1  
-    mn = min(mn, tube((p.xzy+vec3(0.7 , -0.3, -0.1))*rot_z(-PI/8.), vec2(0.8, 0.1))); // right 2   
-    mn = min(mn, tube((p.xzy+vec3(0.5, -0.5, -0.4))*rot_z(-PI/4.), vec2(0.8, 0.1))); // right 3   
-    mn = min(mn, tube((p.xzy+vec3(-1., 1., -0.4))*rot_z(-PI/4.), vec2(0.4, 0.1))); // left 1
-    mn = min(mn, tube(p.xzy+vec3(-1.3, 0., -0.2), vec2(0.4, 0.08))); // left 2
-    
-    // back towers 
-    mn = min(mn,  cyl(p + vec3(0.76, 2., -0.3),   vec2(0.2-smoothstep(1.6, 2.1, p.y)*0.14, 4.0)));  
-    mn = min(mn,  cyl(p + vec3(0.64, 2., -0.64), vec2(0.2-smoothstep(1.8, 2.3, p.y)*0.14, 4.2)));
-    
-    // small platforms
-    float cp = step(-2., pc.z)*0.06;
-    mn = min(mn, ubox(pl + vec3(-0.83+cp,0.0,0.), vec3(0.17-cp,0.09*(step(pc.z, -0.1)+step(2.1, pc.z)),0.85)));
-    
-    // sectors walls
-    ps = pc;
-    ps.z = 0.5+0.5*sin((ps.z)*8. +0.7);
-    ps.x += -1.325;
-    mn = min(mn, sbox(ps, vec3(0.6,0.065+pc.x*0.052,0.02)));
-
-    ps.z = 0.5+0.5*sin((pc.z)*8. -0.7);
-    mn = min(mn, sbox(ps, vec3(0.6,0.065+pc.x*0.052,0.02)));
-    
-	// first wall
-    ps = pc;
-    ps.z = 0.;
-    ps.y += 1.;
-    ps.x += -0.65;  
-    mn = min(mn, urbox(ps, vec3(0.0,1.13,2.), 0.05));
-    
-    // second wall
-    ps = pc;
-    ps.z = 0.5+0.5*sin((ps.z)*72.);
-    ps.x += -2.;   
-    mn = min(mn, sbox(ps, br*vec3(0.1, min(0.25, 0.24 - ps.x*1.1), 0.993+2.*step(ps.y, 0.13))));
-    
-    // presecond wall
-    mn = min(mn, sbox(pl + vec3(-1.9,-0.06,-0.35), br*vec3(0.1, 0.005+pc.x*0.052+step(1.86, pc.x)*0.005, 0.6)));
-
-    // sectors connector tube
-    ps.x += 0.7;
-    ps.y += -0.02;
-    mn = min(mn, sbox(ps, br*vec3(0.03,0.03,2.)));
-    
-    matid = mix(matid, 0., step(mn, mn2));
-    return min(mn, mn2);
-}
-
-float march(in vec3 ro, in vec3 rd)
-{
-    float h=precis*2.0;
-    float d = 0.;
-    for( int i=0; i<ITR; i++ )
-    {
-        if( abs(h)<precis || d>FAR ) break;
-        d += h;
-        h = map(ro+rd*d);
-    }
-        
-    return d;
-}
-
-float smalllights(vec3 pc)
-{
-    vec3 ps = pc;
-    ps.z = (0.5+0.5*sin((ps.z)*40. - 2.3))*0.06;
-    ps.y -= 0.14;
-    float wlc = smoothstep(0.78, 0.68, ps.x);
-    ps.x += -0.69;
-    ps.x = min(ps.x-0.05, 0.);
-    float sc = step(-1.65, pc.z)*step(pc.z, -1.46) + step(-2.45, pc.z)*step(pc.z, -1.95);
-    return ssphere(ps, 0.02*(2.*sc -1.));
-}
-
-float biglights(vec3 pc)
-{
-    vec3 ps = pc;
-    ps.z = (0.5+0.5*sin((ps.z)*48. + 1.))*0.1;
-    ps.y -= 0.27;
-    float wl = smoothstep(1.62, 1.52, ps.x);
-    ps.x += -1.95 + 0.08*wl;
-    ps.x = min(ps.x-0.005, 0.);
-    
-    float sl = step(2.215, abs(pc.z))*step(abs(pc.z), 2.495) + step(-0.14, pc.z)*step(pc.z, 0.15);
-    return ssphere(ps, 0.04*(2.*sl -1.)+.01*(pc.x-1.95));
-}
-
-float lights(vec3 p)
-{
-    vec3 pc = vec3(length(p.xz)*0.5, p.y*0.5, atan(p.z,p.x) - PI/16.);
-    float sl = smalllights(pc);
-    
-    float bl = biglights(pc);
-    light = step(bl, sl);
-    
-    return min(bl, sl);
-}
-
-vec3 marchlights(in vec3 ro, in vec3 rd, float far)
-{
-    light = 0.;
-    
-    float h=precis*2.0;
-    float d = 0.;
-    for( int i=0; i<60; i++ )
-    {
-        if( abs(h)<precis || d>far ) break;
-        d += h;
-        h = lights(ro+rd*d);
-    }
-    
-    if (d < far)
-    {
-        vec3 lpos = (ro+rd*d);
-        float dist = length(lpos.xz);
-        
-        if (light == 0.)
-        {
-            float ld = precis*2.;
-            
-            for( int i=0; i<30; i++ )
-            {
-                if( h > precis*2.) break;
-                vec3 lposb = (lpos+rd*ld);
-                vec3 pc = vec3(length(lposb.xz)*0.5, lposb.y*0.5, atan(lposb.z,lposb.x) - PI/16.);
-                h = smalllights(pc);
-                ld += max(abs(h), precis*2.);
-            }
-			
-            light = smoothstep(2.2, 0., dist)*ld*ld*10.;
-        }
-        else if (light == 1.)
-        {
-            float ld = precis*2.;
-            
-            for( int i=0; i<40; i++ )
-            {
-                if( h > precis*2.) break;
-                vec3 lposb = (lpos+rd*ld);
-                vec3 pc = vec3(length(lposb.xz)*0.5, lposb.y*0.5, atan(lposb.z,lposb.x) - PI/16.);
-                h = biglights(pc);
-                ld += max(abs(h), precis*2.);
-            }
-			
-            light = smoothstep(6.7, 0., dist)*ld*ld*1.5;
-        }
-    }
-
-    return vec3(1.,1.,0.7)*fract(light);   
-}
-
-float makolight(vec3 p)
-{
-    p.y *= 0.3;
-    return ssphere(p, 1.15);
-}
-
-vec3 makocolor(vec3 p)
-{
-    float n = noise(p.xzz);
-        
-    vec3 pc = vec3(length(p.xz)*0.5, p.y, atan(p.z,p.x));
-	
-    float hl = mix(0.4, 1., smoothstep(-2.8, -2.7, pc.z));
-    hl = mix(hl, 0.4, smoothstep(-1.8, -1.65, pc.z));
-    hl = mix(hl, 1., smoothstep(-1.5, -1.4, pc.z));
-    hl = mix(hl, 0.6, smoothstep(-1., -0.9, pc.z));
-    hl = mix(hl, 1., smoothstep(-0.7, -0.6, pc.z));
-    hl = mix(hl, 0.5, smoothstep(-0.2, -0.05, pc.z));
-    hl = mix(hl, 1., smoothstep(0.05, 0.2, pc.z));
-    hl = mix(hl, 0.4, smoothstep(1., 1.2, pc.z));
-    hl = mix(hl, 0.9, smoothstep(1.9, 2.2, pc.z));
-    hl = mix(hl, 0.4, smoothstep(2.8, 3., pc.z));
-    
-    float intensity = 0.25*smoothstep((0.7+0.8*n)*hl, 0., p.y)*step(pc.x, 0.6);
-    
-
-    float mp = intensity*fbm(vec3(30.*p.x,1.5*p.y-2.*time,p.z*30.));
-    return mp*mix(vec3(0.0, 0.4, 0.8), 
-              mix(vec3(0.2, 0.9, 0.6), 
-                  vec3(0.5, 0.5, 0.0), smoothstep(0.3 + 0.3*n, 0.6 + 0.6*n, p.y)), smoothstep(-0.5, 0.3 + 0.3*n, p.y));
-
-}
-
-vec3 marchmako(in vec3 ro, in vec3 rd, float far)
-{
-    vec3 color = vec3(0.);
-    float h=precis*2.0;
-    float d = h;
-    
-    for( int i=0; i<50; i++ )
-    {
-        if( abs(h)<precis || d>far ) break;
-        d += h;
-        h = makolight(ro+rd*d);
-    }
-    
-    if (d < far)
-    {
-        color = makocolor(ro+rd*d);
-            
-        // back face
-        d += h;
-        for(int i = 0; i < 50; i++)
-        {
-            if(h > precis*2. || d > far) break;           
-            h = makolight(ro+rd*d);
-            d += max(abs(h), precis*2.);
-        }
-        if (d < far) 
-        {
-            color += makocolor(ro+rd*d);
-        }
-    }
-        
-    return color;
-}
-
-float tex(in vec3 q)
-{
-    vec3 h = hash33(floor(q*4.)/4.);
-    return (h.x+h.y+h.z)*0.1;
-}
-
-float mapN(in vec3 p)
-{
-    float d= map(p);
-    d += tex(p*10.)*0.005;
-    return d;
-}
-
-vec3 normal(const in vec3 p)
-{  
-    vec2 e = vec2(-1., 1.)*0.008;
-	return normalize(e.yxx*mapN(p + e.yxx) + e.xxy*mapN(p + e.xxy) + 
-					 e.xyx*mapN(p + e.xyx) + e.yyy*mapN(p + e.yyy) );   
-}
-
-//from iq
-float getAO( in vec3 pos, in vec3 nor )
-{
-    float occ = 0.0;
-    float sca = 1.0;
-    for( int i=0; i<5; i++ )
-    {
-        float hr = 0.01 + 0.13*float(i)/3.;
-        vec3 aopos =  nor * hr + pos;
-        float dd = map( aopos );
-        occ += -(dd-hr)*sca;
-        sca *= 0.95;
-    }
-    return clamp( 1. - 3.5*occ, 0.0, 1.0 );    
-}
-
-vec3 shinralogo(vec2 pos, vec2 center, float size)
-{
-    vec2 absp = vec2(abs(pos.x - center.x), abs(pos.y - center.y)*1.3);
-    float clogo = step(size, absp.y + absp.x);
-    float blogo = step(absp.y, size*0.8)*step(absp.x, size*0.8);
-    vec3 col = vec3(step(absp.y, size)*step(absp.x, size));
-    col.r -= 0.8*clogo*blogo;
-    float gb = 1. - (1.-blogo)*clogo;
-    col.gb -= gb*step(2.*(pos.y - center.y) - absp.x*4., 0.4*size);
-    return clamp(col, 0., 1.);
-}
-
-float tri(in float x)
-{
-    return abs(fract(x)-.5);
-}
-
-// From nimitz
-vec3 stars(in vec3 p)
-{
-    vec3 c = vec3(0.);
-    
-    //Triangular deformation (used to break sphere intersection pattterns)
-    p.x += (tri(p.z*50.)+tri(p.y*50.))*0.006;
-    p.y += (tri(p.z*50.)+tri(p.x*50.))*0.006;
-    p.z += (tri(p.x*50.)+tri(p.y*50.))*0.006;
-    
-	for (float i=0.;i<2.;i++)
-    {
-        vec3 q = fract(p*250.)-0.5;
-        vec3 id = floor(p*250.);
-        float rn = hash33(id).z;
-        float c2 = 1.-smoothstep(-0.2,.4,length(q));
-        c2 *= step(rn,0.005+i*0.014);
-        c += c2*(mix(vec3(1.0,0.75,0.5),vec3(0.85,0.9,1.),rn*30.)*0.5 + 0.5);
-        p *= 1.15;
-    }
-    return c*c*smoothstep(-0.1, 0., p.y);
-}
-
-float platformTex(vec2 p)
-{
-	float hp = hash12(floor(p));
-    vec2 fp = fract(p);
-    
-    float s = sign(fp.x - hp);   
-    float ha = hash12(floor(p-vec2(s, 0.0)));
-    float hb = hash12(floor(p+vec2(0.0, s))) + s;
-    float hc = hash12(floor(p+vec2(s, s))) + s;
-    
-    vec2 p1 = vec2(hp, ha);
-    vec2 p2 = vec2(hb, hc);
-
-    vec2 sp = sign(p1 - p2);
-    vec2 sp1 = p1*sp;
-	vec2 sp2 = -p2*sp;
-    vec2 f = max(abs(fp - (p1+p2)*0.5) - (sp1+sp2)*0.5 + 0.033, 0.0);
-    return clamp(1.0 - dot(f, f)*1000., 0.0, 1.0);
-}
-
-vec3 cam()
-{
-    float t = time*0.25 - 0.5;
-    vec3 pos = vec3(-6.5, 7.3, -11.5);
-    pos = mix(pos, vec3(-6.5, 1.2, -3.2), smoothstep(1., 10., time));
-    pos = mix(pos, vec3(0., 3.5, -8.5), smoothstep(8., 18., time)); 
-    pos = mix(pos, vec3(9.5, 7.2, -2.5), smoothstep(16., 26., time));    
-    pos = mix(pos, vec3(9.5, 6.2, -2.5), smoothstep(25., 27., time));    
-    pos = mix(pos, vec3(4.5, 1., 4.5), smoothstep(29., 36., time));    
-    pos = mix(pos, vec3(-1., 1., 4.5), smoothstep(34., 42., time));
-    pos = mix(pos, vec3(13.*sin(t),8.+2.5*sin(t+0.1),-13.*cos(t)), smoothstep(40., 50., time));
-    
-    return pos;
-}
-
-vec3 target()
-{
-    vec3 ta = vec3(0.0,0.7,0.0);
-    ta = mix(ta, vec3(0.0,1.9,0.0), smoothstep(1., 10., time));
-    ta = mix(ta, vec3(0.0,1.6,0.0), smoothstep(9., 18., time));    
-    ta = mix(ta, vec3(0.0,1.,0.0), smoothstep(16., 26., time));    
-    ta = mix(ta, vec3(0.0,-1.,0.0), smoothstep(24., 27., time));   
-    ta = mix(ta, vec3(0.0,-3.,5.0), smoothstep(26.5, 30., time));  
-    ta = mix(ta, vec3(0.0,1.,4.0), smoothstep(30.5, 36., time));   
-    ta = mix(ta, vec3(-1.0,1.,0.0), smoothstep(34., 42., time));
-    ta = mix(ta, vec3(0.0,0.7,0.0), smoothstep(40., 50., time));
-    
-    return ta;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{   
-    vec2 p = fragCoord.xy/iResolution.xy-0.5;
-    p.x *= iResolution.x/iResolution.y;
-    
-    vec3 ro = cam();
-    vec3 ta = target();
-    vec3 ww = normalize( ta - ro );
-    vec3 uu = normalize( cross(ww,vec3(0.0,1.0,0.0) ) );
-    vec3 vv = normalize( cross(uu,ww));
-    vec3 rd = normalize( p.x*uu + p.y*vv + 2.0*ww );
-    
-    float d = march(ro,rd);
-    
-    vec3 col = stars(rd);
-     
-    if ( d < FAR )
-    {
-        vec3 pos = ro+d*rd;
-        float mid = matid;
-        vec3 nor = normal(pos);
-        
-        
-        vec3 pc = vec3(length(pos.xz), pos.y, atan(pos.z,pos.x) - PI/16.);
-        vec3 pl = pc;
-        pl.z = 0.5+0.5*sin(pl.z*8. + PI);
-          
-        vec3 lpos = vec3(0., 0.38, 0.);
-        lpos.xz = 1.25*normalize(pos.xz);
-        vec3 lt = (lpos - pos);
-        vec3 lgt = 0.15*lt;
-        
-        vec3 lgtp = (ta + 0.5*normalize(pos - ta) - pos)*0.5;
-        
-        float dif = clamp( dot( nor, lgt ), 0.0, 1.0 ) + 0.4*clamp( dot( nor, lgtp ), 0.0, 1.0 );
-        float spe = pow(clamp( dot( reflect(rd,nor), lgt ), 0.0, 1.0 ),7.);
-        float fre = pow( clamp(1.0+dot(nor,rd),0.0,1.0), 3.0 );
-        vec3 brdf = vec3(1.)*2.*dif;
-        
-        col = vec3(0.04,0.04,0.02);
-        
-        float ao = getAO(pos,nor);
-
-        if (mid == 1.)
-        {
-            col = col*brdf +.03*fre;
-            col *= ao;
-            
-            float l = 0.5 + 0.5*sin(pos.y*98.);
-            l *= l*step(pos.y, 0.95);
-            float h = hash12(floor(pos.xy*31.)/31.);
-            h = 0.9*step(0.7, h);
-            col += vec3(1. - h*0.7, 1. - h,0.)*l*l*0.1;
-        }
-        else if (mid == 2.)
-        {
-            col += shinralogo(pos.xy, vec2(0., 1.22), 0.12)*0.5;
-            col = col*brdf +.03*fre;
-            col *= ao;
-            
-            float l = 0.5 + 0.5*sin(pos.y*98.);
-            
-            l *= l*step(abs(pos.y - 1.19), 0.19)*step(0.15, abs(pos.x));
-            float h = hash12(floor(pos.xy*31.)/31.);
-            h = 0.9*step(0.8, h);
-            col += vec3(1. - h*0.7, 1. - h,0.)*l*l*0.1;
-        }
-        else if (mid == 3.)
-        {
-            col = col*brdf +.03*fre;
-            col *= ao;
-            
-            float l = 0.5 + 0.5*sin(pos.y*98.);
-            l *= l*step(pos.y, 1.15)*(step(pos.y, 0.65) + step(0.95, pos.y));
-            float h = hash12(floor(pos.xy*31.)/31.);
-            h = 0.9*step(0.8, h);
-            col += vec3(1. - h*0.7, 1. - h,0.)*l*l*0.1;
-        }
-        else if (mid == 4.)
-        {
-            col += shinralogo(pos.xy, vec2(0., 2.5), 0.06)*0.5;
-            
-            col = col*(0.05) +.03*fre;
-            col *= ao;
-            
-            float l = 0.5 + 0.5*sin(pos.y*98.);
-            l *= l*step(pos.z, -0.16*step(pos.y, 2.88))*step(pos.y, 3.05)*step(2.6, pos.y);
-            float h = hash12(floor(pos.xy*23.)/23.);
-            h = 0.9*step(0.5, h);
-            col += vec3(1. - h*0.7, 1. - h,0.)*l*l*0.1;
-        }    
-        else if (mid == 5.)
-        {
-            col = col*brdf +.03*fre;
-            col *= ao;
-            
-            float d = mix(step(abs(pos.y - 0.49), 0.01), step(abs(pos.y - 0.38), 0.01), step(1.82, pl.x));
-            
-            col += vec3(1., 1.,0.)*d*0.1;
-        }       
-        else if (mid == 6.)
-        {
-            col = col*brdf +.03*fre;
-            col *= ao;
-            
-            col += 0.5*mix(smoothstep(1.448, 1.458, pl.x), smoothstep(4.08, 4.11, pl.x), step(2.5, pl.x));
-            
-        }        
-        else if (mid == 7.)
-        {
-            float f = 0.;
-            vec3 l = vec3(0.);
-            
-            if (pl.x < 3.6)
-            {
-                float br = step(0.4, abs(pc.z + 0.46));
-            	col += vec3(0.5, 0.35, 0.)*noise(pos*5.5)*(0.3 + 0.7*br);
-                l = vec3(0.5, 0.3, 0.)*step(0.993, hash12(floor(pos.xz*50.)/50.))*step(pl.x, 3.4)*br;
-            }
-            else
-            {
-				vec2 pt = vec2(pc.x, pc.z*7.);
-                col += platformTex(pt)*0.04;
-                float el = step(4.18, pl.x)*smoothstep(0.51, 0.42, pl.z*10.0/pl.x)*smoothstep(-0.2, -0.18, -pl.y)*smoothstep(5.7, 4.3, pl.x);       
-            	l = vec3(1.,1.,0.7)*(0.02*el*smoothstep(0., 0.2, col.r));
-            }
- 
-            col = col*0.05 + 0.03*fre;
-            col *= ao;          
-            col += l;
-        }       
-        else if (mid == 8.)
-        {
-            col += shinralogo(pl.xy, vec2(4.02, 0.6), .16)*0.5;
-            
-            float rl = hash12(floor((pos.xz )*0.25 + 1.5)/1.);
-            float st = 0.5 + 0.5*sin(time*(2.+rl) + rl*10.); 
-            col += vec3(0.0, 0.75, 0.3)*smoothstep(0.85, 1., pos.y);
-            col = col*0.05 +.03*fre;
-            col *= ao*(4. - 3.*mix(1., smoothstep(0.95, 0.75, pos.y), st));
-            col += (0.25 + 0.75*st)*vec3(0.1, 1., 0.7)*smoothstep(0.95, 0.75, pos.y)*step(0.998, pl.z)*step(abs(pl.x - 4.), 0.16);
-        }       
-        else 
-        {
-            col = col*brdf +.03*fre;
-            col *= ao;          
-        }
-          
-        // fake platform lights
-        float el = step(4.18, pl.x)*smoothstep(0.51, 0.42, pl.z*10.0/pl.x)*smoothstep(-0.2, -0.18, -pl.y)*smoothstep(5.7, 4.3, pl.x);       
-        col += vec3(1.,1.,0.7)*(0.6*el*smoothstep(4.22, 4.2, pl.x));
-                
-        col *= smoothstep(90.0, 0.0, dot(pos, pos));
-        col *= smoothstep(-0.6, -0.1, pos.y);
-    }
-
-    col += marchlights(ro, rd, d);
-    col += marchmako(ro, rd, d);
-    col = pow(clamp(col*1.5,0.,1.), vec3(0.416667))*1.055 - 0.055; //sRGB
-        
-    fragColor = vec4( col, 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-blob-zoo.slang b/procedural/dr2-blob-zoo.slang
deleted file mode 100644
index a33ff5d613..0000000000
--- a/procedural/dr2-blob-zoo.slang
+++ /dev/null
@@ -1,532 +0,0 @@
-#version 450
-// Blob Zoo -  dr2 - 2018-02-18
-// https://www.shadertoy.com/view/4sdcWN
-
-// Lots of strange critters
-
-// "Blob Zoo" by dr2 - 2018
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-float PrBox2Df (vec2 p, vec2 b);
-float PrBoxAn2Df (vec2 p, vec2 b, float w);
-float PrSphDf (vec3 p, float r);
-float PrCylDf (vec3 p, float r, float h);
-float PrCylAnDf (vec3 p, float r, float w, float h);
-float PrCapsDf (vec3 p, float r, float h);
-float SmoothMin (float a, float b, float r);
-float SmoothBump (float lo, float hi, float w, float x);
-vec2 Rot2D (vec2 q, float a);
-vec3 HsvToRgb (vec3 c);
-float Hashfv2 (vec2 p);
-float Fbm2 (vec2 p);
-vec3 VaryNf (vec3 p, vec3 n, float f);
-vec2 PixToHex (vec2 p);
-vec2 HexToPix (vec2 h);
-vec3 HexGrid (vec2 p);
-
-vec3 sunDir;
-vec2 gId;
-float tCur, dstFar, gcRnd, bHt;
-int idObj;
-const float pi = 3.14159, sqrt3 = 1.7320508;
-
-#define DMIN(id) if (d < dMin) { dMin = d;  idObj = id; }
-
-vec3 SMap (vec3 p, float t)
-{
-  float f;
-  f = 2.;
-  for (int k = 0; k < 5; k ++) {
-    p += 0.4 * sin (1.7 * p.yzx / f + f * t);
-    f *= 0.8;
-  }
-  return p;
-}
-
-float BlobDf (vec3 p)
-{
-  float t;
-  t = tCur + 25. * gcRnd;
-  p *= 2.;
-  p.xz = Rot2D (p.xz, 0.2 * t);
-  return max (0.1 * SmoothMin (PrSphDf (SMap (p - vec3 (0.7, 1.8, 0.), t + 2.), 1.1 + 0.31 * sin (t)),
-     PrSphDf (SMap (p + vec3 (0.7, -1.8, 0.), 1.3 * t), 1. + 0.41 * sin (1.7 * t)), 0.5), - p.y);
-}
-
-float ObjDf (vec3 p)
-{
-  vec3 q, qq;
-  float dMin, d, szFac, w, s;
-  szFac = 0.1;
-  dMin = dstFar / szFac;
-  p.xz -= HexToPix (gId);
-  p /= szFac;
-  w = 0.05;
-  q = p;
-  d = max (min (max (PrBoxAn2Df (q.xz, vec2 (2., 7.5), w), - PrBox2Df (q.xz, vec2 (2.1 + w, 2. - w))),
-     max (PrBoxAn2Df (q.xz, vec2 (7.5, 2.), w), - PrBox2Df (q.xz, vec2 (2. - w, 2.1 + w)))), abs (q.y - bHt) - bHt);
-  qq = q;
-  qq.xz = mod (qq.xz, 0.5) - 0.25;
-  s = 1. - sqrt (1. - smoothstep (1.3, 1.7, qq.y));
-  qq.y -= 0.82;
-  d = max (d, - min (PrBox2Df (qq.xy, vec2 (0.2 - 0.2 * s, 0.9)),
-     PrBox2Df (qq.zy, vec2 (0.2 - 0.2 * s, 0.9))));
-  DMIN (1);
-  q.xz = Rot2D (q.xz, pi / 6.);
-  q.xz = Rot2D (q.xz, 2. * pi * ((floor (6. * atan (q.z, - q.x) / (2. * pi) + 0.5)) / 6.));
-  q.xy -= vec2 (-10., 1.6);
-  d = PrCylAnDf (q.xzy, 1.15, 0.08, 0.015);
-  DMIN (2);
-  q.xz = Rot2D (vec2 (q.x - 0.65, abs (q.z)), - pi / 3.);
-  q.x = abs (q.x);
-  q.xy -= vec2 (0.7, -0.8);
-  d = PrCylDf (q.xzy, 0.03, 0.8);
-  DMIN (3);
-  q = p;
-  q.y -= 0.05;
-  d = PrCylAnDf (q.xzy, 1.7, 0.07, 0.05);
-  DMIN (2);
-  q = p;
-  d = length (q.xz) - 1.7;
-  if (d < 0.1) {
-    d = BlobDf (q);
-    DMIN (4);
-  } else dMin = min (dMin, d);
-  return dMin * szFac;
-}
-
-void SetGrdConf ()
-{
-  gcRnd = Hashfv2 (17.3 * gId);
-  bHt =  (1./24.) * floor (22. + 5. * gcRnd);
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  vec3 vri, vf, hv, p;
-  vec2 edN[3], pM, gIdP;
-  float dHit, d, s;
-  edN[0] = vec2 (1., 0.);
-  edN[1] = 0.5 * vec2 (1., sqrt3);
-  edN[2] = 0.5 * vec2 (1., - sqrt3);
-  for (int k = 0; k < 3; k ++) edN[k] *= sign (dot (edN[k], rd.xz));
-  vri = 1. / vec3 (dot (rd.xz, edN[0]), dot (rd.xz, edN[1]), dot (rd.xz, edN[2]));
-  vf = 0.5 * sqrt3 - vec3 (dot (ro.xz, edN[0]), dot (ro.xz, edN[1]),
-     dot (ro.xz, edN[2]));
-  pM = HexToPix (PixToHex (ro.xz));
-  hv = (vf + vec3 (dot (pM, edN[0]), dot (pM, edN[1]), dot (pM, edN[2]))) * vri;
-  s = min (hv.x, min (hv.y, hv.z));
-  gIdP = vec2 (-999.);
-  dHit = 0.;
-  for (int j = 0; j < 220; j ++) {
-    p = ro + dHit * rd;
-    gId = PixToHex (p.xz);
-    if (gId.x != gIdP.x || gId.y != gIdP.y) {
-      gIdP = gId;
-      SetGrdConf ();
-    }
-    d = ObjDf (p);
-    if (dHit + d < s) dHit += d;
-    else {
-      dHit = s + 0.001;
-      pM += sqrt3 * ((s == hv.x) ? edN[0] : ((s == hv.y) ? edN[1] : edN[2]));
-      hv = (vf + vec3 (dot (pM, edN[0]), dot (pM, edN[1]), dot (pM, edN[2]))) * vri;
-      s = min (hv.x, min (hv.y, hv.z));
-    }
-    if (d < 0.0002 || dHit > dstFar || p.y < 0. || p.y > 2.) break;
-  }
-  if (d >= 0.0002) dHit = dstFar;
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  vec4 v;
-  vec2 e = vec2 (0.00002, -0.00002);
-  v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy), ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-vec2 TrackPath (float t)
-{
-  vec2 r;
-  float tt;
-  tt = mod (t, 4.);
-  if (tt < 1.) r = mix (vec2 (sqrt3 * 0.5, -0.5), vec2 (sqrt3 * 0.5, 0.5), tt);
-  else if (tt < 2.) r = mix (vec2 (sqrt3 * 0.5, 0.5), vec2 (0., 1.), tt - 1.);
-  else if (tt < 3.) r = mix (vec2 (0., 1.), vec2 (0., 2.), tt - 2.);
-  else r = mix (vec2 (0., 2.), vec2 (sqrt3 * 0.5, 2.5), tt - 3.);
-  r += vec2 (0.005, 3. * floor (t / 4.));
-  return r;
-}
-
-float ObjSShadow (vec3 ro, vec3 rd)
-{
-  vec3 p;
-  vec2 gIdP;
-  float sh, d, h;
-  sh = 1.;
-  gIdP = vec2 (-999.);
-  d = 0.001;
-  for (int j = 0; j < 40; j ++) {
-    p = ro + d * rd;
-    gId = PixToHex (p.xz);
-    if (gId.x != gIdP.x || gId.y != gIdP.y) {
-      gIdP = gId;
-      SetGrdConf ();
-    }
-    h = ObjDf (p);
-    sh = min (sh, smoothstep (0., 0.03 * d, h));
-    d += min (0.005, 3. * h);
-    if (h < 0.001) break;
-  }
-  return 0.8 + 0.2 * sh;
-}
-
-vec3 SkyCol (vec3 rd)
-{
-  return mix (vec3 (0.2, 0.3, 0.5) + 0.3 * pow (max (dot (rd, sunDir), 0.), 8.), vec3 (1.),
-     0.2 + 0.8 * rd.y * Fbm2 (2. * rd.xz / rd.y));
-}
-
-vec3 ShStagGrid (vec2 p, vec2 g)
-{
-  vec2 q, sq, ss;
-  q = p * g;
-  if (2. * floor (0.5 * floor (q.y)) != floor (q.y)) q.x += 0.5;
-  sq = smoothstep (0.03, 0.07, abs (fract (q + 0.5) - 0.5));
-  q = fract (q) - 0.5;
-  ss = 0.3 * smoothstep (0.35, 0.5, abs (q.xy)) * sign (q.xy);
-  if (abs (q.x) < abs (q.y)) ss.x = 0.;
-  else ss.y = 0.;
-  return vec3 (ss.x, 0.9 + 0.1 * sq.x * sq.y, ss.y);
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec3 col, vn, qh, rg;
-  vec2 g, vf;
-  float dstObj, dstGrnd, spec, sh, f;
-  bool fxz;
-  dstGrnd = (rd.y < 0.) ? - ro.y / rd.y : dstFar;
-  dstObj = ObjRay (ro, rd);
-  if (min (dstObj, dstGrnd) < dstFar) {
-    sh = 1.;
-    vf = vec2 (0.);
-    if (dstObj < dstGrnd) {
-      ro += dstObj * rd;
-      gId = PixToHex (ro.xz);
-      SetGrdConf ();
-      vn = ObjNf (ro);
-      if (idObj == 1) {
-        col = HsvToRgb (vec3 (0.04 + 0.12 * gcRnd, 0.7, 0.7));
-        spec = 0.05;
-        if (ro.y > 0.2 * bHt - 0.0005) col*= 0.7;
-        if (abs (vn.y) < 0.01) {
-          rg = 10. * ro;
-          fxz = (abs (vn.x) > 0.99);
-          rg = ShStagGrid ((fxz ? rg.zy : rg.xy), 6. * vec2 (1., 2.));
-          col *= rg.y;
-          rg.xz *= sign (fxz ? vn.x : vn.z);
-          if (fxz) {
-            if (rg.x == 0.) vn.xy = Rot2D (vn.xy, rg.z);
-            else vn.xz = Rot2D (vn.xz, rg.x);
-          } else {
-            if (rg.x == 0.) vn.zy = Rot2D (vn.zy, rg.z);
-            else vn.zx = Rot2D (vn.zx, rg.x);
-          }
-        }
-      } else if (idObj == 2) {
-        col = vec3 (0.6, 0.6, 0.7);
-        spec = 0.1;
-        vf = vec2 (1024., 0.5);
-      } else if (idObj == 3) {
-        f = mod (256. * ro.y + atan (vn.z, vn.x) / (2. * pi), 1.);
-        if (abs (f - 0.5) < 0.4) {
-          col = vec3 (0.6, 0.6, 0.7);
-          spec = 0.1;
-          vf = vec2 (1024., 0.5);
-        } else {
-          col = vec3 (0.5, 0.7, 0.2);
-          vn.y = sin (2. * pi * (abs (f - 0.5) - 0.4) * sign (f));
-          vn.xz *= sqrt (1. - vn.y * vn.y);
-          spec = 0.3;
-        }
-      } else if (idObj == 4) {
-        col = HsvToRgb (vec3 (mod (13. * gcRnd, 1.), 1., 0.9));
-        spec = 0.3;
-        vf = vec2 (256., 0.5);
-      }
-      if (idObj != 3) sh = ObjSShadow (ro, sunDir);
-    } else {
-      ro += dstGrnd * rd;
-      gId = PixToHex (ro.xz);
-      SetGrdConf ();
-      vn = vec3 (0., 1., 0.);
-      g = ro.xz - HexToPix (gId);
-      if (length (g) < 0.17) {
-        col = vec3 (0.4, 0.4, 0.5);
-        vf = vec2 (256., 0.2);
-      } else if (abs (g.x) < 0.2 && abs (g.y) < 0.75 || abs (g.x) < 0.75 && abs (g.y) < 0.2) {
-        col = HsvToRgb (vec3 (0.3 + 0.15 * gcRnd, 1., 0.5));
-        vf = vec2 (256., 2.);
-      } else {
-        qh = HexGrid (32. * sqrt3 * ro.zx);
-        f = max (length (qh.xy) - 0.5, 0.);
-        vn = vec3 (0., Rot2D (vec2 (1., 0.), 4. * f * f));
-        vn.zx = vn.z * normalize (qh.xy);
-        col = vec3 (0.5, 0.45, 0.45);
-        col = mix (vec3 (0.5, 0.5, 0.3), col, smoothstep (0.036, 0.038, HexGrid (ro.xz).z));
-        col *= 0.8 + 0.2 * smoothstep (0.03, 0.06, qh.z);
-        g = Rot2D (g, pi / 6.);
-        g = Rot2D (g, 2. * pi * ((floor (6. * atan (g.y, - g.x) / (2. * pi) + 0.5)) / 6.));
-        g = Rot2D (vec2 (g.x + 0.935, abs (g.y)), - pi / 3.);
-        col *= 0.8 + 0.2 * smoothstep (0.003, 0.006, length (vec2 (abs (g.x) - 0.07, g.y)));
-      }
-      spec = 0.1;
-      sh = ObjSShadow (ro, sunDir);
-    }
-    if (vf.x > 0.) vn = VaryNf (vf.x * ro, vn, vf.y);
-    col = col * (0.2 + 0.2 * max (dot (normalize (- sunDir.xz), vn.xz), 0.) +
-       0.7 * sh * max (dot (vn, sunDir), 0.)) +
-       spec * sh * pow (max (dot (normalize (sunDir - rd), vn), 0.), 32.);
-  } else {
-    col = (rd.y > 0.) ? SkyCol (rd) : vec3 (0.5, 0.45, 0.45);
-  }
-  return clamp (col, 0., 1.);
-}
-
-// hack for libretro spec
-vec4 iDate = vec4(0.0, 0.0, 0.0, 0.0);
-
-#ifndef MOUSE
-// hack for libretro spec
-vec4 iMouse = vec4(0.0, 0.0, 0.0, 0.0);
-#endif
-
-void mainImage (out vec4 fragColor, in vec2 fragCoord)
-{
-  mat3 vuMat;
-  vec4 mPtr, dateCur;
-  vec3 ro, rd;
-  vec2 canvas, uv, ori, ca, sa, vd, p1, p2;
-  float el, az, asp, vel, tCyc, tt, a;
-  canvas = iResolution.xy;
-  uv = 2. * fragCoord.xy / canvas - 1.;
-  uv.x *= canvas.x / canvas.y;
-  tCur = iGlobalTime;
-  dateCur = iDate;
-  mPtr = iMouse;
-  mPtr.xy = mPtr.xy / canvas - 0.5;
-  vel = 0.12;
-  tCyc = 4. / vel;
-  tCur = mod (tCur, 36000.) + floor (2. + floor (dateCur.w / 600.) / tCyc) * tCyc;
-  p1 = TrackPath (vel * tCur + 0.11);
-  p2 = TrackPath (vel * tCur - 0.11);
-  ro.xz = 0.5 * (p1 + p2);
-  ro.y = 0.09;
-  vd = p1 - p2;
-  az = atan (vd.x, vd.y);
-  el = 0.;
-#ifdef MOUSE
-  if (mPtr.z > 0.) {
-    az += 2. * pi * mPtr.x;
-    el += 0.2 * pi * mPtr.y;
-  }
-  else
-  {
-    a = 0.45 * pi * SmoothBump (0.25, 0.75, 0.12, mod (tCur / (0.25 * tCyc), 1.));
-    tt = mod (tCur / tCyc, 1.) - 0.375;
-    az += a * (step (abs (tt + 0.25), 0.125) - step (abs (tt - 0.25), 0.125));
-  }
-#else
-  a = 0.45 * pi * SmoothBump (0.25, 0.75, 0.12, mod (tCur / (0.25 * tCyc), 1.));
-  tt = mod (tCur / tCyc, 1.) - 0.375;
-  az += a * (step (abs (tt + 0.25), 0.125) - step (abs (tt - 0.25), 0.125));
-#endif
-  ori = vec2 (el, az);
-  ca = cos (ori);
-  sa = sin (ori);
-  vuMat = mat3 (ca.y, 0., - sa.y, 0., 1., 0., sa.y, 0., ca.y) *
-          mat3 (1., 0., 0., 0., ca.x, - sa.x, 0., sa.x, ca.x);
-  asp = canvas.x / canvas.y;
-  uv.xy /= 2.5;
-  rd = vuMat * normalize (vec3 (2. * tan (0.5 * atan (uv.x / asp)) * asp, uv.y, 1.));
-  dstFar = 50.;
-  sunDir = normalize (vec3 (0.5, 3., -1.));
-  fragColor = vec4 (ShowScene (ro, rd), 1.);
-}
-
-float PrBoxDf (vec3 p, vec3 b)
-{
-  vec3 d;
-  d = abs (p) - b;
-  return min (max (d.x, max (d.y, d.z)), 0.) + length (max (d, 0.));
-}
-
-float PrBox2Df (vec2 p, vec2 b)
-{
-  vec2 d;
-  d = abs (p) - b;
-  return min (max (d.x, d.y), 0.) + length (max (d, 0.));
-}
-
-float PrBoxAn2Df (vec2 p, vec2 b, float w)
-{
-  return max (PrBox2Df (p, vec2 (b + w)), - PrBox2Df (p, vec2 (b - w)));
-}
-
-float PrSphDf (vec3 p, float r)
-{
-  return length (p) - r;
-}
-
-float PrCylDf (vec3 p, float r, float h)
-{
-  return max (length (p.xy) - r, abs (p.z) - h);
-}
-
-float PrCylAnDf (vec3 p, float r, float w, float h)
-{
-  return max (abs (length (p.xy) - r) - w, abs (p.z) - h);
-}
-
-float SmoothMin (float a, float b, float r)
-{
-  float h;
-  h = clamp (0.5 + 0.5 * (b - a) / r, 0., 1.);
-  return mix (b, a, h) - r * h * (1. - h);
-}
-
-float SmoothBump (float lo, float hi, float w, float x)
-{
-  return (1. - smoothstep (hi - w, hi + w, x)) * smoothstep (lo - w, lo + w, x);
-}
-
-vec2 Rot2D (vec2 q, float a)
-{
-  return q * cos (a) * vec2 (1., 1.) + q.yx * sin (a) * vec2 (-1., 1.);
-}
-
-vec2 PixToHex (vec2 p)
-{
-  vec3 c, r, dr;
-  c.xz = vec2 ((1./sqrt3) * p.x - (1./3.) * p.y, (2./3.) * p.y);
-  c.y = - c.x - c.z;
-  r = floor (c + 0.5);
-  dr = abs (r - c);
-  r -= step (dr.yzx, dr) * step (dr.zxy, dr) * dot (r, vec3 (1.));
-  return r.xz;
-}
-
-vec2 HexToPix (vec2 h)
-{
-  return vec2 (sqrt3 * (h.x + 0.5 * h.y), (3./2.) * h.y);
-}
-
-vec3 HexGrid (vec2 p)
-{
-  vec2 q;
-  p -= HexToPix (PixToHex (p));
-  q = abs (p);
-  return vec3 (p, 0.5 * sqrt3 - q.x + 0.5 * min (q.x - sqrt3 * q.y, 0.));
-}
-
-vec3 HsvToRgb (vec3 c)
-{
-  vec3 p;
-  p = abs (fract (c.xxx + vec3 (1., 2./3., 1./3.)) * 6. - 3.);
-  return c.z * mix (vec3 (1.), clamp (p - 1., 0., 1.), c.y);
-}
-
-const float cHashM = 43758.54;
-
-float Hashfv2 (vec2 p)
-{
-  return fract (sin (dot (p, vec2 (37., 39.))) * cHashM);
-}
-
-vec2 Hashv2v2 (vec2 p)
-{
-  vec2 cHashVA2 = vec2 (37., 39.);
-  return fract (sin (vec2 (dot (p, cHashVA2), dot (p + vec2 (1., 0.), cHashVA2))) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 t, ip, fp;
-  ip = floor (p);  
-  fp = fract (p);
-  fp = fp * fp * (3. - 2. * fp);
-  t = mix (Hashv2v2 (ip), Hashv2v2 (ip + vec2 (0., 1.)), fp.y);
-  return mix (t.x, t.y, fp.x);
-}
-
-float Fbm2 (vec2 p)
-{
-  float f, a;
-  f = 0.;
-  a = 1.;
-  for (int j = 0; j < 5; j ++) {
-    f += a * Noisefv2 (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return f * (1. / 1.9375);
-}
-
-float Fbmn (vec3 p, vec3 n)
-{
-  vec3 s;
-  float a;
-  s = vec3 (0.);
-  a = 1.;
-  for (int j = 0; j < 5; j ++) {
-    s += a * vec3 (Noisefv2 (p.yz), Noisefv2 (p.zx), Noisefv2 (p.xy));
-    a *= 0.5;
-    p *= 2.;
-  }
-  return dot (s, abs (n));
-}
-
-vec3 VaryNf (vec3 p, vec3 n, float f)
-{
-  vec3 g;
-  vec2 e = vec2 (0.1, 0.);
-  g = vec3 (Fbmn (p + e.xyy, n), Fbmn (p + e.yxy, n), Fbmn (p + e.yyx, n)) - Fbmn (p, n);
-  return normalize (n + f * (g - n * dot (n, g)));
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-droplet.slang b/procedural/dr2-droplet.slang
deleted file mode 100644
index d9acbcad3b..0000000000
--- a/procedural/dr2-droplet.slang
+++ /dev/null
@@ -1,268 +0,0 @@
-#version 450
-// Droplet -  dr2 - 2015-09-17
-// https://www.shadertoy.com/view/4l2Szm
-
-// Probably liquid mercury (change viewpoint using the mouse).
-
-// "Droplet" by dr2 - 2015
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-const float pi = 3.14159;
-const vec4 cHashA4 = vec4 (0., 1., 57., 58.);
-const vec3 cHashA3 = vec3 (1., 57., 113.);
-const float cHashM = 43758.54;
-
-vec4 Hashv4f (float p)
-{
-  return fract (sin (p + cHashA4) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 i = floor (p);
-  vec2 f = fract (p);
-  f = f * f * (3. - 2. * f);
-  vec4 t = Hashv4f (dot (i, cHashA3.xy));
-  return mix (mix (t.x, t.y, f.x), mix (t.z, t.w, f.x), f.y);
-}
-
-float Fbm2 (vec2 p)
-{
-  float f, a;
-  f = 0.;
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    f += a * Noisefv2 (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return f;
-}
-
-float Fbmn (vec3 p, vec3 n)
-{
-  vec3 s;
-  float a;
-  s = vec3 (0.);
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    s += a * vec3 (Noisefv2 (p.yz), Noisefv2 (p.zx), Noisefv2 (p.xy));
-    a *= 0.5;
-    p *= 2.;
-  }
-  return dot (s, abs (n));
-}
-
-vec3 VaryNf (vec3 p, vec3 n, float f)
-{
-  vec3 g;
-  float s;
-  vec3 e = vec3 (0.1, 0., 0.);
-  s = Fbmn (p, n);
-  g = vec3 (Fbmn (p + e.xyy, n) - s,
-     Fbmn (p + e.yxy, n) - s, Fbmn (p + e.yyx, n) - s);
-  return normalize (n + f * (g - n * dot (n, g)));
-}
-
-float Length4 (vec2 p)
-{
-  p *= p;
-  p *= p;
-  return pow (p.x + p.y, 1. / 4.);
-}
-
-float Length6 (vec2 p)
-{
-  p *= p * p;
-  p *= p;
-  return pow (p.x + p.y, 1. / 6.);
-}
-
-float PrSphDf (vec3 p, float s)
-{
-  return length (p) - s;
-}
-
-float PrCylDf (vec3 p, float r, float h)
-{
-  return max (length (p.xy) - r, abs (p.z) - h);
-}
-
-float PrTorus4Df (vec3 p, float ri, float rc)
-{
-  return Length4 (vec2 (length (p.xz) - rc, p.y)) - ri;
-}
-
-vec3 sunDir;
-float tCur;
-int idObj;
-const float dstFar = 100.;
-const int idRing = 1, idWat = 2;
-
-vec3 BgCol (vec3 ro, vec3 rd)
-{
-  vec3 col;
-  float sd, f;
-  if (rd.y > 0.) {
-    col = vec3 (0.1, 0.2, 0.4) + 0.2 * pow (1. - max (rd.y, 0.), 8.);
-    sd = max (dot (rd, sunDir), 0.);
-    ro.xz += 2. * tCur;
-    f = Fbm2 (0.1 * (rd.xz * (50. - ro.y) / rd.y + ro.xz));
-    col += 0.35 * pow (sd, 6.) + 0.65 * min (pow (sd, 256.), 0.3);
-    col = mix (col, vec3 (1.), clamp (0.8 * f * rd.y + 0.1, 0., 1.));
-  } else {
-    f = Fbm2 (0.4 * (ro.xz - ro.y * rd.xz / rd.y));
-    col = mix ((1. + min (f, 1.)) * vec3 (0.05, 0.1, 0.05),
-       vec3 (0.1, 0.15, 0.25), pow (1. + rd.y, 5.));
-  }
-  return col;
-}
-
-float StoneRingDf (vec3 p, float r, float w, float n)
-{
-  return Length6 (vec2 (length (p.xz) - r, p.y)) -
-     w * (0.2 * pow (abs (sin (atan (p.x, p.z) * n)), 0.25) + 0.8);
-}
-
-float ObjDf (vec3 p)
-{
-  vec3 q;
-  float dMin, d, db, r, s, t;
-  bool up;
-  dMin = dstFar;
-  t = mod (tCur, 10.);
-  r = abs (sin (2. * pi * 0.1 * t));
-  q = p;
-  up = (t < 5.);
-  q.y -= up ? 2.5 : 0.55;
-  d = PrTorus4Df (q, 1., r);
-  q.y -= up ? -0.5 : 0.5;
-  d = max (PrCylDf (q.xzy, r, 0.5), - d);
-  if (up) d = max (d, q.y);
-  q.y -= up ? -0.75 : 0.2;
-  s = length (q.xz);
-  q.y -= 0.02 * cos (15. * s - 7. * tCur) * clamp (1. - s / 2.5, 0., 1.) *
-     clamp (s, 0., 1.);
-  db = PrCylDf (q.xzy, 2.5, 0.25);
-  d = up ? min (db, d) : max (db, - d);
-  if (d < dMin) { dMin = d;  idObj = idWat; }
-  q = p;
-  s = 1. - sqrt (max (1. - r * r, 0.));
-  q.y -= 1.2 + (up ? s : - s);
-  d = PrSphDf (q, 0.3);
-  d = max (d, 1. - p.y);
-  if (d < dMin) { dMin = d;  idObj = idWat; }
-  q = p;
-  q.y -= 1.3;
-  d = StoneRingDf (q, 2.8, 0.3, 16.);
-  if (d < dMin) { dMin = d;  idObj = idRing; }
-  return dMin;
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  float dHit, d;
-  dHit = 0.;
-  for (int j = 0; j < 100; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < 0.001 || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  vec4 v;
-  const vec3 e = vec3 (0.001, -0.001, 0.);
-  v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy),
-     ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec3 objCol, col, vn;
-  float dstHit, dif, bk;
-  int idObjT;
-  const int nRefl = 3;
-  for (int k = 0; k < nRefl; k ++) {
-    idObj = -1;
-    dstHit = ObjRay (ro, rd);
-    if (dstHit < dstFar && idObj == idWat) {
-      ro += rd * dstHit;
-      rd = reflect (rd, VaryNf (ro, ObjNf (ro), 0.1));
-      ro += 0.02 * rd;
-    } else break;
-  }
-  if (dstHit < dstFar) {
-    ro += rd * dstHit;
-    idObjT = idObj;
-    vn = ObjNf (ro);
-    idObj = idObjT;
-    if (idObj == idRing) {
-      objCol = vec3 (0.8, 0.6, 0.2);
-      vn = VaryNf (40. * ro, vn, 2.);
-    }
-    bk = max (dot (vn, sunDir * vec3 (-1., 1., -1.)), 0.);
-    dif = max (dot (vn, sunDir), 0.);
-    col = objCol * (0.1 + 0.1 * bk + 0.8 * dif +
-       0.3 * pow (max (0., dot (sunDir, reflect (rd, vn))), 64.));
-  } else col = BgCol (ro, rd);
-  return clamp (col, 0., 1.);
-}
-
-void mainImage (out vec4 fragColor, in vec2 fragCoord)
-{
-  vec2 canvas = iResolution.xy;
-  vec2 uv = 2. * fragCoord.xy / canvas - 1.;
-  uv.x *= canvas.x / canvas.y;
-  tCur = iGlobalTime;
-  sunDir = normalize (vec3 (1., 1., 1.));
-  float el = 0.6;
-#ifdef MOUSE
-  vec4 mPtr = iMouse;
-  mPtr.xy = mPtr.xy / canvas - 0.5;
-  if (mPtr.z > 0.) el = clamp (el - mPtr.y, 0.25, 0.8);
-#endif
-  float cEl = cos (el);
-  float sEl = sin (el);
-  mat3 vuMat = mat3 (1., 0., 0., 0., cEl, - sEl, 0., sEl, cEl);
-  vec3 rd = normalize (vec3 (uv, 4.)) * vuMat;
-  vec3 ro = vec3 (0., 0.7, -10.) * vuMat;
-  fragColor = vec4 (ShowScene (ro, rd), 1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-hexpo.slang b/procedural/dr2-hexpo.slang
deleted file mode 100644
index adc398ace3..0000000000
--- a/procedural/dr2-hexpo.slang
+++ /dev/null
@@ -1,415 +0,0 @@
-#version 450
-// "Hexpo" by dr2 - 2018
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-float PrBox2Df (vec2 p, vec2 b);
-float PrCylDf (vec3 p, float r, float h);
-float SmoothMin (float a, float b, float r);
-float SmoothBump (float lo, float hi, float w, float x);
-vec2 Rot2D (vec2 q, float a);
-vec3 HueToRgb (float c);
-float Hashfv2 (vec2 p);
-float Fbm2 (vec2 p);
-vec3 VaryNf (vec3 p, vec3 n, float f);
-vec2 PixToHex (vec2 p);
-vec2 HexToPix (vec2 h);
-vec3 HexGrid (vec2 p);
-
-vec3 sunDir, qHit;
-vec2 gId;
-float tCur, dstFar, gcRnd, hgSize;
-int idObj;
-const float pi = 3.14159, sqrt3 = 1.7320508;
-
-#define DMINQ(id) if (d < dMin) { dMin = d;  idObj = id;  qHit = q; }
-
-float ObjDf (vec3 p)
-{
-  vec3 q, qq;
-  float dMin, d, w, s, r, rh, a, s3;
-  dMin = dstFar;
-  s3 = 0.5 * sqrt3 * hgSize;
-  rh = 3.07;
-  w = 0.1;
-  p.xz -= HexToPix (gId * hgSize);
-  r = length (p.xz);
-  a = (r > 0.) ? atan (p.z, - p.x) / (2. * pi) : 0.;
-  q = p;
-  q.xz = Rot2D (q.xz, 2. * pi * ((floor (6. * a + 0.5)) / 6.));
-  qq = q;
-  s = 1. - sqrt (1. - smoothstep (0.65, 0.85, q.y));
-  d = max (max (abs (q.x + 3.) - 0.07, abs (q.y - 0.5) - 0.5),
-     - PrBox2Df (vec2 (mod (q.z, 0.25) - 0.125, q.y - 0.41), vec2 (0.08 - 0.08 * s, 0.45)));
-  s = smoothstep (1., 2.2, q.y);
-  d = min (d, max (max (mix (abs (q.x + 0.5 * rh) - 0.5 * rh, r - 2. - w, s),
-     - mix (abs (q.x + 0.5 * rh - w) - 0.5 * rh + w, r - 2. + w, s)), abs (q.y - 1.6) - 0.6));
-  d = min (d, max (abs (r - 2.) - w, abs (q.y - 2.25) - 0.05));
-  s = smoothstep (2.3, rh, q.y);
-  d = min (d, max (max (mix (r - 2. - w, r - 1.4 - w, s), - mix (r - 2. + w, r - 1.4 + w, s)), abs (q.y - 2.6) - 0.3));
-  DMINQ (1);
-  q.xy -= vec2 (- s3 + 0.06, 0.06);
-  d = length (q.xy) - 0.05;
-  DMINQ (2);
-  q.y -= 1.15 - 0.2 * q.x * q.x;
-  d = PrCylDf (vec3 (q.xy, abs (q.z) - 0.04).yzx, 0.03, s3 - rh);
-  DMINQ (3);
-  q = qq;  q.xy -= vec2 (- s3, 1.21);
-  d = PrCylDf (q.xzy, 0.1, 0.04);
-  q = qq;  q.z = abs (q.z);  q -= vec3 (- s3, 0.07, 0.5 * hgSize);
-  d = min (d, PrCylDf (q.xzy, 0.15, 0.07));
-  DMINQ (4);
-  q = qq;  q.y -= 2.2;
-  d = PrCylDf (q.xzy, 0.3, 2.2);
-  DMINQ (5);
-  q = qq;  q.xy -= vec2 (-0.6, 1.8);
-  d = PrCylDf (q.xzy, 0.25, 1.8);
-  DMINQ (6);
-  return 0.6 * dMin;
-}
-
-void SetGrdConf ()
-{
-  gcRnd = Hashfv2 (17.3 * gId);
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  vec3 vri, vf, hv, p;
-  vec2 edN[3], pM, gIdP;
-  float dHit, d, s;
-  if (rd.x == 0.) rd.x = 0.0001;
-  if (rd.y == 0.) rd.y = 0.0001;
-  if (rd.z == 0.) rd.z = 0.0001;
-  edN[0] = vec2 (1., 0.);
-  edN[1] = 0.5 * vec2 (1., sqrt3);
-  edN[2] = 0.5 * vec2 (1., - sqrt3);
-  for (int k = 0; k < 3; k ++) edN[k] *= sign (dot (edN[k], rd.xz));
-  vri = hgSize / vec3 (dot (rd.xz, edN[0]), dot (rd.xz, edN[1]), dot (rd.xz, edN[2]));
-  vf = 0.5 * sqrt3 - vec3 (dot (ro.xz, edN[0]), dot (ro.xz, edN[1]),
-     dot (ro.xz, edN[2])) / hgSize;
-  pM = HexToPix (PixToHex (ro.xz / hgSize));
-  hv = (vf + vec3 (dot (pM, edN[0]), dot (pM, edN[1]), dot (pM, edN[2]))) * vri;
-  s = min (hv.x, min (hv.y, hv.z));
-  gIdP = vec2 (-999.);
-  dHit = 0.;
-  for (int j = 0; j < 320; j ++) {
-    p = ro + dHit * rd;
-    gId = PixToHex (p.xz / hgSize);
-    if (gId.x != gIdP.x || gId.y != gIdP.y) {
-      gIdP = gId;
-      SetGrdConf ();
-    }
-    d = ObjDf (p);
-    if (dHit + d < s) dHit += d;
-    else {
-      dHit = s + 0.001;
-      pM += sqrt3 * ((s == hv.x) ? edN[0] : ((s == hv.y) ? edN[1] : edN[2]));
-      hv = (vf + vec3 (dot (pM, edN[0]), dot (pM, edN[1]), dot (pM, edN[2]))) * vri;
-      s = min (hv.x, min (hv.y, hv.z));
-    }
-    if (d < 0.0005 || dHit > dstFar || p.y < 0. || p.y > 5.) break;
-  }
-  if (d >= 0.0005) dHit = dstFar;
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  vec4 v;
-  vec2 e = vec2 (0.0001, -0.0001);
-  v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy), ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-vec2 TrackPath (float t)
-{
-  vec2 r;
-  float tt;
-  tt = mod (t, 4.);
-  if (tt < 1.) r = mix (vec2 (sqrt3 * 0.5, -0.5), vec2 (sqrt3 * 0.5, 0.5), tt);
-  else if (tt < 2.) r = mix (vec2 (sqrt3 * 0.5, 0.5), vec2 (0., 1.), tt - 1.);
-  else if (tt < 3.) r = mix (vec2 (0., 1.), vec2 (0., 2.), tt - 2.);
-  else r = mix (vec2 (0., 2.), vec2 (sqrt3 * 0.5, 2.5), tt - 3.);
-  r *= hgSize;
-  r += vec2 (0.001, hgSize * 3. * floor (t / 4.));
-  return r;
-}
-
-vec3 SkyCol (vec3 rd)
-{
-  rd.y = abs (rd.y);
-  return 0.2 * mix (vec3 (0.2, 0.3, 0.5) + 0.3 * pow (max (dot (rd, sunDir), 0.), 8.), vec3 (1.),
-     0.2 + 0.8 * rd.y * Fbm2 (2. * rd.xz / max (rd.y, 0.0001)));
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec3 col, gCol, vn, qc, qh;
-  vec2 vf;
-  float dstObj, dstGrnd, spec, f, s;
-  bool isLit;
-  dstGrnd = (rd.y < 0.) ? - ro.y / rd.y : dstFar;
-  dstObj = ObjRay (ro, rd);
-  isLit = true;
-  if (min (dstObj, dstGrnd) < dstFar) {
-    vf = vec2 (0.);
-    ro += min (dstObj, dstGrnd) * rd;
-    gId = PixToHex (ro.xz / hgSize);
-    SetGrdConf ();
-    gCol = HueToRgb (mod (77.7 * gcRnd, 1.));
-    spec = 0.1;
-    if (dstObj < dstGrnd) {
-      vn = ObjNf (ro);
-      if (idObj == 1) {
-        qc = ro - vec3 (hgSize * HexToPix (gId).xy, 0.).xzy;
-        f = dot (vn, normalize (qc));
-        col = gCol;
-        vf = vec2 (1024., 0.5);
-        if (f < 0. || ro.y < 1. && f < 0.6) {
-          col = 0.8 * mix (vec3 (1.), col, 0.5) * (0.55 - 0.45 * f) * (0.7 +
-             0.3 * SmoothBump (0.25, 0.75, 0.1, mod (tCur + gcRnd, 1.)));
-          isLit = false;
-        } else {
-          col = 0.2 * mix (vec3 (1.), col, 0.2) * (0.2 + 0.8 * f);
-          s = atan (qc.z, - qc.x) / (2. * pi);
-          if (ro.y < 2.6) {
-            s = SmoothBump (1., 2.5, 0.1, ro.y) * SmoothBump (0.4, 0.6, 0.02, mod (128. * s, 1.)) *
-               SmoothBump (0.4, 0.6, 0.02, mod (8. * qc.y - 2. * tCur, 1.));
-            col *= 1. + 5. * s;
-          } else {
-            s = smoothstep (2.6, 2.85, ro.y) * SmoothBump (0.4, 0.6, 0.05, mod (32. * s +
-               2. * (2. * step (gcRnd, 0.5) - 1.) * tCur, 1.));
-            col *= 1. + 4. * s;
-          }
-          isLit = (s > 0.1);
-        }
-      } else if (idObj == 2) {
-        col = 0.8 * gCol * (0.4 + 0.6 * SmoothBump (0.25, 0.75, 0.05, mod (2. * qHit.z + tCur, 1.)));
-      } else if (idObj == 3) {
-        col = 0.8 * HueToRgb (mod (0.1 * tCur, 1.)) * (0.4 +
-           0.6 * SmoothBump (0.25, 0.75, 0.05, mod (4. * qHit.x + 2. * tCur * sign (qHit.z), 1.)));
-      } else if (idObj == 4) {
-        col = vec3 (0.7, 0.7, 0.2) * (0.3 + 0.7 * smoothstep (0., 0.4, - dot (vn, rd)));
-        isLit = false;
-      } else if (idObj == 5 || idObj == 6) {
-        col = 0.8 * ((idObj == 5) ? gCol : HueToRgb (mod (mod (77.7 * gcRnd, 1.) + 0.5, 1.)));
-        if (vn.y < 0.99) col *= (0.4 + 0.6 * SmoothBump (0.25, 0.75, 0.05, mod (8. * qHit.y +
-           atan (vn.z, vn.x) / (2. * pi) + ((idObj == 5) ? - 4. : 4.) * tCur, 1.)));
-        else col *= 0.5;
-      }
-    } else {
-      qh = HexGrid (32. * sqrt3 * ro.zx / hgSize);
-      f = max (length (qh.xy) - 0.5, 0.);
-      vn = vec3 (0., Rot2D (vec2 (1., 0.), 4. * f * f));
-      vn.zx = vn.z * normalize (qh.xy);
-      s = HexGrid (ro.xz / hgSize).z;
-      col = 0.3 * mix (vec3 (1.), gCol, 0.2) * (0.8 + 0.2 * smoothstep (0.025, 0.03, s)) *
-         (0.8 + 0.2 * smoothstep (0.03, 0.06, qh.z));
-      col = mix (col, 0.5 * gCol * (0.7 + 0.3 * SmoothBump (0.25, 0.75, 0.1, mod (tCur + gcRnd, 1.))),
-         smoothstep (0.1, 0.35, s));
-    }
-    if (isLit) {
-      if (vf.x > 0.) vn = VaryNf (vf.x * ro, vn, vf.y);
-      col = col * (0.5 + 0.5 * max (dot (vn, sunDir), 0.)) +
-         spec * pow (max (dot (normalize (sunDir - rd), vn), 0.), 32.);
-    }
-    s = min (dstObj, dstGrnd) / dstFar;
-    col = mix (col * (1. - 0.95 * smoothstep (0.3, 1., s)), SkyCol (rd), smoothstep (0.4, 1., s));
-  } else {
-    col = SkyCol (rd);
-  }
-  return clamp (col, 0., 1.);
-}
-
-void mainImage (out vec4 fragColor, in vec2 fragCoord)
-{
-  mat3 vuMat;
-  vec4 mPtr, dateCur;
-  vec3 ro, rd;
-  vec2 canvas, uv, ori, ca, sa, vd, p1, p2;
-  float el, az, zmFac, asp, vel, tCyc, tt, s;
-  canvas = iResolution.xy;
-  uv = 2. * fragCoord.xy / canvas - 1.;
-  uv.x *= canvas.x / canvas.y;
-  tCur = iGlobalTime;
-  dateCur = iDate;
-  mPtr = iMouse;
-  mPtr.xy = mPtr.xy / canvas - 0.5;
-  hgSize = 5.;
-  vel = 0.3;
-  tCyc = 4. / vel;
-  tCur = mod (tCur, 36000.) + floor (2. + floor (dateCur.w / 600.) / tCyc + 1.) * tCyc;
-  p1 = TrackPath (vel * tCur + 0.3);
-  p2 = TrackPath (vel * tCur - 0.3);
-  s = SmoothBump (0.25, 0.75, 0.02, mod (tCur / (4. * tCyc), 1.));
-  ro = vec3 (0.5 * (p1 + p2), 0.7 + 3.3 * s).xzy;
-  vd = p1 - p2;
-  az = atan (vd.x, vd.y);
-  el = -0.1 * pi * s;
-  zmFac = 1.5 + s;
-  if (mPtr.z > 0.) {
-    az += 2. * pi * mPtr.x;
-    el += 0.5 * pi * mPtr.y;
-  }
-  ori = vec2 (el, az);
-  ca = cos (ori);
-  sa = sin (ori);
-  vuMat = mat3 (ca.y, 0., - sa.y, 0., 1., 0., sa.y, 0., ca.y) *
-          mat3 (1., 0., 0., 0., ca.x, - sa.x, 0., sa.x, ca.x);
-  asp = canvas.x / canvas.y;
-  dstFar = 300.;
-  uv.xy /= zmFac;
-  rd = vuMat * normalize (vec3 (2. * tan (0.5 * atan (uv.x / asp)) * asp, uv.y, 1.));
-  sunDir = normalize (vec3 (0.5, 1., -1.));
-  fragColor = vec4 (ShowScene (ro, rd), 1.);
-}
-
-float PrBox2Df (vec2 p, vec2 b)
-{
-  vec2 d;
-  d = abs (p) - b;
-  return min (max (d.x, d.y), 0.) + length (max (d, 0.));
-}
-
-float PrCylDf (vec3 p, float r, float h)
-{
-  return max (length (p.xy) - r, abs (p.z) - h);
-}
-
-float SmoothMin (float a, float b, float r)
-{
-  float h;
-  h = clamp (0.5 + 0.5 * (b - a) / r, 0., 1.);
-  return mix (b, a, h) - r * h * (1. - h);
-}
-
-float SmoothBump (float lo, float hi, float w, float x)
-{
-  return (1. - smoothstep (hi - w, hi + w, x)) * smoothstep (lo - w, lo + w, x);
-}
-
-vec2 Rot2D (vec2 q, float a)
-{
-  return q * cos (a) * vec2 (1., 1.) + q.yx * sin (a) * vec2 (-1., 1.);
-}
-
-vec2 PixToHex (vec2 p)
-{
-  vec3 c, r, dr;
-  c.xz = vec2 ((1./sqrt3) * p.x - (1./3.) * p.y, (2./3.) * p.y);
-  c.y = - c.x - c.z;
-  r = floor (c + 0.5);
-  dr = abs (r - c);
-  r -= step (dr.yzx, dr) * step (dr.zxy, dr) * dot (r, vec3 (1.));
-  return r.xz;
-}
-
-vec2 HexToPix (vec2 h)
-{
-  return vec2 (sqrt3 * (h.x + 0.5 * h.y), (3./2.) * h.y);
-}
-
-vec3 HexGrid (vec2 p)
-{
-  vec2 q;
-  p = p - HexToPix (PixToHex (p));
-  q = abs (p);
-  return vec3 (p, 0.5 * sqrt3 - q.x + 0.5 * min (q.x - sqrt3 * q.y, 0.));
-}
-
-vec3 HueToRgb (float c)
-{
-  return clamp (abs (fract (c + vec3 (1., 2./3., 1./3.)) * 6. - 3.) - 1., 0., 1.);
-}
-
-const float cHashM = 43758.54;
-
-float Hashfv2 (vec2 p)
-{
-  return fract (sin (dot (p, vec2 (37., 39.))) * cHashM);
-}
-
-vec2 Hashv2v2 (vec2 p)
-{
-  vec2 cHashVA2 = vec2 (37., 39.);
-  return fract (sin (vec2 (dot (p, cHashVA2), dot (p + vec2 (1., 0.), cHashVA2))) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 t, ip, fp;
-  ip = floor (p);  
-  fp = fract (p);
-  fp = fp * fp * (3. - 2. * fp);
-  t = mix (Hashv2v2 (ip), Hashv2v2 (ip + vec2 (0., 1.)), fp.y);
-  return mix (t.x, t.y, fp.x);
-}
-
-float Fbm2 (vec2 p)
-{
-  float f, a;
-  f = 0.;
-  a = 1.;
-  for (int j = 0; j < 5; j ++) {
-    f += a * Noisefv2 (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return f * (1. / 1.9375);
-}
-
-float Fbmn (vec3 p, vec3 n)
-{
-  vec3 s;
-  float a;
-  s = vec3 (0.);
-  a = 1.;
-  for (int j = 0; j < 5; j ++) {
-    s += a * vec3 (Noisefv2 (p.yz), Noisefv2 (p.zx), Noisefv2 (p.xy));
-    a *= 0.5;
-    p *= 2.;
-  }
-  return dot (s, abs (n));
-}
-
-vec3 VaryNf (vec3 p, vec3 n, float f)
-{
-  vec3 g;
-  vec2 e = vec2 (0.1, 0.);
-  g = vec3 (Fbmn (p + e.xyy, n), Fbmn (p + e.yxy, n), Fbmn (p + e.yyx, n)) - Fbmn (p, n);
-  return normalize (n + f * (g - n * dot (n, g)));
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-ocean-structure.slang b/procedural/dr2-ocean-structure.slang
deleted file mode 100644
index 42035337a9..0000000000
--- a/procedural/dr2-ocean-structure.slang
+++ /dev/null
@@ -1,740 +0,0 @@
-#version 450
-// Ocean Structure -  dr2 - 2017-11-01
-// https://www.shadertoy.com/view/ltBczc
-
-// Abstract construction with fire, smoke, reflections and aurora.
-// Look around using mouse; mouse to lower-right corner for daylight view.
-
-// "Ocean Structure" by dr2 - 2017
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define REAL_WAVE 0   // real (=1) or fake (=0, less work) water waves
-#define N_REFL    3   // number of reflections (1-4, 0 = none)
-
-float PrBoxDf (vec3 p, vec3 b);
-float PrSphDf (vec3 p, float s);
-float PrSphAnDf (vec3 p, float r, float w);
-float PrCylDf (vec3 p, float r, float h);
-float PrTorusDf (vec3 p, float ri, float rc);
-float PrCapsDf (vec3 p, float r, float h);
-float PrCapsAnDf (vec3 p, float r, float w, float h);
-float PrFlatCylDf (vec3 p, float rhi, float rlo, float h);
-float Noisefv2 (vec2 p);
-float Noisefv3 (vec3 p);
-float Fbm1 (float p);
-float Fbm2 (vec2 p);
-float Fbm3 (vec3 p);
-vec3 VaryNf (vec3 p, vec3 n, float f);
-vec3 HsvToRgb (vec3 c);
-vec2 Rot2D (vec2 q, float a);
-
-vec3 qHit, sunDir, smkPos;
-float dstFar, tCur, smkRadEx, smkRadIn, smkPhs, smkHt, tWav;
-int idObj;
-bool isNite;
-const int idBase = 1, idPlat = 2, isShel = 3, idFrm = 4, idDway = 5,
-   idTwr = 6, idBrg = 7, idBrCab = 8, idRdw = 9;
-const float pi = 3.14159;
-
-float BridgeDf (vec3 p, float dMin)
-{
-  float cbRad = 0.06;
-  vec3 q, qq;
-  float d, cLen, wRd;
-  wRd = 1.;
-  q = p;  q.x = abs (q.x) - wRd;  q.y -= -0.3;
-  d = PrBoxDf (q, vec3 (0.15, 5., 0.15));
-  q = p;  q.y -= 4.85;
-  d = min (d, PrBoxDf (q, vec3 (wRd + 0.15, 0.15, 0.15)));
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idBrg; }
-  qq = p;  qq.x = abs (qq.x) - wRd + 0.07;  qq.z = abs (qq.z);
-  q = qq;  q.y -= 4.92;
-  q.yz = Rot2D (q.yz, -0.1 * pi);
-  q.z -= 9.5;
-  d = PrCylDf (q, cbRad, 9.5);
-  q = qq;  q.y -= 4.82;
-  q.yz = Rot2D (q.yz, -0.15 * pi);
-  q.z -= 6.4;
-  d = min (d, PrCylDf (q, cbRad, 6.4));
-  q = qq;  q.y -= 4.77;
-  q.yz = Rot2D (q.yz, -0.26 * pi);
-  q.z -= 4.;
-  d = min (d, PrCylDf (q, cbRad, 4.));
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idBrCab; }
-  return dMin;
-}
-
-float CentStrucDf (vec3 p, float dMin, float ar)
-{
-  float cRad = 6., cLen = 8., ww = 0.03, wThk = 0.05,
-     doorHt = 1.6, doorWd = 1.4;
-  vec3 q;
-  vec2 qo;
-  float d, dd;
-  q = p;  q.y -= -1.05;
-  d = PrCylDf (q.xzy, 8.5, 0.15);
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idPlat; }
-  d = PrTorusDf (vec3 (q.xz, abs (abs (q.y - 1.1) - 0.4) - 0.2), 0.03, 8.5);
-  q.xz = Rot2D (q.xz, 2. * pi * (floor (16. * ar) + 0.5) / 16.);
-  q.xy -= vec2 (-8.5, 0.9);
-  d = min (d, PrCylDf (q.xzy, 0.05, 0.82));
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idBrCab; }
-  q = p;
-  qo = Rot2D (q.xz, 2. * pi * (floor (4. * ar) + 0.5) / 4.);
-  q.xz = qo;  q.y -= cLen + 1.2 * doorHt - 9.;
-  dd = PrFlatCylDf (q.yzx, doorHt, doorWd, 0.);
-  q = p;  q.y -= cLen - 9.;
-  d = max (max (max (PrCapsAnDf (q.xzy, cRad, wThk, cLen), - q.y), q.y - 1.635 * cLen), - dd);
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = isShel; }
-  q.xz = Rot2D (q.xz, 2. * pi * (floor (8. * ar) + 0.5) / 8.);
-  d = max (max (max (PrCapsAnDf (q.xzy, cRad, 0.2, cLen),
-     min (abs (mod (q.y, 2.) - 1.) - 0.1,
-     dot (vec2 (q.x, abs (q.z)), vec2 (sin (0.04 * 2. * pi / 16.), cos (0.04 * 2. * pi / 16.))))),
-     - q.y), - dd);
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idFrm; }
-  q = p;  q.xz = qo;  q.xy -= vec2 (-0.98 * cRad, cLen + 1.2 * doorHt - 9.);
-  d = max (max (max (PrFlatCylDf (q.yzx, doorHt, doorWd, 0.1 * cRad),
-     - PrFlatCylDf (q.yzx, doorHt - ww, doorWd - ww, 0.)),
-     - (q.y + 2. * doorHt - ww - wThk)), - (q.y + 1.2 * doorHt));
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idDway; }
-  return dMin;
-}
-
-float CornStrucDf (vec3 p, float dMin)
-{
-  vec3 q;
-  float d, a;
-  q = p;  q.y -= -1.2;
-  d = PrCylDf (q.xzy, 3.2, 0.15);
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idPlat; }
-  q = p;  q.y -= 1.;
-  d = max (PrCapsAnDf  (q.xzy, 2.5, 0.1, 3.), -2.2 - q.y);
-  q = p;  q.y -= 7.;
-  d = min (d, max (PrCapsDf (q.xzy, 0.7, 2.), -1. - q.y));
-  q = p;
-  a = (length (q.xz) > 0.) ? atan (q.z, - q.x) / (2. * pi) : 0.;
-  q.xz = Rot2D (q.xz, 2. * pi * (floor (4. * a + 0.5) / 4.));
-  d = max (d, - PrFlatCylDf (q.yzx, 1.5, 1., 0.));
-  q = p;
-  q.xz = Rot2D (q.xz, 2. * pi * (floor (16. * a) + 0.5) / 16.);
-  q.y -= 4.3;
-  d = max (d, - (length (max (abs (q.yz) - vec2 (0.6, 0.08), 0.)) - 0.2));
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idTwr; }
-  return dMin;
-}
-
-float ObjDf (vec3 p)
-{
-  vec3 q;
-  float d, dMin, hs, wRd, ar;
-  dMin = dstFar;
-  hs = 5.;
-  q = p;  q.xz = abs (q.xz) - 4.;
-  d = max (PrSphAnDf (q, 4.85, 0.15), - min (3.9 - q.y, q.y));
-  q.y -= 0.5;
-  d = max (d, 2.2 - min (length (q.yz), length (q.xy)));
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idBase; }
-  q = p;  q.xz = abs (q.xz) - 20.;
-  d = max (PrSphAnDf (q, 4.85, 0.15), - min (3.9 - q.y, q.y));
-  q.y -= 0.5;
-  d = max (d, 2.2 - min (length (q.yz), length (q.xy)));
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idBase; }
-  wRd = 1.;
-  q = p;  q.xz = abs (q.xz) - 20.7 + wRd;
-  d = max (max (length (max (q.xz - wRd, 0.)) - 0.3,
-     - (length (max (q.xz + wRd, 0.)) - 0.3)), abs (q.y - hs + 1.) - 0.1);
-  if (d < dMin) { dMin = d;  qHit = q;  idObj = idRdw; }
-  q = p;
-  ar = (length (p.xz) > 0.) ? atan (p.z, - p.x) / (2. * pi) : 0.;
-  q.y -= hs;
-  dMin = CentStrucDf (q, dMin, ar);
-  q = p;  q.y -= hs;  q.xz = abs (q.xz) - vec2 (20.);
-  dMin = CornStrucDf (q, dMin);
-  q = p;  q.y -= hs;
-  q.xz = Rot2D (q.xz, 2. * pi * (floor (4. * ar + 0.5) / 4.));
-  q.x += 20.;
-  dMin = BridgeDf (q, dMin);
-  return dMin;
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  float dHit, d;
-  dHit = 0.;
-  for (int j = 0; j < 120; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < 0.001 || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  vec4 v;
-  vec3 e = vec3 (0.001, -0.001, 0.);
-  v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy), ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-float WaveHt (vec2 p)
-{
-  mat2 qRot = mat2 (0.8, -0.6, 0.6, 0.8);
-  vec4 t4, v4;
-  vec2 t;
-  float wFreq, wAmp, ht;
-  wFreq = 1.;
-  wAmp = 1.;
-  ht = 0.;
-  for (int j = 0; j < 3; j ++) {
-    p *= qRot;
-    t = tWav * vec2 (1., -1.);
-    t4 = (p.xyxy + t.xxyy) * wFreq;
-    t = vec2 (Noisefv2 (t4.xy), Noisefv2 (t4.zw));
-    t4 += 2. * t.xxyy - 1.;
-    v4 = (1. - abs (sin (t4))) * (abs (sin (t4)) + abs (cos (t4)));
-    ht += wAmp * dot (pow (1. - sqrt (v4.xz * v4.yw), vec2 (8.)), vec2 (1.));
-    wFreq *= 2.;
-    wAmp *= 0.5;
-  }
-  return ht;
-}
-
-vec3 WaveNf (vec3 p, float d)
-{
-  vec3 vn;
-  vec2 e;
-  e = vec2 (max (0.01, 0.005 * d * d), 0.);
-  p *= 0.3;
-  vn.xz = 0.4 * (WaveHt (p.xz) - vec2 (WaveHt (p.xz + e.xy),  WaveHt (p.xz + e.yx)));
-  vn.y = e.x;
-  return normalize (vn);
-}
-
-#if REAL_WAVE
-
-float WaveRay (vec3 ro, vec3 rd)
-{
-  vec3 p;
-  float dHit, h, s, sLo, sHi, f1, f2;
-  dHit = dstFar;
-  f1 = 0.4;
-  f2 = 0.3;
-  s = max (- (ro.y - 1.2 * f1) / rd.y, 0.);
-  sLo = s;
-  for (int j = 0; j < 80; j ++) {
-    p = ro + s * rd;
-    h = p.y - f1 * WaveHt (f2 * p.xz);
-    if (h < 0.) break;
-    sLo = s;
-    s += max (0.3, h) + 0.005 * s;
-    if (s >= dstFar) break;
-  }
-  if (h < 0.) {
-    sHi = s;
-    for (int j = 0; j < 5; j ++) {
-      s = 0.5 * (sLo + sHi);
-      p = ro + s * rd;
-      h = step (0., p.y - f1 * WaveHt (f2 * p.xz));
-      sLo += h * (s - sLo);
-      sHi += (1. - h) * (s - sHi);
-    }
-    dHit = sHi;
-  }
-  return dHit;
-}
-
-#endif
-
-float SmokeDens (vec3 p)
-{
-  mat2 rMat;
-  vec3 q, u;
-  float f;
-  f = PrTorusDf (p.xzy, smkRadIn, smkRadEx);
-  if (f < 0.) {
-    q = p.xzy / smkRadEx;
-    u = normalize (vec3 (q.xy, 0.));
-    q -= u;
-    rMat = mat2 (vec2 (u.x, - u.y), u.yx);
-    q.xy = rMat * q.xy;
-    q.xz = Rot2D (q.xz, 2.5 * tCur);
-    q.xy = q.xy * rMat;
-    q += u;
-    q.xy = Rot2D (q.xy, 0.1 * tCur);
-    f = smoothstep (0., smkRadIn, - f) * Fbm3 (10. * q);
-  } else f = 0.;
-  return f;
-}
-
-vec4 SmokeCol (vec3 ro, vec3 rd, float dstObj)
-{
-  vec4 col4;
-  vec3 q;
-  float densFac, dens, d, h, sh;
-  d = 0.;
-  for (int j = 0; j < 150; j ++) {
-    q = ro + d * rd;
-    q.xz = abs (q.xz);
-    q -= smkPos;
-    h = PrTorusDf (q.xzy, smkRadIn, smkRadEx);
-    d += h;
-    if (h < 0.001 || d > dstFar) break;
-  }
-  col4 = vec4 (0.);
-  if (d < min (dstObj, dstFar)) {
-    densFac = 1.45 * (1.08 - pow (smkPhs, 1.5));
-    for (int j = 0; j < 150; j ++) {
-      q = ro + d * rd;
-      q.xz = abs (q.xz);
-      q -= smkPos;
-      dens = SmokeDens (q);
-      sh = 0.3 + 0.7 * smoothstep (-0.3, 0.1, dens - SmokeDens (q + 0.1 * sunDir));
-      col4 += densFac * dens * (1. - col4.w) * vec4 (sh * vec3 (0.9) - col4.rgb, 0.3);
-      d += 2.2 * smkRadEx / 150.;
-      if (col4.w > 0.99 || d > dstFar) break;
-    }
-  }
-  if (isNite) col4.rgb *= vec3 (0.3, 0.4, 0.3);
-  return col4;
-}
-
-vec4 ObjCol (vec3 n)
-{
-  vec4 col;
-  if (idObj == idBase) col = vec4 (0.3, 0.4, 0.1, 0.1);
-  else if (idObj == idPlat) col = vec4 (0.4, 0.4, 0.3, 0.1);
-  else if (idObj == isShel) col = vec4 (0.5, 0.5, 0.5, 0.3);
-  else if (idObj == idFrm) col = vec4 (0.8, 0.8, 0.9, 0.5);
-  else if (idObj == idDway) col = vec4 (0.7, 0.8, 0.7, 0.3);
-  else if (idObj == idTwr) col = vec4 (0.7, 0.7, 0.6, 0.3);
-  else if (idObj == idBrg) col = vec4 (1., 0.3, 0.3, 0.3);
-  else if (idObj == idBrCab) col = vec4 (0.9, 0.9, 1., 0.5);
-  else if (idObj == idRdw) col = vec4 (0.4, 0.3, 0.3, 0.1);
-  return col;
-}
-
-vec4 AurCol (vec3 ro, vec3 rd)
-{
-  vec4 col, mCol;
-  vec3 p, dp;
-  float ar;
-  dp = rd / rd.y;
-  p = ro + (40. - ro.y) * dp;
-  col = vec4 (0.);
-  mCol = vec4 (0.);
-  tWav = 0.05 * tCur;
-  for (float ns = 0.; ns < 50.; ns ++) {
-    p += dp;
-    ar = 0.05 - clamp (0.06 * WaveHt (0.01 * p.xz), 0., 0.04);
-    mCol = mix (mCol, ar * vec4 (HsvToRgb (vec3 (0.34 + 0.007 * ns, 1., 1. - 0.02 * ns)), 1.), 0.5);
-    col += mCol;
-  }
-  return col;
-}
-
-vec3 NtSkyCol (vec3 rd)
-{
-  vec3 rds;
-  rds = floor (2000. * rd);
-  rds = 0.00015 * rds + 0.1 * Noisefv3 (0.0005 * rds.yzx);
-  for (int j = 0; j < 19; j ++) rds = abs (rds) / dot (rds, rds) - 0.9;
-  return 0.3 * vec3 (1., 1., 0.9) * min (1., 0.5e-3 * pow (min (6., length (rds)), 5.));
-}
-
-vec3 BgCol (vec3 ro, vec3 rd)
-{
-  vec3 col;
-  float f, a;
-  if (rd.y > 0.) {
-    a = atan (rd.x, - rd.z);
-    if (rd.y < 0.03 * Fbm1 (32. * a) + 0.005)
-       col = (isNite ? vec3 (0.07, 0.1, 0.07) : vec3 (0.4, 0.5, 0.7)) * (1. - 0.3 * Fbm2 (128. * vec2 (a, rd.y)));
-    else {
-      if (isNite) {
-        vec4 aCol = AurCol (ro, rd);
-        col = (1. - 0.5 * aCol.a) * NtSkyCol (rd) + 0.6 * aCol.rgb;
-      } else {
-        ro.xz += 2. * tCur;
-        col = vec3 (0.2, 0.3, 0.6) + 0.2 * (1. - max (rd.y, 0.)) +
-           0.1 * pow (max (dot (rd, sunDir), 0.), 16.);
-        f = Fbm2 (0.02 * (ro.xz + rd.xz * (100. - ro.y) / max (rd.y, 0.01)));
-        col = mix (col, vec3 (1.), 0.2 + 0.8 * f * rd.y);
-      }
-    }
-  } else {
-    col = vec3 (0.6, 0.5, 0.3);
-    if (- ro.y / rd.y < dstFar) {
-      ro += - (ro.y / rd.y) * rd;
-      col *= 1.1 - 0.2 * Noisefv2 (30. * ro.xz);
-    }
-    col = mix (col, 0.9 * (vec3 (0.4, 0.2, 0.1) + 0.2) + 0.1, pow (1. + rd.y, 5.));
-  }
-  return col;
-}
-
-vec4 GlowCol (vec3 ro, vec3 rd, float dstObj)
-{
-  vec3 gloDir;
-  float gloDist, wGlow, s;
-  wGlow = 0.;
-  for (float j = 0.; j < 4.; j ++) {
-    gloDir = vec3 (20., 9.3, 20.) * (1. - 2. * vec3 (floor (j / 2.), 0., mod (j, 2.))) - ro;
-    gloDist = length (gloDir);
-    s = dot (rd, normalize (gloDir));
-    if (s > 0. && gloDist < dstObj) wGlow += 1. - smoothstep (1., 2., sqrt (1. - s * s) * gloDist);
-  }
-  gloDir = vec3 (0., 15.5, 0.) - ro;
-  gloDist = length (gloDir);
-  s = dot (rd, normalize (gloDir));
-  if (s > 0. && gloDist < dstObj) wGlow += 1. - smoothstep (2., 3., sqrt (1. - s * s) * gloDist);
-  return (0.6 + 0.4 * sin (0.3 * 2. * pi * tCur)) * clamp (wGlow, 0., 1.) * vec4 (1., 0.5, 0.3, 1.);
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec4 objCol, smkCol, smkColR, smkColW, glwCol, glwColR, glwColW;
-  vec3 col, vn;
-  float dstObj, dstWat, reflCol;
-  bool wRefl;
-  col = vec3 (0.2, 0.2, 0.);
-  wRefl = false;
-  dstObj = ObjRay (ro, rd);
-  smkCol = SmokeCol (ro, rd, dstObj);
-  glwCol = GlowCol (ro, rd, dstObj);
-  glwColR = vec4 (0.);
-  glwColW = vec4 (0.);
-  smkColR = vec4 (0.);
-  smkColW = vec4 (0.);
-  tWav = 0.4 * tCur;
-  reflCol = 1.;
-  if (N_REFL >= 2 && dstObj < dstFar && idObj == isShel) {
-    if (length (qHit.xz) > 6. || qHit.y >= 8.8) {
-      ro += dstObj * rd;
-      vn = ObjNf (ro);
-      rd = reflect (rd, vn);
-      ro += 0.01 * rd;
-      dstObj = ObjRay (ro, rd);
-      smkColR = SmokeCol (ro, rd, dstObj);
-      glwColR = GlowCol (ro, rd, dstObj);
-      reflCol *= 0.9;
-    }
-  }
-  if (N_REFL >= 1 && rd.y < 0.) {
-#if REAL_WAVE
-    dstWat = WaveRay (ro, rd);
-#else
-    dstWat = - ro.y / rd.y;
-#endif
-    if (dstWat < min (dstObj, dstFar)) {
-      wRefl = true;
-      ro += dstWat * rd;
-      vn = WaveNf (ro, dstWat);
-      rd = reflect (rd, vn);
-      ro += 0.01 * rd;
-      dstObj = ObjRay (ro, rd);
-      smkColW = SmokeCol (ro, rd, dstObj);
-      glwColW = GlowCol (ro, rd, dstObj);
-      if (N_REFL >= 3 && dstObj < dstFar && idObj == isShel) {
-        ro += dstObj * rd;
-        vn = ObjNf (ro);
-        rd = reflect (rd, vn);
-        if (N_REFL == 4) {
-          ro += 0.01 * rd;
-          dstObj = ObjRay (ro, rd);
-        } else {
-          dstObj = dstFar;
-        }
-      }
-      reflCol *= 0.7;
-    }
-  }
-  if (dstObj < dstFar) {
-    ro += dstObj * rd;
-    vn = ObjNf (ro);
-    if (idObj == idRdw) vn = VaryNf (5. * qHit, vn, 1.);
-    else if (idObj == idBase) vn = VaryNf (2. * floor (16. * qHit), vn, 2.);
-    objCol = ObjCol (vn);
-    if (isNite) col = objCol.rgb * vec3 (0.3, 0.35, 0.3) * (0.2 + 0.8 * max (0.,vn.y));
-    else col = objCol.rgb * (0.2 + 0.8 * max (0., max (dot (vn, sunDir), 0.))) + 
-       objCol.a * pow (max (dot (normalize (sunDir - rd), vn), 0.), 64.);
-  } else if (rd.y > 0.) {
-    col = BgCol (ro, rd);
-  } else {
-#if N_REFL == 0
-    dstWat = - ro.y / rd.y;
-#endif
-    col = BgCol (ro + dstWat * rd, reflect (rd, vec3 (0., 1., 0.)));
-    reflCol = 0.7;
-  }
-  col = clamp (reflCol * col, 0., 1.);
-  col = mix (col, glwCol.rgb, glwCol.a);
-  col = mix (col, glwColR.rgb, glwColR.a);
-  col = mix (col, smkCol.rgb, smkCol.a);
-  col = mix (col, smkColR.rgb, smkColR.a);
-  if (wRefl) {
-    col = mix (col, reflCol * glwColW.rgb, glwColW.a);
-    col = mix (col, reflCol * smkColW.rgb, smkColW.a);
-    col = mix (mix (vec3 (0., 0.1, 0.), vec3 (0., 0.05, 0.05),
-       smoothstep (0.4, 0.6, Fbm2 (0.5 * ro.xz))), col, 1. - pow (abs (rd.y), 4.));
-  }
-  return clamp (col, 0., 1.);
-}
-
-void mainImage (out vec4 fragColor, in vec2 fragCoord)
-{
-  mat3 vuMat;
-#ifdef MOUSE
-  vec4 mPtr;
-#endif
-  vec3 ro, rd;
-  vec2 uv, ori, ca, sa;
-  float el, az;
-  uv = 2. * fragCoord.xy / iResolution.xy - 1.;
-  uv.x *= iResolution.x / iResolution.y;
-  tCur = iGlobalTime;
-#ifdef MOUSE
-  mPtr = iMouse;
-  mPtr.xy = mPtr.xy / iResolution.xy - 0.5;
-#endif
-  smkPhs = mod (0.15 * tCur + 0.3, 1.);
-  smkPos = vec3 (20., 9. + 10. * smkPhs, 20.);
-  smkRadIn = 0.6 * (0.1 + 0.9 * smoothstep (0.01, 0.1, smkPhs));
-  smkRadEx = smkRadIn + 2.5;
-  dstFar = 140.;
-  isNite = true;
-  az = 0.33 * pi;
-  el = -0.016 * pi;
-#ifdef MOUSE
-  if (mPtr.z > 0.) {
-    if (mPtr.x > 0.45 && mPtr.y < -0.45) isNite = false;
-    else {
-      az += pi * mPtr.x;
-      el += 0.05 * pi * mPtr.y;
-    }
-  } else {
-    az += 0.002 * pi * tCur;
-    el += 0.01 * pi * sin (0.01 * pi * tCur);
-  }
-#else
-  az += 0.002 * pi * tCur;
-  el += 0.01 * pi * sin (0.01 * pi * tCur);
-#endif
-  el = clamp (el, -0.4 * pi, -0.01 * pi);
-  ori = vec2 (el, az);
-  ca = cos (ori);
-  sa = sin (ori);
-  vuMat = mat3 (ca.y, 0., - sa.y, 0., 1., 0., sa.y, 0., ca.y) *
-          mat3 (1., 0., 0., 0., ca.x, - sa.x, 0., sa.x, ca.x);
-  ro = vuMat * vec3 (0., 10., -100.);
-  rd = vuMat * normalize (vec3 (uv, 4.2));
-  sunDir = vuMat * normalize (vec3 (1., 1., -1.));
-  fragColor = vec4 (ShowScene (ro, rd), 1.);
-}
-
-float PrBoxDf (vec3 p, vec3 b)
-{
-  vec3 d;
-  d = abs (p) - b;
-  return min (max (d.x, max (d.y, d.z)), 0.) + length (max (d, 0.));
-}
-
-float PrSphDf (vec3 p, float s)
-{
-  return length (p) - s;
-}
-
-float PrSphAnDf (vec3 p, float r, float w)
-{
-  return abs (length (p) - r) - w;
-}
-
-float PrCylDf (vec3 p, float r, float h)
-{
-  return max (length (p.xy) - r, abs (p.z) - h);
-}
-
-float PrCapsDf (vec3 p, float r, float h)
-{
-  return length (p - vec3 (0., 0., h * clamp (p.z / h, -1., 1.))) - r;
-}
-
-float PrCapsAnDf (vec3 p, float r, float w, float h)
-{
-  p.z = abs (p.z);
-  return max (length (p - vec3 (0., 0., min (p.z, h + w))) - r,
-     - length (p - vec3 (0., 0., min (p.z, h - w))) + r) - w;
-}
-
-float PrFlatCylDf (vec3 p, float rhi, float rlo, float h)
-{
-  float d;
-  d = length (p.xy - vec2 (rhi * clamp (p.x / rhi, -1., 1.), 0.)) - rlo;
-  if (h > 0.) d = max (d, abs (p.z) - h);
-  return d;
-}
-
-float PrTorusDf (vec3 p, float ri, float rc)
-{
-  return length (vec2 (length (p.xy) - rc, p.z)) - ri;
-}
-
-const float cHashM = 43758.54;
-
-vec2 Hashv2f (float p)
-{
-  return fract (sin (p + vec2 (0., 1.)) * cHashM);
-}
-
-vec2 Hashv2v2 (vec2 p)
-{
-  vec2 cHashVA2 = vec2 (37., 39.);
-  return fract (sin (vec2 (dot (p, cHashVA2), dot (p + vec2 (1., 0.), cHashVA2))) * cHashM);
-}
-
-vec4 Hashv4v3 (vec3 p)
-{
-  vec3 cHashVA3 = vec3 (37., 39., 41.);
-  vec2 e = vec2 (1., 0.);
-  return fract (sin (vec4 (dot (p + e.yyy, cHashVA3), dot (p + e.xyy, cHashVA3),
-     dot (p + e.yxy, cHashVA3), dot (p + e.xxy, cHashVA3))) * cHashM);
-}
-
-float Noiseff (float p)
-{
-  vec2 t;
-  float ip, fp;
-  ip = floor (p);
-  fp = fract (p);
-  fp = fp * fp * (3. - 2. * fp);
-  t = Hashv2f (ip);
-  return mix (t.x, t.y, fp);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 t, ip, fp;
-  ip = floor (p);  
-  fp = fract (p);
-  fp = fp * fp * (3. - 2. * fp);
-  t = mix (Hashv2v2 (ip), Hashv2v2 (ip + vec2 (0., 1.)), fp.y);
-  return mix (t.x, t.y, fp.x);
-}
-
-float Noisefv3 (vec3 p)
-{
-  vec4 t;
-  vec3 ip, fp;
-  ip = floor (p);
-  fp = fract (p);
-  fp *= fp * (3. - 2. * fp);
-  t = mix (Hashv4v3 (ip), Hashv4v3 (ip + vec3 (0., 0., 1.)), fp.z);
-  return mix (mix (t.x, t.y, fp.x), mix (t.z, t.w, fp.x), fp.y);
-}
-
-float Fbm1 (float p)
-{
-  float f, a;
-  f = 0.;
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    f += a * Noiseff (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return f * (1. / 1.9375);
-}
-
-float Fbm2 (vec2 p)
-{
-  float f, a;
-  f = 0.;
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    f += a * Noisefv2 (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return f * (1. / 1.9375);
-}
-
-float Fbm3 (vec3 p)
-{
-  float f, a;
-  f = 0.;
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    f += a * Noisefv3 (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return f * (1. / 1.9375);
-}
-
-float Fbmn (vec3 p, vec3 n)
-{
-  vec3 s;
-  float a;
-  s = vec3 (0.);  
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    s += a * vec3 (Noisefv2 (p.yz), Noisefv2 (p.zx), Noisefv2 (p.xy));
-    a *= 0.5;  
-    p *= 2.;
-  }
-  return dot (s, abs (n));
-}
-
-vec3 VaryNf (vec3 p, vec3 n, float f)
-{
-  vec3 g;
-  vec2 e = vec2 (0.1, 0.);
-  g = vec3 (Fbmn (p + e.xyy, n), Fbmn (p + e.yxy, n), Fbmn (p + e.yyx, n)) - Fbmn (p, n);
-  return normalize (n + f * (g - n * dot (n, g)));
-}
-
-vec3 HsvToRgb (vec3 c)
-{
-  vec3 p;
-  p = abs (fract (c.xxx + vec3 (1., 2./3., 1./3.)) * 6. - 3.);
-  return c.z * mix (vec3 (1.), clamp (p - 1., 0., 1.), c.y);
-}
-
-vec2 Rot2D (vec2 q, float a)
-{
-  return q * cos (a) + q.yx * sin (a) * vec2 (-1., 1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-rainbow-cavern.slang b/procedural/dr2-rainbow-cavern.slang
deleted file mode 100644
index df26354c6a..0000000000
--- a/procedural/dr2-rainbow-cavern.slang
+++ /dev/null
@@ -1,414 +0,0 @@
-#version 450
-// Rainbow Cavern -  dr2 - 2017-06-01
-// https://www.shadertoy.com/view/XsfBWM
-
-// Underground boat ride (mouseable)
-
-// "Rainbow Cavern" by dr2 - 2017
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define USE_BMAP true
-//#define USE_BMAP false  // for weaker GPUs
-
-float PrSphDf (vec3 p, float r);
-float PrCapsDf (vec3 p, float r, float h);
-float SmoothBump (float lo, float hi, float w, float x);
-vec2 Rot2D (vec2 q, float a);
-float Hashfv3 (vec3 p);
-vec3 Hashv3f (float p);
-vec3 VaryNf (vec3 p, vec3 n, float f);
-
-vec4 vcId;
-vec3 ltPos[2], boatPos[2];
-float boatAng[2], dstFar, tCur, htWat, dstBMap;
-int idObj;
-bool uWat, hitWat;
-const int idBoat = 1, idBLamp = 2, idFLamp = 3;
-const float pi = 3.14159;
-
-float ObjDf (vec3 p)
-{
-  vec3 q;
-  float dMin, d;
-  dMin = dstFar;
-  for (int k = 0; k < 2; k ++) {
-    q = p - boatPos[k];
-    q.xz = Rot2D (q.xz, boatAng[k]);
-    d = max (PrCapsDf (q, 0.11, 0.25),
-       - PrCapsDf (q + vec3 (0., -0.02, 0.), 0.1, 0.24));
-    if (d < dMin) { dMin = d;  idObj = idBoat; }
-    q.y -= 0.1;
-    q.z -= 0.3;
-    d = PrSphDf (q, 0.01);
-    if (d < dMin) { dMin = d;  idObj = idFLamp; }
-    q.z -= -0.6;
-    d = PrSphDf (q, 0.01);
-    if (d < dMin) { dMin = d;  idObj = idBLamp; }
-  }
-  return dMin;
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  float dHit, d;
-  dHit = 0.;
-  for (int j = 0; j < 100; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < 0.001 || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  vec4 v;
-  vec3 e = vec3 (0.001, -0.001, 0.);
-  v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy),
-     ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-float VPoly (vec3 p)
-{
-  vec3 ip, fp, g, w, a;
-  ip = floor (p);
-  fp = fract (p);
-  a = vec3 (2.);
-  for (float gz = -1.; gz <= 1.; gz ++) {
-    for (float gy = -1.; gy <= 1.; gy ++) {
-      for (float gx = -1.; gx <= 1.; gx ++) {
-        g = vec3 (gx, gy, gz);
-        w = g + 0.7 * Hashfv3 (ip + g) - fp;
-        a.x = dot (w, w);
-        if (a.x < a.y) {
-          vcId = vec4 (ip + g, a.y - a.x);
-          a = a.zxy;
-        } else a.z = min (a.z, a.x);
-      }
-    }
-  }
-  return a.y;
-}
-
-vec3 TrackPath (float t)
-{
-  return vec3 (4.7 * sin (t * 0.15) + 2.7 * cos (t * 0.19), 0., t);
-}
-
-float CaveDf (vec3 p)
-{
-  vec3 hv;
-  float s, d;
-  s = p.y - htWat;
-  p.xy -= TrackPath (p.z).xy;
-  p += 0.1 * (1. - cos (2. * pi * (p + 0.2 * (1. - cos (2. * pi * p.zxy)))));
-  hv = cos (0.6 * p - 0.5 * sin (1.4 * p.zxy + 0.4 * cos (2.7 * p.yzx)));
-  if (USE_BMAP && dstBMap < 10.) hv *= 1. + 0.01 *
-     (1. - smoothstep (0., 10., dstBMap)) *
-     smoothstep (0.05, 0.4, VPoly (10. * p)) / length (hv);
-  d = 0.9 * (length (hv) - 1.1);
-  if (! uWat) d = min (d, s);
-  return d;
-}
-
-float CaveRay (vec3 ro, vec3 rd)
-{
-  float d, dHit;
-  dHit = 0.;
-  for (int j = 0; j < 200; j ++) {
-    dstBMap = dHit;
-    d = CaveDf (ro + dHit * rd);
-    dHit += d;
-    if (d < 0.001 || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 CaveNf (vec3 p)
-{
-  vec4 v;
-  const vec3 e = vec3 (0.001, -0.001, 0.);
-  v = vec4 (CaveDf (p + e.xxx), CaveDf (p + e.xyy),
-     CaveDf (p + e.yxy), CaveDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-float CaveSShadow (vec3 ro, vec3 rd)
-{
-  float sh, d, h;
-  sh = 1.;
-  d = 0.1;
-  for (int j = 0; j < 16; j ++) {
-    h = CaveDf (ro + rd * d);
-    sh = min (sh, smoothstep (0., 0.05 * d, h));
-    d += max (0.2, 0.1 * d);
-    if (sh < 0.05) break;
-  }
-  return 0.4 + 0.6 * sh;
-}
-
-vec3 CaveCol (vec3 ro, vec3 rd, vec3 ltDir, float atten)
-{
-  vec3 col, vn, q, vno;
-  float glit;
-  VPoly (10. * ro);
-  q = ro;
-  if (! USE_BMAP) q = 0.004 * floor (250. * q);
-  vn = VaryNf (10. * q, CaveNf (q), 1.);
-  col = (vec3 (0.3, 0.1, 0.) + vec3 (0.3, 0.2, 0.1) * Hashv3f (Hashfv3 (vcId.xyz))) *
-     (1.2 - 0.4 * Hashfv3 (100. * ro)) *
-     (0.4 + 0.6 * smoothstep (0.05, 1., sqrt (vcId.w))) *
-     (0.2 + 0.8 * max (dot (vn, ltDir), 0.) +
-     2. * pow (max (dot (normalize (ltDir - rd), vn), 0.), 256.));
-  if (! hitWat) {
-    vno = CaveNf (ro);
-    glit = 20. * pow (max (0., dot (ltDir, reflect (rd, vno))), 4.) *
-       pow (1. - 0.6 * abs (dot (normalize (ltDir - rd),
-       VaryNf (100. * ro, vno, 5.))), 8.);
-    col += vec3 (1., 1., 0.5) * glit;
-  }
-  col *= atten * CaveSShadow (ro, ltDir);
-  return col;
-}
-
-vec3 ObjCol (vec3 ro, vec3 rd, vec3 vn, vec3 ltDir, float atten)
-{
-  vec4 col4;
-  if (idObj == idBoat) col4 = vec4 (0.3, 0.3, 0.6, 0.2);
-  else if (idObj == idFLamp) col4 = vec4 (0., 1., 0., -1.);
-  else if (idObj == idBLamp) col4 = vec4 (1., 0., 0., -1.);
-  if (col4.a >= 0.)
-    col4.rgb = col4.rgb * (0.2 + 0.8 * CaveSShadow (ro, ltDir)) *
-       (0.1 + 0.9 * atten * max (dot (ltDir, vn), 0.)) +
-       col4.a * atten * pow (max (dot (normalize (ltDir - rd), vn), 0.), 64.);
-  return col4.rgb;
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec3 col, colR, bgCol, ltVec, vn, roo, rdo, row, vnw;
-  float dstCave, dstObj, atten, frFac;
-  roo = ro;
-  rdo = rd;
-  bgCol = (abs (rd.y) < 0.5) ? vec3 (0., 0.05, 0.08) : vec3 (0.01);
-  uWat = false;
-  hitWat = false;
-  dstCave = CaveRay (ro, rd);
-  dstObj = ObjRay (ro, rd);
-  if (dstCave < min (dstObj, dstFar) && ro.y + rd.y * dstCave < htWat + 0.001) {
-    hitWat = true;
-    ro += rd * dstCave;
-    row = ro;
-    vnw = VaryNf (1.5 * ro, vec3 (0., 1., 0.), 0.1);
-    rd = reflect (rd, vnw);
-    ro += 0.01 * rd;
-    dstCave = CaveRay (ro, rd);
-    dstObj = ObjRay (ro, rd);
-  }
-  if (min (dstCave, dstObj) < dstFar) {
-    ltVec = roo + ltPos[0] - ro;
-    atten = 1. / (0.1 + dot (ltVec, ltVec));
-    if (hitWat) atten *= 3.;
-    ltVec = normalize (ltVec);
-    ro += min (dstCave, dstObj) * rd;
-    if (dstCave < dstObj) col = mix (CaveCol (ro, rd, ltVec, atten), bgCol,
-       smoothstep (0.45, 0.99, dstCave / dstFar));
-    else col = ObjCol (ro, rd, ObjNf (ro), ltVec, atten);
-  } else col = bgCol;
-  if (hitWat) {
-    frFac = rdo.y * rdo.y;
-    frFac *= frFac;
-    if (frFac > 0.005) {
-      rd = refract (rdo, vnw, 1./1.333);
-      ro = row + 0.01 * rd;
-      uWat = true;
-      dstCave = CaveRay (ro, rd);
-      if (min (dstCave, dstObj) < dstFar) {
-        ltVec = roo + ltPos[1] - ro;
-        atten = 1. / (0.1 + dot (ltVec, ltVec));
-        ltVec = normalize (ltVec);
-        ro += rd * dstCave;
-        hitWat = false;
-        colR = mix (CaveCol (ro, rd, ltVec, atten), bgCol,
-           smoothstep (0.45, 0.99, dstCave / dstFar));
-      } else colR = bgCol;
-      col = mix (col, colR * vec3 (0.4, 1., 0.6) * exp (0.02 * ro.y), frFac);
-    }
-  }
-  return pow (clamp (col, 0., 1.), vec3 (0.8));
-}
-
-void mainImage (out vec4 fragColor, in vec2 fragCoord)
-{
-  mat3 vuMat;
-#ifdef MOUSE
-  vec4 mPtr;
-#endif
-  vec3 ro, rd, fpF, fpB, vd;
-  vec2 canvas, uv, ori, ca, sa;
-  float el, az, t, tt, a;
-  canvas = iResolution.xy;
-  uv = 2. * fragCoord.xy / canvas - 1.;
-  uv.x *= canvas.x / canvas.y;
-  tCur = iGlobalTime;
-#ifdef MOUSE
-  mPtr = iMouse;
-  mPtr.xy = mPtr.xy / canvas - 0.5;
-#endif
-  t = 1. * tCur;
-  az = 0.;
-  el = 0.;
-#ifdef MOUSE
-  if (mPtr.z > 0.) {
-    az = az + 2. * pi * mPtr.x;
-    el = el + 0.95 * pi * mPtr.y;
-  } else {
-    tt = mod (floor (0.05 * tCur), 4.);
-    a = 0.45 * pi * SmoothBump (0.75, 0.95, 0.05, mod (0.05 * tCur, 1.));
-    if (tt < 2.) el = (2. * tt - 1.) * a;
-    else az = (2. * tt - 5.) * a;
-  }
-#else
-    tt = mod (floor (0.05 * tCur), 4.);
-    a = 0.45 * pi * SmoothBump (0.75, 0.95, 0.05, mod (0.05 * tCur, 1.));
-    if (tt < 2.) el = (2. * tt - 1.) * a;
-    else az = (2. * tt - 5.) * a;
-#endif
-  htWat = -0.5;
-  for (int k = 0; k < 2; k ++) {
-    fpF = TrackPath (t + 3. + 3. * float (k) + 0.1);
-    fpB = TrackPath (t + 3. + 3. * float (k) - 0.1);
-    boatPos[k] = 0.5 * (fpF + fpB);
-    boatPos[k].y = htWat + 0.01;
-    vd = fpF - fpB;
-    boatAng[k] = (length (vd.xz) > 0.) ? atan (vd.x, vd.z) : 0.5 * pi;
-  }
-  fpF = TrackPath (t + 0.1);
-  fpB = TrackPath (t - 0.1);
-  ro = 0.5 * (fpF + fpB);
-  vd = fpF - fpB;
-  ori = vec2 (el, az + ((length (vd.xz) > 0.) ? atan (vd.x, vd.z) : 0.5 * pi));
-  ca = cos (ori);
-  sa = sin (ori);
-  vuMat = mat3 (ca.y, 0., - sa.y, 0., 1., 0., sa.y, 0., ca.y) *
-          mat3 (1., 0., 0., 0., ca.x, - sa.x, 0., sa.x, ca.x);
-  rd = vuMat * normalize (vec3 (uv, 2.));
-  ltPos[0] = 0.5 * vuMat * vec3 (0., 1., -1.);
-  ltPos[1] = 0.5 * vuMat * vec3 (0., -1., -1.);
-  dstFar = 50.;
-  fragColor = vec4 (ShowScene (ro, rd) , 1.);
-}
-
-float PrSphDf (vec3 p, float r)
-{
-  return length (p) - r;
-}
-
-float PrCapsDf (vec3 p, float r, float h)
-{
-  return length (p - vec3 (0., 0., clamp (p.z, - h, h))) - r;
-}
-
-float SmoothBump (float lo, float hi, float w, float x)
-{
-  return (1. - smoothstep (hi - w, hi + w, x)) * smoothstep (lo - w, lo + w, x);
-}
-
-vec2 Rot2D (vec2 q, float a)
-{
-  return q * cos (a) + q.yx * sin (a) * vec2 (-1., 1.);
-}
-
-const vec4 cHashA4 = vec4 (0., 1., 57., 58.);
-const vec3 cHashA3 = vec3 (1., 57., 113.);
-const float cHashM = 43758.54;
-
-float Hashfv2 (vec2 p)
-{
-  return fract (sin (dot (p, cHashA3.xy)) * cHashM);
-}
-
-float Hashfv3 (vec3 p)
-{
-  return fract (sin (dot (p, cHashA3)) * cHashM);
-}
-
-vec3 Hashv3f (float p)
-{
-  return fract (sin (vec3 (p, p + 1., p + 2.)) *
-     vec3 (cHashM, cHashM * 0.43, cHashM * 0.37));
-}
-
-vec4 Hashv4f (float p)
-{
-  return fract (sin (p + cHashA4) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec4 t;
-  vec2 ip, fp;
-  ip = floor (p);
-  fp = fract (p);
-  fp = fp * fp * (3. - 2. * fp);
-  t = Hashv4f (dot (ip, cHashA3.xy));
-  return mix (mix (t.x, t.y, fp.x), mix (t.z, t.w, fp.x), fp.y);
-}
-
-float Fbmn (vec3 p, vec3 n)
-{
-  vec3 s;
-  float a;
-  s = vec3 (0.);
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    s += a * vec3 (Noisefv2 (p.yz), Noisefv2 (p.zx), Noisefv2 (p.xy));
-    a *= 0.5;
-    p *= 2.;
-  }
-  return dot (s, abs (n));
-}
-
-vec3 VaryNf (vec3 p, vec3 n, float f)
-{
-  vec3 g;
-  const vec3 e = vec3 (0.1, 0., 0.);
-  g = vec3 (Fbmn (p + e.xyy, n), Fbmn (p + e.yxy, n), Fbmn (p + e.yyx, n)) -
-     Fbmn (p, n);
-  return normalize (n + f * (g - n * dot (n, g)));
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-river-flight.slang b/procedural/dr2-river-flight.slang
deleted file mode 100644
index d780e0d884..0000000000
--- a/procedural/dr2-river-flight.slang
+++ /dev/null
@@ -1,629 +0,0 @@
-#version 450
-// River Flight -  dr2 - 2014-11-06
-// https://www.shadertoy.com/view/4sSXDG
-
-// Fasten your seatbelts for a wild ride.
-
-// "River Flight" by dr2 - 2014
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-const vec4 cHashA4 = vec4 (0., 1., 57., 58.);
-const vec3 cHashA3 = vec3 (1., 57., 113.);
-const float cHashM = 43758.54;
-
-vec4 Hashv4f (float p)
-{
-  return fract (sin (p + cHashA4) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 i = floor (p);
-  vec2 f = fract (p);
-  f = f * f * (3. - 2. * f);
-  vec4 t = Hashv4f (dot (i, cHashA3.xy));
-  return mix (mix (t.x, t.y, f.x), mix (t.z, t.w, f.x), f.y);
-}
-
-float Noisefv3 (vec3 p)
-{
-  vec3 i = floor (p);
-  vec3 f = fract (p);
-  f = f * f * (3. - 2. * f);
-  float q = dot (i, cHashA3);
-  vec4 t1 = Hashv4f (q);
-  vec4 t2 = Hashv4f (q + cHashA3.z);
-  return mix (mix (mix (t1.x, t1.y, f.x), mix (t1.z, t1.w, f.x), f.y),
-     mix (mix (t2.x, t2.y, f.x), mix (t2.z, t2.w, f.x), f.y), f.z);
-}
-
-vec3 Noisev3v2 (vec2 p)
-{
-  vec2 i = floor (p);
-  vec2 f = fract (p);
-  vec2 ff = f * f;
-  vec2 u = ff * (3. - 2. * f);
-  vec2 uu = 30. * ff * (ff - 2. * f + 1.);
-  vec4 h = Hashv4f (dot (i, cHashA3.xy));
-  return vec3 (h.x + (h.y - h.x) * u.x + (h.z - h.x) * u.y +
-     (h.x - h.y - h.z + h.w) * u.x * u.y, uu * (vec2 (h.y - h.x, h.z - h.x) +
-     (h.x - h.y - h.z + h.w) * u.yx));
-}
-
-float SmoothMin (float a, float b, float r)
-{
-  float h = clamp (0.5 + 0.5 * (b - a) / r, 0., 1.);
-  return mix (b, a, h) - r * h * (1. - h);
-}
-
-float SmoothBump (float lo, float hi, float w, float x)
-{
-  return (1. - smoothstep (hi - w, hi + w, x)) * smoothstep (lo - w, lo + w, x);
-}
-
-float PrCapsDf (vec3 p, vec2 b)
-{
-  return length (p - vec3 (0., 0., b.x * clamp (p.z / b.x, -1., 1.))) - b.y;
-}
-
-float PrCylDf (vec3 p, vec2 b)
-{
-  return max (length (p.xy) - b.x, abs (p.z) - b.y);
-}
-
-float PrConeDf (vec3 p, vec3 b)
-{
-  return max (dot (vec2 (length (p.xy), p.z), b.xy), abs (p.z) - b.z);
-}
-
-int idObj;
-mat3 flyerMat;
-vec3 flyerPos, engPos, qHit, qHitTransObj, sunDir, sunCol;
-vec2 trkOffset;
-float szFac, wSpan, tCur;
-const float dstFar = 400.;
-const float pi = 3.14159;
-
-vec3 TrackPath (float t)
-{
-  return vec3 (24. * sin (0.035 * t) * sin (0.012 * t) * cos (0.01 * t) +
-     19. * sin (0.0032 * t) + 100. * trkOffset.x, 0., t);
-}
-
-float GrndHt (vec2 p, int hiRes)
-{
-  const vec2 vRot = vec2 (1.4624, 1.6721);
-  vec2 q = p * 0.06;
-  float w = 0.75 * Noisefv2 (0.25 * q) + 0.15;
-  w *= 36. * w;
-  vec2 vyz = vec2 (0.);
-  float ht = 0.;
-  for (int j = 0; j < 10; j ++) {
-    vec3 v = Noisev3v2 (q);
-    vyz += v.yz;
-    ht += w * v.x / (1. + dot (vyz, vyz));
-    if (j == 4) {
-      if (hiRes == 0) break;
-    }
-    w *= -0.37;      
-    q *= mat2 (vRot.x, vRot.y, - vRot.y, vRot.x);
-  }
-  vec3 pt = TrackPath (p.y);
-  pt.y -= 2.;
-  float g = smoothstep (1.5, 4.5, sqrt (abs (p.x - pt.x)));
-  return min (ht, pt.y * (1. - g) + ht * g);
-}
-
-vec3 GrndNf (vec3 p, float d)
-{
-  float ht = GrndHt (p.xz, 1);
-  vec2 e = vec2 (max (0.01, 0.00001 * d * d), 0.);
-  return normalize (vec3 (ht - GrndHt (p.xz + e.xy, 1), e.x,
-     ht - GrndHt (p.xz + e.yx, 1)));
-}
-
-vec4 GrndCol (vec3 p, vec3 n)
-{
-  const vec3 gCol1 = vec3 (0.6, 0.7, 0.7), gCol2 = vec3 (0.2, 0.1, 0.1),
-     gCol3 = vec3 (0.4, 0.3, 0.3), gCol4 = vec3 (0.1, 0.2, 0.1),
-     gCol5 = vec3 (0.7, 0.7, 0.8), gCol6 = vec3 (0.05, 0.3, 0.03),
-     gCol7 = vec3 (0.1, 0.08, 0.);
-  vec2 q = p.xz;
-  float f, d;
-  float cSpec = 0.;
-  f = 0.5 * (clamp (Noisefv2 (0.1 * q), 0., 1.) +
-      0.8 * Noisefv2 (0.2 * q + 2.1 * n.xy + 2.2 * n.yz));
-  vec3 col = f * mix (f * gCol1 + gCol2, f * gCol3 + gCol4, 0.65 * f);
-  if (n.y < 0.5) {
-    f = 0.4 * (Noisefv2 (0.4 * q + vec2 (0., 0.57 * p.y)) +
-       0.5 * Noisefv2 (6. * q));
-    d = 4. * (0.5 - n.y);
-    col = mix (col, vec3 (f), clamp (d * d, 0.1, 1.));
-    cSpec += 0.1;
-  }
-  if (p.y > 22.) {
-    if (n.y > 0.25) {
-      f = clamp (0.07 * (p.y - 22. - Noisefv2 (0.2 * q) * 15.), 0., 1.);
-      col = mix (col, gCol5, f);
-      cSpec += f;
-    }
-  } else {
-    if (n.y > 0.45) {
-      vec3 c = (n.y - 0.3) * (gCol6 * vec3 (Noisefv2 (0.4 * q),
-         Noisefv2 (0.34 * q), Noisefv2 (0.38 * q)) + vec3 (0.02, 0.1, 0.02));
-      col = mix (col, c, smoothstep (0.45, 0.65, n.y) *
-         (1. - smoothstep (15., 22., p.y - 1.5 + 1.5 * Noisefv2 (0.2 * q))));
-    }
-    if (p.y < 0.65 && n.y > 0.4) {
-      d = n.y - 0.4;
-      col = mix (col, d * d + gCol7, 2. * clamp ((0.65 - p.y -
-         0.35 * (Noisefv2 (0.4 * q) + 0.5 * Noisefv2 (0.8 * q) +
-         0.25 * Noisefv2 (1.6 * q))), 0., 0.3));
-      cSpec += 0.1;
-    }
-  }
-  return vec4 (col, cSpec);
-}
-
-float GrndRay (vec3 ro, vec3 rd)
-{
-  vec3 p;
-  float h, s, sLo, sHi;
-  s = 0.;
-  sLo = 0.;
-  float dHit = dstFar;
-  for (int j = 0; j < 150; j ++) {
-    p = ro + s * rd;
-    h = p.y - GrndHt (p.xz, 0);
-    if (h < 0.) break;
-    sLo = s;
-    s += max (0.15, 0.4 * h) + 0.008 * s;
-    if (s > dstFar) break;
-  }
-  if (h < 0.) {
-    sHi = s;
-    for (int j = 0; j < 10; j ++) {
-      s = 0.5 * (sLo + sHi);
-      p = ro + s * rd;
-      h = step (0., p.y - GrndHt (p.xz, 0));
-      sLo += h * (s - sLo);
-      sHi += (1. - h) * (s - sHi);
-    }
-    dHit = sHi;
-  }
-  return dHit;
-}
-
-float WaterHt (vec3 p)
-{
-  p *= 0.1;
-  float ht = 0.;
-  const float wb = 1.414;
-  float w = 0.2 * wb;
-  for (int j = 0; j < 7; j ++) {
-    w *= 0.5;
-    p = wb * vec3 (p.y + p.z, p.z - p.y, 2. * p.x);
-    ht += w * abs (Noisefv3 (p) - 0.5);
-  }
-  return ht;
-}
-
-vec3 WaterNf (vec3 p, float d)
-{
-  float ht = WaterHt (p);
-  vec2 e = vec2 (max (0.01, 0.001 * d * d), 0.);
-  return normalize (vec3 (ht - WaterHt (p + e.xyy), e.x, ht - WaterHt (p + e.yyx)));
-}
-
-vec3 SkyBg (vec3 rd)
-{
-  const vec3 sbCol = vec3 (0.15, 0.2, 0.65);
-  vec3 col;
-  col = sbCol + 0.2 * sunCol * pow (1. - max (rd.y, 0.), 5.);
-  return col;
-}
-
-vec3 SkyCol (vec3 ro, vec3 rd)
-{
-  const float skyHt = 200.;
-  vec3 col;
-  float cloudFac;
-  if (rd.y > 0.) {
-    ro.x += 0.5 * tCur;
-    vec2 p = 0.01 * (rd.xz * (skyHt - ro.y) / rd.y + ro.xz);
-    float w = 0.65;
-    float f = 0.;
-    for (int j = 0; j < 4; j ++) {
-      f += w * Noisefv2 (p);
-      w *= 0.5;
-      p *= 2.3;
-    }
-    cloudFac = clamp (5. * (f - 0.5) * rd.y - 0.1, 0., 1.);
-  } else cloudFac = 0.;
-  float s = max (dot (rd, sunDir), 0.);
-  col = SkyBg (rd) + sunCol * (0.35 * pow (s, 6.) +
-     0.65 * min (pow (s, 256.), 0.3));
-  col = mix (col, vec3 (0.85), cloudFac);
-  return col;
-}
-
-float GrndSShadow (vec3 ro, vec3 rd)
-{
-  float sh = 1.;
-  float d = 0.01;
-  for (int i = 0; i < 80; i++) {
-    vec3 p = ro + rd * d;
-    float h = p.y - GrndHt (p.xz, 0);
-    sh = min (sh, 20. * h / d);
-    d += 0.5;
-    if (h < 0.001) break;
-  }
-  return clamp (sh, 0., 1.);
-}
-
-struct WingParm
-{
-  float span, sRad, trans, thck, leCut, leRad;
-};
-
-float WingDf (vec3 p, WingParm wg)
-{
-  vec2 q = p.yz;
-  float w = max (length (q - vec2 (wg.sRad, 0.)),
-     length (q + vec2 (wg.sRad, 0.)));
-  w = max (max (w - wg.thck, abs (p.x - wg.trans) - wg.span),
-     p.z - wg.leCut);
-  return min (w, max (length (q - vec2 (0., wg.leCut)) - wg.leRad,
-     abs (p.x - wg.trans) - wg.span));
-}
-
-float PropelDf (vec3 p, float dHit)
-{
-  vec3 q;
-  float d;
-  dHit /= szFac;
-  p /= szFac;
-  q = p;
-  q.x = abs (q.x);
-  q -= engPos;
-  d = PrCylDf (q - vec3 (0., 0., 3.65), vec2 (1.9, 0.05));
-  if (d < dHit) {
-    dHit = d;
-    qHitTransObj = q;
-  }
-  return dHit * szFac;
-}
-
-float TransObjDf (vec3 p)
-{
-  float dHit = dstFar;
-  dHit = PropelDf (flyerMat * (p - flyerPos), dHit);
-  return dHit;
-}
-
-float TransObjRay (vec3 ro, vec3 rd)
-{
-  const float dTol = 0.001;
-  float d;
-  float dHit = 0.;
-  for (int j = 0; j < 150; j ++) {
-    d = TransObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < dTol || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-float FlyerDf (vec3 p, float dHit)
-{
-  vec3 q;
-  WingParm wg;
-  float d, wr, ws, cLen;
-  const float wSweep = 0.2;
-  const float fusLen = 11.;
-  const float taPos = 12.5;
-  dHit /= szFac;
-  p /= szFac;
-  q = p;
-  wr = q.z / fusLen;
-  d = PrCapsDf (q - fusLen * vec3 (0., 0.045 + 0.08 * wr, 0.),
-     fusLen * vec2 (0.46, 0.11));
-  if (d < dHit) {
-    dHit = d;  idObj = 1;  qHit = q;
-  }
-  d = PrCapsDf (q - fusLen * vec3 (0., 0., -0.32),
-     fusLen * vec2 (1., 0.15 - 0.051 * wr * wr));
-  if (d < dHit + 0.1) {
-    dHit = SmoothMin (dHit, d, 0.1);  idObj = 2;  qHit = q;
-  }
-  ws = wSweep * abs (p.x) / wSpan;
-  q = p + vec3 (0., 0.054 * fusLen - 6. * ws, 12. * ws);
-  wg = WingParm (wSpan, 13.7, 0., 14., 1.72, 0.195);
-  d = WingDf (q, wg);
-  if (d < dHit + 0.2) {
-    dHit = SmoothMin (dHit, d, 0.2);  idObj = 3;  qHit = q;
-   }
-  q = p + vec3 (0., -0.1 - 6. * ws, taPos + 12. * ws);
-  wg = WingParm (0.4 * wSpan, 6.8, 0., 7., 1.2, 0.095);
-  d = WingDf (q, wg);
-  if (d < dHit + 0.1) {
-    dHit = SmoothMin (dHit, d, 0.1);  idObj = 4;  qHit = q;
-  }
-  ws = wSweep * abs (p.y) / wSpan;
-  q = p.yxz + vec3 (-0.2, 0., taPos + 12. * ws);
-  wg = WingParm (0.15 * wSpan, 6.8, 2.2, 7., 1.2, 0.095);
-  d = WingDf (q, wg);
-  if (d < dHit + 0.1) {
-    dHit = SmoothMin (dHit, d, 0.1);  idObj = 5;  qHit = q;
-  }
-  q = p;
-  q.x = abs (q.x);
-  cLen = 3.5;
-  wr = q.z / cLen;
-  d = PrCylDf (q - engPos, cLen * vec2 (0.2  - 0.07 * wr * wr, 1.));
-  float d2 = PrCylDf (q - engPos, cLen * vec2 (0.04, 1.02));
-  d = max (d, - d2);
-  if (d < dHit) {
-    dHit = d;  idObj = 6;  qHit = q;
-  }
-  q = p;
-  q.x = abs (q.x);
-  d = PrConeDf (q - engPos - vec3 (0., 0., 4.2), vec3 (0.8, 0.6, 0.7));
-  if (d < dHit) {
-    dHit = d;  idObj = 7;  qHit = q;
-  }
-  q = p;
-  cLen = 2.8;
-  q.z += wSweep * wSpan - 0.025 * cLen;
-  q.x = abs (q.x);
-  wr = q.z / cLen;
-  d = PrCapsDf (q - vec3 (wSpan + 0.1, 0.5 * wSweep * wSpan - 0.6, -0.5),
-     cLen * vec2 (1., 0.15 - 0.055 * wr * wr));
-  if (d < dHit) {
-    dHit = d;  idObj = 8;  qHit = q;
-  }
-  return 0.8 * dHit * szFac;
-}
-
-float ObjDf (vec3 p)
-{
-  float dHit = dstFar;
-  dHit = FlyerDf (flyerMat * (p - flyerPos), dHit);
-  return dHit;
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  const float dTol = 0.001;
-  float d;
-  float dHit = 0.;
-  for (int j = 0; j < 150; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < dTol || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  const vec3 e = vec3 (0.001, -0.001, 0.);
-  float v0 = ObjDf (p + e.xxx);
-  float v1 = ObjDf (p + e.xyy);
-  float v2 = ObjDf (p + e.yxy);
-  float v3 = ObjDf (p + e.yyx);
-  return normalize (vec3 (v0 - v1 - v2 - v3) + 2. * vec3 (v1, v2, v3));
-}
-
-float ObjSShadow (vec3 ro, vec3 rd)
-{
-  float sh = 1.;
-  float d = 0.07 * szFac;
-  for (int i = 0; i < 50; i++) {
-    float h = ObjDf (ro + rd * d);
-    sh = min (sh, 20. * h / d);
-    d += 0.07 * szFac;
-    if (h < 0.001) break;
-  }
-  return clamp (sh, 0., 1.);
-}
-
-vec3 ObjCol (vec3 p, vec3 n)
-{
-  vec3 bCol = vec3 (0.8, 0.8, 0.85), wCol = vec3 (0.3, 0.3, 0.7),
-     tCol = vec3 (0.9, 0.7, 0.), uCol = vec3 (0.9, 0.1, 0.);
-  float cFac = 1.;
-  if (idObj >= 3 && idObj <= 5) {
-    float s1, s2;
-    if (idObj == 3) {
-      s1 = 2.2;  s2 = 6.;
-    } else if (idObj == 4) {
-      s1 = 1.2;  s2 = 1.7;
-    } else if (idObj == 5) {
-      s1 = 1.;  s2 = 1.;
-    }
-    if (abs (qHit.x) > s2 - 0.03)
-       cFac = 1. - 0.9 * SmoothBump (- 0.08, 0.08, 0.02, qHit.z + s1);
-    if (qHit.z < - s1)
-       cFac = 1. - 0.9 * SmoothBump (- 0.05, 0.05, 0.02, abs (qHit.x) - s2);
-  }
-  vec3 col;
-  vec3 nn;
-  if (idObj >= 1 && idObj <= 5) nn = flyerMat * n;
-  if (idObj == 1 || idObj == 2) {
-    col = mix (uCol, bCol, 1. - smoothstep (-0.6, 0., nn.y));
-    if (idObj == 2 && nn.y < 0.)
-       col = mix (bCol, wCol, SmoothBump (-0.8, 0.8, 0.3, qHit.z + 0.28));         
-  } else if (idObj == 3 || idObj == 4) {
-    col = mix (bCol, wCol, SmoothBump (-0.8, 0.8, 0.3, qHit.z));
-  } else if (idObj == 5) {
-    col = mix (bCol, tCol, SmoothBump (-0.6, 0.8, 0.3, qHit.z));
-  } else if (idObj == 6) {
-    col = bCol;
-  } else if (idObj == 7 || idObj == 8) {
-    col = tCol;
-  }
-  if (idObj == 1) {
-    if (qHit.z > 4.5 && abs (qHit.x) > 0.07) idObj = 10;
-  } else if (idObj == 2) {
-    float s = - qHit.z;
-    if (s > 0. && s < 9.) {
-      vec2 ws = vec2 (qHit.y - 0.5, mod (s + 1.5, 1.5) - 0.75);
-      ws *= ws;
-      if (dot (ws, ws) < 0.02) idObj = 10;
-    }
-  }
-  return col * cFac;
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  const float eps = 0.01;
-  vec4 col4;
-  vec3 objCol, col, vn;
-  float dstHit, dstGrnd, dstObj, dstPropel, f;
-  int idObjT;
-  vec3 roo = ro;
-  dstHit = dstFar;
-  dstGrnd = GrndRay (ro, rd);
-  wSpan = 12.;
-  engPos = vec3 (0.35 * wSpan, -0.2, -1.5);
-  idObj = 0;
-  dstObj = ObjRay (ro, rd);
-  idObjT = idObj;
-  dstPropel = TransObjRay (ro, rd);
-  if (dstObj < dstPropel) dstPropel = dstFar;
-  float refFac = 1.;
-  if (dstGrnd < dstObj && ro.y + dstGrnd * rd.y < 0.) {
-    float dw = - ro.y / rd.y;
-    ro += dw * rd;
-    rd = reflect (rd, WaterNf (ro, dw));
-    ro += eps * rd;
-    dstGrnd = GrndRay (ro, rd);
-    idObj = 0;
-    dstObj = ObjRay (ro, rd);
-    idObjT = idObj;
-    refFac *= 0.6;
-  }
-  bool isGrnd = false;
-  if (dstObj < dstGrnd) {
-    ro += dstObj * rd;
-    vn = ObjNf (ro);
-    idObj = idObjT;
-    objCol = ObjCol (ro, vn);
-    if (idObj == 10) objCol = vec3 (0.2) + 0.5 * SkyCol (ro, reflect (rd, vn));
-    float dif = max (dot (vn, sunDir), 0.);
-    col = sunCol * objCol * (0.2 * (1. +
-       max (dot (vn, - normalize (vec3 (sunDir.x, 0., sunDir.z))), 0.)) +
-       max (0., dif) * ObjSShadow (ro, sunDir) *
-       (dif + 0.5 * pow (max (0., dot (sunDir, reflect (rd, vn))), 100.)));
-    dstHit = dstObj;
-  } else {
-    vec3 rp = ro + dstGrnd * rd;
-    if (refFac < 1.) dstHit = length (rp - roo);
-    else dstHit = dstGrnd;
-    if (dstHit < dstFar) {
-      ro = rp;
-      isGrnd = true;
-    } else {
-      col = refFac * SkyCol (ro, rd);
-    }
-  }
-  if (isGrnd) {
-    vn = GrndNf (ro, dstHit);
-    col4 = GrndCol (ro, vn);
-    col = col4.xyz * refFac;
-    float dif = max (dot (vn, sunDir), 0.);
-    col *= sunCol * (0.2 * (1. +
-       max (dot (vn, - normalize (vec3 (sunDir.x, 0., sunDir.z))), 0.)) +
-       max (0., dif) * GrndSShadow (ro, sunDir) *
-       (dif + col4.w * pow (max (0., dot (sunDir, reflect (rd, vn))), 100.)));
-  }
-  if (dstPropel < dstFar) col = 0.7 * col + 0.1 -
-     0.04 * SmoothBump (1.5, 1.7, 0.02, length (qHitTransObj.xy));
-  if (dstHit < dstFar) {
-    f = dstHit / dstFar;
-    col = mix (col, refFac * SkyBg (rd), clamp (1.03 * f * f, 0., 1.));
-  }
-  col = sqrt (clamp (col, 0., 1.));
-  return clamp (col, 0., 1.);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-  vec2 uv = 2. * fragCoord.xy / iResolution.xy - 1.;
-  vec2 uvs = uv;
-  uv.x *= iResolution.x / iResolution.y;
-  trkOffset = vec2 (0.);
-  float zmFac = 2.7;
-  tCur = 15. * iGlobalTime + 100. * trkOffset.y;
-  sunDir = normalize (vec3 (0.9, 1., 0.4));
-  sunCol = vec3 (1., 0.9, 0.8);
-  vec3 ro, rd, vd, fpF, fpB, vDir;
-  szFac = 0.25;
-  float dt = 1.;
-  fpF = TrackPath (tCur + dt);
-  flyerPos = TrackPath (tCur);
-  fpB = TrackPath (tCur - dt);
-  vec3 vel = (fpF - fpB) / (2. * dt);
-  vel.y = 0.;
-  vec3 acc = (fpF - 2. * flyerPos + fpB) / (dt * dt);
-  acc.y = 0.;
-  vec3 va = cross (acc, vel) / length (vel);
-  float roll = 12. * length (va);
-  if (va.y < 0.) roll *= -1.;
-  vDir = normalize (vel);
-  float cRl = cos (roll);
-  float sRl = sin (roll);
-  flyerMat = mat3 (cRl, - sRl, 0., sRl, cRl, 0., 0., 0., 1.) *
-     mat3 (vDir.z, 0., vDir.x, 0., 1., 0., - vDir.x, 0., vDir.z);
-  float vuPeriod = 500.;
-  flyerPos.y = 3. + 1.5 * sin (2.5 * tCur / vuPeriod);
-  float lookDir = 2. * mod (floor (tCur / vuPeriod), 2.) - 1.;
-  ro = TrackPath (tCur - 40. * lookDir * (1. -
-     0.8 * abs (sin (pi * mod (tCur, vuPeriod) / vuPeriod))));
-  ro.y = 3. + 0.6 * sin (0.16 * tCur / vuPeriod);
-  vd = flyerPos - ro;
-  vd.y = 0.;
-  vd = normalize (lookDir * vDir + 0.3 * normalize (vd));
-  mat3 scMat = mat3 (vd.z, 0., - vd.x, 0., 1., 0., vd);
-  rd = scMat * normalize (vec3 (uv, zmFac));
-  vec3 col = ShowScene (ro, rd);
-  uvs *= uvs * uvs;
-  col = mix (vec3 (0.7), col, pow (max (0., 0.95 - length (uvs * uvs * uvs)), 0.3));
-  fragColor = vec4 (col, 1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-seabirds-at-sunset.slang b/procedural/dr2-seabirds-at-sunset.slang
deleted file mode 100644
index 41a1a5bc05..0000000000
--- a/procedural/dr2-seabirds-at-sunset.slang
+++ /dev/null
@@ -1,515 +0,0 @@
-#version 450
-// Seabirds at Sunset -  dr2 - 2014-12-24
-// https://www.shadertoy.com/view/Mtl3z4
-
-// Searching for dinner.
-
-// "Seabirds at Sunset" by dr2 - 2014
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-// Clouds and sky colors borrowed from nimitz's "PostCard".
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-const float pi = 3.14159;
-const vec4 cHashA4 = vec4 (0., 1., 57., 58.);
-const vec3 cHashA3 = vec3 (1., 57., 113.);
-const float cHashM = 43758.54;
-
-vec4 Hashv4f (float p)
-{
-  return fract (sin (p + cHashA4) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 i = floor (p);
-  vec2 f = fract (p);
-  f = f * f * (3. - 2. * f);
-  vec4 t = Hashv4f (dot (i, cHashA3.xy));
-  return mix (mix (t.x, t.y, f.x), mix (t.z, t.w, f.x), f.y);
-}
-
-float Noisefv3 (vec3 p)
-{
-  vec3 i = floor (p);
-  vec3 f = fract (p);
-  f = f * f * (3. - 2. * f);
-  float q = dot (i, cHashA3);
-  vec4 t1 = Hashv4f (q);
-  vec4 t2 = Hashv4f (q + cHashA3.z);
-  return mix (mix (mix (t1.x, t1.y, f.x), mix (t1.z, t1.w, f.x), f.y),
-     mix (mix (t2.x, t2.y, f.x), mix (t2.z, t2.w, f.x), f.y), f.z);
-}
-
-float SmoothMin (float a, float b, float r)
-{
-  float h = clamp (0.5 + 0.5 * (b - a) / r, 0., 1.);
-  return mix (b, a, h) - r * h * (1. - h);
-}
-
-float SmoothBump (float lo, float hi, float w, float x)
-{
-  return (1. - smoothstep (hi - w, hi + w, x)) * smoothstep (lo - w, lo + w, x);
-}
-
-vec2 Rot2D (vec2 q, float a)
-{
-  return q * cos (a) * vec2 (1., 1.) + q.yx * sin (a) * vec2 (-1., 1.);
-}
-
-float PrSphDf (vec3 p, float s)
-{
-  return length (p) - s;
-}
-
-float PrCapsDf (vec3 p, float r, float h)
-{
-  return length (p - vec3 (0., 0., h * clamp (p.z / h, -1., 1.))) - r;
-}
-
-float PrCylDf (vec3 p, float r, float h)
-{
-  return max (length (p.xy) - r, abs (p.z) - h);
-}
-
-float PrFlatCylDf (vec3 p, float rhi, float rlo, float h)
-{
-  return max (length (p.xy - vec2 (rhi *
-     clamp (p.x / rhi, -1., 1.), 0.)) - rlo, abs (p.z) - h);
-}
-
-float PrTorusDf (vec3 p, float ri, float rc)
-{
-  return length (vec2 (length (p.xy) - rc, p.z)) - ri;
-}
-
-int idObj, idObjGrp;
-mat3 bdMat, birdMat[2];
-vec3 bdPos, birdPos[2], fltBox, qHit, sunDir, waterDisp, cloudDisp;
-float tCur, birdVel, birdLen, legAng;
-const float dstFar = 100.;
-const int idWing = 21, idBdy = 22, idEye = 23, idBk = 24, idLeg = 25;
-
-float WaterHt (vec3 p)
-{
-  p *= 0.03;
-  p += waterDisp;
-  float ht = 0.;
-  const float wb = 1.414;
-  float w = wb;
-  for (int j = 0; j < 7; j ++) {
-    w *= 0.5;
-    p = wb * vec3 (p.y + p.z, p.z - p.y, 2. * p.x) + 20. * waterDisp;
-    ht += w * abs (Noisefv3 (p) - 0.5);
-  }
-  return ht;
-}
-
-vec3 WaterNf (vec3 p, float d)
-{
-  vec2 e = vec2 (max (0.01, 0.001 * d * d), 0.);
-  float ht = WaterHt (p);
-  return normalize (vec3 (ht - WaterHt (p + e.xyy), e.x, ht - WaterHt (p + e.yyx)));
-}
-
-float FbmS (vec2 p)
-{
-  float a = 1.;
-  float v = 0.;
-  for (int i = 0; i < 5; i ++) {
-    v += a * (sin (6. * Noisefv2 (p)) + 1.);
-    a *= 0.5;
-    p *= 2.;
-    p *= mat2 (0.8, -0.6, 0.6, 0.8);
-  }
-  return v;
-}
-
-vec3 SkyCol (vec3 ro, vec3 rd)
-{
-  vec3 col, skyCol, sunCol, p;
-  float ds, fd, att, attSum, d, dDotS, skyHt;
-  skyHt = 200.;
-  p = ro + rd * (skyHt - ro.y) / rd.y;
-  ds = 0.1 * sqrt (distance (ro, p));
-  fd = 0.001 / (smoothstep (0., 10., ds) + 0.1);
-  p.xz *= fd;
-  p.xz += cloudDisp.xz;
-  att = FbmS (p.xz);
-  attSum = att;
-  d = fd;
-  ds *= fd;
-  for (int i = 0; i < 4; i ++) {
-    attSum += FbmS (p.xz + d * sunDir.xz);
-    d += ds;
-  }
-  attSum *= 0.27;
-  att *= 0.27;
-  dDotS = clamp (dot (sunDir, rd), 0., 1.);
-  skyCol = mix (vec3 (0.7, 1., 1.), vec3 (1., 0.4, 0.1), 0.25 + 0.75 * dDotS);
-  sunCol = vec3 (1., 0.8, 0.7) * pow (dDotS, 1024.) +
-     vec3 (1., 0.4, 0.2) * pow (dDotS, 256.);
-  col = mix (vec3 (0.5, 0.75, 1.), skyCol, exp (-2. * (3. - dDotS) *
-     max (rd.y - 0.1, 0.))) + 0.3 * sunCol;
-  attSum = 1. - smoothstep (1., 9., attSum);
-  col = mix (vec3 (0.4, 0., 0.2), mix (col, vec3 (0.2), att), attSum) +
-     vec3 (1., 0.4, 0.) * pow (attSum * att, 3.) * (pow (dDotS, 10.) + 0.5);
-  return col;
-}
-
-float AngQnt (float a, float s1, float s2, float nr)
-{
-  return (s1 + floor (s2 + a * (nr / (2. * pi)))) * (2. * pi / nr);
-}
-
-float BdWingDf (vec3 p, float dHit)
-{
-  vec3 q, qh;
-  float d, dd, a, wr;
-  float wngFreq = 6.;
-  float wSegLen = 0.15 * birdLen;
-  float wChord = 0.3 * birdLen;
-  float wSpar = 0.03 * birdLen;
-  float fTap = 8.;
-  float tFac = (1. - 1. / fTap);
-  q = p - vec3 (0., 0., 0.3 * birdLen);
-  q.x = abs (q.x) - 0.1 * birdLen;
-  float wf = 1.;
-  a = -0.1 + 0.2 * sin (wngFreq * tCur);
-  d = dHit;
-  qh = q;
-  for (int k = 0; k < 5; k ++) {
-    q.xy = Rot2D (q.xy, a);
-    q.x -= wSegLen;
-    wr = wf * (1. - 0.5 * q.x / (fTap * wSegLen));
-    dd = PrFlatCylDf (q.zyx, wr * wChord, wr * wSpar, wSegLen);
-    if (k < 4) {
-      q.x -= wSegLen;
-      dd = min (dd, PrCapsDf (q, wr * wSpar, wr * wChord));
-    } else {
-      q.x += wSegLen;
-      dd = max (dd, PrCylDf (q.xzy, wr * wChord, wSpar));
-      dd = min (dd, max (PrTorusDf (q.xzy, 0.98 * wr * wSpar,
-         wr * wChord), - q.x));
-    }
-    if (dd < d) { d = dd;  qh = q; }
-    a *= 1.03;
-    wf *= tFac;
-  }
-  if (d < dHit) { dHit = min (dHit, d);  idObj = idObjGrp + idWing;  qHit = qh; }
-  return dHit;
-}
-
-float BdBodyDf (vec3 p, float dHit)
-{
-  vec3 q;
-  float d, a, wr;
-  float bkLen = 0.15 * birdLen;
-  q = p;
-  wr = q.z / birdLen;
-  float tr, u;
-  if (wr > 0.5) {
-    u = (wr - 0.5) / 0.5;
-    tr = 0.17 - 0.11 * u * u;
-  } else {
-    u = clamp ((wr - 0.5) / 1.5, -1., 1.);
-    u *= u;
-    tr = 0.17 - u * (0.34 - 0.18 * u); 
-  }
-  d = PrCapsDf (q, tr * birdLen, birdLen);
-  if (d < dHit) {
-    dHit = d;  idObj = idObjGrp + idBdy;  qHit = q;
-  }
-  q = p;
-  q.x = abs (q.x);
-  wr = (wr + 1.) * (wr + 1.);
-  q -= birdLen * vec3 (0.3 * wr, 0.1 * wr, -1.2);
-  d = PrCylDf (q, 0.009 * birdLen, 0.2 * birdLen);
-  if (d < dHit) { dHit = min (dHit, d);  idObj = idObjGrp + idBdy;  qHit = q; }
-  q = p;
-  q.x = abs (q.x);
-  q -= birdLen * vec3 (0.08, 0.05, 0.9);
-  d = PrSphDf (q, 0.04 * birdLen);
-  if (d < dHit) { dHit = d;  idObj = idObjGrp + idEye;  qHit = q; }
-  q = p;  q -= birdLen * vec3 (0., -0.015, 1.15);
-  wr = clamp (0.5 - 0.3 * q.z / bkLen, 0., 1.);
-  d = PrFlatCylDf (q, 0.25 * wr * bkLen, 0.25 * wr * bkLen, bkLen);
-  if (d < dHit) { dHit = d;  idObj = idObjGrp + idBk;  qHit = q; }
-  return dHit;
-}
-
-float BdFootDf (vec3 p, float dHit)
-{
-  vec3 q;
-  float d;
-  float lgLen = 0.1 * birdLen;
-  float ftLen = 0.5 * lgLen;
-  q = p;
-  q.x = abs (q.x);
-  q -= birdLen * vec3 (0.1, -0.12, 0.6);
-  q.yz = Rot2D (q.yz, legAng);
-  q.xz = Rot2D (q.xz, -0.05 * pi);
-  q.z += lgLen;
-  d = PrCylDf (q, 0.15 * lgLen, lgLen);
-  if (d < dHit) { dHit = d;  idObj = idLeg;  qHit = q; }
-  q.z += lgLen;
-  q.xy = Rot2D (q.xy, 0.5 * pi);
-  q.xy = Rot2D (q.xy, AngQnt (atan (q.y, - q.x), 0., 0.5, 3.));
-  q.xz = Rot2D (q.xz, - pi + 0.4 * legAng);
-  q.z -= ftLen;
-  d = PrCapsDf (q, 0.2 * ftLen, ftLen);
-  if (d < dHit) { dHit = d;  idObj = idObjGrp + idLeg;  qHit = q; }
-  return dHit;
-}
-
-float BirdDf (vec3 p, float dHit)
-{
-  dHit = BdWingDf (p, dHit);
-  dHit = BdBodyDf (p, dHit);
-  dHit = BdFootDf (p, dHit);
-  return dHit;
-}
-
-vec4 BirdCol (vec3 n)
-{
-  vec3 col;
-  int ig = idObj / 256;
-  int id = idObj - 256 * ig;
-  float spec = 1.;
-  if (id == idWing) {
-    float gw = 0.15 * birdLen;
-    float w = mod (qHit.x, gw);
-    w = SmoothBump (0.15 * gw, 0.65 * gw, 0.1 * gw, w);
-    col = mix (vec3 (0.05), vec3 (1.), w);
-  } else if (id == idEye) {
-    col = vec3 (0., 0.6, 0.);
-    spec = 5.;
-  } else if (id == idBdy) {
-    vec3 nn;
-    if (ig == 1) nn = birdMat[0] * n;
-    else nn = birdMat[1] * n;
-    col = mix (mix (vec3 (1.), vec3 (0.1), smoothstep (0.5, 1., nn.y)), vec3 (1.),
-       1. - smoothstep (-1., -0.7, nn.y));
-  } else if (id == idBk) {
-    col = vec3 (1., 1., 0.);
-  } else if (id == idLeg) {
-    col = (0.5 + 0.4 * sin (100. * qHit.z)) * vec3 (0.6, 0.4, 0.);
-  }
-  col.gb *= 0.7;
-  return vec4 (col, spec);
-}
-
-float ObjDf (vec3 p)
-{
-  float dHit = dstFar;
-  idObjGrp = 1 * 256;
-  dHit = BirdDf (birdMat[0] * (p - birdPos[0]), dHit);
-  idObjGrp = 2 * 256;
-  dHit = BirdDf (birdMat[1] * (p - birdPos[1]), dHit);
-  return 0.9 * dHit;
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  float dTol = 0.001;
-  float d;
-  float dHit = 0.;
-  for (int j = 0; j < 150; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < dTol || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  vec3 e = vec3 (0.001, -0.001, 0.);
-  vec4 v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy),
-     ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * vec3 (v.y, v.z, v.w));
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec3 vn;
-  vec4 objCol;
-  float dstHit;
-  float htWat = -1.5;
-  float reflFac = 1.;
-  vec3 col = vec3 (0.);
-  idObj = -1;
-  dstHit = ObjRay (ro, rd);
-  if (rd.y < 0. && dstHit >= dstFar) {
-    float dw = - (ro.y - htWat) / rd.y;
-    ro += dw * rd;
-    rd = reflect (rd, WaterNf (ro, dw));
-    ro += 0.01 * rd;
-    idObj = -1;
-    dstHit = ObjRay (ro, rd);
-    reflFac *= 0.7;
-  }
-  int idObjT = idObj;
-  if (idObj < 0) dstHit = dstFar;
-  if (dstHit >= dstFar) col = reflFac * SkyCol (ro, rd);
-  else {
-    ro += rd * dstHit;
-    vn = ObjNf (ro);
-    idObj = idObjT;
-    objCol = BirdCol (vn);
-    float dif = max (dot (vn, sunDir), 0.);
-    col = reflFac * objCol.xyz * (0.2 + max (0., dif) *
-       (dif + objCol.a * pow (max (0., dot (sunDir, reflect (rd, vn))), 128.)));
-  }
-  return col;
-}
-
-vec3 BirdTrack (float t)
-{
-  t = - t;
-  vec3 bp;
-  float rdTurn = 0.45 * min (fltBox.x, fltBox.z);
-  float tC = 0.5 * pi * rdTurn / birdVel;
-  vec3 tt = vec3 (fltBox.x - rdTurn, length (fltBox.xy), fltBox.z - rdTurn) *
-     2. / birdVel;
-  float tCyc = 2. * (2. * tt.z + tt.x  + 4. * tC + tt.y);
-  float tSeq = mod (t, tCyc);
-  float ti[9];  ti[0] = 0.;  ti[1] = ti[0] + tt.z;  ti[2] = ti[1] + tC;
-  ti[3] = ti[2] + tt.x;  ti[4] = ti[3] + tC;  ti[5] = ti[4] + tt.z;
-  ti[6] = ti[5] + tC;  ti[7] = ti[6] + tt.y;  ti[8] = ti[7] + tC;
-  float a, h, hd, tf;
-  h = - fltBox.y;
-  hd = 1.;
-  if (tSeq > 0.5 * tCyc) { tSeq -= 0.5 * tCyc;  h = - h;  hd = - hd; }
-  float rSeg = -1.;
-  vec3 fbR = vec3 (1.);
-  fbR.xz -= vec2 (rdTurn) / fltBox.xz;
-  bp.xz = fltBox.xz;
-  bp.y = h;
-  if (tSeq < ti[4]) {
-    if (tSeq < ti[1]) {
-      tf = (tSeq - ti[0]) / (ti[1] - ti[0]);
-      bp.xz *= vec2 (1., fbR.z * (2. * tf - 1.));
-    } else if (tSeq < ti[2]) {
-      tf = (tSeq - ti[1]) / (ti[2] - ti[1]);  rSeg = 0.;
-      bp.xz *= fbR.xz;
-    } else if (tSeq < ti[3]) {
-      tf = (tSeq - ti[2]) / (ti[3] - ti[2]);
-      bp.xz *= vec2 (fbR.x * (1. - 2. * tf), 1.);
-    } else {
-      tf = (tSeq - ti[3]) / (ti[4] - ti[3]);  rSeg = 1.;
-      bp.xz *= fbR.xz * vec2 (-1., 1.);
-    }
-  } else {
-    if (tSeq < ti[5]) {
-      tf = (tSeq - ti[4]) / (ti[5] - ti[4]);
-      bp.xz *= vec2 (- 1., fbR.z * (1. - 2. * tf));
-    } else if (tSeq < ti[6]) {
-      tf = (tSeq - ti[5]) / (ti[6] - ti[5]);  rSeg = 2.;
-      bp.xz *= - fbR.xz;
-    } else if (tSeq < ti[7]) {
-      tf = (tSeq - ti[6]) / (ti[7] - ti[6]);
-      bp.xz *= vec2 (fbR.x * (2. * tf - 1.), - 1.);
-      bp.y = h + 2. * fltBox.y * hd * tf;
-    } else {
-      tf = (tSeq - ti[7]) / (ti[8] - ti[7]);  rSeg = 3.;
-      bp.xz *= fbR.xz * vec2 (1., -1.);
-      bp.y = - h;
-    }
-  }
-  if (rSeg >= 0.) {
-    a = 0.5 * pi * (rSeg + tf);
-    bp += rdTurn * vec3 (cos (a), 0., sin (a));
-  }
-  bp.y -= - 1.1 * fltBox.y;
-  return bp;
-}
-
-void BirdPM (float t)
-{
-  float dt = 1.;
-  bdPos = BirdTrack (t);
-  vec3 bpF = BirdTrack (t + dt);
-  vec3 bpB = BirdTrack (t - dt);
-  vec3 vel = (bpF - bpB) / (2. * dt);
-  float vy = vel.y;
-  vel.y = 0.;
-  vec3 acc = (bpF - 2. * bdPos + bpB) / (dt * dt);
-  acc.y = 0.;
-  vec3 va = cross (acc, vel) / length (vel);
-  vel.y = vy;
-  float el = - 0.7 * asin (vel.y / length (vel));
-  vec3 ort = vec3 (el, atan (vel.z, vel.x) - 0.5 * pi, 0.2 * length (va) * sign (va.y));
-  vec3 cr = cos (ort);
-  vec3 sr = sin (ort);
-  bdMat = mat3 (cr.z, - sr.z, 0., sr.z, cr.z, 0., 0., 0., 1.) *
-     mat3 (1., 0., 0., 0., cr.x, - sr.x, 0., sr.x, cr.x) *
-     mat3 (cr.y, 0., - sr.y, 0., 1., 0., sr.y, 0., cr.y);
-  legAng = pi * clamp (0.4 + 1.5 * el, 0.12, 0.8);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-  vec2 uv = 2. * fragCoord.xy / iResolution.xy - 1.;
-  uv.x *= iResolution.x / iResolution.y;
-  tCur = iGlobalTime;
-  vec3 ro, rd, vd;
-  float zmFac = 2.4;
-  sunDir = normalize (vec3 (-1., 0.05, 0.));
-  waterDisp = -0.002 * tCur * vec3 (-1., 0., 1.);
-  cloudDisp = -0.05 * tCur * vec3 (1., 0., 1.);
-  birdLen = 1.2;
-  birdVel = 7.;
-  float tGap = 10.;
-  fltBox = vec3 (12., 4., 12.);
-  BirdPM (tCur);
-  birdMat[0] = bdMat;
-  birdPos[0] = bdPos;
-  BirdPM (tCur + tGap);
-  birdMat[1] = bdMat;
-  birdPos[1] = bdPos;
-  float el = 0.;
-  float az = -0.5 * pi;
-  vec2 ca = cos (vec2 (el, az));
-  vec2 sa = sin (vec2 (el, az));
-  mat3 vuMat = mat3 (ca.y, 0., - sa.y, 0., 1., 0., sa.y, 0., ca.y) *
-     mat3 (1., 0., 0., 0., ca.x, - sa.x, 0., sa.x, ca.x);
-  rd = vuMat * normalize (vec3 (uv, zmFac));
-  ro = vuMat * vec3 (0., 0., -30.);
-  ro.y = 4.;
-  vec3 col = ShowScene (ro, rd);
-  fragColor = vec4 (col, 1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-stairway-to-the-stars.slang b/procedural/dr2-stairway-to-the-stars.slang
deleted file mode 100644
index 00e1835188..0000000000
--- a/procedural/dr2-stairway-to-the-stars.slang
+++ /dev/null
@@ -1,336 +0,0 @@
-#version 450
-// Stairway to the Stars -  dr2 - 2015-05-13
-// https://www.shadertoy.com/view/lls3z7
-
-// A long climb; use the mouse to look around.
-
-// "Stairway to the Stars" by dr2 - 2015
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-const float pi = 3.14159;
-const vec4 cHashA4 = vec4 (0., 1., 57., 58.);
-const vec3 cHashA3 = vec3 (1., 57., 113.);
-const float cHashM = 43758.54;
-
-vec4 Hashv4f (float p)
-{
-  return fract (sin (p + cHashA4) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 i = floor (p);
-  vec2 f = fract (p);
-  f = f * f * (3. - 2. * f);
-  vec4 t = Hashv4f (dot (i, cHashA3.xy));
-  return mix (mix (t.x, t.y, f.x), mix (t.z, t.w, f.x), f.y);
-}
-
-float Fbm2 (vec2 p)
-{
-  float s = 0.;
-  float a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    s += a * Noisefv2 (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return s;
-}
-
-float PrSphDf (vec3 p, float s)
-{
-  return length (p) - s;
-}
-
-vec2 Rot2D (vec2 q, float a)
-{
-  return q * cos (a) * vec2 (1., 1.) + q.yx * sin (a) * vec2 (-1., 1.);
-}
-
-#define REFBALL
-
-int idObj;
-float tCur, stPitch, rotAng, rOut, rIn, rWid;
-vec3 qHit, ltPos[2];
-int doLt;
-const float dstFar = 20.;
-
-vec3 BrickCol (vec2 p)
-{
-  vec2 i = floor (p);
-  if (2. * floor (i.y / 2.) != i.y) {
-    p.x += 0.5;
-    i = floor (p);
-  }
-  p = smoothstep (0.02, 0.08, abs (fract (p + 0.5) - 0.5));
-  return (0.5 + 0.5 * p.x * p.y) * vec3 (0.5, 0.4, 0.3);
-}
-
-vec3 WoodCol (vec2 p)
-{
-  float f = Fbm2 (p * vec2 (1., 0.1));
-  return mix (vec3 (0.8, 0.4, 0.2), vec3 (0.45, 0.25, 0.1), f);
-}
-
-float ObjDf (vec3 p)
-{
-  vec3 q, pp;
-  float d, dr, da, dy, dMin, r, ns, nh, sh, sw, rw, ca, sa;
-  const int ins = 12;
-  const int inh = 6;
-  dMin = dstFar;
-  ns = float (ins);
-  nh = float (inh);
-  sh = 0.2 * stPitch / ns;
-  sw = 1.1 * pi * rOut / ns;
-  rw = 0.09;
-  pp = p;
-  pp.xz = Rot2D (pp.xz, rotAng);
-  pp.y += stPitch * rotAng / (2. * pi);
-  r = length (pp.xz);
-  dr = max (r - rOut, rIn - r);
-  q = pp;
-  d = dMin;
-  dy = stPitch / ns;
-  q.y -= dy;
-  da = 2. * pi / ns;
-  ca = cos (da);  sa = sin (da);
-  for (int j = 0; j < ins; j ++) {
-    q.y = mod (q.y + dy + 0.5 * stPitch, stPitch) - 0.5 * stPitch;
-    d = min (d, max (max (max (dr, abs (q.z) - sw), q.x), abs (q.y) - sh));
-    if (d < dMin) { dMin = d;  idObj = 1;  qHit = q; }
-    q.xz = q.xz * ca + q.zx * vec2 (- sa, sa);
-  }
-  d = min (min (d, max (r - rIn, - (r - rIn + rWid))),
-     max (r - rOut - rWid, - (r - rOut)));
-  q = pp;
-  dy = stPitch / nh;
-  q.y -= 0.25 * stPitch + dy;
-  da = 2. * pi / nh;
-  ca = cos (da);  sa = sin (da);
-  for (int j = 0; j < inh; j ++) {
-    q.y = mod (q.y + dy + 0.5 * stPitch, stPitch) - 0.5 * stPitch;
-    d = max (d, - length (q.xy) + rw);
-    q.xz = q.xz * ca + q.zx * vec2 (- sa, sa);
-  }
-  if (d < dMin) { dMin = d;  idObj = 2;  qHit = q; }
-  if (doLt != 0) {
-    d = PrSphDf (p - ltPos[0], 0.07 * rIn);
-    if (d < dMin) { dMin = d;  idObj = 5; }
-   }
-  if (doLt != 1) {
-    d = PrSphDf (p - ltPos[1], 0.07 * rIn);
-    if (d < dMin) { dMin = d;  idObj = 6; }
-  }
-#ifdef REFBALL
-  d = min (d, max (r - 0.006 * rIn, 0.));
-  if (d < dMin) { dMin = d;  idObj = 3; }
-  pp = p;
-  pp.y = mod (pp.y + stPitch * rotAng / (2. * pi) + 0.5 * stPitch, stPitch) -
-     0.5 * stPitch;
-  d = PrSphDf (pp, 0.3 * rIn);
-  if (d < dMin) { dMin = d;  idObj = 4; }
-#endif
-  return dMin;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  const vec3 e = vec3 (0.001, -0.001, 0.);
-  vec4 v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy),
-     ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * vec3 (v.y, v.z, v.w));
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  float dHit, d;
-  dHit = 0.;
-  for (int j = 0; j < 100; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < 0.001 || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjCol (vec3 ro, vec3 rd, vec3 vn)
-{
-  vec3 ltDir, acDif, col; 
-  float ltDist, ltDistSq, dif, atten, acSpe, sh, d, h;
-  col = vec3 (0.);
-  if (idObj == 1) {
-    col = WoodCol (120. * qHit.zx);
-  } else if (idObj == 2) {
-    if (abs (vn.y) > 0.005) col = 0.4 * vec3 (0.5, 0.4, 0.3);
-    else col = BrickCol (vec2 (20. * (atan (qHit.z, qHit.x) / pi + 1.),
-       40. * qHit.y));
-  } else if (idObj == 3) {
-    col = vec3 (0.4, 0.4, 0.2);
-  } else if (idObj == 5) {
-    col = vec3 (1., 1., 0.5) * (0.75 + 0.25 * dot (rd, normalize (ltPos[0] - ro)));
-  } else if (idObj == 6) {
-    col = vec3 (1., 1., 0.5) * (0.75 + 0.25 * dot (rd, normalize (ltPos[1] - ro)));
-  }
-  if (idObj < 5) {
-    acDif = vec3 (0.);
-    acSpe = 0.;
-    for (int j = 0; j < 2; j ++) {
-      doLt = j;
-      ltDir = ltPos[j] - ro;
-      ltDistSq = dot (ltDir, ltDir);
-      ltDist = sqrt (ltDistSq);
-      ltDir /= ltDist;
-      dif = clamp (dot (vn, ltDir), 0., 1.);
-      sh = 0.;
-      if (dif > 0.) {
-	sh = 1.;
-	d = 0.01;
-	for (int i = 0; i < 60; i ++) {
-	  h = ObjDf (ro + ltDir * d);
-	  sh = min (sh, 50. * h / d);
-	  d += h;
-	  if (d > ltDist) break;
-	}
-	dif *= sh;
-      }
-      atten = 1. / (0.1 + ltDistSq);
-      acDif += atten * dif;
-      acSpe += atten * sh * pow (clamp (dot (reflect (rd, vn), ltDir), 0., 1.), 16.);
-    }
-    col = (0.4 + 0.2 * acDif) * col + 0.03 * acSpe * vec3 (1.);
-  }
-  return col;
-}
-
-float GlowCol (vec3 ro, vec3 rd, float dstHit)
-{
-  vec3 ltDir;
-  float ltDist, wGlow;
-  wGlow = 0.;
-  for (int j = 0; j < 2; j ++) {
-    ltDir = ltPos[j] - ro;
-    ltDist = length (ltDir);
-    ltDir /= ltDist;
-    if (ltDist < dstHit) wGlow += pow (max (dot (rd, ltDir), 0.), 1024.) / ltDist;
-  }
-  return clamp (0.5 * wGlow, 0., 1.);
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec3 col, vn, roo, rds;
-  float dstHit, rLt, aLt;
-  int idObjT;
-  rotAng = 0.3 * tCur;
-  stPitch = 0.4;
-  rWid = 0.006;
-  rLt = 0.6 * rOut;
-  aLt = 0.1 * pi;
-  ltPos[0] = vec3 (rLt * cos (aLt), stPitch * (0.1 - 0.14 * cos (tCur)),
-     rLt * sin (aLt));
-  aLt = - 0.95 * pi;
-  ltPos[1] = vec3 (rLt * cos (aLt), stPitch * (-0.4 + 0.14 * sin (tCur)),
-     rLt * sin (aLt));
-  roo = ro;
-  idObj = -1;
-  doLt = -1;
-  dstHit = ObjRay (ro, rd);
-  if (idObj < 0) dstHit = dstFar;
-#ifdef REFBALL
-  if (idObj == 4 && dstHit < dstFar) {
-    ro += rd * dstHit;
-    rd = reflect (rd, ObjNf (ro));
-    ro += 0.01 * rd;
-    roo = ro;
-    idObj = -1;
-    dstHit = ObjRay (ro, rd);
-  }
-#endif
-  if (dstHit >= dstFar) {
-    col = vec3 (0., 0., 0.1);
-    rds = rd;
-    rds.xz = Rot2D (rds.xz, rotAng);
-    rds = (rds + vec3 (1.));
-    for (int j = 0; j < 10; j ++)
-       rds = 11. * abs (rds) / dot (rds, rds) - 3.;
-    col += min (1., 1.5e-6 * pow (min (16., length (rds)), 5.)) *
-       vec3 (0.7, 0.6, 0.6);
-  } else {
-    ro += rd * dstHit;
-    idObjT = idObj;
-    vn = ObjNf (ro);
-    idObj = idObjT;
-    col = ObjCol (ro, rd, vn);
-  }
-  col = mix (col, vec3 (1., 1., 0.5), GlowCol (roo, rd, dstHit));
-  return clamp (col, 0., 1.);
-}
-
-void mainImage (out vec4 fragColor, in vec2 fragCoord)
-{
-  vec2 canvas = iResolution.xy;
-  vec2 uv = 2. * fragCoord.xy / canvas - 1.;
-  uv.x *= canvas.x / canvas.y;
-  tCur = iGlobalTime;
-#ifdef MOUSE
-  vec4 mPtr = iMouse;
-  mPtr.xy = mPtr.xy / canvas - 0.5;
-#endif
-  mat3 vuMat;
-  vec3 ro, rd;
-  vec2 vEl, vAz;
-  float az, el;
-  rOut = 0.5;
-  rIn = 0.2;
-  ro = - vec3 (0., 0.1, 0.9) * rOut;
-  az = 0.2;
-  el = 0.1;
-#ifdef MOUSE
-  if (mPtr.z > 0.) {
-    ro.z = clamp (ro.z + 0.8 * mPtr.x, - 0.99 * rOut, - 0.4 * rIn);
-    el = clamp (el + 3. * mPtr.y, -1.5, 1.5);
-  }
-#endif
-  vEl = vec2 (cos (el), sin (el));
-  vAz = vec2 (cos (az), sin (az));
-  vuMat = mat3 (1., 0., 0., 0., vEl.x, - vEl.y, 0., vEl.y, vEl.x) *
-     mat3 (vAz.x, 0., vAz.y, 0., 1., 0., - vAz.y, 0., vAz.x);
-  rd = normalize (vec3 (uv, 1.5)) * vuMat;
-  fragColor = vec4 (ShowScene (ro, rd), 1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-wavescape.slang b/procedural/dr2-wavescape.slang
deleted file mode 100644
index cd5140d4ea..0000000000
--- a/procedural/dr2-wavescape.slang
+++ /dev/null
@@ -1,566 +0,0 @@
-#version 450
-// Wavescape -  dr2 - 2015-01-05
-// https://www.shadertoy.com/view/lls3z7
-
-// Another wave renderer, from both above and below the waterline. See the source for where it all comes from.
-
-// "Wavescape" by dr2 - 2015
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-// Water waves, including what the fish sees.
-
-// Acknowledgments: thanks for the following -
-//  Dave_H's multilayered clouds with nimitz's variable layer spacing
-//    (but depends on elevation rather than distance).
-//  Wave shapes from TDM; they seem a little more "energetic" than TekF's.
-//  Raymarching with binary subdivision, as used by Dave_H for mountains;
-//    TekF and TDM use one or the other, not both.
-//  Buoy based on TekF's, but raymarched for generality; shows aging effects
-//    below waterline.
-//  Foam idea from TekF.
-//  Noise functions from iq.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-const float pi = 3.14159;
-const vec4 cHashA4 = vec4 (0., 1., 57., 58.);
-const vec3 cHashA3 = vec3 (1., 57., 113.);
-const float cHashM = 43758.54;
-
-vec2 Hashv2f (float p)
-{
-  return fract (sin (p + cHashA4.xy) * cHashM);
-}
-
-vec4 Hashv4f (float p)
-{
-  return fract (sin (p + cHashA4) * cHashM);
-}
-
-vec4 Hashv4v3 (vec3 p)
-{
-  const vec3 cHashVA3 = vec3 (37.1, 61.7, 12.4);
-  const vec3 e = vec3 (1., 0., 0.);
-  return fract (sin (vec4 (dot (p + e.yyy, cHashVA3), dot (p + e.xyy, cHashVA3),
-     dot (p + e.yxy, cHashVA3), dot (p + e.xxy, cHashVA3))) * cHashM);
-}
-
-float Noiseff (float p)
-{
-  float i, f;
-  i = floor (p);  f = fract (p);
-  f = f * f * (3. - 2. * f);
-  vec2 t = Hashv2f (i);
-  return mix (t.x, t.y, f);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 i, f;
-  i = floor (p);  f = fract (p);
-  f = f * f * (3. - 2. * f);
-  vec4 t = Hashv4f (dot (i, cHashA3.xy));
-  return mix (mix (t.x, t.y, f.x), mix (t.z, t.w, f.x), f.y);
-}
-
-float Noisefv3a (vec3 p)
-{
-  vec3 i, f;
-  i = floor (p);  f = fract (p);
-  f *= f * (3. - 2. * f);
-  vec4 t1 = Hashv4v3 (i);
-  vec4 t2 = Hashv4v3 (i + vec3 (0., 0., 1.));
-  return mix (mix (mix (t1.x, t1.y, f.x), mix (t1.z, t1.w, f.x), f.y),
-              mix (mix (t2.x, t2.y, f.x), mix (t2.z, t2.w, f.x), f.y), f.z);
-}
-
-float Fbm1 (float p)
-{
-  float f, a;
-  f = 0.;  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    f += a * Noiseff (p);
-    a *= 0.5;  p *= 2.;
-  }
-  return f;
-}
-
-float Fbm3 (vec3 p)
-{
-  const mat3 mr = mat3 (0., 0.8, 0.6, -0.8, 0.36, -0.48, -0.6, -0.48, 0.64);
-  float f, a, am, ap;
-  f = 0.;  a = 0.5;
-  am = 0.5;  ap = 4.;
-  p *= 0.5;
-  for (int i = 0; i < 6; i ++) {
-    f += a * Noisefv3a (p);
-    p *= mr * ap;  a *= am;
-  }
-  return f;
-}
-
-float Fbmn (vec3 p, vec3 n)
-{
-  vec3 f = vec3 (0.);
-  float a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    f += a * vec3 (Noisefv2 (p.yz), Noisefv2 (p.zx), Noisefv2 (p.xy));
-    a *= 0.5;  p *= 2.;
-  }
-  return dot (f, abs (n));
-}
-
-vec3 VaryNf (vec3 p, vec3 n, float f)
-{
-  vec3 e = vec3 (0.2, 0., 0.);
-  float s = Fbmn (p, n);
-  vec3 g = vec3 (Fbmn (p + e.xyy, n) - s,
-     Fbmn (p + e.yxy, n) - s, Fbmn (p + e.yyx, n) - s);
-  return normalize (n + f * (g - n * dot (n, g)));
-}
-
-float SmoothBump (float lo, float hi, float w, float x)
-{
-  return (1. - smoothstep (hi - w, hi + w, x)) * smoothstep (lo - w, lo + w, x);
-}
-
-float PrSphDf (vec3 p, float s)
-{
-  return length (p) - s;
-}
-
-float PrCylDf (vec3 p, float r, float h)
-{
-  return max (length (p.xy) - r, abs (p.z) - h);
-}
-
-int idObj;
-mat3 ballMat;
-vec3 qHit, ballPos, sunCol, sunDir, cloudDisp, waterDisp;
-float tCur, fCloud;
-const float dstFar = 300.;
-
-vec3 SkyGrndCol (vec3 ro, vec3 rd)
-{
-  vec3 p, q, cSun, skyBg, clCol, col;
-  float colSum, attSum, s, att, a, dDotS, ds;
-  const vec3 cCol1 = 0.5 * vec3 (0.15, 0.2, 0.4),
-     cCol2 = 0.5 * vec3 (0.25, 0.5, 0.7), gCol = 1.3 * vec3 (0.05, 0.08, 0.05);
-  const float cloudLo = 100., cloudRngI = 1./50., atFac = 0.06;
-  const int nLay = 30;
-  if (rd.y < 0.015 * Fbm1 (16. * rd.x)) col = gCol * (0.5 + 0.5 *
-     Noisefv2 (1000. * vec2 (5. * atan (rd.x, rd.z), rd.y)));
-  else {
-    fCloud = clamp (fCloud, 0., 1.);
-    dDotS = max (dot (rd, sunDir), 0.);
-    ro += cloudDisp;
-    p = ro;
-    p.xz += (cloudLo - p.y) * rd.xz / rd.y;
-    p.y = cloudLo;
-    ds = 1. / (cloudRngI * rd.y * (2. - rd.y) * float (nLay));
-    colSum = 0.;  attSum = 0.;
-    s = 0.;  att = 0.;
-    for (int j = 0; j < nLay; j ++) {
-      q = p + rd * s;
-      q.z *= 0.7;
-      att += atFac * max (fCloud - Fbm3 (0.02 * q), 0.);
-      a = (1. - attSum) * att;
-      colSum += a * (q.y - cloudLo) * cloudRngI;
-      attSum += a;  s += ds;
-      if (attSum >= 1.) break;
-    }
-    colSum += 0.5 * min ((1. - attSum) * pow (dDotS, 3.), 1.);
-    clCol = vec3 (1.) * colSum + 0.05 * sunCol;
-    cSun = sunCol * clamp ((min (pow (dDotS, 1500.) * 2., 1.) +
-       min (pow (dDotS, 10.) * 0.75, 1.)), 0., 1.);
-    skyBg = mix (cCol1, cCol2, 1. - rd.y);
-    col = clamp (mix (skyBg + cSun, 1.6 * clCol, attSum), 0., 1.);
-  }
-  return col;
-}
-
-vec3 SeaFloorCol (vec3 rd)
-{
-  vec2 p;
-  float w, f;
-  p = 5. * rd.xz / rd.y;
-  w = 1.;
-  f = 0.;
-  for (int j = 0; j < 4; j ++) {
-    f += w * Noisefv2 (p);
-    w *= 0.5;  p *= 2.;
-  }
-  return mix (vec3 (0.01, 0.04, 0.02), vec3 (0, 0.05, 0.05), 
-     smoothstep (0.4, 0.7, f));
-}
-
-float WaveHt (vec3 p)
-{
-  const mat2 qRot = mat2 (1.6, -1.2, 1.2, 1.6);
-  vec4 t4, ta4, v4;
-  vec2 q2, t2, v2;
-  float wFreq, wAmp, pRough, ht;
-  wFreq = 0.16;  wAmp = 0.6;  pRough = 5.;
-  q2 = p.xz + waterDisp.xz;
-  ht = 0.;
-  for (int j = 0; j < 5; j ++) {
-    t2 = 1.1 * tCur * vec2 (1., -1.);
-    t4 = vec4 (q2 + t2.xx, q2 + t2.yy) * wFreq;
-    t2 = vec2 (Noisefv2 (t4.xy), Noisefv2 (t4.zw));
-    t4 += 2. * vec4 (t2.xx, t2.yy) - 1.;
-    ta4 = abs (sin (t4));
-    v4 = (1. - ta4) * (ta4 + abs (cos (t4)));
-    v2 = pow (1. - pow (v4.xz * v4.yw, vec2 (0.65)), vec2 (pRough));
-    ht += (v2.x + v2.y) * wAmp;
-    q2 *= qRot;  wFreq *= 1.9;  wAmp *= 0.22;
-    pRough = 0.8 * pRough + 0.2;
-  }
-  return ht;
-}
-
-float WaveRay (vec3 ro, vec3 rd)
-{
-  vec3 p;
-  float dHit, h, s, sLo, sHi;
-  s = 0.;
-  sLo = 0.;
-  dHit = dstFar;
-  for (int j = 0; j < 150; j ++) {
-    p = ro + s * rd;
-    h = p.y - WaveHt (p);
-    if (h < 0.) break;
-    sLo = s;
-    s += max (0.2, h) + 0.005 * s;
-    if (s > dstFar) break;
-  }
-  if (h < 0.) {
-    sHi = s;
-    for (int j = 0; j < 7; j ++) {
-      s = 0.5 * (sLo + sHi);
-      p = ro + s * rd;
-      h = step (0., p.y - WaveHt (p));
-      sLo += h * (s - sLo);
-      sHi += (1. - h) * (s - sHi);
-    }
-    dHit = sHi;
-  }
-  return dHit;
-}
-
-float WaveOutRay (vec3 ro, vec3 rd)
-{
-  vec3 p;
-  float dHit, h, s, sLo, sHi;
-  s = 0.;
-  sLo = 0.;
-  dHit = dstFar;
-  ro.y *= -1.;
-  rd.y *= -1.;
-  for (int j = 0; j < 150; j ++) {
-    p = ro + s * rd;
-    h = p.y + WaveHt (p);
-    if (h < 0.) break;
-    sLo = s;
-    s += max (0.2, h) + 0.005 * s;
-    if (s > dstFar) break;
-  }
-  if (h < 0.) {
-    sHi = s;
-    for (int j = 0; j < 7; j ++) {
-      s = 0.5 * (sLo + sHi);
-      p = ro + s * rd;
-      h = step (0., p.y + WaveHt (p));
-      sLo += h * (s - sLo);
-      sHi += (1. - h) * (s - sHi);
-    }
-    dHit = sHi;
-  }
-  return dHit;
-}
-
-vec3 WaveNf (vec3 p, float d)
-{
-  vec2 e = vec2 (max (0.1, 5e-5 * d * d), 0.);
-  float h = WaveHt (p);
-  return normalize (vec3 (h - WaveHt (p + e.xyy), e.x, h - WaveHt (p + e.yyx)));
-}
-
-float ObjDf (vec3 p)
-{
-  vec3 q;
-  float dHit, d;
-  dHit = dstFar;
-  q = p;
-  q -= ballPos;
-  q *= ballMat;
-  d = PrSphDf (q, 2.);
-  if (d < dHit) { dHit = d;  idObj = 1;  qHit = q; }
-  q.y -= 3.;
-  d = PrCylDf (q.xzy, 0.05, 1.);
-  if (d < dHit) { dHit = d;  idObj = 2;  qHit = q; }
-  q.y -= 1.3;
-  d = PrCylDf (q.xzy, 0.15, 0.3);
-  if (d < dHit) { dHit = d;  idObj = 3;  qHit = q; }
-  return dHit;
-}
-
-float ObjRay (in vec3 ro, in vec3 rd)
-{
-  float d, dHit;
-  dHit = 0.;
-  for (int j = 0; j < 150; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < 0.002 || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  const vec3 e = vec3 (0.001, -0.001, 0.);
-  vec4 v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy),
-     ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-vec3 ObjCol (vec3 n)
-{
-  vec3 col;
-  col = vec3 (0.);
-  if (idObj == 1) {
-    col = vec3 (1., 0.01, 0.);
-    if (abs (qHit.y) < 0.21) col =
-       (mod (floor (7. * (atan (qHit.x, qHit.z) / pi + 1.)), 2.) == 0.) ?
-       vec3 (1., 0.8, 0.08) : vec3 (0.04);
-    else if (qHit.y > 1.93) col = vec3 (0.15, 0.05, 0.);
-    else if (abs (qHit.y) < 0.25) col = vec3 (1., 0.8, 0.08);
-    else if (abs (abs (qHit.y) - 0.55) < 0.05) col = vec3 (1.);
-    else if (abs (abs (qHit.y) - 0.65) < 0.05) col = vec3 (0.04);
-    if (qHit.y < 0.) col = mix (col, vec3 (0.05, 0.2, 0.05), 
-       min (- 2. * qHit.y, 0.9));
-  } else if (idObj == 2) {
-    col = vec3 (0.6, 0.4, 0.2);
-  } else if (idObj == 3) {
-    if (abs (qHit.y) < 0.2) 
-       col = vec3 (0., 1., 0.) * (2. + 1.5 * cos (10. * tCur));
-    else col = vec3 (0.6, 0.4, 0.2);
-  }
-  return col;
-}
-
-float ObjSShadow (vec3 ro, vec3 rd)
-{
-  float sh, d, h;
-  sh = 1.;
-  d = 0.1;
-  for (int j = 0; j < 40; j ++) {
-    h = ObjDf (ro + rd * d);
-    sh = min (sh, 20. * h / d);
-    d += 0.1;
-    if (h < 0.001) break;
-  }
-  return clamp (sh, 0., 1.);
-}
-
-vec3 ObjRender (vec3 ro, vec3 rd)
-{
-  vec3 col, vn;
-  float dif, bk, sh, cc;
-  int idObjT;
-  idObjT = idObj;
-  vn = ObjNf (ro);
-  idObj = idObjT;
-  if (idObj == 1) {
-    vn = VaryNf (20. * qHit, vn, 0.3);
-    if (qHit.y < 0.) vn = mix (vn, VaryNf (12. * qHit, vn, 2.),
-      min (- 5. * qHit.y, 1.));
-  }
-  col = ObjCol (rd);
-  cc = 1. - smoothstep (0.3, 0.6, fCloud);
-  sh = ObjSShadow (ro, sunDir);
-  bk = max (dot (vn, - normalize (vec3 (sunDir.x, 0., sunDir.z))), 0.);
-  dif = max (dot (vn, sunDir), 0.);
-  return col * (0.2 + 0.1 * bk + max (0., dif) * (0.7 + 0.3 * cc * sh)) + 
-     0.3 * cc * sh * sunCol * pow (max (0., dot (sunDir, reflect (rd, vn))), 32.);
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec3 col, vn, rdd, refCol, uwatCol;
-  float dstHit, dstWat, dif, bk, sh, foamFac;
-  const float eta = 0.75, att = 0.5;
-  int idObjT;
-  bool doReflect;
-  if (ro.y > WaveHt (ro)) {
-    dstWat = WaveRay (ro, rd);
-    idObj = -1;
-    dstHit = ObjRay (ro, rd);
-    if (idObj < 0) dstHit = dstFar;
-    doReflect = (dstWat < dstFar && dstWat < dstHit);
-    if (doReflect) {
-      ro += rd * dstWat;
-      vn = WaveNf (ro, dstWat);
-      rdd = rd;
-      rd = reflect (rd, vn);
-      idObj = -1;
-      dstHit = ObjRay (ro, rd);
-      if (idObj < 0) dstHit = dstFar;
-    }
-    col = (dstHit < dstFar) ? ObjRender (ro + rd * dstHit, rd) :
-       SkyGrndCol (ro, rd);
-    if (doReflect) {
-      refCol = col;
-      rd = refract (rdd, vn, eta);
-      idObj = -1;
-      dstHit = ObjRay (ro, rd);
-      if (idObj < 0) dstHit = dstFar;
-      col = (dstHit < dstFar) ? ObjRender (ro + rd * dstHit, rd) *
-         exp (- att * dstHit) : SeaFloorCol (rd);
-      col = mix (col, 0.8 * refCol, pow (1. - abs (dot (rdd, vn)), 5.));
-      foamFac = pow (clamp (WaveHt (ro) +
-         0.004 * Fbm3 (256. * ro) - 0.65, 0., 1.), 8.);
-      col = mix (col, vec3 (1.), foamFac);
-    }
-  } else {
-    uwatCol = vec3 (0., 0.05, 0.05) +
-       step (0.4, Fbm1 (20. * tCur)) * vec3 (0.02, 0.02, 0.03);
-    col = uwatCol;
-    dstWat = WaveOutRay (ro, rd);
-    idObj = -1;
-    dstHit = ObjRay (ro, rd);
-    if (idObj < 0) dstHit = dstFar;
-    if (dstWat < dstFar && dstWat < dstHit) {
-      ro += rd * dstWat;
-      vn = - WaveNf (ro, dstWat);
-      rdd = refract (rd, vn, 1. / eta);
-      if (length (rdd) > 0.) rd = rdd;
-      else rd = reflect (rd, vn);
-      idObj = -1;
-      dstHit = ObjRay (ro, rd);
-      if (idObj < 0) dstHit = dstFar;
-      if (dstHit < dstFar) col = 0.9 * ObjRender (ro + rd * dstHit, rd);
-      else if (rd.y > 0.) col = mix (uwatCol, 0.9 * SkyGrndCol (ro, rd),
-         exp (- 0.07 * att * dstWat));
-    } else if (dstHit < dstFar) col = mix (uwatCol,
-       ObjRender (ro + rd * dstHit, rd), exp (- 0.07 * att * dstHit));
-  }
-  return col;
-}
-
-void BallPM ()
-{
-  const vec3 e = vec3 (1., 0., 0.);
-  float h[5], b;
-  ballPos = vec3 (0., 0., 0.);
-  h[0] = WaveHt (ballPos);
-  h[1] = WaveHt (ballPos + e.yyx);  h[2] = WaveHt (ballPos - e.yyx);
-  h[3] = WaveHt (ballPos + e);  h[4] = WaveHt (ballPos - e);
-  ballPos.y = 0.5 + (2. * h[0] + h[1] + h[2] + h[3] + h[4]) / 9.;
-  b = (h[1] - h[2]) / (4. * e.x);
-  ballMat[2] = normalize (vec3 (0., b, 1.));
-  b = (h[3] - h[4]) / (4. * e.x);
-  ballMat[1] = normalize (cross (ballMat[2], vec3 (1., b, 0.)));
-  ballMat[0] = cross (ballMat[1], ballMat[2]);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-  vec2 uv = 2. * fragCoord.xy / iResolution.xy - 1.;
-  uv.x *= iResolution.x / iResolution.y;
-  tCur = iGlobalTime;
-#ifdef MOUSE
-  vec4 mPtr = iMouse;
-  mPtr.xy = mPtr.xy / iResolution.xy - 0.5;
-#endif
-  mat3 vuMat;
-  vec3 col, ro, rd;
-  vec2 vEl, vAz;
-  float el, az, zmFac, a, tPer, tSeq;
-  cloudDisp = 10. * tCur * vec3 (1., 0., 1.);
-  waterDisp = 0.5 * tCur * vec3 (-1., 0., 1.);
-  sunDir = normalize (vec3 (0.2, 0.5, 0.5));
-  sunCol = vec3 (1., 0.4, 0.3) + vec3 (0., 0.5, 0.2) * sunDir.y;
-  fCloud = 0.5 + 0.2 * sin (0.022 * 2. * pi * tCur);
-  zmFac = 3.5;
-  tPer = 35.;
-#ifdef MOUSE
-  if (mPtr.z <= 0.) {
-    az = 0.01 * tCur;
-    el = 0.2 * pi;
-    tSeq = mod (tCur, tPer);
-    if (mod (floor (tCur / tPer), 2.) == 0.) {
-      a = SmoothBump (10., 30., 5., tSeq);
-      zmFac -= 0.1 * a;
-      el -= 0.19 * pi * a;
-    } else {
-      a = SmoothBump (8., 26., 8., tSeq);
-      zmFac -= 0.05 * a;
-      el -= 0.55 * pi * a;
-    }
-  }
-  else
-  {
-    az = 1.1 * pi * mPtr.x;
-    el = 0.02 * pi - 0.7 * pi * mPtr.y;
-  }
-#else
-  {
-    az = 0.01 * tCur;
-    el = 0.2 * pi;
-    tSeq = mod (tCur, tPer);
-    if (mod (floor (tCur / tPer), 2.) == 0.) {
-      a = SmoothBump (10., 30., 5., tSeq);
-      zmFac -= 0.1 * a;
-      el -= 0.19 * pi * a;
-    } else {
-      a = SmoothBump (8., 26., 8., tSeq);
-      zmFac -= 0.05 * a;
-      el -= 0.55 * pi * a;
-    }
-  }
-#endif
-  vEl = vec2 (cos (el), sin (el));
-  vAz = vec2 (cos (az), sin (az));
-  rd = normalize (vec3 (uv, zmFac));
-  vuMat = mat3 (1., 0., 0., 0., vEl.x, - vEl.y, 0., vEl.y, vEl.x) *
-     mat3 (vAz.x, 0., vAz.y, 0., 1., 0., - vAz.y, 0., vAz.x);
-  rd = rd * vuMat;
-  ro = vec3 (0., 0., -20.) * vuMat;
-  ro.y += 2.;
-  BallPM ();
-  col = ShowScene (ro, rd);
-  fragColor = vec4 (sqrt (clamp (col, 0., 1.)), 1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/dr2-white-folly.slang b/procedural/dr2-white-folly.slang
deleted file mode 100644
index da5291f0aa..0000000000
--- a/procedural/dr2-white-folly.slang
+++ /dev/null
@@ -1,527 +0,0 @@
-#version 450
-// White Folly -  dr2 - 2017-11-07
-// https://www.shadertoy.com/view/ll2cDG
-
-// Folly (architectural) with spiral stairways (in a pond filled with Voronoi stones); mouse enabled
-
-// "White Folly" by dr2 - 2017
-// License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-float PrBoxDf (vec3 p, vec3 b);
-float PrBox2Df (vec2 p, vec2 b);
-float PrCylDf (vec3 p, float r, float h);
-float PrCylAnDf (vec3 p, float r, float w, float h);
-void HexVorInit ();
-vec4 HexVor (vec2 p);
-float SmoothMin (float a, float b, float r);
-float SmoothBump (float lo, float hi, float w, float x);
-vec2 Rot2D (vec2 q, float a);
-vec3 HsvToRgb (vec3 c);
-float Hashfv2 (vec2 p);
-vec2 Hashv2v2 (vec2 p);
-float Noisefv2 (vec2 p);
-float Fbm2 (vec2 p);
-vec3 VaryNf (vec3 p, vec3 n, float f);
-
-const float pi = 3.14159;
-
-vec3 sunDir, qHit;
-float dstFar, tCur, tWav;
-int idObj;
-bool inWat;
-const int idStr = 1, idBal = 2, idPlat = 3, idBalc = 4, idPil = 5, idWl = 6, idFlr = 7;
-
-float ObjDfS (vec3 p, float dMin)
-{
-  vec3 q;
-  float d, db, s, a;
-  q = p;
-  q.xz = abs (Rot2D (q.xz, pi)) - 6.5;
-  db = PrBox2Df (q.xz, vec2 (4.));
-  q.xz += 6.5;
-  q.xz = Rot2D (q.xz, 0.75 * pi);
-  q.x += 4.;
-  a = (length (q.xz) > 0.) ? atan (q.z, - q.x) / (2. * pi) : 0.;
-  q.xz = vec2 (24. * a, length (q.xz) - 6.);
-  q.xy = Rot2D (q.xy, -0.25 * pi);
-  s = mod (q.x, sqrt (0.5));
-  d = max (0.3 * max (q.y - min (s, sqrt (0.5) - s), max (-0.1 - q.y, abs (q.z) - 1.5)),
-     abs (p.y) - 3.5);
-  d = max (d, db);
-  if (d < dMin) { dMin = d;  idObj = idStr; }
-  q.xy -= vec2 (1.5, 1.4);
-  q.z = abs (q.z) - 1.43;
-  d = PrBoxDf (q, vec3 (4.7, 0.07, 0.07));
-  q.x = 0.5 * mod (96. * a + 0.5, 1.) - 0.35;
-  q.y += 0.7;
-  d = min (d,  PrCylDf (q.xzy, 0.05, 0.7));
-  d = max (0.3 * d, db);
-  if (d < dMin) { dMin = d;  idObj = idBal; }
-  return dMin;
-}
-
-/*
-  This function is called twice, for the two orientations of the horizontal 
-  walkway. Could be replaced by a single call, with orientation dependent on 
-  position along ray path; this is faster (good) but there are visual artifacts for 
-  certain view directions (bad). Artifacts can be removed by using cells in the 
-  vertical direction (good), but this is slower (bad).
-*/
-
-float ObjDfB (vec3 p, float dMin)
-{
-  vec3 q;
-  float d;
-  q = p;
-  d = max (PrBoxDf (q, vec3 (10.35, 0.26, 2.85)),
-    - max (length (vec2 (mod (q.x + 2., 4.) - 2., q.z)) - 1.5, 0.3 - abs (q.z)));
-  if (d < dMin) { dMin = d;  idObj = idPlat;  qHit = q; }
-  q = p;  q.y -= 2.05;  q.z = abs (q.z) - 2.45;
-  d = PrBoxDf (q, vec3 (7.45, 0.08, 0.07));
-  q.x = mod (q.x + 0.25, 0.5) - 0.25;
-  q.y += 0.95;
-  d = min (d, max (PrCylDf (q.xzy, 0.06, 0.9), abs (p.x) - 7.45));
-  q = p;  q.y -= 1.06;  q.x = abs (q.x) - 10.23;  q.y -= 0.95;
-  d = min (d, PrBoxDf (q, vec3 (0.07, 0.08, 2.5)));
-  q.y += 0.95;  q.z = mod (q.z + 0.25, 0.5) - 0.25;
-  d = min (d, max (PrCylDf (q.xzy, 0.06, 0.9), abs (p.z) - 2.45));
-  if (d < dMin) { dMin = d;  idObj = idBalc; }
-  q = p;  q.xz = abs (q.xz) - vec2 (8.8, 2.4);  q.x = abs (q.x) - 1.45;  q.y -= 1.3;
-  d = PrCylDf (q.xzy, 0.2, 1.05);
-  if (d < dMin) { dMin = d;  idObj = idPil;  qHit = q; }
-  return dMin;
-}
-
-float ObjDf (vec3 p)
-{
-  vec3 q;
-  float dMin, d;
-  dMin = dstFar;
-  p.y -= 3.;
-  if (! inWat) {
-    dMin = ObjDfS (p, dMin);
-    q = p;  q.y -= 3.25;
-    dMin = ObjDfB (q, dMin);
-    q = p;  q.y -= -3.25;  q.xz = vec2 (- q.z, q.x);
-    dMin = ObjDfB (q, dMin);
-    q = p;  q.y -= 9.;
-    d = max (PrBoxDf (q, vec3 (2.5, 0.15, 2.5)),
-       - max (length (q.xz) - 1., max (0.1 - abs (q.x), 0.1 - abs (q.z))));
-    if (d < dMin) { dMin = d;  idObj = idPlat;  qHit = q; }
-  }
-  q = p;  q.xz = abs (q.xz) - 1.8;  q.y -= 1.;
-  d = PrCylDf (q.xzy, 0.2, 8.);
-  if (d < dMin) { dMin = d;  idObj = idPil;  qHit = q; }
-  q = p;  q.y -= -5.2;
-  d = PrCylAnDf (q.xzy, 20., 0.3, 2.3);
-  if (d < dMin) { dMin = d;  idObj = idWl; }
-  q = p;  q.y -= -7.4;
-  d = PrCylDf (q.xzy, 20., 0.01);
-  if (d < dMin) { dMin = d;  idObj = idFlr; }
-  return dMin;
-}
-
-float ObjRay (vec3 ro, vec3 rd)
-{
-  float dHit, d, eps;
-  eps = 0.001;
-  dHit = 0.;
-  for (int j = 0; j < 160; j ++) {
-    d = ObjDf (ro + dHit * rd);
-    dHit += d;
-    if (d < eps || dHit > dstFar) break;
-  }
-  return dHit;
-}
-
-vec3 ObjNf (vec3 p)
-{
-  vec4 v;
-  vec3 e = vec3 (0.001, -0.001, 0.);
-  v = vec4 (ObjDf (p + e.xxx), ObjDf (p + e.xyy), ObjDf (p + e.yxy), ObjDf (p + e.yyx));
-  return normalize (vec3 (v.x - v.y - v.z - v.w) + 2. * v.yzw);
-}
-
-float ObjSShadow (vec3 ro, vec3 rd)
-{
-  float sh, d, h;
-  sh = 1.;
-  d = 0.05;
-  for (int j = 0; j < 40; j ++) {
-    h = ObjDf (ro + rd * d);
-    sh = min (sh, smoothstep (0., 0.05 * d, h));
-    d += h;
-    if (sh < 0.05) break;
-  }
-  return sh;
-}
-
-vec3 BgCol (vec3 ro, vec3 rd)
-{
-  vec3 col;
-  if (rd.y >= 0.) col = mix (vec3 (0.1, 0.2, 0.4), vec3 (1.), 0.1 + 0.8 * rd.y);
-  else {
-    ro -= ((ro.y + 0.5) / rd.y) * rd;
-    col = mix (0.7 * mix (vec3 (0.3, 0.4, 0.1), vec3 (0.4, 0.5, 0.2), Fbm2 (ro.xz)) *
-         (1. - 0.15 * Noisefv2 (330. * ro.xz)), vec3 (0.18, 0.28, 0.48), pow (1. + rd.y, 5.));
-  }
-  return col;
-}
-
-float WaveHt (vec2 p)
-{
-  mat2 qRot = mat2 (0.8, -0.6, 0.6, 0.8);
-  vec4 t4, v4;
-  vec2 t;
-  float wFreq, wAmp, ht;
-  wFreq = 1.;
-  wAmp = 1.;
-  ht = 0.;
-  for (int j = 0; j < 3; j ++) {
-    p *= qRot;
-    t = tWav * vec2 (1., -1.);
-    t4 = (p.xyxy + t.xxyy) * wFreq;
-    t = vec2 (Noisefv2 (t4.xy), Noisefv2 (t4.zw));
-    t4 += 2. * t.xxyy - 1.;
-    v4 = (1. - abs (sin (t4))) * (abs (sin (t4)) + abs (cos (t4)));
-    ht += wAmp * dot (pow (1. - sqrt (v4.xz * v4.yw), vec2 (8.)), vec2 (1.));
-    wFreq *= 2.;
-    wAmp *= 0.5;
-  }
-  return ht;
-}
-
-vec3 WaveNf (vec3 p, float d)
-{
-  vec3 vn;
-  vec2 e;
-  e = vec2 (max (0.01, 0.005 * d * d), 0.);
-  p *= 0.5;
-  vn.xz = 3. * (WaveHt (p.xz) - vec2 (WaveHt (p.xz + e.xy),  WaveHt (p.xz + e.yx)));
-  vn.y = e.x;
-  return normalize (vn);
-}
-
-vec3 ShowScene (vec3 ro, vec3 rd)
-{
-  vec4 vc;
-  vec3 vn, vnw, row, rdw, col;
-  float dstObj, dstWat, s, a, sh;
-  bool isRefl;
-  HexVorInit ();
-  inWat = false;
-  isRefl = false;
-  tWav = 0.3 * tCur;
-  dstObj = ObjRay (ro, rd);
-  dstWat = - (ro.y + 0.6) / rd.y;
-  if (dstWat < min (dstObj, dstFar) && length ((ro + dstWat * rd).xz) < 20.) {
-    ro += dstWat * rd;
-    row = ro;
-    rdw = rd;
-    vnw = WaveNf (1.5 * ro, dstWat);;
-    rd = refract (rd, vnw, 1./1.333);
-    ro += 0.01 * rd;
-    inWat = true;
-    dstObj = ObjRay (ro, rd);
-    inWat = false;
-    isRefl = true;
-  }
-  if (dstObj < dstFar) {
-    ro += rd * dstObj;
-    if (ro.y < -0.5 && length (ro.xz) > 20.3) col = BgCol (ro, rd);
-    else {
-      vn = ObjNf (ro);
-      if (idObj == idStr) {
-        col = vec3 (0.95, 0.95, 1.);
-      } else if (idObj == idBal || idObj == idBalc) {
-        col = vec3 (0.8, 0.8, 1.);
-      } else if (idObj == idPlat) {
-        col = vec3 (1.);
-        if (vn.y > 0.99) {
-          if (ro.y > 7.5) s = mod (3. * length (qHit.xz), 1.);
-          else s = mod (3. * qHit.x, 1.);
-          col *= 0.8 + 0.2 * SmoothBump (0.1, 0.9, 0.03, s);
-        } else if (abs (vn.y) < 0.01) {
-          s = mod (8. * ro.y, 1.);
-          col *= 0.8 + 0.2 * SmoothBump (0.1, 0.9, 0.03, s);
-        }
-        vn = VaryNf (100. * ro, vn, 0.2); 
-      } else if (idObj == idPil) {
-        if (abs (vn.y) < 0.01) {
-          a = (length (qHit.xz) > 0.) ? atan (qHit.z, - qHit.x) / pi : 0.;
-          s = mod (3. * qHit.y + a, 1.);
-          vn.y = 0.2 * (1. - SmoothBump (0.2, 0.8, 0.1, s)) * sign (s - 0.5);
-          vn.xz *= sqrt (1. - vn.y * vn.y);
-        }
-        col = vec3 (0.9, 0.9, 0.3);
-      } else if (idObj == idWl) {
-        a = (length (ro.xz) > 0.) ? atan (ro.z, - ro.x) / pi : 0.;
-        col = vec3 (0.6, 0.4, 0.3) * (0.5 +
-           0.5 * SmoothBump (0.05, 0.95, 0.02, mod (64. * a, 1.))) *
-           (0.5 + 0.5 * SmoothBump (0.03, 0.97, 0.01, mod (ro.y + 0.5, 1.)));
-        vn = VaryNf (20. * ro, vn, 1.);   
-      } else if (idObj == idFlr) {
-        vc = HexVor (ro.xz);
-        vn.xz = - 0.7 * vc.yz;
-        vn = normalize (vn);
-        s = mod (10. * vc.w, 1.);
-        col = HsvToRgb (vec3 (0.1 + 0.3 * step (2. * s, 1.) + 0.1 * mod (5. * s, 1.),
-           0.5 + 0.5 * mod (17. * s, 1.), 0.7 + 0.3 * mod (12. * s, 1.))) *
-           (0.6 + 0.4 * smoothstep (0., 0.2, vc.x)) * (1. - 0.2 * Noisefv2 (128. * ro.xz));
-      }
-      sh = 0.4 + 0.6 * ObjSShadow (ro, sunDir);
-      col = col * (0.2 + sh * max (dot (sunDir, vn), 0.) +
-         0.1 * max (dot (- sunDir.xz, vn.xz), 0.)) +
-         0.1 * sh * pow (max (dot (normalize (sunDir - rd), vn), 0.), 64.);
-    }
-  } else {
-    if (isRefl) sh = ObjSShadow (row, sunDir);
-    col = BgCol (ro, rd);
-  }
-  if (isRefl) {
-    col = mix (0.9 * col, vec3 (1., 1., 0.9), sh *
-       pow (max (0., dot (sunDir, reflect (rdw, vnw))), 64.));
-  }
-  return clamp (col, 0., 1.);
-}
-
-void mainImage (out vec4 fragColor, in vec2 fragCoord)
-{
-  mat3 vuMat;
-#ifdef MOUSE
-  vec4 mPtr;
-#endif
-  vec3 ro, rd;
-  vec2 canvas, uv, ori, ca, sa;
-  float el, az, zmFac;
-  canvas = iResolution.xy;
-  uv = 2. * fragCoord.xy / canvas - 1.;
-  uv.x *= canvas.x / canvas.y;
-  tCur = iGlobalTime;
-#ifdef MOUSE
-  mPtr = iMouse;
-  mPtr.xy = mPtr.xy / canvas - 0.5;
-#endif
-  dstFar = 120.;
-  az = 0.;
-  el = -0.2 * pi;
-#ifdef MOUSE
-  if (mPtr.z > 0.) {
-    az += 3. * pi * mPtr.x;
-    el += 1. * pi * mPtr.y;
-  } else {
-    az -= 0.1 * tCur;
-    el -= 0.1 * pi * cos (0.03 * pi * tCur);
-  }
-#else
-  az -= 0.1 * tCur;
-  el -= 0.1 * pi * cos (0.03 * pi * tCur);
-#endif
-  el = clamp (el, -0.4 * pi, -0.05 * pi);
-  ori = vec2 (el, az);
-  ca = cos (ori);
-  sa = sin (ori);
-  vuMat = mat3 (ca.y, 0., - sa.y, 0., 1., 0., sa.y, 0., ca.y) *
-          mat3 (1., 0., 0., 0., ca.x, - sa.x, 0., sa.x, ca.x);
-  zmFac = 7. - 2. * cos (az);
-  rd = vuMat * normalize (vec3 (uv, zmFac));
-  ro = vuMat * vec3 (0., 1., -70.);
-  sunDir = vuMat * normalize (vec3 (1., 1., -1.));
-  fragColor = vec4 (ShowScene (ro, rd), 1.);
-}
-
-float PrBoxDf (vec3 p, vec3 b)
-{
-  vec3 d;
-  d = abs (p) - b;
-  return min (max (d.x, max (d.y, d.z)), 0.) + length (max (d, 0.));
-}
-
-float PrBox2Df (vec2 p, vec2 b)
-{
-  vec2 d;
-  d = abs (p) - b;
-  return min (max (d.x, d.y), 0.) + length (max (d, 0.));
-}
-
-float PrCylDf (vec3 p, float r, float h)
-{
-  return max (length (p.xy) - r, abs (p.z) - h);
-}
-
-float PrCylAnDf (vec3 p, float r, float w, float h)
-{
-  return max (abs (length (p.xy) - r) - w, abs (p.z) - h);
-}
-
-vec2 gVec[7], hVec[7];
-#define SQRT3 1.7320508
-
-vec2 PixToHex (vec2 p)
-{
-  vec3 c, r, dr;
-  c.xz = vec2 ((1./SQRT3) * p.x - (1./3.) * p.y, (2./3.) * p.y);
-  c.y = - c.x - c.z;
-  r = floor (c + 0.5);
-  dr = abs (r - c);
-  r -= step (dr.yzx, dr) * step (dr.zxy, dr) * dot (r, vec3 (1.));
-  return r.xz;
-}
-
-vec2 HexToPix (vec2 h)
-{
-  return vec2 (SQRT3 * (h.x + 0.5 * h.y), (3./2.) * h.y);
-}
-
-void HexVorInit ()
-{
-  vec3 e = vec3 (1., 0., -1.);
-  gVec[0] = e.yy;
-  gVec[1] = e.xy;
-  gVec[2] = e.yx;
-  gVec[3] = e.xz;
-  gVec[4] = e.zy;
-  gVec[5] = e.yz;
-  gVec[6] = e.zx;
-  for (int k = 0; k < 7; k ++) hVec[k] = HexToPix (gVec[k]);
-}
-
-vec4 HexVor (vec2 p)
-{
-  vec4 sd, udm;
-  vec2 ip, fp, d, u;
-  float amp, a;
-  amp = 0.7;
-  ip = PixToHex (p);
-  fp = p - HexToPix (ip);
-  sd = vec4 (4.);
-  udm = vec4 (4.);
-  for (int k = 0; k < 7; k ++) {
-    u = Hashv2v2 (ip + gVec[k]);
-    a = 2. * pi * (u.y - 0.5);
-    d = hVec[k] + amp * (0.4 + 0.6 * u.x) * vec2 (cos (a), sin (a)) - fp;
-    sd.w = dot (d, d);
-    if (sd.w < sd.x) {
-      sd = sd.wxyw;
-      udm = vec4 (d, u);
-    } else sd = (sd.w < sd.y) ? sd.xwyw : ((sd.w < sd.z) ? sd.xyww : sd);
-  }
-  sd.xyz = sqrt (sd.xyz);
-  return vec4 (SmoothMin (sd.y, sd.z, 0.3) - sd.x, udm.xy, Hashfv2 (udm.zw));
-}
-
-float SmoothMin (float a, float b, float r)
-{
-  float h;
-  h = clamp (0.5 + 0.5 * (b - a) / r, 0., 1.);
-  return mix (b, a, h) - r * h * (1. - h);
-}
-
-float SmoothBump (float lo, float hi, float w, float x)
-{
-  return (1. - smoothstep (hi - w, hi + w, x)) * smoothstep (lo - w, lo + w, x);
-}
-
-vec2 Rot2D (vec2 q, float a)
-{
-  return q * cos (a) + q.yx * sin (a) * vec2 (-1., 1.);
-}
-
-vec3 HsvToRgb (vec3 c)
-{
-  vec3 p;
-  p = abs (fract (c.xxx + vec3 (1., 2./3., 1./3.)) * 6. - 3.);
-  return c.z * mix (vec3 (1.), clamp (p - 1., 0., 1.), c.y);
-}
-
-const float cHashM = 43758.54;
-
-float Hashfv2 (vec2 p)
-{
-  return fract (sin (dot (p, vec2 (37., 39.))) * cHashM);
-}
-
-vec2 Hashv2v2 (vec2 p)
-{
-  vec2 cHashVA2 = vec2 (37., 39.);
-  return fract (sin (vec2 (dot (p, cHashVA2), dot (p + vec2 (1., 0.), cHashVA2))) * cHashM);
-}
-
-float Noisefv2 (vec2 p)
-{
-  vec2 t, ip, fp;
-  ip = floor (p);  
-  fp = fract (p);
-  fp = fp * fp * (3. - 2. * fp);
-  t = mix (Hashv2v2 (ip), Hashv2v2 (ip + vec2 (0., 1.)), fp.y);
-  return mix (t.x, t.y, fp.x);
-}
-
-float Fbm2 (vec2 p)
-{
-  float f, a;
-  f = 0.;
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    f += a * Noisefv2 (p);
-    a *= 0.5;
-    p *= 2.;
-  }
-  return f * (1. / 1.9375);
-}
-
-float Fbmn (vec3 p, vec3 n)
-{
-  vec3 s;
-  float a;
-  s = vec3 (0.);  
-  a = 1.;
-  for (int i = 0; i < 5; i ++) {
-    s += a * vec3 (Noisefv2 (p.yz), Noisefv2 (p.zx), Noisefv2 (p.xy));
-    a *= 0.5;  
-    p *= 2.;
-  }
-  return dot (s, abs (n));
-}
-
-vec3 VaryNf (vec3 p, vec3 n, float f)
-{
-  vec3 g;
-  vec2 e = vec2 (0.1, 0.);
-  g = vec3 (Fbmn (p + e.xyy, n), Fbmn (p + e.yxy, n), Fbmn (p + e.yyx, n)) - Fbmn (p, n);
-  return normalize (n + f * (g - n * dot (n, g)));
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/fabriceneyret2-skyline-3d.slang b/procedural/fabriceneyret2-skyline-3d.slang
deleted file mode 100644
index 0684ddeada..0000000000
--- a/procedural/fabriceneyret2-skyline-3d.slang
+++ /dev/null
@@ -1,91 +0,0 @@
-#version 450
-// Skyline 3D -  FabriceNeyret2 - 2015-07-02
-// https://www.shadertoy.com/view/4tlSWr
-
-// in the spirit of the 2D skylines (e.g., https://www.shadertoy.com/view/4tlXzM )... but in 3D :-)  ( I even reproduced the original temporal aliasing :-D  )
-
-// Be sure to wait long enough ;-)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define T iGlobalTime
-
-// --- using the base ray-marcher of Trisomie21: https://www.shadertoy.com/view/4tfGRB#
-
-vec4 bg = vec4(0); // vec4(0,0,.3,0); 
-
-void mainImage( out vec4 f, vec2 w ) {
-    vec4 p = vec4(w,0,1)/iResolution.yyxy-.5, d,c; p.x-=.4; // init ray
-    // r(p.xz,.13); r(p.yz,.2); r(p.xy,.1);   // camera rotations
-    d =p;                                 // ray dir = ray0-vec3(0)
-    p.x += 15.*T; p += 2.*d;
-    f = bg;
-    float l,x=1e9, closest = 999.;
-   
-    for (float i=1.; i>0.; i-=.01)  {
-       
-        vec4 u = floor(p/8.), t = mod(p, 8.)-4., ta; // objects id + local frame
-      	u.y = 0.; 
-        u = sin(78.17*(u+u.yzxw));                     // randomize ids
-        
-        c = p/p*1.2;
-        ta = abs(t);
-        x=1e9; 
-        if (sin(17.*(u.x+u.y+u.z))>.95) { // 10% of blocks
-            ta.y = p.y + 30.*u.x - .3*pow(abs(.03*floor(p.z)),3.) + 35.;
-            x = max(ta.x,max(ta.y,ta.z))  -3.; 
-         }
-        closest = min(closest, p.y+150.); 
-        
-        // artifacts: passed a object, we might be fooled about dist to next (hidden in next modulo-tile)
-#if 1        // if dist to box border is closest to object, go there.  <<< the working solution ! (at mod8 scale)
-        vec4 k, k1 = (4.-t)/d ,k2 = (-4.-t)/d, dd; 
-        k = min (k1-1e5*sign(k1),k2-1e5*sign(k2))+1e5; // ugly trick to get the min only if positive.
-        // 2 less ugly/costly formulations, but less robust close to /0 :
-        //   k = mix(k1,k2, .5+.5*sign(k2));
-        //   dd = d+.001*clamp(1.-d*d,.999,1.); k = (4.*sign(dd)-t)/dd;
-        l = min(k.x,min(k.y,k.z));
-        if (l<x) { p+= 1.*d*(l+0.01); continue; }
-#endif
-        // if (x<.01) c = texture(iChannel0,.1*(p.xy+p.yz));
-      
-        if(x<.01) // hit !
-            { f = mix(bg,c,i*i); break;  }  // color texture + black fog
-       
-        p += d*x;       // march ray
-     }
-    //if (length(f)==0.) f = vec4(1,1,.6,0)*smoothstep(.31,.3,length(w/iResolution.y-vec2(1.3,.7)));
-    f += vec4(1) * exp(-.01*closest)*(.5+.5*cos(1.+T/8.)); // thanks kuvkar ! 
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/fizzer-kirby-jump.slang b/procedural/fizzer-kirby-jump.slang
deleted file mode 100644
index c2d42f7495..0000000000
--- a/procedural/fizzer-kirby-jump.slang
+++ /dev/null
@@ -1,295 +0,0 @@
-#version 450
-//kirby jump
-// fizzer 2018-01-31
-// https://www.shadertoy.com/view/lt2fD3
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-   float ZOOM;
-   float X_AXIS;
-   float Y_AXIS;
-   float SPEED;
-} global;
-
-#pragma parameter ZOOM "Zoom" 2.0 0.001 10.0 0.1
-#pragma parameter X_AXIS "Pan Horizontal" 0.0 -1.0 1.0 0.01
-#pragma parameter Y_AXIS "Pan Vertical" 0.0 -1.01 1.0 0.01
-#pragma parameter SPEED "Animation Speed" 1.0 0.0 5.0 0.1
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-   vTexCoord = vTexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025 * global.SPEED;
-vec2 iResolution = global.OutputSize.xy;
-
-// polynomial smooth min (from IQ)
-float smin( float a, float b, float k )
-{
-    float h = clamp( 0.5+0.5*(b-a)/k, 0.0, 1.0 );
-    return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-
-float smax(float a,float b, float k)
-{
-    return -smin(-a,-b,k);
-}
-
-mat2 rotmat(float a)
-{
-    return mat2(cos(a),sin(a),-sin(a),cos(a));
-}
-
-float shoesDist(vec3 p)
-{
-    vec3 op=p;
-    float d=1e4;
-
-    p.y-=1.5;
-
-    // right shoe
-    op=p;
-    p-=vec3(-.5,-.6,-.9);
-    p.yz=rotmat(-.7)*p.yz;
-    p.xz=rotmat(0.1)*p.xz;
-    d=min(d,-smin(p.y,-(length(p*vec3(1.6,1,1))-.64),.2));
-    p=op;
-
-    // left shoe
-    op=p;
-    p-=vec3(.55,-.8,0.4);
-    p.x=-p.x;
-    p.yz=rotmat(1.4)*p.yz;
-    d=min(d,-smin(p.y,-(length(p*vec3(1.6,1,1))-.73),.2));
-    p=op;
-    return d;
-}
-
-float sceneDist(vec3 p)
-{
-    vec3 op=p;
-    float d=shoesDist(p);
-
-    d=min(d,p.y);
-    p.y-=1.5;
-
-    // torso
-    d=min(d,length(p)-1.);
-
-
-    // left arm
-    op=p;
-    p-=vec3(.66,.7,0);
-    p.xz=rotmat(-0.1)*p.xz;
-    d=smin(d,(length(p*vec3(1.8,1,1))-.58),.07);
-    p=op;
-
-    // right arm
-    op=p;
-    p-=vec3(-.75,0.2,0);
-    d=smin(d,(length(p*vec3(1,1.5,1))-.54),.03);
-    p=op;
-
-    // mouth
-    p.y-=.11;
-    float md=smax(p.z+.84,smax(smax(p.x-.2,p.y-.075,.2),dot(p,vec3(.7071,-.7071,0))-.1,.08),.04);
-    p.x=-p.x;
-    md=smax(md,smax(p.z+.84,smax(smax(p.x-.2,p.y-.075,.2),dot(p,vec3(.7071,-.7071,0))-.1,.08),.01),.13);
-    d=smax(d,-md,.012);
-
-    // tongue
-    p=op;
-    d=smin(d,length((p-vec3(0,.03,-.75))*vec3(1,1,1))-.16,.01);
-
-    return min(d,10.);
-}
-
-
-
-vec3 sceneNorm(vec3 p)
-{
-    vec3 e=vec3(1e-3,0,0);
-    float d = sceneDist(p);
-    return normalize(vec3(sceneDist(p + e.xyy) - sceneDist(p - e.xyy), sceneDist(p + e.yxy) - sceneDist(p - e.yxy),
-                          sceneDist(p + e.yyx) - sceneDist(p - e.yyx)));
-}
-
-
-// from simon green and others
-float ambientOcclusion(vec3 p, vec3 n)
-{
-    const int steps = 4;
-    const float delta = 0.15;
-
-    float a = 0.0;
-    float weight = 4.;
-    for(int i=1; i<=steps; i++) {
-        float d = (float(i) / float(steps)) * delta; 
-        a += weight*(d - sceneDist(p + n*d));
-        weight *= 0.5;
-    }
-    return clamp(1.0 - a, 0.0, 1.0);
-}
-
-// a re-shaped cosine, to make the peaks more pointy
-float cos2(float x){return cos(x-sin(x)/3.);}
-
-float starShape(vec2 p)
-{
-    float a=atan(p.y,p.x)+iGlobalTime/3.;
-    float l=pow(length(p),.8);
-    float star=1.-smoothstep(0.,(3.-cos2(a*5.*2.))*.02,l-.5+cos2(a*5.)*.1);
-    return star;
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    // Normalized pixel coordinates (from 0 to 1)
-    vec2 uv = fragCoord/iResolution.xy;
-
-    float an=cos(iGlobalTime)*.1;
-
-    vec2 ot=uv*2.-1.;
-    ot.y*=iResolution.y/iResolution.x;
-    vec3 ro=vec3(0.,1.4,4.);
-    vec3 rd=normalize(vec3(ot.xy,-1.3));
-
-    rd.xz=mat2(cos(an),sin(an),sin(an),-cos(an))*rd.xz;
-    ro.xz=mat2(cos(an),sin(an),sin(an),-cos(an))*ro.xz;
-
-    float s=20.;
-
-    // primary ray
-    float t=0.,d=0.;
-    for(int i=0;i<80;++i)
-    {
-        d=sceneDist(ro+rd*t);
-        if(d<1e-4)
-            break;
-        if(t>10.)
-            break;
-        t+=d*.9;
-    }
-
-    t=min(t,10.0);
-
-    // shadow ray
-    vec3 rp=ro+rd*t;
-    vec3 n=sceneNorm(rp);
-    float st=5e-3;
-    vec3 ld=normalize(vec3(2,4,-4));
-    for(int i=0;i<20;++i)
-    {
-        d=sceneDist(rp+ld*st);
-        if(d<1e-5)
-            break;
-        if(st>5.)
-            break;
-        st+=d*2.;
-    }
-
-    // ambient occlusion and shadowing
-    vec3 ao=vec3(ambientOcclusion(rp, n));
-    float shad=mix(.85,1.,step(5.,st));
-
-    ao*=mix(.3,1.,.5+.5*n.y);
-
-    // soft floor shadow
-    if(rp.y<1e-3)
-        ao*=mix(mix(vec3(1,.5,.7),vec3(1),.4)*.6,vec3(1),smoothstep(0.,1.6,length(rp.xz)));
-
-
-
-    vec3 diff=vec3(1);
-    vec3 emit=vec3(0);
-
-    // skin
-    diff*=vec3(1.15,.3,.41)*1.4;
-    diff+=.4*mix(1.,0.,smoothstep(0.,1.,length(rp.xy-vec2(0.,1.9))));
-    diff+=.5*mix(1.,0.,smoothstep(0.,.5,length(rp.xy-vec2(.7,2.5))));
-    diff+=.36*mix(1.,0.,smoothstep(0.,.5,length(rp.xy-vec2(-1.1,1.8))));
-
-    if(rp.y<1e-3)
-        diff=vec3(.6,1,.6);
-
-    // mouth
-    diff*=mix(vec3(1,.3,.2),vec3(1),smoothstep(.97,.99,length(rp-vec3(0,1.5,0))));
-
-    // shoes
-    diff=mix(vec3(1.,.05,.1),diff,smoothstep(0.,0.01,shoesDist(rp)));
-    diff+=.2*mix(1.,0.,smoothstep(0.,.2,length(rp.xy-vec2(-0.5,1.4))));
-    diff+=.12*mix(1.,0.,smoothstep(0.,.25,length(rp.xy-vec2(0.57,.3))));
-
-    // bounce light from the floor
-    diff+=vec3(.25,1.,.25)*smoothstep(-.3,1.7,-rp.y+1.)*max(0.,-n.y)*.7;
-
-    vec3 orp=rp;
-    rp.y-=1.5;
-    rp.x=abs(rp.x);
-
-    // blushes
-    diff*=mix(vec3(1,.5,.5),vec3(1),smoothstep(.1,.15,length((rp.xy-vec2(.4,.2))*vec2(1.,1.65))));
-
-    rp.xy-=vec2(.16,.45);
-    rp.xy*=.9;
-    orp=rp;
-    rp.y=pow(abs(rp.y),1.4)*sign(rp.y);
-
-    // eye outline
-    diff*=smoothstep(.058,.067,length((rp.xy)*vec2(.9,.52)));
-
-    rp=orp;
-    rp.y+=.08;
-    rp.y-=pow(abs(rp.x),2.)*16.;
-
-    // eye reflections
-    emit+=vec3(.1,.5,1.)*(1.-smoothstep(.03,.036,length((rp.xy)*vec2(.7,.3))))*max(0.,-rp.y)*10.;
-
-    rp=orp;
-    rp.y-=.12;
-
-    // eye highlights
-    emit+=vec3(1)*(1.-smoothstep(.03,.04,length((rp.xy)*vec2(1.,.48))));
-
-    // fresnel
-    diff+=pow(clamp(1.-dot(-rd,n),0.,.9),4.)*.5;
-
-    // background and floor fade
-    vec3 backg=vec3(1.15,.3,.41)*.9;
-    ot.x+=.6+iGlobalTime/50.;
-    ot.y+=cos(floor(ot.x*2.)*3.)*.1+.2;
-    ot.x=mod(ot.x,.5)-.25;
-    backg=mix(backg,vec3(1.,1.,.5),.1*starShape((ot-vec2(0.,.6))*8.)*smoothstep(9.,10.,t));
-    diff=mix(diff,backg,smoothstep(.9,10.,t));
-
-    fragColor.rgb=mix(vec3(.15,0,0),vec3(1.,1.,1.),ao)*shad*diff*1.1;
-    fragColor.rgb+=emit;
-    fragColor.a = 1.0;
-
-    fragColor.rgb=pow(fragColor.rgb,vec3(1./2.4));
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = ((vTexCoord / global.ZOOM) + 0.5 + vec2(global.X_AXIS, global.Y_AXIS)) * global.OutputSize.xy;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/fizzer-power-coils.slang b/procedural/fizzer-power-coils.slang
deleted file mode 100644
index 30eae3aa4f..0000000000
--- a/procedural/fizzer-power-coils.slang
+++ /dev/null
@@ -1,80 +0,0 @@
-#version 450
-#
-//Playing with inversion and volumetric light.
-//fizer 2015-06-06
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-void mainImage(out vec4 c, vec2 q)
-{
-    float a=iGlobalTime*.1+1.,b=.5,g,e,t=0.,s;
-    vec3 r=vec3(0.,0.,3.),w=normalize(vec3((q-iResolution.xy/2.)/iResolution.y,-.5)),p;
-
-    mat2 x=mat2(cos(a),sin(a),sin(a),-cos(a)),y=mat2(cos(b),sin(b),sin(b),-cos(b));
-
-    w.xz=y*w.xz;
-    r.xz=y*r.xz;
-
-    w.yz=x*w.yz;
-    r.yz=x*r.yz;
-
-    c.rgb=vec3(0.,0.,.02);
-
-    for(int i=0;i<150;++i)
-    {
-        p=r+w*t;
-
-        float f=.25,d=1e4;
-        for(int j=0;j<2;++j)
-        {
-            s=.2*dot(p,p);
-            p=p/s;
-            f*=s;
-            g=p.z;
-            e=atan(p.y,p.x);
-            p=(mod(p,2.)-1.)*1.25;
-        }
-
-        d=min((length(abs(p.xy)-1.3)-.1)*f,1e2);
-
-        if(d<1e-3)
-            break;
-
-        c.rgb+=vec3(.3,.4,.8)*(pow(.5+.5*cos(g*.5+a*77.+cos(e*10.)),16.))*
-            (1.-smoothstep(0.,1.,70.*d))*.25;
-
-        t+=d;
-    }
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/fizzer-the-popular-shader.slang b/procedural/fizzer-the-popular-shader.slang
deleted file mode 100644
index 83b8cae446..0000000000
--- a/procedural/fizzer-the-popular-shader.slang
+++ /dev/null
@@ -1,433 +0,0 @@
-#version 450
-#
-//I remade my other shader (https://www.shadertoy.com/view/ldjGWD) inspired by "The Popular Demo", to make it more accurate 
-//I added a tiling effect to make the robot look faceted, but it seems to somehow over-complicate the shader so it doesn't compile.
-// fizzer - 2014-01-04
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define USE_IQ_SMIN 0
-
-float time;
-
-vec2 leg0[3];
-vec2 leg1[3];
-
-vec2 arm0[3];
-vec2 arm1[3];
-
-float wlen=15.0;
-float bob;
-float wc_scale=0.5;
-float scroll;
-float scene_scale=15.0;
-
-// Finds the entry and exit points of a 2D ray with a circle of radius 1
-// centered at the origin.
-vec2 intersectCircle(vec2 ro, vec2 rd)
-{
-	float a = dot(rd, rd);
-	float b = 2.0 * dot(rd, ro);
-	float ds = b * b - 4.0 * a * (dot(ro, ro) - 1.0);
-	
-	if(ds < 0.0)
-		return vec2(1e3);
-	
-	return ((-b - sqrt(ds) * vec2(-1.0, 1.0))) / (2.0 * a);
-}
-
-mat3 rotateXMat(float a)
-{
-	return mat3(1.0, 0.0, 0.0, 0.0, cos(a), -sin(a), 0.0, sin(a), cos(a));
-}
-
-mat3 rotateYMat(float a)
-{
-	return mat3(cos(a), 0.0, -sin(a), 0.0, 1.0, 0.0, sin(a), 0.0, cos(a));
-}
-
-// Adapted from https://www.shadertoy.com/view/ldlGR7   
-vec2 solve( vec2 p, float l1, float l2, float side )
-{
-	vec2 q = p*( 0.5 + 0.5*(l1*l1-l2*l2)/dot(p,p) );
-	
-	float s = l1*l1/dot(q,q) - 1.0;
-	
-	if( s<0.0 ) return vec2(-100.0);
-	
-	return q + q.yx*vec2(-1.0,1.0)*side*sqrt( s );
-}
-
-// Returns a pyramid-like periodic signal.
-float pyramid(float x)
-{
-	x = fract(x);
-	return min(x * 2.0, (1.0 - x) * 2.0);
-}
-
-// Returns a semicircular periodic signal.
-float circ(float x)
-{
-	x = fract(x) * 2.0 - 1.0;
-	return sqrt(1.0 - x * x);
-}
-
-#if USE_IQ_SMIN
-float smin(float a,float b,float k){ return -log(exp(-k*a)+exp(-k*b))/k;}//from iq
-#else
-// http://www.johndcook.com/blog/2010/01/20/how-to-compute-the-soft-maximum/
-float smin(in float a, in float b, in float k) { return a - log(1.0+exp(k*(a-b))) / k; }
-#endif
-
-float mp(float x)
-{
-	float y=0.3;
-	return clamp((pyramid(x)-0.5)*2.0-0.4,-y,y);
-}
-
-float mosaic(vec3 p)
-{
-	// Disabled because it causes a compilation failure due to time-out or size limit.
-	return 0.0;//max(mp(p.y*10.0),mp(p.z*10.0))*0.01;
-}
-/*
-mat3 transpose(mat3 m)
-{
-	return mat3(vec3(m[0].x,m[1].x,m[2].x),
-				vec3(m[0].y,m[1].y,m[2].y),
-				vec3(m[0].z,m[1].z,m[2].z));
-}*/
-
-float capsuleDist(vec3 p,vec3 o,vec3 d,float h0,float h1,float r0,float r1)
-{
-	vec3 u=cross(d,vec3(1.0,0.0,0.0));
-	vec3 v=cross(u,d);
-	u=cross(v,d);
-	mat3 m=transpose(mat3(normalize(u),normalize(v),normalize(d)));
-	d=normalize(d);
-	float t=clamp(dot(p-o,d),h0,h1);
-	vec3 np=o+t*d;
-	return distance(np,p)-mix(r0,r1,t)+mosaic(m*(p-o));
-}
-
-float boxDist(vec3 p,vec3 s,float r)
-{
-	return length(max(vec3(0.0),abs(p)-s))-r+mosaic(p);
-}
-
-float sphereDist(vec3 p,vec3 o,float r)
-{
-	return distance(p,o)-r+mosaic(p-o);
-}
-
-float sceneDist(vec3 p)
-{
-	float d=1e3;
-	
-	p+=vec3(0.0,0.07,0.0)*scene_scale;
-	p=rotateYMat(3.1415926*0.5)*p;
-	
-	p.z+=cos(p.y*2.0+time)*0.1;
-	float tm=fract(time*wc_scale*2.0-0.1);
-	p.x-=(smoothstep(0.0,0.3,tm)-smoothstep(0.4,1.0,tm))*smoothstep(0.5,2.0,p.y)*0.2+scroll;
-	
-	// Leg 0
-	{
-		float g=0.08;
-		vec3 o=vec3(0.0,0.0,0.2);
-		float d0=capsuleDist(p+o,vec3(leg0[0],0.0),vec3(leg0[1]-leg0[0],0.0),0.0,1.0-g,0.1,0.1);
-		float d1=capsuleDist(p+o,vec3(leg0[1],0.0),vec3(leg0[2]-leg0[1],0.0),g,1.0,0.1,0.2);
-		d=min(d,smin(d0,d1,15.0));
-	}
-	
-	// Leg 1
-	{
-		float g=0.08;
-		vec3 o=vec3(0.0,0.0,-0.2);
-		float d0=capsuleDist(p+o,vec3(leg1[0],0.0),vec3(leg1[1]-leg1[0],0.0),0.0,1.0-g,0.1,0.1);
-		float d1=capsuleDist(p+o,vec3(leg1[1],0.0),vec3(leg1[2]-leg1[1],0.0),g,1.0,0.1,0.2);
-		d=min(d,smin(d0,d1,15.0));
-	}
-	
-	p.y-=bob;
-	
-	// Arm 0
-	{
-		float g=0.08;
-		vec3 o=vec3(0.0,0.0,0.4);
-		mat3 m=rotateXMat(-0.3)*rotateYMat((cos((time*wc_scale+0.5)*3.1415926*2.0)-0.6)*0.5);
-		float d0=capsuleDist(p+o,vec3(arm0[0],0.0),m*vec3(arm0[1]-arm0[0],0.0),0.0,0.7-g,0.03,0.03);
-		float d1=capsuleDist(p+o,vec3(arm0[0],0.0)+m*vec3(arm0[1]-arm0[0],0.0),m*vec3(arm0[2]-arm0[1],0.0),g,0.7,0.03,0.06);
-		d=min(d,smin(d0,d1,15.0));
-	}
-	
-	// Arm 1
-	{
-		float g=0.08;
-		vec3 o=vec3(0.0,0.0,-0.4);
-		mat3 m=rotateXMat(0.3)*rotateYMat(-(cos(time*wc_scale*3.1415926*2.0)-0.6)*0.5);
-		float d0=capsuleDist(p+o,vec3(arm1[0],0.0),m*vec3(arm1[1]-arm1[0],0.0),0.0,0.7-g,0.03,0.03);
-		float d1=capsuleDist(p+o,vec3(arm1[0],0.0)+m*vec3(arm1[1]-arm1[0],0.0),m*vec3(arm1[2]-arm1[1],0.0),g,0.7,0.03,0.06);
-		d=min(d,smin(d0,d1,15.0));
-	}
-	
-	// Torso   
-	d=smin(d,boxDist(p+vec3(0.0,-0.7,0.0),vec3(0.05,0.7,0.15),0.1),15.0);
-	d=smin(d,boxDist(p+vec3(-0.1,-1.1,0.0),vec3(0.05,0.2,0.15)*0.1,0.1),5.0);
-	
-	// Head
-	d=smin(d,sphereDist(p,vec3(0.0,1.825,0.0),0.2),15.0);
-	
-	
-	return d;
-}
-
-vec3 sceneNorm(vec3 p)
-{
-	p*=scene_scale;
-	float c=sceneDist(p);
-	float e=1e-3;
-	return normalize(vec3(sceneDist(p+vec3(e,0,0))-c,
-						  sceneDist(p+vec3(0,e,0))-c,
-						  sceneDist(p+vec3(0,0,e))-c));
-}
-
-float robot(vec3 ro,vec3 rd)
-{
-	float t=0.0;
-	float tm;
-	
-	tm=time*wc_scale;
-	
-	leg0[0]=vec2(0.0,bob);
-	leg0[2]=vec2(pyramid(tm)-0.3,-1.8+0.3*circ(tm*2.0)*step(fract(tm),0.5));
-	leg0[1]=(leg0[0]+solve(leg0[2]-leg0[0],1.0,1.0,1.0));
-	
-	arm1[0]=vec2(0.0,1.4);
-	arm1[2]=vec2(pyramid(tm)-0.3,0.1+pow(pyramid(tm),2.0)*0.7);
-	arm1[1]=(arm1[0]+solve(arm1[2]-arm1[0],0.7,0.7,-1.0));
-	
-	tm+=0.5;
-	
-	leg1[0]=vec2(0.0,bob);
-	leg1[2]=vec2(pyramid(tm)-0.3,-1.8+0.3*circ(tm*2.0)*step(fract(tm),0.5));
-	leg1[1]=(leg1[0]+solve(leg1[2]-leg1[0],1.0,1.0,1.0));
-	
-	arm0[0]=vec2(0.0,1.4);
-	arm0[2]=vec2(pyramid(tm)-0.3,0.1+pow(pyramid(tm),2.0)*0.7);
-	arm0[1]=(arm0[0]+solve(arm0[2]-arm0[0],0.7,0.7,-1.0));
-	
-	float rt=1e4;
-	
-	ro*=scene_scale;
-	rd*=scene_scale;
-	
-	for(int i=0;i<15;i+=1)
-	{
-		vec3 rp=ro+rd*t;
-		
-		float d=sceneDist(rp);
-		
-		if(d<1e-2)
-		{
-			rt=t;
-		}
-		
-		t+=d/scene_scale;
-	}
-	
-	
-	return rt;
-}
-
-
-vec2 unitSquareInterval(vec2 ro, vec2 rd)
-{	
-	vec2 slabs0 = (vec2(+1.0) - ro) / rd;	
-	vec2 slabs1 = (vec2(-1.0) - ro) / rd;
-	
-	vec2 mins = min(slabs0, slabs1);
-	vec2 maxs = max(slabs0, slabs1);
-	
-	return vec2(max(mins.x, mins.y),
-				min(maxs.x, maxs.y));
-}
-
-vec3 squaresColours(vec2 p)
-{
-	p+=vec2(time*0.2);
-	
-	vec3 orange=vec3(1.0,0.4,0.1)*2.0;
-	vec3 purple=vec3(1.0,0.2,0.5)*0.8;
-	
-	float l=pow(0.5+0.5*cos(p.x*7.0+cos(p.y)*8.0)*sin(p.y*2.0),4.0)*2.0;
-	vec3 c=pow(l*(mix(orange,purple,0.5+0.5*cos(p.x*40.0+sin(p.y*10.0)*3.0))+
-				  mix(orange,purple,0.5+0.5*cos(p.x*20.0+sin(p.y*3.0)*3.0))),vec3(1.2))*0.7;
-	
-	c+=vec3(1.0,0.8,0.4)*pow(0.5+0.5*cos(p.x*20.0)*sin(p.y*12.0),20.0)*2.0;
-	
-	c+=vec3(0.1,0.5+0.5*cos(p*20.0))*vec3(0.05,0.1,0.4).bgr*0.7;
-	
-	return c;
-}
-
-vec3 squaresTex(vec2 p,float border)
-{
-	float sm=0.02;
-	vec2 res=vec2(8.0);
-	vec2 ip=floor(p*res)/res;
-	vec2 fp=fract(p*res);
-	float m=1.0-max(smoothstep(border-sm,border,abs(fp.x-0.5)),smoothstep(border-sm,border,abs(fp.y-0.5)));
-	m+=1.0-smoothstep(0.0,0.56,distance(fp,vec2(0.5)));
-	return m*squaresColours(ip);
-}
-
-vec3 room(vec3 ro,vec3 rd,out vec3 rp,out vec3 n)
-{
-	vec2 box_size=vec2(1.0,5.0+3.0/8.0);
-	
-	vec2 cp=vec2(0.0),ct=vec2(1e3);
-	
-	for(int i=0;i<4;i+=1)
-	{
-		float cr=0.03;
-		vec2 tcp=vec2(2.5/8.0*float(-1),float(i)-2.0+0.5/8.0);
-		vec2 tct=intersectCircle((ro.xz-tcp)/cr,rd.xz/cr);
-		
-		if(tct.y > 0.0 && tct.y<ct.y)
-		{
-			ct=tct;
-			cp=tcp;
-		}
-	}
-
-	for(int i=0;i<4;i+=1)
-	{
-		float cr=0.03;
-		vec2 tcp=vec2(2.5/8.0*float(+1),float(i)-2.0+0.5/8.0);
-		vec2 tct=intersectCircle((ro.xz-tcp)/cr,rd.xz/cr);
-		
-		if(tct.y > 0.0 && tct.y<ct.y)
-		{
-			ct=tct;
-			cp=tcp;
-		}
-	}
-	
-	ct.y=max(0.0,ct.y);
-	
-	vec3 ci=ro+rd*ct.y;
-	vec2 cu=vec2(atan(ci.z-cp.y,ci.x-cp.x)/3.1415926*0.5,(ci.y+0.5/8.0)*4.0);
-	
-	float wt=max(0.0,unitSquareInterval(ro.xy * box_size, rd.xy * box_size).y);
-	float t=min(ct.y,wt);
-	
-	rp=ro+rd*(t-1e-4);
-	
-	n.z=0.0;
-	if(abs(rp.x*box_size.x)>abs(rp.y*box_size.y))
-		n.xy=vec2(rp.x/abs(rp.x),0.0);
-	else
-		n.xy=vec2(0.0,rp.y/abs(rp.y));
-	
-	if(ct.y<wt)
-	{
-		n.y=0.0;
-		n.xz=normalize(rp.xz-ci.xz);
-	}
-	
-	float l=1.0-smoothstep(0.0,3.0,abs(rp.z-ro.z));
-	
-	vec3 wc=mix(squaresTex(rp.zy+vec2(0.0,0.5/8.0),0.5),squaresTex(rp.xz,0.44),step(0.999/box_size.y,abs(rp.y)));
-	vec3 cc=squaresTex(cu,0.45)+0.8*vec3(smoothstep(0.83/5.0,0.86/5.0,abs(rp.y)));
-	
-	return l*mix(cc,wc,step(wt,t));
-}
-
-vec3 scene(vec2 p)
-{
-	mat3 cam = rotateXMat(cos(time * 0.2) * 0.1) * rotateYMat(time * 0.5);
-	float lt=mod(time*wc_scale,wlen)/wlen;
-	
-	vec3 ro = cam*vec3(0.0,-0.15+lt*0.15, 0.15+lt*0.2)+vec3(0.0,0.0,scroll/scene_scale);
-	vec3 rd = cam*vec3(p, -1.0);
-	
-	rd=normalize(rd);
-	
-	float robot_t=robot(ro,rd);
-	
-	vec3 n,rp;
-	
-	vec3 c;
-	vec3 c0=room(ro,rd,rp,n);
-	
-	if(robot_t < distance(ro,rp))
-	{
-		rp=ro+rd*robot_t;
-		n=sceneNorm(rp);
-		vec3 r=reflect(rd,n);
-		c=vec3(0.5+0.5*n.y)*0.5*vec3(1.0,0.8,0.5);
-		vec3 c1=room(rp,r,rp,n);
-		c+=c1*0.5;
-	}
-	else
-	{
-		vec3 r=reflect(rd,n);
-		vec3 c1=room(rp,r,rp,n);
-		c=c0+c1*c0*0.4;
-	}
-		
-	vec3 ll=vec3(1.0-(smoothstep(0.0,0.07,lt)-smoothstep(0.93,1.0,lt)));
-	
-	return ll+c+
-		0.6*((sin(p.y)*cos(p.x+time*2.0)*0.5+0.5)*
-			 pow(mix(vec3(1.0,0.7,0.1),vec3(1.0,0.2,0.6),0.5+0.5*cos(p.x+sin(time*3.0+p.y*2.0))),vec3(2.0)));
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	time=iGlobalTime+1.0;
-	bob=cos(time*12.0)*0.05;
-	scroll=-15.0+mod(time*wc_scale,wlen)*2.0;
-	vec2 uv = fragCoord.xy / iResolution.xy;
-	vec2 q=uv;
-	vec2 t=uv*2.0-vec2(1.0);
-	t.x*=iResolution.x/iResolution.y;
-   fragColor.a   = 1.0f;
-	fragColor.rgb = scene(t.xy) * 1.3;
-	
-	// vignet
-	fragColor.rgb *= 0.5 + 0.5*pow( 16.0*q.x*q.y*(1.0-q.x)*(1.0-q.y), 0.1 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/greendestruction-ironicflux.slang b/procedural/greendestruction-ironicflux.slang
deleted file mode 100644
index 9bd0623d1a..0000000000
--- a/procedural/greendestruction-ironicflux.slang
+++ /dev/null
@@ -1,114 +0,0 @@
-#version 450
-// ironicflux - greendestruction - 2018-02-22
-// https://www.shadertoy.com/view/MdcyzB
-// The words of these songs were composed without any human intervention whatever on an instrument known as a versificator. But the woman sang so tunefully as to turn the dreadful rubbish into an almost pleasant sound.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/* it even comes with a little message */
-
-mat2 rot(float x) {
-    return mat2(cos(x), sin(x), -sin(x), cos(x));
-}
-
-float map(vec3 p) {
-    
-    p.z = abs(p.z) - 2.0;
-    p.z = abs(p.z) - 2.0;
-    
-    
-    float gt = iGlobalTime * 2.0;
-    p.x += gt;
-    float d = 1000.0;
-    const int n = 12;
-    for (int i = 1; i < n; ++i) {
-        float x = float(i) / float(n);
-        vec3 q = p;
-        q.x += x * 3.141592 * 1.0;
-        q.z = abs(q.z) - 1.0;
-        q.yz *= rot(x * q.x);
-        q.y = abs(q.y) - 2.0;
-        q.y += x * 3.141592 * 0.5;
-        float k = length(q.yz) - 0.125;
-        d = min(d, k);
-        d = max(d, 1.5 * x + gt - p.x);
-    }
-    return min(d, 5.0 + gt - p.x);
-}
-
-float trace(vec3 o, vec3 r) {
-    float t = 0.0;
-    for (int i = 0; i < 32; ++i) {
-        t += map(o + r * t) * 0.5;
-    }
-    return t;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    vec2 uv = fragCoord.xy / iResolution.xy;
-    uv = uv * 2.0 - 1.0;
-    uv.x *= iResolution.x / iResolution.y;
-    
-    vec3 r = normalize(vec3(uv, 1.0 - dot(uv, uv) * 0.5));
-    vec3 o = vec3(0.0, 0.0, 0.0);
-    
-    r.xz *= rot(3.141592 * 0.5);
-    
-    float t = trace(o, r);
-    
-    vec3 w = o + r * t;
-    float fd = map(w);
-
-    float f = 1.0 / (1.0 + t * t * 0.1 + fd * 1000.0);
-
-    vec3 c = vec3(0.0, 0.5, 1.0) * f;
-    
-    c = mix(c, vec3(1.0), 1.0 / (1.0 + t * t * 0.1));
-    
-    c = mix(vec3(0.125), c, 1.0 / (1.0 + t * t * 0.1));
-    
-    vec3 fc = vec3(c);
-    
-    float b = sign((fract(uv.y * 16.0) - 0.5) / 16.0) * 0.5 + 0.5;
-    
-    float b2 = sign(0.8 - abs(uv.y)) * 0.5 + 0.5;
-    
-    fc = mix(fc * vec3(0.5, 0.5, 0.5), fc, b);
-    
-    fc *= b2;
-
-    fragColor = vec4(fc, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/hlorenzi-mariobros.slang b/procedural/hlorenzi-mariobros.slang
deleted file mode 100644
index 33c6dc56ea..0000000000
--- a/procedural/hlorenzi-mariobros.slang
+++ /dev/null
@@ -1,541 +0,0 @@
-#version 450
-// Super Mario Bros. by HLorenzi
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// Uncomment for totally random level!
-// Just to show off Mario's dynamic movements :P
-//#define TOTALLY_RANDOM_LEVEL 1
-
-	
-// Positions to start and end Mario simulation (relative to screen position)
-// You can try changing these! (the difference between the two should be a multiple of 4)
-// Put startX too close to endX, and Mario'll experience jittering!
-#define startX  0.0
-#define endX   80.0
-
-
-
-
-
-
-
-#define RGB(r,g,b) vec4(float(r)/255.0,float(g)/255.0,float(b)/255.0,1.0)
-
-#define SPRROW(x,a,b,c,d,e,f,g,h, i,j,k,l,m,n,o,p) (x <= 7 ? SPRROW_H(a,b,c,d,e,f,g,h) : SPRROW_H(i,j,k,l,m,n,o,p))
-#define SPRROW_H(a,b,c,d,e,f,g,h) (a+4.0*(b+4.0*(c+4.0*(d+4.0*(e+4.0*(f+4.0*(g+4.0*(h))))))))
-#define SECROW(x,a,b,c,d,e,f,g,h) (x <= 3 ? SECROW_H(a,b,c,d) : SECROW_H(e,f,g,h))
-#define SECROW_H(a,b,c,d) (a+8.0*(b+8.0*(c+8.0*(d))))
-#define SELECT(x,i) mod(floor(i/pow(4.0,float(x))),4.0)
-#define SELECTSEC(x,i) mod(floor(i/pow(8.0,float(x))),8.0)
-
-float rand(vec2 co)
-{
-    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-}
-
-vec4 sprGround(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,1.,0.,0.,0.,0.,0.,0.,0., 0.,2.,1.,0.,0.,0.,0.,1.);
-	if (y == 14) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y == 13) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y == 12) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y == 11) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,2.,1.,1.,1.,2.);
-	if (y == 10) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,1.,2.,2.,2.,2.,1.);
-	if (y ==  9) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,0.,0.,0.,0.,2.);
-	if (y ==  8) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	
-	if (y ==  7) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y ==  6) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y ==  5) col = SPRROW(x,2.,2.,1.,1.,1.,1.,1.,1., 2.,0.,1.,1.,1.,1.,1.,2.);
-	if (y ==  4) col = SPRROW(x,0.,0.,2.,2.,1.,1.,1.,1., 2.,0.,1.,1.,1.,1.,1.,2.);
-	if (y ==  3) col = SPRROW(x,0.,1.,0.,0.,2.,2.,2.,2., 0.,1.,1.,1.,1.,1.,1.,2.);
-	if (y ==  2) col = SPRROW(x,0.,1.,1.,1.,0.,0.,0.,2., 0.,1.,1.,1.,1.,1.,1.,2.);
-	if (y ==  1) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,2., 0.,1.,1.,1.,1.,1.,2.,2.);
-	if (y ==  0) col = SPRROW(x,1.,2.,2.,2.,2.,2.,2.,1., 0.,2.,2.,2.,2.,2.,2.,1.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(247,214,181);
-	if (col == 1.0) return RGB(231,90,16);
-	return RGB(0,0,0);
-}
-
-vec4 sprQuestionBlock(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,3.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,3.);
-	if (y == 14) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,2.);
-	if (y == 13) col = SPRROW(x,0.,1.,2.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,2.,1.,2.);
-	if (y == 12) col = SPRROW(x,0.,1.,1.,1.,1.,0.,0.,0., 0.,0.,1.,1.,1.,1.,1.,2.);
-	if (y == 11) col = SPRROW(x,0.,1.,1.,1.,0.,0.,2.,2., 2.,0.,0.,1.,1.,1.,1.,2.);
-	if (y == 10) col = SPRROW(x,0.,1.,1.,1.,0.,0.,2.,1., 1.,0.,0.,2.,1.,1.,1.,2.);
-	if (y ==  9) col = SPRROW(x,0.,1.,1.,1.,0.,0.,2.,1., 1.,0.,0.,2.,1.,1.,1.,2.);
-	if (y ==  8) col = SPRROW(x,0.,1.,1.,1.,1.,2.,2.,1., 0.,0.,0.,2.,1.,1.,1.,2.);
-	
-	if (y ==  7) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,2.,2.,2.,1.,1.,1.,2.);
-	if (y ==  6) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,2.,1.,1.,1.,1.,1.,2.);
-	if (y ==  5) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 2.,2.,1.,1.,1.,1.,1.,2.);
-	if (y ==  4) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,0.,1.,1.,1.,1.,1.,2.);
-	if (y ==  3) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,2.,1.,1.,1.,1.,1.,2.);
-	if (y ==  2) col = SPRROW(x,0.,1.,2.,1.,1.,1.,1.,1., 2.,2.,1.,1.,1.,2.,1.,2.);
-	if (y ==  1) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,2.);
-	if (y ==  0) col = SPRROW(x,2.,2.,2.,2.,2.,2.,2.,2., 2.,2.,2.,2.,2.,2.,2.,2.);
-	
-	if (y < 0 || y > 15) return RGB(107,140,255);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(231,90,16);
-	if (col == 1.0) return RGB(255,165,66);
-	if (col == 2.0) return RGB(0,0,0);
-	return RGB(107,140,255);
-}
-
-vec4 sprUsedBlock(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,3.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,3.);
-	if (y == 14) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y == 13) col = SPRROW(x,0.,1.,0.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,1.,0.);
-	if (y == 12) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y == 11) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y == 10) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  9) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  8) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  6) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  5) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  4) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  3) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  2) col = SPRROW(x,0.,1.,0.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,1.,0.);
-	if (y ==  1) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  0) col = SPRROW(x,3.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,3.);
-	
-	if (y < 0 || y > 15) return RGB(107,140,255);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(231,90,16);
-	return RGB(107,140,255);
-}
-
-vec4 sprMarioJump(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,2.,2.,2.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,0.,0.,1.,1., 1.,1.,1.,0.,0.,2.,2.,2.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,1.,1.,1.,1.,2.,2.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 2.,2.,3.,2.,0.,3.,3.,3.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,2., 2.,2.,3.,2.,2.,3.,3.,3.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,3., 2.,2.,2.,3.,2.,2.,2.,3.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,3.,3.,2.,2., 2.,2.,3.,3.,3.,3.,3.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,0.,0.,0.,0.,2.,2., 2.,2.,2.,2.,2.,3.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,0.,3.,3.,3.,3.,3.,1., 3.,3.,3.,1.,3.,0.,0.,0.);
-	if (y ==  6) col = SPRROW(x,0.,3.,3.,3.,3.,3.,3.,3., 1.,3.,3.,3.,1.,0.,0.,3.);
-	if (y ==  5) col = SPRROW(x,2.,2.,3.,3.,3.,3.,3.,3., 1.,1.,1.,1.,1.,0.,0.,3.);
-	if (y ==  4) col = SPRROW(x,2.,2.,2.,0.,1.,1.,3.,1., 1.,2.,1.,1.,2.,1.,3.,3.);
-	if (y ==  3) col = SPRROW(x,0.,2.,0.,3.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,3.,3.);
-	if (y ==  2) col = SPRROW(x,0.,0.,3.,3.,3.,1.,1.,1., 1.,1.,1.,1.,1.,1.,3.,3.);
-	if (y ==  1) col = SPRROW(x,0.,3.,3.,3.,1.,1.,1.,1., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,3.,0.,0.,1.,1.,1.,1., 0.,0.,0.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-vec4 sprMarioWalk3(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,0.,0.,0.,0.,0.,0.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,0.,0.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,3.,3.,3.,2., 2.,3.,2.,0.,0.,0.,0.,0.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,3.,2.,3.,2.,2., 2.,3.,2.,2.,2.,0.,0.,0.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,3.,2.,3.,3.,2., 2.,2.,3.,2.,2.,2.,0.,0.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,3.,3.,2.,2.,2., 2.,3.,3.,3.,3.,0.,0.,0.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,0.,2.,2.,2., 2.,2.,2.,2.,0.,0.,0.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,3.,3.,3.,3.,1.,1., 3.,3.,0.,0.,0.,0.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,2.,2.,3.,3.,3.,3.,1.,1., 1.,3.,3.,3.,2.,2.,2.,0.);
-	if (y ==  6) col = SPRROW(x,2.,2.,2.,0.,3.,3.,1.,2., 1.,1.,1.,3.,3.,2.,2.,0.);
-	if (y ==  5) col = SPRROW(x,2.,2.,0.,0.,1.,1.,1.,1., 1.,1.,1.,0.,0.,3.,0.,0.);
-	if (y ==  4) col = SPRROW(x,0.,0.,0.,1.,1.,1.,1.,1., 1.,1.,1.,1.,3.,3.,0.,0.);
-	if (y ==  3) col = SPRROW(x,0.,0.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,3.,3.,0.,0.);
-	if (y ==  2) col = SPRROW(x,0.,3.,3.,1.,1.,1.,0.,0., 0.,1.,1.,1.,3.,3.,0.,0.);
-	if (y ==  1) col = SPRROW(x,0.,3.,3.,3.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,0.,3.,3.,3.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-
-vec4 sprMarioWalk2(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,0.,0.,0.,0.,0.,0.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,0.,0.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,3.,3.,3.,2., 2.,3.,2.,0.,0.,0.,0.,0.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,3.,2.,3.,2.,2., 2.,3.,2.,2.,2.,0.,0.,0.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,3.,2.,3.,3.,2., 2.,2.,3.,2.,2.,2.,0.,0.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,3.,3.,2.,2.,2., 2.,3.,3.,3.,3.,0.,0.,0.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,0.,2.,2.,2., 2.,2.,2.,2.,0.,0.,0.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,0.,0.,3.,3.,1.,3., 3.,3.,0.,0.,0.,0.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,0.,0.,3.,3.,3.,3.,1., 1.,3.,3.,0.,0.,0.,0.,0.);
-	if (y ==  6) col = SPRROW(x,0.,0.,0.,3.,3.,3.,1.,1., 2.,1.,1.,2.,0.,0.,0.,0.);
-	if (y ==  5) col = SPRROW(x,0.,0.,0.,3.,3.,3.,3.,1., 1.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  4) col = SPRROW(x,0.,0.,0.,1.,3.,3.,2.,2., 2.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  3) col = SPRROW(x,0.,0.,0.,0.,1.,3.,2.,2., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y ==  2) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 3.,3.,3.,0.,0.,0.,0.,0.);
-	if (y ==  1) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 3.,3.,3.,3.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 3.,0.,0.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-
-vec4 sprMarioWalk1(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,0.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,0.,0.,1.,1., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,1.,1.,1.,1.,0.,0.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 2.,2.,3.,2.,0.,0.,0.,0.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,2., 2.,2.,3.,2.,2.,2.,0.,0.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,3., 2.,2.,2.,3.,2.,2.,2.,0.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,3.,3.,2.,2., 2.,2.,3.,3.,3.,3.,0.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,0.,0.,0.,0.,2.,2., 2.,2.,2.,2.,2.,0.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 3.,1.,3.,0.,2.,0.,0.,0.);
-	if (y ==  6) col = SPRROW(x,0.,0.,0.,0.,2.,3.,3.,3., 3.,3.,3.,2.,2.,2.,0.,0.);
-	if (y ==  5) col = SPRROW(x,0.,0.,0.,2.,2.,1.,3.,3., 3.,3.,3.,2.,2.,0.,0.,0.);
-	if (y ==  4) col = SPRROW(x,0.,0.,0.,3.,3.,1.,1.,1., 1.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  3) col = SPRROW(x,0.,0.,0.,3.,1.,1.,1.,1., 1.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  2) col = SPRROW(x,0.,0.,3.,3.,1.,1.,1.,0., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y ==  1) col = SPRROW(x,0.,0.,3.,0.,0.,0.,0.,3., 3.,3.,0.,0.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,0.,0.,0.,0.,0.,0.,3., 3.,3.,3.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-vec4 getTile(int t, int x, int y)
-{
-	if (t == 0) return RGB(107,140,255);
-	if (t == 1) return sprGround(x,y);
-	if (t == 2) return sprQuestionBlock(x,y);
-	if (t == 3) return sprUsedBlock(x,y);
-	
-	return RGB(107,140,255);
-}
-
-int getSection(int s, int x, int y)
-{
-	float col = 0.0;
-	if (s == 0) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,3.,3.,3.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,2.,2.,2.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 1) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,1.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 2) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,3.,0.,0.,3.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,2.,0.,0.,2.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 3) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,1.,1.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 4) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,3.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,2.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 5) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,0.,0.,1.,1.,1.);
-	}
-	
-	
-	
-	return int(SELECTSEC(mod(float(x),4.0),col));
-}
-
-int getBlock(int x, int y)
-{
-#ifdef TOTALLY_RANDOM_LEVEL
-	int height = 1 + int(rand(vec2(int(float(x) / 3.0),2.3)) * 3.0);
-	return (y < height ? 1 : 0);
-#else
-	if (y > 6) return 0;
-	
-	int section = int(rand(vec2(int(float(x) / 8.0),3.0)) * 6.0);
-	int sectionX = int(mod(float(x), 8.0));
-	
-	return getSection(section,sectionX,y - int(rand(vec2(section,2.0)) * 0.0));
-#endif
-}
-
-bool isSolid(int b)
-{
-	return (b != 0);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	const float gameSpeed = 60.0;
-	
-	// Get the current game pixel
-	// (Each game pixel is two screen pixels)
-	//  (or four, if the screen is larger)
-	float x = fragCoord.x / 2.0;
-	float y = fragCoord.y / 2.0;
-	if (iResolution.y >= 640.0) {
-		x /= 2.0;
-		y /= 2.0;
-	}
-	if (iResolution.y < 200.0) {
-		x *= 2.0;
-		y *= 2.0;
-	}
-	
-	// Just move the screen up for half a block's size
-	y -= 8.0;
-
-	// Get the grid index of the block at this pixel,
-	// and of the block at the screen's leftmost position
-	int firstBlockX = int((iGlobalTime * gameSpeed) / 16.0);
-	int blockX = int((x + iGlobalTime * gameSpeed) / 16.0);
-	int blockY = int(y / 16.0);
-	
-	// Ask for the block ID that exists in the current position
-	int block = getBlock(blockX,blockY);
-	
-	// Get the fractional position inside current block
-	int subx = int(mod((x + iGlobalTime * gameSpeed),16.0));
-	int suby = int(mod(y,16.0));
-	
-	// Animate block if it's a Question Block
-	if (block == 2) {
-		if (blockX - firstBlockX == 5) {
-			suby -= int(max(0.0,(sin(mod((iGlobalTime * gameSpeed / 16.0),1.0) * 3.141592 * 1.5) * 8.0)));
-		}
-		
-		if ((floor((x + iGlobalTime * gameSpeed) / 16.0) - (iGlobalTime * gameSpeed) / 16.0) < 4.25) block = 3;
-	// Animate block if it's on top of a Question Block
-	} else if (block == 3) {
-		block = 2;
-		suby += 16;
-		if (blockX - firstBlockX == 5) {
-			suby -= int(max(0.0,(sin(mod((iGlobalTime * gameSpeed / 16.0),1.0) * 3.141592 * 1.5) * 8.0)));
-		}
-	}
-	// Get the final color for this pixel
-	// (Mario can override this later on)
-	fragColor = getTile(block,subx,suby);
-	
-	
-	// If this is the column where Mario stops simulating...
-	// (it's the only column he can appear in)
-	if (x >= endX && x < endX + 16.0) {
-		
-		// Screen position in pixels:
-		// Every block is 16 pixels wide
-		float screenX = iGlobalTime * gameSpeed;
-		
-		// Mario's starting position and speed
-		float marioX = screenX + startX;
-		float marioY = 16.0;
-		float marioXSpd = 4.0;
-		float marioYSpd = 0.0;
-		
-		// Find out the first empty block in this column,
-		// starting from the bottom, as to put Mario on top of it
-		for(int i = 1; i < 4; i++) {
-			if (!isSolid(getBlock(int(marioX / 16.0), i))) {
-				marioY = float(i) * 16.0;
-				break;
-			}
-		}
-		
-		// Number of steps to simulate;
-		// We'll simulate at 15 FPS and interpolate later,
-		// hence the division by 4.0
-		// (Mario should actually be walking 1 pixel every 1/60th of a second,
-		//  but he'll be walking 4 pixels every 1/15th)
-		const int simSteps = int((endX - startX) / 4.0);
-		
-		// Previous position, as to interpolate later, for high frame rates
-		float lastX = 0.0;
-		float lastY = 0.0;
-		
-		// Start simulating
-		bool onGround = false;
-		for(int sim = 0; sim < simSteps; sim++) {
-			// Store the previous position
-			lastX = marioX;
-			lastY = marioY;
-			
-			// If Mario is inside a block, move him up
-			// (This happens only at the start of the simulation,
-			//  sometimes because he is heads-up with a wall and
-			//  cannot make a jump properly)
-			onGround = false;
-			if (isSolid(getBlock(int(marioX / 16.0) + 1, int(marioY / 16.0)))) {
-				marioY = (floor(marioY / 16.0) * 16.0) + 16.0;
-			}
-			
-			// Next, pretty standard platforming code
-			
-			// Apply gravity and move in the Y-axis
-			marioYSpd -= 2.5;
-			marioY += marioYSpd;
-			
-			// If he is going up,
-			// and if there is a block above him,
-			// align him with the grid (as to avoid getting inside the block),
-			// and invert his YSpeed, as to fall quickly (because he bounced his head)
-			if (marioYSpd > 0.0) {
-				if (isSolid(getBlock(int(floor((marioX + 12.0) / 16.0)), int(floor((marioY + 15.9) / 16.0))))) {
-					marioYSpd *= -0.5;
-					marioY = (floor(marioY / 16.0) * 16.0);
-				}
-			}
-			
-			// If he is going down,
-			// and if there is a block beneath him,
-			// align him with the grid (as to land properly on top of the block),
-			// and mark him as onGround (to be able to perform a jump)
-			if (marioYSpd < 0.0) {
-				if (isSolid(getBlock(int(floor((marioX) / 16.0)), int(floor(marioY / 16.0)))) ||
-					isSolid(getBlock(int(floor((marioX + 15.9) / 16.0)), int(floor(marioY / 16.0))))) {
-					marioYSpd = 0.0;
-					marioY = (floor(marioY / 16.0) * 16.0) + 16.0;
-					onGround = true;
-				}
-			}
-			
-			// Finally, move him in the X-axis
-			// I assume here he'll never hit a block horizontally
-			marioX += marioXSpd;
-			
-			// Now, if he's onGround,
-			// and if there are blocks in front of him,
-			// or if there is a pit right next to him,
-			// set his YSpeed to jump
-			if (onGround) {
-				if (!isSolid(getBlock(int((marioX) / 16.0) + 1,0))) {
-					marioYSpd = 15.5;
-				} else if (isSolid(getBlock(int((marioX + 36.0) / 16.0), int((marioY + 24.0) / 16.0)))) {
-					marioYSpd = 15.5;
-				} else if (isSolid(getBlock(int((marioX) / 16.0) + 2, int((marioY + 8.0) / 16.0)))) {
-					marioYSpd = 12.5;
-				} else if (getBlock(int((marioX) / 16.0) + 1, int((marioY + 8.0) / 16.0) + 2) == 2) {
-					marioYSpd = 15.5;
-				}
-				
-			}
-		}
-		
-		// Interpolate Y-pos for smooth high-frame-rate movement
-		marioY = mix(lastY,marioY,mod(iGlobalTime * 15.0,1.0)) - 1.0;
-		
-		// Finally, if he appears at this row, fetch a pixel from his sprites
-		if (y >= marioY && y < marioY + 16.0) {
-			vec4 spr = vec4(0,0,0,0);
-			if (onGround) {
-				// Which frame?
-				int f = int(mod(iGlobalTime * 10.0, 3.0));
-				if (f == 0) spr = sprMarioWalk1(int(x - (marioX - screenX)),int(y - marioY));
-				if (f == 1) spr = sprMarioWalk2(int(x - (marioX - screenX)),int(y - marioY));
-				if (f == 2) spr = sprMarioWalk3(int(x - (marioX - screenX)),int(y - marioY));
-			} else {
-				spr = sprMarioJump(int(x - (marioX - screenX)),int(y - marioY));
-			}
-			// Transparency check
-			if (spr.x != 0.0) fragColor = spr;
-		}
-	}
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/hlorenzi-super-mario-bros.slang b/procedural/hlorenzi-super-mario-bros.slang
deleted file mode 100644
index 33c6dc56ea..0000000000
--- a/procedural/hlorenzi-super-mario-bros.slang
+++ /dev/null
@@ -1,541 +0,0 @@
-#version 450
-// Super Mario Bros. by HLorenzi
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// Uncomment for totally random level!
-// Just to show off Mario's dynamic movements :P
-//#define TOTALLY_RANDOM_LEVEL 1
-
-	
-// Positions to start and end Mario simulation (relative to screen position)
-// You can try changing these! (the difference between the two should be a multiple of 4)
-// Put startX too close to endX, and Mario'll experience jittering!
-#define startX  0.0
-#define endX   80.0
-
-
-
-
-
-
-
-#define RGB(r,g,b) vec4(float(r)/255.0,float(g)/255.0,float(b)/255.0,1.0)
-
-#define SPRROW(x,a,b,c,d,e,f,g,h, i,j,k,l,m,n,o,p) (x <= 7 ? SPRROW_H(a,b,c,d,e,f,g,h) : SPRROW_H(i,j,k,l,m,n,o,p))
-#define SPRROW_H(a,b,c,d,e,f,g,h) (a+4.0*(b+4.0*(c+4.0*(d+4.0*(e+4.0*(f+4.0*(g+4.0*(h))))))))
-#define SECROW(x,a,b,c,d,e,f,g,h) (x <= 3 ? SECROW_H(a,b,c,d) : SECROW_H(e,f,g,h))
-#define SECROW_H(a,b,c,d) (a+8.0*(b+8.0*(c+8.0*(d))))
-#define SELECT(x,i) mod(floor(i/pow(4.0,float(x))),4.0)
-#define SELECTSEC(x,i) mod(floor(i/pow(8.0,float(x))),8.0)
-
-float rand(vec2 co)
-{
-    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-}
-
-vec4 sprGround(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,1.,0.,0.,0.,0.,0.,0.,0., 0.,2.,1.,0.,0.,0.,0.,1.);
-	if (y == 14) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y == 13) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y == 12) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y == 11) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,2.,1.,1.,1.,2.);
-	if (y == 10) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,1.,2.,2.,2.,2.,1.);
-	if (y ==  9) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,0.,0.,0.,0.,2.);
-	if (y ==  8) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	
-	if (y ==  7) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y ==  6) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,2.,0.,1.,1.,1.,1.,2.);
-	if (y ==  5) col = SPRROW(x,2.,2.,1.,1.,1.,1.,1.,1., 2.,0.,1.,1.,1.,1.,1.,2.);
-	if (y ==  4) col = SPRROW(x,0.,0.,2.,2.,1.,1.,1.,1., 2.,0.,1.,1.,1.,1.,1.,2.);
-	if (y ==  3) col = SPRROW(x,0.,1.,0.,0.,2.,2.,2.,2., 0.,1.,1.,1.,1.,1.,1.,2.);
-	if (y ==  2) col = SPRROW(x,0.,1.,1.,1.,0.,0.,0.,2., 0.,1.,1.,1.,1.,1.,1.,2.);
-	if (y ==  1) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,2., 0.,1.,1.,1.,1.,1.,2.,2.);
-	if (y ==  0) col = SPRROW(x,1.,2.,2.,2.,2.,2.,2.,1., 0.,2.,2.,2.,2.,2.,2.,1.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(247,214,181);
-	if (col == 1.0) return RGB(231,90,16);
-	return RGB(0,0,0);
-}
-
-vec4 sprQuestionBlock(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,3.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,3.);
-	if (y == 14) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,2.);
-	if (y == 13) col = SPRROW(x,0.,1.,2.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,2.,1.,2.);
-	if (y == 12) col = SPRROW(x,0.,1.,1.,1.,1.,0.,0.,0., 0.,0.,1.,1.,1.,1.,1.,2.);
-	if (y == 11) col = SPRROW(x,0.,1.,1.,1.,0.,0.,2.,2., 2.,0.,0.,1.,1.,1.,1.,2.);
-	if (y == 10) col = SPRROW(x,0.,1.,1.,1.,0.,0.,2.,1., 1.,0.,0.,2.,1.,1.,1.,2.);
-	if (y ==  9) col = SPRROW(x,0.,1.,1.,1.,0.,0.,2.,1., 1.,0.,0.,2.,1.,1.,1.,2.);
-	if (y ==  8) col = SPRROW(x,0.,1.,1.,1.,1.,2.,2.,1., 0.,0.,0.,2.,1.,1.,1.,2.);
-	
-	if (y ==  7) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,2.,2.,2.,1.,1.,1.,2.);
-	if (y ==  6) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,2.,1.,1.,1.,1.,1.,2.);
-	if (y ==  5) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 2.,2.,1.,1.,1.,1.,1.,2.);
-	if (y ==  4) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,0.,1.,1.,1.,1.,1.,2.);
-	if (y ==  3) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,0., 0.,2.,1.,1.,1.,1.,1.,2.);
-	if (y ==  2) col = SPRROW(x,0.,1.,2.,1.,1.,1.,1.,1., 2.,2.,1.,1.,1.,2.,1.,2.);
-	if (y ==  1) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,2.);
-	if (y ==  0) col = SPRROW(x,2.,2.,2.,2.,2.,2.,2.,2., 2.,2.,2.,2.,2.,2.,2.,2.);
-	
-	if (y < 0 || y > 15) return RGB(107,140,255);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(231,90,16);
-	if (col == 1.0) return RGB(255,165,66);
-	if (col == 2.0) return RGB(0,0,0);
-	return RGB(107,140,255);
-}
-
-vec4 sprUsedBlock(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,3.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,3.);
-	if (y == 14) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y == 13) col = SPRROW(x,0.,1.,0.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,1.,0.);
-	if (y == 12) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y == 11) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y == 10) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  9) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  8) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  6) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  5) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  4) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  3) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  2) col = SPRROW(x,0.,1.,0.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,1.,0.);
-	if (y ==  1) col = SPRROW(x,0.,1.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,1.,0.);
-	if (y ==  0) col = SPRROW(x,3.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,3.);
-	
-	if (y < 0 || y > 15) return RGB(107,140,255);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(231,90,16);
-	return RGB(107,140,255);
-}
-
-vec4 sprMarioJump(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,2.,2.,2.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,0.,0.,1.,1., 1.,1.,1.,0.,0.,2.,2.,2.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,1.,1.,1.,1.,2.,2.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 2.,2.,3.,2.,0.,3.,3.,3.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,2., 2.,2.,3.,2.,2.,3.,3.,3.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,3., 2.,2.,2.,3.,2.,2.,2.,3.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,3.,3.,2.,2., 2.,2.,3.,3.,3.,3.,3.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,0.,0.,0.,0.,2.,2., 2.,2.,2.,2.,2.,3.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,0.,3.,3.,3.,3.,3.,1., 3.,3.,3.,1.,3.,0.,0.,0.);
-	if (y ==  6) col = SPRROW(x,0.,3.,3.,3.,3.,3.,3.,3., 1.,3.,3.,3.,1.,0.,0.,3.);
-	if (y ==  5) col = SPRROW(x,2.,2.,3.,3.,3.,3.,3.,3., 1.,1.,1.,1.,1.,0.,0.,3.);
-	if (y ==  4) col = SPRROW(x,2.,2.,2.,0.,1.,1.,3.,1., 1.,2.,1.,1.,2.,1.,3.,3.);
-	if (y ==  3) col = SPRROW(x,0.,2.,0.,3.,1.,1.,1.,1., 1.,1.,1.,1.,1.,1.,3.,3.);
-	if (y ==  2) col = SPRROW(x,0.,0.,3.,3.,3.,1.,1.,1., 1.,1.,1.,1.,1.,1.,3.,3.);
-	if (y ==  1) col = SPRROW(x,0.,3.,3.,3.,1.,1.,1.,1., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,3.,0.,0.,1.,1.,1.,1., 0.,0.,0.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-vec4 sprMarioWalk3(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,0.,0.,0.,0.,0.,0.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,0.,0.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,3.,3.,3.,2., 2.,3.,2.,0.,0.,0.,0.,0.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,3.,2.,3.,2.,2., 2.,3.,2.,2.,2.,0.,0.,0.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,3.,2.,3.,3.,2., 2.,2.,3.,2.,2.,2.,0.,0.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,3.,3.,2.,2.,2., 2.,3.,3.,3.,3.,0.,0.,0.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,0.,2.,2.,2., 2.,2.,2.,2.,0.,0.,0.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,3.,3.,3.,3.,1.,1., 3.,3.,0.,0.,0.,0.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,2.,2.,3.,3.,3.,3.,1.,1., 1.,3.,3.,3.,2.,2.,2.,0.);
-	if (y ==  6) col = SPRROW(x,2.,2.,2.,0.,3.,3.,1.,2., 1.,1.,1.,3.,3.,2.,2.,0.);
-	if (y ==  5) col = SPRROW(x,2.,2.,0.,0.,1.,1.,1.,1., 1.,1.,1.,0.,0.,3.,0.,0.);
-	if (y ==  4) col = SPRROW(x,0.,0.,0.,1.,1.,1.,1.,1., 1.,1.,1.,1.,3.,3.,0.,0.);
-	if (y ==  3) col = SPRROW(x,0.,0.,1.,1.,1.,1.,1.,1., 1.,1.,1.,1.,3.,3.,0.,0.);
-	if (y ==  2) col = SPRROW(x,0.,3.,3.,1.,1.,1.,0.,0., 0.,1.,1.,1.,3.,3.,0.,0.);
-	if (y ==  1) col = SPRROW(x,0.,3.,3.,3.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,0.,3.,3.,3.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-
-vec4 sprMarioWalk2(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,0.,0.,0.,0.,0.,0.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,1.,1.,1.,1., 1.,1.,1.,1.,1.,0.,0.,0.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,3.,3.,3.,2., 2.,3.,2.,0.,0.,0.,0.,0.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,3.,2.,3.,2.,2., 2.,3.,2.,2.,2.,0.,0.,0.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,3.,2.,3.,3.,2., 2.,2.,3.,2.,2.,2.,0.,0.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,3.,3.,2.,2.,2., 2.,3.,3.,3.,3.,0.,0.,0.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,0.,2.,2.,2., 2.,2.,2.,2.,0.,0.,0.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,0.,0.,3.,3.,1.,3., 3.,3.,0.,0.,0.,0.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,0.,0.,3.,3.,3.,3.,1., 1.,3.,3.,0.,0.,0.,0.,0.);
-	if (y ==  6) col = SPRROW(x,0.,0.,0.,3.,3.,3.,1.,1., 2.,1.,1.,2.,0.,0.,0.,0.);
-	if (y ==  5) col = SPRROW(x,0.,0.,0.,3.,3.,3.,3.,1., 1.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  4) col = SPRROW(x,0.,0.,0.,1.,3.,3.,2.,2., 2.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  3) col = SPRROW(x,0.,0.,0.,0.,1.,3.,2.,2., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y ==  2) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 3.,3.,3.,0.,0.,0.,0.,0.);
-	if (y ==  1) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 3.,3.,3.,3.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 3.,0.,0.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-
-vec4 sprMarioWalk1(int x, int y)
-{
-	float col = 0.0;
-	if (y == 15) col = SPRROW(x,0.,0.,0.,0.,0.,0.,0.,0., 0.,0.,0.,0.,0.,0.,0.,0.);
-	if (y == 14) col = SPRROW(x,0.,0.,0.,0.,0.,0.,1.,1., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y == 13) col = SPRROW(x,0.,0.,0.,0.,0.,1.,1.,1., 1.,1.,1.,1.,1.,1.,0.,0.);
-	if (y == 12) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 2.,2.,3.,2.,0.,0.,0.,0.);
-	if (y == 11) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,2., 2.,2.,3.,2.,2.,2.,0.,0.);
-	if (y == 10) col = SPRROW(x,0.,0.,0.,0.,3.,2.,3.,3., 2.,2.,2.,3.,2.,2.,2.,0.);
-	if (y ==  9) col = SPRROW(x,0.,0.,0.,0.,3.,3.,2.,2., 2.,2.,3.,3.,3.,3.,0.,0.);
-	if (y ==  8) col = SPRROW(x,0.,0.,0.,0.,0.,0.,2.,2., 2.,2.,2.,2.,2.,0.,0.,0.);
-	
-	if (y ==  7) col = SPRROW(x,0.,0.,0.,0.,0.,3.,3.,3., 3.,1.,3.,0.,2.,0.,0.,0.);
-	if (y ==  6) col = SPRROW(x,0.,0.,0.,0.,2.,3.,3.,3., 3.,3.,3.,2.,2.,2.,0.,0.);
-	if (y ==  5) col = SPRROW(x,0.,0.,0.,2.,2.,1.,3.,3., 3.,3.,3.,2.,2.,0.,0.,0.);
-	if (y ==  4) col = SPRROW(x,0.,0.,0.,3.,3.,1.,1.,1., 1.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  3) col = SPRROW(x,0.,0.,0.,3.,1.,1.,1.,1., 1.,1.,1.,1.,0.,0.,0.,0.);
-	if (y ==  2) col = SPRROW(x,0.,0.,3.,3.,1.,1.,1.,0., 1.,1.,1.,0.,0.,0.,0.,0.);
-	if (y ==  1) col = SPRROW(x,0.,0.,3.,0.,0.,0.,0.,3., 3.,3.,0.,0.,0.,0.,0.,0.);
-	if (y ==  0) col = SPRROW(x,0.,0.,0.,0.,0.,0.,0.,3., 3.,3.,3.,0.,0.,0.,0.,0.);
-	
-	col = SELECT(mod(float(x),8.0),col);
-	if (col == 0.0) return RGB(0,0,0);
-	if (col == 1.0) return RGB(177,52,37);
-	if (col == 2.0) return RGB(227,157,37);
-	if (col == 3.0) return RGB(106,107,4);
-	return RGB(0,0,0);
-}
-
-vec4 getTile(int t, int x, int y)
-{
-	if (t == 0) return RGB(107,140,255);
-	if (t == 1) return sprGround(x,y);
-	if (t == 2) return sprQuestionBlock(x,y);
-	if (t == 3) return sprUsedBlock(x,y);
-	
-	return RGB(107,140,255);
-}
-
-int getSection(int s, int x, int y)
-{
-	float col = 0.0;
-	if (s == 0) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,3.,3.,3.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,2.,2.,2.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 1) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,1.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 2) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,3.,0.,0.,3.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,2.,0.,0.,2.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 3) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,1.,1.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 4) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,3.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,2.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,1.,1.,1.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,1.,1.,1.,1.,1.);
-	}
-	if (s == 5) {
-		if (y == 6) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 5) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 4) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 3) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 2) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y == 1) col = SECROW(x,0.,0.,0.,0.,0.,0.,0.,0.);
-		if (y <= 0) col = SECROW(x,1.,1.,1.,0.,0.,1.,1.,1.);
-	}
-	
-	
-	
-	return int(SELECTSEC(mod(float(x),4.0),col));
-}
-
-int getBlock(int x, int y)
-{
-#ifdef TOTALLY_RANDOM_LEVEL
-	int height = 1 + int(rand(vec2(int(float(x) / 3.0),2.3)) * 3.0);
-	return (y < height ? 1 : 0);
-#else
-	if (y > 6) return 0;
-	
-	int section = int(rand(vec2(int(float(x) / 8.0),3.0)) * 6.0);
-	int sectionX = int(mod(float(x), 8.0));
-	
-	return getSection(section,sectionX,y - int(rand(vec2(section,2.0)) * 0.0));
-#endif
-}
-
-bool isSolid(int b)
-{
-	return (b != 0);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	const float gameSpeed = 60.0;
-	
-	// Get the current game pixel
-	// (Each game pixel is two screen pixels)
-	//  (or four, if the screen is larger)
-	float x = fragCoord.x / 2.0;
-	float y = fragCoord.y / 2.0;
-	if (iResolution.y >= 640.0) {
-		x /= 2.0;
-		y /= 2.0;
-	}
-	if (iResolution.y < 200.0) {
-		x *= 2.0;
-		y *= 2.0;
-	}
-	
-	// Just move the screen up for half a block's size
-	y -= 8.0;
-
-	// Get the grid index of the block at this pixel,
-	// and of the block at the screen's leftmost position
-	int firstBlockX = int((iGlobalTime * gameSpeed) / 16.0);
-	int blockX = int((x + iGlobalTime * gameSpeed) / 16.0);
-	int blockY = int(y / 16.0);
-	
-	// Ask for the block ID that exists in the current position
-	int block = getBlock(blockX,blockY);
-	
-	// Get the fractional position inside current block
-	int subx = int(mod((x + iGlobalTime * gameSpeed),16.0));
-	int suby = int(mod(y,16.0));
-	
-	// Animate block if it's a Question Block
-	if (block == 2) {
-		if (blockX - firstBlockX == 5) {
-			suby -= int(max(0.0,(sin(mod((iGlobalTime * gameSpeed / 16.0),1.0) * 3.141592 * 1.5) * 8.0)));
-		}
-		
-		if ((floor((x + iGlobalTime * gameSpeed) / 16.0) - (iGlobalTime * gameSpeed) / 16.0) < 4.25) block = 3;
-	// Animate block if it's on top of a Question Block
-	} else if (block == 3) {
-		block = 2;
-		suby += 16;
-		if (blockX - firstBlockX == 5) {
-			suby -= int(max(0.0,(sin(mod((iGlobalTime * gameSpeed / 16.0),1.0) * 3.141592 * 1.5) * 8.0)));
-		}
-	}
-	// Get the final color for this pixel
-	// (Mario can override this later on)
-	fragColor = getTile(block,subx,suby);
-	
-	
-	// If this is the column where Mario stops simulating...
-	// (it's the only column he can appear in)
-	if (x >= endX && x < endX + 16.0) {
-		
-		// Screen position in pixels:
-		// Every block is 16 pixels wide
-		float screenX = iGlobalTime * gameSpeed;
-		
-		// Mario's starting position and speed
-		float marioX = screenX + startX;
-		float marioY = 16.0;
-		float marioXSpd = 4.0;
-		float marioYSpd = 0.0;
-		
-		// Find out the first empty block in this column,
-		// starting from the bottom, as to put Mario on top of it
-		for(int i = 1; i < 4; i++) {
-			if (!isSolid(getBlock(int(marioX / 16.0), i))) {
-				marioY = float(i) * 16.0;
-				break;
-			}
-		}
-		
-		// Number of steps to simulate;
-		// We'll simulate at 15 FPS and interpolate later,
-		// hence the division by 4.0
-		// (Mario should actually be walking 1 pixel every 1/60th of a second,
-		//  but he'll be walking 4 pixels every 1/15th)
-		const int simSteps = int((endX - startX) / 4.0);
-		
-		// Previous position, as to interpolate later, for high frame rates
-		float lastX = 0.0;
-		float lastY = 0.0;
-		
-		// Start simulating
-		bool onGround = false;
-		for(int sim = 0; sim < simSteps; sim++) {
-			// Store the previous position
-			lastX = marioX;
-			lastY = marioY;
-			
-			// If Mario is inside a block, move him up
-			// (This happens only at the start of the simulation,
-			//  sometimes because he is heads-up with a wall and
-			//  cannot make a jump properly)
-			onGround = false;
-			if (isSolid(getBlock(int(marioX / 16.0) + 1, int(marioY / 16.0)))) {
-				marioY = (floor(marioY / 16.0) * 16.0) + 16.0;
-			}
-			
-			// Next, pretty standard platforming code
-			
-			// Apply gravity and move in the Y-axis
-			marioYSpd -= 2.5;
-			marioY += marioYSpd;
-			
-			// If he is going up,
-			// and if there is a block above him,
-			// align him with the grid (as to avoid getting inside the block),
-			// and invert his YSpeed, as to fall quickly (because he bounced his head)
-			if (marioYSpd > 0.0) {
-				if (isSolid(getBlock(int(floor((marioX + 12.0) / 16.0)), int(floor((marioY + 15.9) / 16.0))))) {
-					marioYSpd *= -0.5;
-					marioY = (floor(marioY / 16.0) * 16.0);
-				}
-			}
-			
-			// If he is going down,
-			// and if there is a block beneath him,
-			// align him with the grid (as to land properly on top of the block),
-			// and mark him as onGround (to be able to perform a jump)
-			if (marioYSpd < 0.0) {
-				if (isSolid(getBlock(int(floor((marioX) / 16.0)), int(floor(marioY / 16.0)))) ||
-					isSolid(getBlock(int(floor((marioX + 15.9) / 16.0)), int(floor(marioY / 16.0))))) {
-					marioYSpd = 0.0;
-					marioY = (floor(marioY / 16.0) * 16.0) + 16.0;
-					onGround = true;
-				}
-			}
-			
-			// Finally, move him in the X-axis
-			// I assume here he'll never hit a block horizontally
-			marioX += marioXSpd;
-			
-			// Now, if he's onGround,
-			// and if there are blocks in front of him,
-			// or if there is a pit right next to him,
-			// set his YSpeed to jump
-			if (onGround) {
-				if (!isSolid(getBlock(int((marioX) / 16.0) + 1,0))) {
-					marioYSpd = 15.5;
-				} else if (isSolid(getBlock(int((marioX + 36.0) / 16.0), int((marioY + 24.0) / 16.0)))) {
-					marioYSpd = 15.5;
-				} else if (isSolid(getBlock(int((marioX) / 16.0) + 2, int((marioY + 8.0) / 16.0)))) {
-					marioYSpd = 12.5;
-				} else if (getBlock(int((marioX) / 16.0) + 1, int((marioY + 8.0) / 16.0) + 2) == 2) {
-					marioYSpd = 15.5;
-				}
-				
-			}
-		}
-		
-		// Interpolate Y-pos for smooth high-frame-rate movement
-		marioY = mix(lastY,marioY,mod(iGlobalTime * 15.0,1.0)) - 1.0;
-		
-		// Finally, if he appears at this row, fetch a pixel from his sprites
-		if (y >= marioY && y < marioY + 16.0) {
-			vec4 spr = vec4(0,0,0,0);
-			if (onGround) {
-				// Which frame?
-				int f = int(mod(iGlobalTime * 10.0, 3.0));
-				if (f == 0) spr = sprMarioWalk1(int(x - (marioX - screenX)),int(y - marioY));
-				if (f == 1) spr = sprMarioWalk2(int(x - (marioX - screenX)),int(y - marioY));
-				if (f == 2) spr = sprMarioWalk3(int(x - (marioX - screenX)),int(y - marioY));
-			} else {
-				spr = sprMarioJump(int(x - (marioX - screenX)),int(y - marioY));
-			}
-			// Transparency check
-			if (spr.x != 0.0) fragColor = spr;
-		}
-	}
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/hlorenzi-zelda.slang b/procedural/hlorenzi-zelda.slang
deleted file mode 100644
index f600ed6965..0000000000
--- a/procedural/hlorenzi-zelda.slang
+++ /dev/null
@@ -1,544 +0,0 @@
-#version 450
-// The Legend of Zelda, by Henrique Lorenzi!
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define RGB(r,g,b) vec4(r/255.,g/255.,b/255.,1)
-#define SPR(x,a,b,c,d,e,f,g,h, i,j,k,l,m,n,o,p) (x <= 7. ? SPR_H(a,b,c,d,e,f,g,h) : SPR_H(i,j,k,l,m,n,o,p))
-#define SPR_H(a,b,c,d,e,f,g,h) (a+4.0*(b+4.0*(c+4.0*(d+4.0*(e+4.0*(f+4.0*(g+4.0*(h))))))))
-#define SELECT(x,i) mod(floor(i/pow(4.0,float(mod(float(x),8.0)))),4.0)
-
-float hash(float x)
-{
-    return fract(sin(x) * 43758.5453) * 2.0 - 1.0;
-}
-
-vec2 hashPos(float x)
-{
-	return vec2(
-		floor(hash(x) * 3.0) * 32.0 + 16.0,
-		floor(hash(x * 1.1) * 2.0) * 32.0 + 16.0
-	);
-}
-
-vec4 fragColor;
-
-void spr_rock(float x, float y)
-{
-	float c = 0.;
-	if (y == 0.) c = (x < 8. ? 592. : 0.); if (y == 1.) c = (x < 8. ? 2388. : 0.);
-	if (y == 2.) c = (x < 8. ? 26948. : 165.); if (y == 3.) c = (x < 8. ? 18769. : 597.);
-	if (y == 4.) c = (x < 8. ? 18769. : 2645.); if (y == 5.) c = (x < 8. ? 21073. : 2389.);
-	if (y == 6.) c = (x < 8. ? 21077. : 10582.); if (y == 7.) c = (x < 8. ? 21077. : 10902.);
-	if (y == 8.) c = (x < 8. ? 21076. : 10646.); if (y == 9.) c = (x < 8. ? 21076. : 10650.);
-	if (y == 10.) c = (x < 8. ? 21076. : 10650.); if (y == 11.) c = (x < 8. ? 22101. : 10905.);
-	if (y == 12.) c = (x < 8. ? 22101. : 9877.); if (y == 13.) c = (x < 8. ? 21845. : 1449.);
-	if (y == 14.) c = (x < 8. ? 25940. : 43685.); if (y == 15.) c = (x < 8. ? 43690. : 2730.);
-	
-	float s = SELECT(x,c);
-	if (s == 0.) fragColor = RGB(252.,216.,168.);
-	if (s == 1.) fragColor = RGB(192.,56.,0.);
-	if (s == 2.) fragColor = RGB(0.,0.,0.);
-}
-
-void spr_tree(float x, float y)
-{
-	float c = 0.;
-	if (y == 0.) c = 0.; if (y == 1.) c = (x < 8. ? 37120. : 10.);
-	if (y == 2.) c = (x < 8. ? 21776. : 681.); if (y == 3.) c = (x < 8. ? 22096. : 2469.);
-	if (y == 4.) c = (x < 8. ? 21844. : 2709.); if (y == 5.) c = (x < 8. ? 25940. : 10853.);
-	if (y == 6.) c = (x < 8. ? 21845. : 2725.); if (y == 7.) c = (x < 8. ? 21861. : 10901.);
-	if (y == 8.) c = (x < 8. ? 21844. : 9878.); if (y == 9.) c = (x < 8. ? 22101. : 10901.);
-	if (y == 10.) c = (x < 8. ? 21845. : 2729.); if (y == 11.) c = (x < 8. ? 21861. : 2661.);
-	if (y == 12.) c = (x < 8. ? 38228. : 682.); if (y == 13.) c = (x < 8. ? 4416. : 26.);
-	if (y == 14.) c = (x < 8. ? 512. : 43680.); if (y == 15.) c = (x < 8. ? 43648. : 2730.);
-	
-	float s = SELECT(x,c);
-	if (s == 0.) fragColor = RGB(252.,216.,168.);
-	if (s == 1.) fragColor = RGB(0.,156.,0.);
-	if (s == 2.) fragColor = RGB(0.,0.,0.);
-}
-
-void spr_player_down(float f, float x, float y)
-{
-	float c = 0.;
-	if (f == 0.) {
-		if (y == 0.) c = (x < 8. ? 21504. : 21.); if (y == 1.) c = (x < 8. ? 21760. : 85.);
-		if (y == 2.) c = (x < 8. ? 64800. : 2175.); if (y == 3.) c = (x < 8. ? 65312. : 2303.);
-		if (y == 4.) c = (x < 8. ? 39840. : 2790.); if (y == 5.) c = (x < 8. ? 48032. : 2798.);
-		if (y == 6.) c = (x < 8. ? 43648. : 3754.); if (y == 7.) c = (x < 8. ? 59712. : 3435.);
-		if (y == 8.) c = (x < 8. ? 45052. : 16218.); if (y == 9.) c = (x < 8. ? 32751. : 15957.);
-		if (y == 10.) c = (x < 8. ? 61355. : 14999.); if (y == 11.) c = (x < 8. ? 28655. : 11007.);
-		if (y == 12.) c = (x < 8. ? 61423. : 2391.); if (y == 13.) c = (x < 8. ? 28671. : 85.);
-		if (y == 14.) c = (x < 8. ? 15016. : 252.); if (y == 15.) c = (x < 8. ? 16128. : 0.);
-		
-		float s = SELECT(x,c);
-		if (s == 1.) fragColor = RGB(128.,208.,16.);
-		if (s == 2.) fragColor = RGB(255.,160.,68.);
-		if (s == 3.) fragColor = RGB(228.,92.,16.);
-	}
-	if (f == 1.) {
-		if (y == 0.) c = (x < 8. ? 21504. : 21.); if (y == 1.) c = (x < 8. ? 21760. : 85.);
-		if (y == 2.) c = (x < 8. ? 64800. : 2175.); if (y == 3.) c = (x < 8. ? 65312. : 2303.);
-		if (y == 4.) c = (x < 8. ? 39840. : 2790.); if (y == 5.) c = (x < 8. ? 48032. : 2798.);
-		if (y == 6.) c = (x < 8. ? 43648. : 3754.); if (y == 7.) c = (x < 8. ? 59648. : 3947.);
-		if (y == 8.) c = (x < 8. ? 49136. : 2394.); if (y == 9.) c = (x < 8. ? 65468. : 2389.);
-		if (y == 10.) c = (x < 8. ? 48812. : 863.); if (y == 11.) c = (x < 8. ? 49084. : 509.);
-		if (y == 12.) c = (x < 8. ? 49084. : 351.); if (y == 13.) c = (x < 8. ? 49148. : 213.);
-		if (y == 14.) c = (x < 8. ? 10912. : 252.); if (y == 15.) c = (x < 8. ? 0. : 252.);
-		
-		float s = SELECT(x,c);
-		if (s == 1.) fragColor = RGB(128.,208.,16.);
-		if (s == 2.) fragColor = RGB(255.,160.,68.);
-		if (s == 3.) fragColor = RGB(228.,92.,16.);
-	}
-	if (f == 2.) {
-		if (y == 0.) c = 0.; if (y == 1.) c = (x < 8. ? 41280. : 42.);
-		if (y == 2.) c = (x < 8. ? 43472. : 170.); if (y == 3.) c = (x < 8. ? 23252. : 677.);
-		if (y == 4.) c = (x < 8. ? 22261. : 12949.); if (y == 5.) c = (x < 8. ? 60917. : 15963.);
-		if (y == 6.) c = (x < 8. ? 56791. : 3703.); if (y == 7.) c = (x < 8. ? 32348. : 1021.);
-		if (y == 8.) c = (x < 8. ? 31344. : 381.); if (y == 9.) c = (x < 8. ? 60096. : 1375.);
-		if (y == 10.) c = (x < 8. ? 43264. : 1370.); if (y == 11.) c = (x < 8. ? 26112. : 2389.);
-		if (y == 12.) c = (x < 8. ? 23040. : 2646.); if (y == 13.) c = (x < 8. ? 26944. : 6781.);
-		if (y == 14.) c = (x < 8. ? 41296. : 22207.); if (y == 15.) c = (x < 8. ? 0. : 21823.);
-		
-		float s = SELECT(x,c);
-		if (s == 1.) fragColor = RGB(228.,92.,16.);
-		if (s == 2.) fragColor = RGB(128.,208.,16.);
-		if (s == 3.) fragColor = RGB(255.,160.,68.);
-	}
-}
-
-void spr_player_up(float f, float x, float y)
-{
-	float c = 0.;
-	if (f == 0. || f == 1.) {
-		if (f == 1.) x = 15. - x;
-		
-		if (y == 0.) c = (x < 8. ? 21504. : 21.); if (y == 1.) c = (x < 8. ? 21760. : 85.);
-		if (y == 2.) c = (x < 8. ? 21792. : 2133.); if (y == 3.) c = (x < 8. ? 21856. : 2389.);
-		if (y == 4.) c = (x < 8. ? 21984. : 2901.); if (y == 5.) c = (x < 8. ? 24480. : 2805.);
-		if (y == 6.) c = (x < 8. ? 32640. : 765.); if (y == 7.) c = (x < 8. ? 64960. : 895.);
-		if (y == 8.) c = (x < 8. ? 22000. : 981.); if (y == 9.) c = (x < 8. ? 22000. : 3029.);
-		if (y == 10.) c = (x < 8. ? 22464. : 3029.); if (y == 11.) c = (x < 8. ? 64832. : 2687.);
-		if (y == 12.) c = (x < 8. ? 21824. : 341.); if (y == 13.) c = (x < 8. ? 24512. : 213.);
-		if (y == 14.) c = (x < 8. ? 16320. : 60.); if (y == 15.) c = (x < 8. ? 3840. : 0.);
-		
-		float s = SELECT(x,c);
-		if (s == 1.) fragColor = RGB(128.,208.,16.);
-		if (s == 2.) fragColor = RGB(255.,160.,68.);
-		if (s == 3.) fragColor = RGB(228.,92.,16.);
-	}
-	if (f == 2.) {
-		if (y == 0.) c = (x < 8. ? 43584. : 2.); if (y == 1.) c = (x < 8. ? 43660. : 10.);
-		if (y == 2.) c = (x < 8. ? 43676. : 42.); if (y == 3.) c = (x < 8. ? 43708. : 810.);
-		if (y == 4.) c = (x < 8. ? 43636. : 986.); if (y == 5.) c = (x < 8. ? 43380. : 49365.);
-		if (y == 6.) c = (x < 8. ? 26004. : 28901.); if (y == 7.) c = (x < 8. ? 22164. : 23897.);
-		if (y == 8.) c = (x < 8. ? 43664. : 22362.); if (y == 9.) c = (x < 8. ? 43664. : 21978.);
-		if (y == 10.) c = (x < 8. ? 43616. : 5498.); if (y == 11.) c = (x < 8. ? 21924. : 1493.);
-		if (y == 12.) c = (x < 8. ? 43685. : 938.); if (y == 13.) c = (x < 8. ? 32789. : 362.);
-		if (y == 14.) c = (x < 8. ? 0. : 1360.); if (y == 15.) c = (x < 8. ? 0. : 1360.);
-		
-		float s = SELECT(x,c);
-		if (s == 1.) fragColor = RGB(228.,92.,16.);
-		if (s == 2.) fragColor = RGB(128.,208.,16.);
-		if (s == 3.) fragColor = RGB(255.,160.,68.);
-	}
-	
-}
-
-
-void spr_player_left(float f, float x, float y)
-{
-	float c = 0.;
-	if (f == 0.) {
-		if (y == 0.) c = (x < 8. ? 16384. : 21.); if (y == 1.) c = (x < 8. ? 43520. : 341.);
-		if (y == 2.) c = (x < 8. ? 43648. : 5590.); if (y == 3.) c = (x < 8. ? 43520. : 22010.);
-		if (y == 4.) c = (x < 8. ? 63240. : 17918.); if (y == 5.) c = (x < 8. ? 64504. : 1726.);
-		if (y == 6.) c = (x < 8. ? 65288. : 687.); if (y == 7.) c = (x < 8. ? 65288. : 85.);
-		if (y == 8.) c = (x < 8. ? 23224. : 2389.); if (y == 9.) c = (x < 8. ? 22200. : 10879.);
-		if (y == 10.) c = (x < 8. ? 22152. : 10943.); if (y == 11.) c = (x < 8. ? 22536. : 10941.);
-		if (y == 12.) c = (x < 8. ? 43016. : 1686.); if (y == 13.) c = (x < 8. ? 21504. : 5461.);
-		if (y == 14.) c = (x < 8. ? 0. : 170.); if (y == 15.) c = (x < 8. ? 32768. : 170.);
-	}
-	if (f == 1.) {
-		if (y == 0.) c = 0.; if (y == 1.) c = (x < 8. ? 20480. : 5.);
-		if (y == 2.) c = (x < 8. ? 27264. : 85.); if (y == 3.) c = (x < 8. ? 43680. : 1397.);
-		if (y == 4.) c = (x < 8. ? 43648. : 5502.); if (y == 5.) c = (x < 8. ? 48576. : 4479.);
-		if (y == 6.) c = (x < 8. ? 48892. : 431.); if (y == 7.) c = (x < 8. ? 65480. : 171.);
-		if (y == 8.) c = (x < 8. ? 32712. : 21.); if (y == 9.) c = (x < 8. ? 65208. : 421.);
-		if (y == 10.) c = (x < 8. ? 64952. : 682.); if (y == 11.) c = (x < 8. ? 62856. : 1706.);
-		if (y == 12.) c = (x < 8. ? 22024. : 1450.); if (y == 13.) c = (x < 8. ? 43592. : 10581.);
-		if (y == 14.) c = (x < 8. ? 21920. : 10837.); if (y == 15.) c = 2688.;
-	}
-	if (f == 2.) {
-		if (y == 0.) c = 0.; if (y == 1.) c = (x < 8. ? 21504. : 1.);
-		if (y == 2.) c = (x < 8. ? 23200. : 21.); if (y == 3.) c = (x < 8. ? 27304. : 93.);
-		if (y == 4.) c = (x < 8. ? 43680. : 95.); if (y == 5.) c = (x < 8. ? 61296. : 351.);
-		if (y == 6.) c = (x < 8. ? 61375. : 1387.); if (y == 7.) c = (x < 8. ? 65520. : 1066.);
-		if (y == 8.) c = (x < 8. ? 24572. : 21.); if (y == 9.) c = (x < 8. ? 43772. : 90.);
-		if (y == 10.) c = (x < 8. ? 43760. : 106.); if (y == 11.) c = (x < 8. ? 43584. : 362.);
-		if (y == 12.) c = (x < 8. ? 38304. : 1370.); if (y == 13.) c = (x < 8. ? 27296. : 10581.);
-		if (y == 14.) c = (x < 8. ? 21864. : 10837.); if (y == 15.) c = (x < 8. ? 170. : 2688.);
-	}
-	
-	float s = SELECT(x,c);
-	if (s == 1.) fragColor = RGB(128.,208.,16.);
-	if (s == 2.) fragColor = RGB(228.,92.,16.);
-	if (s == 3.) fragColor = RGB(255.,160.,68.);
-}
-
-void spr_player_right(float f, float x, float y)
-{
-	spr_player_left(f, 15. - x, y);
-}
-
-void spr_sword(float f, float tDirX, float tDirY, float x, float y)
-{
-	if (f < 4. || f > 32.) return;
-	
-	if (tDirX > 0.) {x = 15. - x;}
-	if (tDirY > 0.) {float temp = y; y = x; x = temp;}
-	if (tDirY < 0.) {float temp = y; y = x; x = 15. - temp;}
-	
-	if (f < 5. || f > 28.) {if (x < 10.) {x -= 4.;}}
-	
-	if (x < 0.) return;
-	
-	float c = 0.;
-	if (y == 0.) c = 0.; if (y == 1.) c = 0.;
-	if (y == 2.) c = 0.; if (y == 3.) c = 0.;
-	if (y == 4.) c = 0.; if (y == 5.) c = (x < 8. ? 0. : 20480.);
-	if (y == 6.) c = (x < 8. ? 0. : 4096.); if (y == 7.) c = (x < 8. ? 43520. : 39594.);
-	if (y == 8.) c = (x < 8. ? 43648. : 39594.); if (y == 9.) c = (x < 8. ? 43520. : 39594.);
-	if (y == 10.) c = (x < 8. ? 0. : 4096.); if (y == 11.) c = (x < 8. ? 0. : 20480.);
-	if (y == 12.) c = 0.; if (y == 13.) c = 0.;
-	if (y == 14.) c = 0.; if (y == 15.) c = 0.;
-	
-	float s = SELECT(x,c);
-	if (s == 1.) fragColor = RGB(128.,208.,16.);
-	if (s == 2.) fragColor = RGB(228.,92.,16.);
-
-}
-
-void spr_enemy(float f, float tDirX, float tDirY, float x, float y)
-{
-	
-	if (tDirX > 0.) {x = 15. - x;}
-	if (tDirY > 0.) {float temp = y; y = x; x = 15. - temp;}
-	if (tDirY < 0.) {float temp = y; y = x; x = temp;}
-	
-	if (y >= 8.) y = 15. - y;
-	
-	float c = 0.;
-	if (f == 0.) {
-		if (y == 0.) c = (x < 8. ? 16384. : 4160.); if (y == 1.) c = (x < 8. ? 16384. : 5201.);
-		if (y == 2.) c = (x < 8. ? 16640. : 1365.); if (y == 3.) c = (x < 8. ? 21760. : 5466.);
-		if (y == 4.) c = (x < 8. ? 42000. : 5610.); if (y == 5.) c = (x < 8. ? 25680. : 30053.);
-		if (y == 6.) c = (x < 8. ? 22864. : 22361.); if (y == 7.) c = (x < 8. ? 43344. : 54618.);
-		
-		float s = SELECT(x,c);
-		if (s == 1.) fragColor = RGB(224.,80.,0.);
-		if (s == 2.) fragColor = RGB(255.,255.,255.);
-		if (s == 3.) fragColor = RGB(255.,160.,0.);
-	}
-	if (f == 1.) {
-		if (y == 0.) c = (x < 8. ? 0. : 1040.); if (y == 1.) c = (x < 8. ? 20480. : 1300.);
-		if (y == 2.) c = (x < 8. ? 16384. : 1365.); if (y == 3.) c = (x < 8. ? 21760. : 5466.);
-		if (y == 4.) c = (x < 8. ? 42241. : 5610.); if (y == 5.) c = (x < 8. ? 25601. : 30053.);
-		if (y == 6.) c = (x < 8. ? 22869. : 22361.); if (y == 7.) c = (x < 8. ? 43349. : 54618.);
-		
-		float s = SELECT(x,c);
-		if (s == 1.) fragColor = RGB(224.,80.,0.);
-		if (s == 2.) fragColor = RGB(255.,255.,255.);
-		if (s == 3.) fragColor = RGB(255.,160.,0.);
-	}
-	
-	if (x >= 8.) x = 15. - x;
-	if (y >= 8.) y = 15. - y;
-	if (f == 2. || f == 5. || f == 7.) {		
-		if (y == 0.) c = 0.; if (y == 1.) c = 0.;
-		if (y == 2.) c = 0.; if (y == 3.) c = (x < 8. ? 64. : 0.);
-		if (y == 4.) c = (x < 8. ? 32768. : 0.); if (y == 5.) c = (x < 8. ? 17408. : 0.);
-		if (y == 6.) c = (x < 8. ? 32768. : 0.); if (y == 7.) c = (x < 8. ? 26112. : 0.);
-		
-		float s = SELECT(x,c);
-		if (mod(floor(iGlobalTime * 10.),2.) == 0.) {
-			if (s == 2.) s = 1.;
-			else if (s == 1.) s= 2.;
-		}
-		
-		if (s == 1.) fragColor = RGB(255.,255.,255.);
-		if (s == 2.) fragColor = RGB(104.,136.,255.);
-	}
-	if (f == 3. || f == 6.) {
-		if (y == 0.) c = 0.; if (y == 1.) c = (x < 8. ? 4. : 0.);
-		if (y == 2.) c = (x < 8. ? 32. : 0.); if (y == 3.) c = (x < 8. ? 32832. : 0.);
-		if (y == 4.) c = (x < 8. ? 33024. : 0.); if (y == 5.) c = (x < 8. ? 17408. : 0.);
-		if (y == 6.) c = (x < 8. ? 40960. : 0.); if (y == 7.) c = (x < 8. ? 26240. : 0.);
-		
-		float s = SELECT(x,c);
-		if (mod(floor(iGlobalTime * 10.),2.) == 0.) {
-			if (s == 2.) s = 1.;
-			else if (s == 1.) s= 2.;
-		}
-		
-		if (s == 1.) fragColor = RGB(255.,255.,255.);
-		if (s == 2.) fragColor = RGB(104.,136.,255.);
-
-	}
-}
-
-
-void background(vec2 p)
-{
-	float tileX = floor((p.x - 8.0) / 16.0);
-	float tileY = floor((p.y - 8.0) / 16.0);
-	float pixelX = mod((p.x - 8.0), 16.0);
-	float pixelY = 15.0 - mod((p.y - 8.0), 16.0);
-	
-	if ((tileX >= -4. && tileX <= 2. && tileY >= -2. && tileY <= 0.) ||
-		(tileX == -5. && tileY == 1.) ||
-		(tileX == -5. && tileY == -3.) ||
-		(tileX == 3. && tileY == 1.) ||
-		(tileX == 3. && tileY == -3.) ||
-		
-		(tileX == 5. && tileY == -1.) ||
-		(tileX == -1. && tileY == -3.) ||
-		(tileX == -7. && tileY == -1.) ||
-		((mod(tileX, 2.0) == 0. || mod(tileY, 2.0) == 0.) &&
-	   ((tileX >= -6. && tileX <= 4.) || (tileY >= -4. && tileY <= 2.)))) {
-			
-			if (mod(pixelX * 5.5 + pixelY * 4.,21.) == 0.)
-				fragColor = mix(RGB(252.,206.,168.),RGB(252.,196.,118.),length(p / 256.));
-			else
-				fragColor = RGB(252.,216.,168.);
-	} else {
-		if (tileX >= -5. && tileX <= 3. && tileY >= -3. && tileY <= 2.)
-			spr_tree(pixelX,pixelY);
-		else
-			spr_rock(pixelX,pixelY);
-	}
-}
-
-void mainImage( out vec4 oFragColor, in vec2 fragCoord )
-{
-	float size = 2.;
-	if (iResolution.y < 200.) size = 1.;
-	if (iResolution.y > 600.) size = 4.;
-	vec2 uv = floor((fragCoord.xy - iResolution.xy / 2.0) / size);
-	
-	
-	
-	background(uv);
-	
-	
-	float time = floor(iGlobalTime * 60.0);
-	
-	const float walkTime = 60.0 * 5.0;
-	float walkIndex = floor(time / walkTime);
-	float walkFrame = mod(time, walkTime);
-	
-	vec2 lastPlayerPos = hashPos(walkIndex - 1.);
-	vec2 curPlayerPos = hashPos(walkIndex);
-	vec2 playerPos = lastPlayerPos;
-	
-	float dirX = 0., dirXRand = 0.;
-	float dirY = 0., dirYRand = 0.;
-	float dirRand = floor(abs(hash(floor(time / 50.0))) * 4.0);
-	if (dirRand == 0.) dirXRand = 1.;
-	else if (dirRand == 1.) dirXRand = -1.;
-	else if (dirRand == 2.) dirYRand = 1.;
-	else dirYRand = -1.;
-	
-	float frame = floor(mod(time / 6.0,2.0));
-	float swordFrame = 0.;
-	
-	if (hash(walkIndex * 3.84) < 0.) {
-		float yDisp = abs(lastPlayerPos.y - curPlayerPos.y);
-		float xDisp = abs(lastPlayerPos.x - curPlayerPos.x);
-		float ySign = sign(curPlayerPos.y - lastPlayerPos.y);
-		float xSign = sign(curPlayerPos.x - lastPlayerPos.x);
-		
-		if (walkFrame < yDisp) {
-			playerPos = vec2(lastPlayerPos.x,lastPlayerPos.y + ySign * walkFrame);
-			dirY = ySign;
-		} else if (walkFrame < yDisp + xDisp - 16.0) {
-			playerPos = vec2(lastPlayerPos.x + xSign * (walkFrame - yDisp),curPlayerPos.y);
-			dirX = xSign;
-		} else if (walkFrame < yDisp + xDisp - 16.0 + 40.0) {
-			dirX = xSign;
-			frame = 2.;
-			swordFrame = walkFrame - (yDisp + xDisp - 16.0);
-			playerPos = vec2(lastPlayerPos.x + xSign * (xDisp - 16.0),curPlayerPos.y);
-		} else if (walkFrame < yDisp + xDisp - 16.0 + 56.0) {
-			dirX = xSign;
-			playerPos = vec2(lastPlayerPos.x + xSign * (walkFrame - (yDisp - 16.0 + 56.0)),curPlayerPos.y);
-		} else {
-			frame = 0.;
-			if (walkFrame < yDisp + xDisp - 16.0 + 90.) dirX = xSign;
-			playerPos = curPlayerPos;
-		}
-	} else {
-		float yDisp = abs(lastPlayerPos.y - curPlayerPos.y);
-		float xDisp = abs(lastPlayerPos.x - curPlayerPos.x);
-		float ySign = sign(curPlayerPos.y - lastPlayerPos.y);
-		float xSign = sign(curPlayerPos.x - lastPlayerPos.x);
-		
-		if (walkFrame < xDisp) {
-			dirX = xSign;
-			playerPos = vec2(lastPlayerPos.x + xSign * walkFrame,lastPlayerPos.y);
-		} else if (walkFrame < yDisp + xDisp - 16.0) {
-			dirY = ySign;
-			playerPos = vec2(curPlayerPos.x,lastPlayerPos.y + ySign * (walkFrame - xDisp));
-		} else if (walkFrame < yDisp + xDisp - 16.0 + 40.0) {
-			frame = 2.;
-			swordFrame = walkFrame - (yDisp + xDisp - 16.0);
-			dirY = ySign;
-			playerPos = vec2(curPlayerPos.x,lastPlayerPos.y + ySign * (yDisp - 16.0));
-		} else if (walkFrame < yDisp + xDisp - 16.0 + 56.0) {
-			dirY = ySign;
-			playerPos = vec2(curPlayerPos.x,lastPlayerPos.y + ySign * (walkFrame - (xDisp - 16.0 + 56.0)));
-		} else {
-			frame = 0.;
-			if (walkFrame < yDisp + xDisp - 16.0 + 90.) dirY = ySign;
-			playerPos = curPlayerPos;
-		}
-	}
-	
-	
-	if (dirX == 0. && dirY == 0.) {
-		dirY = dirYRand;
-		dirX = dirXRand;
-		frame = 0.;
-	}
-	
-	const int enemyNum = 3;
-	for(int i = 0; i < enemyNum; i++) {
-		float wi = walkIndex + float(i);
-		vec2 eLastPos = hashPos(wi - 1.);
-		vec2 eCurPos = hashPos(wi);
-		vec2 ePos = vec2(0,0);
-		
-		float eDirX = 0.;
-		float eDirY = 0.;
-		
-		float yDisp = abs(eCurPos.y - eLastPos.y);
-		float xDisp = abs(eCurPos.x - eLastPos.x);
-		float ySign = sign(eCurPos.y - eLastPos.y);
-		float xSign = sign(eCurPos.x - eLastPos.x);
-		
-		float eFrame = floor(mod((time + 2.5) / 6.0,2.0));
-		
-		if (hash(wi * 3.84) < 0.) {
-			if (eLastPos.x != eCurPos.x) {
-				float s = (hash(wi) < 0. ? 1. : -1.);
-				float y = (xDisp + yDisp - (walkFrame - walkTime * float(i)));
-				float yc = abs(hash(wi)) * 64. + 64.;
-				
-				if (y < 0.) {
-					ePos = eCurPos;
-					eDirY = s;
-					eFrame = 2. + floor(abs(y / 5.));
-				} else if (y < yc) {
-					ePos = vec2(eCurPos.x, eCurPos.y + s * yc + s * (y - yc));
-					eDirY = s;
-				} else {
-					ePos = vec2(eCurPos.x, eCurPos.y + s * yc - s * (y - yc));
-					eDirY = -s;
-				}
-			}
-		} else {
-			if (eLastPos.y != eCurPos.y) {
-				float s = (hash(wi) < 0. ? 1. : -1.);
-				float x = (xDisp + yDisp - (walkFrame - walkTime * float(i)));
-				float xc = abs(hash(wi)) * 64. + 64.;
-				
-				if (x < 0.) {
-					ePos = eCurPos;
-					eDirX = s;
-					eFrame = 2. + floor(abs(x / 5.));
-				} else if (x < xc) {
-					ePos = vec2(eCurPos.x + s * xc + s * (x - xc), eCurPos.y);
-					eDirX = -s;
-				} else {
-					ePos = vec2(eCurPos.x + s * xc - s * (x - xc), eCurPos.y);
-					eDirX = s;
-				}
-			}
-		}
-		
-		ePos = floor(ePos);
-		
-		if ((eDirX != 0. || eDirY != 0.) &&
-			uv.x >= ePos.x - 8. && uv.x <= ePos.x + 7. &&
-			uv.y >= ePos.y - 8. && uv.y <= ePos.y + 7.) {
-				float epx = uv.x - ePos.x + 8.;
-				float epy = ePos.y - uv.y + 7.;
-				spr_enemy(eFrame, eDirX, eDirY, epx, epy);
-		}
-		
-	}
-	
-	if (frame == 2.) {
-		float spx = 0.;
-		float spy = 0.;
-		if (dirX > 0.) {spx = 15.; spy = -1.;}
-		if (dirX < 0.) {spx = -15.; spy = -1.;}
-		if (dirY > 0.) {spx = -3.; spy = 15.;}
-		if (dirY < 0.) {spx = 1.; spy = -15.;}
-		
-		if (uv.x >= playerPos.x - 8. + spx && uv.x <= playerPos.x + 7. + spx &&
-			uv.y >= playerPos.y - 7. + spy && uv.y <= playerPos.y + 8. + spy) {
-			
-			float sx = uv.x - playerPos.x + 8. - spx;
-			float sy = playerPos.y - uv.y + 8. + spy;
-			spr_sword(swordFrame,dirX,dirY,sx,sy);
-		}
-	}
-	
-	if (uv.x >= playerPos.x - 8. && uv.x <= playerPos.x + 7. &&
-		uv.y >= playerPos.y - 7. && uv.y <= playerPos.y + 8.) {
-			float px = uv.x - playerPos.x + 8.;
-			float py = playerPos.y - uv.y + 8.;
-		
-			if (dirX > 0.) spr_player_right(frame,px,py);
-			if (dirX < 0.) spr_player_left(frame,px,py);
-			if (dirY > 0.) spr_player_up(frame,px,py);
-			if (dirY < 0.) spr_player_down(frame,px,py);
-	}
-	
-    oFragColor = fragColor;
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/iq-image-audrey-hepburn.slang b/procedural/iq-image-audrey-hepburn.slang
deleted file mode 100644
index ea9805d0c9..0000000000
--- a/procedural/iq-image-audrey-hepburn.slang
+++ /dev/null
@@ -1,274 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// Created by inigo quilez - iq/2013
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-// These are 316 gaussian points (201 brushes by using local symmetry) forming the picture
-// of Audrey Hepburn. They pack down to 800 bytes (34 bits per point) before huffman/arithmetic
-// compression.
-//
-// The points were chosen by (very quickly) runing this 
-//
-// http://www.iquilezles.org/www/articles/genetic/genetic.htm
-//
-// with some importance sampling for the eyes, nouse and mouth.
-
-float brush( float col, vec2 p, in vec4 b, float an )
-{
-	p += an*cos( iGlobalTime + 100.0*b.yz );
-				
-    vec2 dd = p - b.yz;
-    col = mix( col, b.x, exp( -b.w*b.w*dot(dd,dd) ) );
-    if( abs(b.z-0.5)<0.251 )
-    {
-        dd.x = p.x - 1.0 + b.y;
-        col =  mix( col, b.x, exp( -b.w*b.w*dot(dd,dd) ) );
-    }
-    return col;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    vec2 uv = fragCoord.xy / iResolution.y;
-    uv.x -=  0.5*(iResolution.x / iResolution.y - 1.0);
-
-    float an = smoothstep( 0.0, 1.0, cos(iGlobalTime) );
-
-	float col = 0.0;
-
-    col = brush( col, uv, vec4(1.000,0.371,0.379,11.770), an );
-    col = brush( col, uv, vec4(0.992,0.545,0.551,8.359), an );
-    col = brush( col, uv, vec4(0.749,0.623,0.990,36.571), an );
-    col = brush( col, uv, vec4(1.000,0.510,0.395,11.315), an );
-    col = brush( col, uv, vec4(1.000,0.723,0.564,15.170), an );
-    col = brush( col, uv, vec4(0.953,0.729,0.750,14.629), an );
-    col = brush( col, uv, vec4(0.706,0.982,0.033,16.254), an );
-    col = brush( col, uv, vec4(1.000,0.855,0.652,26.256), an );
-    col = brush( col, uv, vec4(1.000,0.664,0.623,81.920), an );
-    col = brush( col, uv, vec4(0.000,0.881,0.750,8.031), an );
-    col = brush( col, uv, vec4(0.686,0.682,0.900,27.676), an );
-    col = brush( col, uv, vec4(1.000,0.189,0.684,18.618), an );
-    col = brush( col, uv, vec4(0.000,0.904,0.750,8.031), an );
-    col = brush( col, uv, vec4(1.000,0.422,0.195,44.522), an );
-    col = brush( col, uv, vec4(1.000,0.779,0.750,16.787), an );
-    col = brush( col, uv, vec4(1.000,0.645,0.330,14.222), an );
-    col = brush( col, uv, vec4(1.000,0.197,0.648,22.505), an );
-    col = brush( col, uv, vec4(0.702,0.512,0.393,35.310), an );
-    col = brush( col, uv, vec4(1.000,0.744,0.621,14.949), an );
-    col = brush( col, uv, vec4(0.671,0.885,0.092,24.675), an );
-    col = brush( col, uv, vec4(0.000,0.344,0.750,8.031), an );
-    col = brush( col, uv, vec4(1.000,0.760,0.465,40.960), an );
-    col = brush( col, uv, vec4(0.008,0.908,0.311,8.031), an );
-    col = brush( col, uv, vec4(0.016,0.959,0.750,10.039), an );
-    col = brush( col, uv, vec4(0.004,0.930,0.750,12.800), an );
-    col = brush( col, uv, vec4(1.000,0.555,0.250,19.883), an );
-    col = brush( col, uv, vec4(1.000,0.770,1.018,15.876), an );
-    col = brush( col, uv, vec4(0.000,0.828,0.756,36.571), an );
-    col = brush( col, uv, vec4(0.580,0.566,0.424,89.043), an );
-    col = brush( col, uv, vec4(0.988,0.162,0.691,40.157), an );
-    col = brush( col, uv, vec4(0.000,0.314,0.750,8.031), an );
-    col = brush( col, uv, vec4(0.000,0.947,0.125,32.000), an );
-    col = brush( col, uv, vec4(0.914,0.844,0.725,52.513), an );
-    col = brush( col, uv, vec4(1.000,0.313,0.762,42.667), an );
-    col = brush( col, uv, vec4(0.996,0.676,0.689,85.333), an );
-    col = brush( col, uv, vec4(0.980,0.346,0.559,24.675), an );
-    col = brush( col, uv, vec4(1.000,0.553,0.250,18.789), an );
-    col = brush( col, uv, vec4(0.004,0.258,0.248,8.031), an );
-    col = brush( col, uv, vec4(1.000,0.420,0.742,30.567), an );
-    col = brush( col, uv, vec4(0.906,0.543,0.250,22.756), an );
-    col = brush( col, uv, vec4(0.863,0.674,0.322,20.078), an );
-    col = brush( col, uv, vec4(0.753,0.357,0.686,78.769), an );
-    col = brush( col, uv, vec4(0.906,0.795,0.705,37.236), an );
-    col = brush( col, uv, vec4(0.933,0.520,0.365,38.642), an );
-    col = brush( col, uv, vec4(0.996,0.318,0.488,14.734), an );
-    col = brush( col, uv, vec4(0.337,0.486,0.281,81.920), an );
-    col = brush( col, uv, vec4(0.965,0.691,0.516,16.650), an );
-    col = brush( col, uv, vec4(0.808,0.582,0.973,52.513), an );
-    col = brush( col, uv, vec4(0.012,0.240,0.928,8.063), an );
-    col = brush( col, uv, vec4(1.000,0.496,0.217,31.508), an );
-    col = brush( col, uv, vec4(0.000,0.658,0.953,34.133), an );
-    col = brush( col, uv, vec4(0.871,0.582,0.172,62.061), an );
-    col = brush( col, uv, vec4(0.855,0.346,0.342,17.504), an );
-    col = brush( col, uv, vec4(0.878,0.787,0.648,28.845), an );
-    col = brush( col, uv, vec4(0.000,0.984,0.111,35.310), an );
-    col = brush( col, uv, vec4(0.855,0.514,0.965,66.065), an );
-    col = brush( col, uv, vec4(0.561,0.613,0.350,81.920), an );
-    col = brush( col, uv, vec4(0.992,0.818,0.902,21.558), an );
-    col = brush( col, uv, vec4(0.914,0.746,0.615,40.157), an );
-    col = brush( col, uv, vec4(0.557,0.580,0.125,60.235), an );
-    col = brush( col, uv, vec4(0.475,0.547,0.414,70.621), an );
-    col = brush( col, uv, vec4(0.843,0.680,0.793,20.277), an );
-    col = brush( col, uv, vec4(1.000,0.230,0.758,56.889), an );
-    col = brush( col, uv, vec4(1.000,0.299,0.691,68.267), an );
-    col = brush( col, uv, vec4(0.737,0.518,0.100,68.267), an );
-    col = brush( col, uv, vec4(0.996,0.227,0.514,41.796), an );
-    col = brush( col, uv, vec4(0.929,0.850,0.770,62.061), an );
-    col = brush( col, uv, vec4(0.682,0.834,0.111,30.118), an );
-    col = brush( col, uv, vec4(0.996,0.854,0.793,58.514), an );
-    col = brush( col, uv, vec4(0.490,0.736,0.889,19.321), an );
-    col = brush( col, uv, vec4(0.980,0.465,0.725,16.126), an );
-    col = brush( col, uv, vec4(0.992,0.484,1.010,23.273), an );
-    col = brush( col, uv, vec4(0.008,0.949,0.727,23.540), an );
-    col = brush( col, uv, vec4(0.012,0.086,0.086,8.031), an );
-    col = brush( col, uv, vec4(1.000,0.121,0.750,44.522), an );
-    col = brush( col, uv, vec4(0.427,0.617,0.891,27.676), an );
-    col = brush( col, uv, vec4(0.804,0.693,0.633,78.769), an );
-    col = brush( col, uv, vec4(0.012,0.711,0.084,13.745), an );
-    col = brush( col, uv, vec4(0.082,0.584,0.338,107.789), an );
-    col = brush( col, uv, vec4(0.929,0.613,0.268,19.692), an );
-    col = brush( col, uv, vec4(0.200,0.549,0.420,128.000), an );
-    col = brush( col, uv, vec4(1.000,0.402,0.717,26.947), an );
-    col = brush( col, uv, vec4(0.000,0.551,0.168,45.511), an );
-    col = brush( col, uv, vec4(0.992,0.627,0.621,56.889), an );
-    col = brush( col, uv, vec4(0.902,0.361,0.748,40.960), an );
-    col = brush( col, uv, vec4(0.984,0.344,0.754,38.642), an );
-    col = brush( col, uv, vec4(0.902,0.203,0.818,51.200), an );
-    col = brush( col, uv, vec4(1.000,0.230,0.803,52.513), an );
-    col = brush( col, uv, vec4(0.922,0.738,0.691,47.628), an );
-    col = brush( col, uv, vec4(0.000,0.385,0.797,43.574), an );
-    col = brush( col, uv, vec4(0.000,0.725,0.305,62.061), an );
-    col = brush( col, uv, vec4(0.000,0.150,0.750,45.511), an );
-    col = brush( col, uv, vec4(1.000,0.742,0.408,47.628), an );
-    col = brush( col, uv, vec4(0.000,0.645,0.643,60.235), an );
-    col = brush( col, uv, vec4(1.000,0.645,0.438,35.310), an );
-    col = brush( col, uv, vec4(0.510,0.564,0.789,18.450), an );
-    col = brush( col, uv, vec4(0.863,0.211,0.781,30.567), an );
-    col = brush( col, uv, vec4(0.106,0.508,0.328,89.043), an );
-    col = brush( col, uv, vec4(0.012,0.410,0.875,14.629), an );
-    col = brush( col, uv, vec4(1.000,0.871,0.877,48.762), an );
-    col = brush( col, uv, vec4(1.000,0.258,0.779,37.926), an );
-    col = brush( col, uv, vec4(0.000,0.436,0.807,28.845), an );
-    col = brush( col, uv, vec4(0.918,0.861,0.836,49.951), an );
-    col = brush( col, uv, vec4(1.000,0.291,0.770,40.960), an );
-    col = brush( col, uv, vec4(0.000,0.750,0.283,27.676), an );
-    col = brush( col, uv, vec4(0.965,0.596,0.572,28.055), an );
-    col = brush( col, uv, vec4(0.902,0.803,0.953,24.976), an );
-    col = brush( col, uv, vec4(0.957,0.498,0.600,16.126), an );
-    col = brush( col, uv, vec4(0.914,0.322,0.432,15.634), an );
-    col = brush( col, uv, vec4(0.008,0.025,0.621,17.809), an );
-    col = brush( col, uv, vec4(0.000,0.916,0.713,56.889), an );
-    col = brush( col, uv, vec4(0.914,0.547,0.971,47.628), an );
-    col = brush( col, uv, vec4(0.000,0.207,0.432,37.926), an );
-    col = brush( col, uv, vec4(0.875,0.176,0.793,46.545), an );
-    col = brush( col, uv, vec4(0.000,0.646,0.668,41.796), an );
-    col = brush( col, uv, vec4(1.000,0.721,0.691,51.200), an );
-    col = brush( col, uv, vec4(0.451,0.559,0.754,49.951), an );
-    col = brush( col, uv, vec4(0.969,0.846,0.750,58.514), an );
-    col = brush( col, uv, vec4(0.000,0.900,0.146,36.571), an );
-    col = brush( col, uv, vec4(1.000,0.613,0.635,85.333), an );
-    col = brush( col, uv, vec4(0.596,0.807,0.150,58.514), an );
-    col = brush( col, uv, vec4(0.898,0.330,0.760,40.157), an );
-    col = brush( col, uv, vec4(0.694,0.594,0.012,51.200), an );
-    col = brush( col, uv, vec4(0.698,0.592,0.055,53.895), an );
-    col = brush( col, uv, vec4(0.902,0.268,0.773,39.385), an );
-    col = brush( col, uv, vec4(0.925,0.838,0.660,58.514), an );
-    col = brush( col, uv, vec4(0.843,0.670,0.242,28.444), an );
-    col = brush( col, uv, vec4(0.243,0.465,0.285,85.333), an );
-    col = brush( col, uv, vec4(0.816,0.588,0.674,44.522), an );
-    col = brush( col, uv, vec4(0.008,0.283,0.115,8.031), an );
-    col = brush( col, uv, vec4(0.247,0.414,0.691,60.235), an );
-    col = brush( col, uv, vec4(1.000,0.104,0.781,60.235), an );
-    col = brush( col, uv, vec4(0.000,0.619,0.660,60.235), an );
-    col = brush( col, uv, vec4(0.584,0.650,0.994,46.545), an );
-    col = brush( col, uv, vec4(0.000,0.219,0.393,36.571), an );
-    col = brush( col, uv, vec4(1.000,0.307,0.645,97.524), an );
-    col = brush( col, uv, vec4(0.953,0.639,0.771,38.642), an );
-    col = brush( col, uv, vec4(0.000,0.238,0.357,34.712), an );
-    col = brush( col, uv, vec4(0.922,0.713,0.352,53.895), an );
-    col = brush( col, uv, vec4(0.965,0.387,0.748,43.574), an );
-    col = brush( col, uv, vec4(0.000,0.898,0.633,41.796), an );
-    col = brush( col, uv, vec4(0.941,0.352,0.488,14.734), an );
-    col = brush( col, uv, vec4(0.933,0.439,0.725,30.567), an );
-    col = brush( col, uv, vec4(0.310,0.541,0.906,47.628), an );
-    col = brush( col, uv, vec4(0.941,0.502,0.689,24.094), an );
-    col = brush( col, uv, vec4(0.094,0.527,0.330,85.333), an );
-    col = brush( col, uv, vec4(0.000,0.090,0.688,55.351), an );
-    col = brush( col, uv, vec4(0.000,0.652,0.713,75.852), an );
-    col = brush( col, uv, vec4(0.949,0.320,0.623,107.789), an );
-    col = brush( col, uv, vec4(0.890,0.775,0.750,22.505), an );
-    col = brush( col, uv, vec4(0.012,0.918,0.490,14.322), an );
-    col = brush( col, uv, vec4(1.000,0.871,0.967,58.514), an );
-    col = brush( col, uv, vec4(0.000,0.324,0.676,64.000), an );
-    col = brush( col, uv, vec4(0.008,0.141,0.248,8.031), an );
-    col = brush( col, uv, vec4(0.000,0.633,0.707,75.852), an );
-    col = brush( col, uv, vec4(0.910,0.385,0.207,44.522), an );
-    col = brush( col, uv, vec4(0.012,0.703,0.182,31.508), an );
-    col = brush( col, uv, vec4(0.000,0.617,0.703,73.143), an );
-    col = brush( col, uv, vec4(0.890,0.352,0.225,45.511), an );
-    col = brush( col, uv, vec4(0.933,0.826,0.604,44.522), an );
-    col = brush( col, uv, vec4(0.914,0.777,0.574,25.924), an );
-    col = brush( col, uv, vec4(0.631,0.781,0.182,68.267), an );
-    col = brush( col, uv, vec4(1.000,0.873,0.916,48.762), an );
-    col = brush( col, uv, vec4(0.694,0.520,0.113,81.920), an );
-    col = brush( col, uv, vec4(0.000,0.900,0.926,58.514), an );
-    col = brush( col, uv, vec4(0.184,0.598,0.344,146.286), an );
-    col = brush( col, uv, vec4(0.863,0.678,0.250,35.310), an );
-    col = brush( col, uv, vec4(0.090,0.566,0.332,78.769), an );
-    col = brush( col, uv, vec4(0.420,0.445,0.301,56.889), an );
-    col = brush( col, uv, vec4(0.973,0.617,0.516,18.124), an );
-    col = brush( col, uv, vec4(0.000,0.191,0.500,39.385), an );
-    col = brush( col, uv, vec4(0.000,0.240,0.326,31.508), an );
-    col = brush( col, uv, vec4(0.000,0.264,0.322,55.351), an );
-    col = brush( col, uv, vec4(0.000,0.604,0.699,70.621), an );
-    col = brush( col, uv, vec4(0.000,0.113,0.604,43.574), an );
-    col = brush( col, uv, vec4(0.894,0.760,0.697,49.951), an );
-    col = brush( col, uv, vec4(0.914,0.725,0.383,55.351), an );
-    col = brush( col, uv, vec4(0.000,0.199,0.467,48.762), an );
-    col = brush( col, uv, vec4(0.000,0.904,0.660,52.513), an );
-    col = brush( col, uv, vec4(0.922,0.611,0.191,45.511), an );
-    col = brush( col, uv, vec4(0.059,0.789,0.869,30.118), an );
-    col = brush( col, uv, vec4(0.976,0.641,0.213,40.960), an );
-    col = brush( col, uv, vec4(0.918,0.402,0.742,47.628), an );
-    col = brush( col, uv, vec4(0.945,0.717,0.582,40.157), an );
-    col = brush( col, uv, vec4(0.000,0.299,0.672,58.514), an );
-    col = brush( col, uv, vec4(0.000,0.719,0.666,48.762), an );
-    col = brush( col, uv, vec4(0.882,0.697,0.271,58.514), an );
-    col = brush( col, uv, vec4(0.929,0.752,0.436,64.000), an );
-    col = brush( col, uv, vec4(1.000,0.867,0.813,56.889), an );
-    col = brush( col, uv, vec4(0.643,0.588,0.090,64.000), an );
-    col = brush( col, uv, vec4(0.012,0.063,0.922,10.952), an );
-    col = brush( col, uv, vec4(0.878,0.186,0.750,31.508), an );
-    col = brush( col, uv, vec4(0.953,0.648,0.613,120.471), an );
-    col = brush( col, uv, vec4(0.973,0.180,0.576,45.511), an );
-    col = brush( col, uv, vec4(0.741,0.943,0.076,52.513), an );
-    col = brush( col, uv, vec4(0.059,0.545,0.332,89.043), an );
-    col = brush( col, uv, vec4(0.094,0.295,0.734,85.333), an );
-    col = brush( col, uv, vec4(0.008,0.676,0.721,85.333), an );
-    col = brush( col, uv, vec4(0.550,0.350,0.650,85.000), an );
-
-	fragColor = vec4(col,col,col,1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/iq-julia-quaternion.slang b/procedural/iq-julia-quaternion.slang
deleted file mode 100644
index 647e6f94f2..0000000000
--- a/procedural/iq-julia-quaternion.slang
+++ /dev/null
@@ -1,213 +0,0 @@
-#version 450
-// Created by inigo quilez - iq/2013
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-// A port of my 2007 demo Kindernoiser: https://www.youtube.com/watch?v=9AX8gNyrSWc (http://www.pouet.net/prod.php?which=32549)
-//
-// More info here:  http://iquilezles.org/www/articles/juliasets3d/juliasets3d.htm
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// antialias level (1, 2, 3...)
-#define AA 1
-
-float map( in vec3 p, out vec4 oTrap, in vec4 c )
-{
-    vec4 z = vec4(p,0.0);
-    float md2 = 1.0;
-    float mz2 = dot(z,z);
-
-    vec4 trap = vec4(abs(z.xyz),dot(z,z));
-
-    for( int i=0; i<11; i++ )
-    {
-        // |dz|^2 -> 4*|dz|^2
-        md2 *= 4.0*mz2;
-        
-        // z -> z2 + c
-        z = vec4( z.x*z.x-dot(z.yzw,z.yzw),
-                  2.0*z.x*z.yzw ) + c;
-
-        trap = min( trap, vec4(abs(z.xyz),dot(z,z)) );
-
-        mz2 = dot(z,z);
-        if(mz2>4.0) break;
-    }
-    
-    oTrap = trap;
-
-    return 0.25*sqrt(mz2/md2)*log(mz2);
-}
-
-// analytic normal for quadratic formula
-vec3 calcNormal( in vec3 p, in vec4 c )
-{
-    vec4 z = vec4(p,0.0);
-
-	vec4 dz0 = vec4(1.0,0.0,0.0,0.0);
-	vec4 dz1 = vec4(0.0,1.0,0.0,0.0);
-	vec4 dz2 = vec4(0.0,0.0,1.0,0.0);
-    vec4 dz3 = vec4(0.0,0.0,0.0,1.0);
-
-  	for(int i=0;i<11;i++)
-    {
-        vec4 mz = vec4(z.x,-z.y,-z.z,-z.w);
-
-		// derivative
-		dz0 = vec4(dot(mz,dz0),z.x*dz0.yzw+dz0.x*z.yzw);
-		dz1 = vec4(dot(mz,dz1),z.x*dz1.yzw+dz1.x*z.yzw);
-		dz2 = vec4(dot(mz,dz2),z.x*dz2.yzw+dz2.x*z.yzw);
-        dz3 = vec4(dot(mz,dz3),z.x*dz3.yzw+dz3.x*z.yzw);
-
-        z = vec4( dot(z, mz), 2.0*z.x*z.yzw ) + c;
-
-	    if( dot(z,z)>4.0 ) break;
-    }
-
-	return normalize(vec3(dot(z,dz0),
-	                      dot(z,dz1),
-	                      dot(z,dz2)));
-}
-
-float intersect( in vec3 ro, in vec3 rd, out vec4 res, in vec4 c )
-{
-    vec4 tmp;
-    float resT = -1.0;
-	float maxd = 10.0;
-    float h = 1.0;
-    float t = 0.0;
-    for( int i=0; i<150; i++ )
-    {
-        if( h<0.002||t>maxd ) break;
-	    h = map( ro+rd*t, tmp, c );
-        t += h;
-    }
-    if( t<maxd ) { resT=t; res = tmp; }
-
-	return resT;
-}
-
-float softshadow( in vec3 ro, in vec3 rd, float mint, float k, in vec4 c )
-{
-    float res = 1.0;
-    float t = mint;
-    for( int i=0; i<64; i++ )
-    {
-        vec4 kk;
-        float h = map(ro + rd*t, kk, c);
-        res = min( res, k*h/t );
-        if( res<0.001 ) break;
-        t += clamp( h, 0.01, 0.5 );
-    }
-    return clamp(res,0.0,1.0);
-}
-
-vec3 render( in vec3 ro, in vec3 rd, in vec4 c )
-{
-    vec3 light1 = vec3(  0.577, 0.577,  0.577 );
-	vec3 light2 = vec3( -0.707, 0.000, -0.707 );
-
-	vec4 tra;
-	vec3 col;
-    float t = intersect( ro, rd, tra, c );
-    if( t < 0.0 )
-    {
-     	col = vec3(0.8,0.9,1.0)*(0.7+0.3*rd.y);
-		col += vec3(0.8,0.7,0.5)*pow( clamp(dot(rd,light1),0.0,1.0), 48.0 );
-	}
-	else
-	{
-        col = vec3(1.0,0.8,0.7)*0.3;
-
-        vec3 pos = ro + t*rd;
-        vec3 nor = calcNormal( pos, c );
-        vec3 ref = reflect( rd, nor );
-
-		float dif1 = clamp( dot( light1, nor ), 0.0, 1.0 );
-		float dif2 = clamp( 0.5 + 0.5*dot( light2, nor ), 0.0, 1.0 );
-		float occ = clamp(2.5*tra.w-0.15,0.0,1.0);
-        float sha = softshadow( pos, light1, 0.001, 64.0, c );
-        float fre = pow( clamp( 1.+dot(rd,nor), 0.0, 1.0 ), 2.0 );
-        
-		vec3 lin  = 1.5*vec3(0.15,0.20,0.25)*(0.6+0.4*nor.y)*(0.1+0.9*occ);
-		     lin += 3.5*vec3(1.00,0.90,0.70)*dif1*sha;
-		     lin += 1.5*vec3(0.14,0.14,0.14)*dif2*occ;
-             lin += 0.3*vec3(1.00,0.80,0.60)*fre*(0.5+0.5*occ);
-
-		col *= lin;
-        col += pow( clamp( dot( ref, light1 ), 0.0, 1.0 ), 32.0 )*dif1*sha;
-        col += 0.1*vec3(0.8,0.9,1.0)*smoothstep( 0.0, 0.1, ref.y )*occ*(0.5+0.5*nor.y);
-	}
-
-	return pow( col, vec3(0.4545) );
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    // anim
-    float time = iGlobalTime*.15;
-    vec4 c = 0.4*cos( vec4(0.5,3.9,1.4,1.1) + time*vec4(1.2,1.7,1.3,2.5) ) - vec4(0.3,0.0,0.0,0.0);
-
-    // camera
-	float r = 1.4+0.15*cos(0.0+0.29*time);
-	vec3 ro = vec3(           r*cos(0.3+0.37*time), 
-					0.3 + 0.8*r*cos(1.0+0.33*time), 
-					          r*cos(2.2+0.31*time) );
-	vec3 ta = vec3(0.0,0.0,0.0);
-    float cr = 0.1*cos(0.1*time);
-    
-    
-    // render
-    vec3 col = vec3(0.0);
-    for( int j=0; j<AA; j++ )
-    for( int i=0; i<AA; i++ )
-    {
-        vec2 p = (-iResolution.xy + 2.0*(fragCoord + vec2(float(i),float(j))/float(AA))) / iResolution.y;
-
-        vec3 cw = normalize(ta-ro);
-        vec3 cp = vec3(sin(cr), cos(cr),0.0);
-        vec3 cu = normalize(cross(cw,cp));
-        vec3 cv = normalize(cross(cu,cw));
-        vec3 rd = normalize( p.x*cu + p.y*cv + 2.0*cw );
-
-        col += render( ro, rd, c );
-    }
-    col /= float(AA*AA);
-    
-    vec2 uv = fragCoord.xy / iResolution.xy;
-	col *= 0.7 + 0.3*pow(16.0*uv.x*uv.y*(1.0-uv.x)*(1.0-uv.y),0.25);
-    
-	fragColor = vec4( col, 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/kali-emerging.slang b/procedural/kali-emerging.slang
deleted file mode 100644
index 42433561ac..0000000000
--- a/procedural/kali-emerging.slang
+++ /dev/null
@@ -1,288 +0,0 @@
-#version 450
-// Emerging -  Kali - 2015-03-10
-// https://www.shadertoy.com/view/XlfGWI
-
-// An emerging fractal tower. You can use the mouse. Or not.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define ENABLE_HARD_SHADOWS // turn off to enable faster AO soft shadows 
-
-
-#define RAY_STEPS 80
-#define SHADOW_STEPS 50
-#define LIGHT_COLOR vec3(.97,.92,.82)
-#define AMBIENT_COLOR vec3(.57,.55,.6)
-#define FLOOR_COLOR vec3(.35,.25,.2)
-#define ENERGY_COLOR vec3(1.,.7,.4)
-#define BRIGHTNESS 1.5
-#define GAMMA 1.2
-#define SATURATION .9
-
-
-
-#define detail .00003
-#define t iGlobalTime*.1
-
-
-float cc,ss;
-vec3 lightdir=normalize(vec3(0.5,-0.4,-1.));
-vec3 ambdir=normalize(vec3(0.,0.,1.));
-const vec3 origin=vec3(0.,3.11,0.);
-float det=0.0;
-vec3 pth1;
-
-
-float smin( float a, float b, float k )
-{
-    float h = clamp( 0.5+0.5*(b-a)/k, 0.0, 1.0 );
-    return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-
-mat2 rot(float a) {
-	return mat2(cos(a),sin(a),-sin(a),cos(a));	
-}
-
-
-vec3 path(float ti) {
-return vec3(0.,2.5,0.)+vec3(cos(ti)*.9,cos(ti*.5),sin(ti)*.8);
-}
-
-
-vec4 formula (vec4 p) {
-	p.y-=t*.25;
-    p.y=abs(3.-mod(p.y-t,6.));
-    for (int i=0; i<6; i++) {
-		p.xyz = abs(p.xyz)-vec3(.0,1.,.0);
-		p=p*1.6/clamp(dot(p.xyz,p.xyz),.2,1.)-vec4(0.4,1.5,0.4,0.);
-		p.xz*=mat2(cc,ss,-ss,cc);
-	}
-	return p;
-}
-
-
-float texture1(vec3 p) {
-    p=abs(1.-mod(p,2.));
-    vec3 c=vec3(3.);
-	float es=1000., l=0.;
-	for (int i = 0; i < 8; i++) { 
-			p = abs(p + c) - abs(p - c) - p; 
-			p/= clamp(dot(p, p), .25, 1.);
-			p = p* -1.5 + c;
-        	es=min(min(abs(p.x),abs(p.y)),es);
-	}
-	return es*es;
-}
-
-float texture2 (vec3 p) {
-	//p.xz=abs(.75-mod(p.xz,1.5));
-    p=formula(vec4(p,0.)).xyz;
-    return .13+clamp(pow(max(0.,1.-max(abs(p.x),abs(p.z))),2.)*2.,.1,.7);
-}
-
-
-vec2 de(vec3 pos) {
-	float aa=smoothstep(0.,1.,clamp(cos(t-pos.y*.4)*1.5,0.,1.))*3.14159;
-    cc=cos(aa);ss=sin(aa);
-    float hid=0.;
-	vec3 tpos=pos;
-	//tpos.xz=abs(1.5-mod(tpos.xz,3.))-1.5;
-	vec4 p=vec4(tpos,1.);
-	float y=max(0.,.3-abs(pos.y-3.3))/.3;
-    p=formula(p);
-    float fl=pos.y-3.7-length(sin(pos.xz*60.))*.01;
-	float fr=max(abs(p.z/p.w)-.01,length(p.zx)/p.w-.002);
-	float bl=max(abs(p.x/p.w)-.01,length(p.zy)/p.w-.0005);
-    fr=smin(bl,fr,.02);
-	fr*=.9;
-    //float fr=length(p.xyz)/p.w;
-    fl-=(length(p.xz)*.005+length(sin(pos*3.+t*5.))*.15);
-    fl*=.9;
-	float d=smin(fl,fr,.7);
-    if (abs(d-fl)<.2) {
-        hid=1.;
-    }
-    return vec2(d,hid);
-}
-
-
-vec3 normal(vec3 p) {
-	vec3 e = vec3(0.0,det,0.0);
-	
-	return normalize(vec3(
-			de(p+e.yxx).x-de(p-e.yxx).x,
-			de(p+e.xyx).x-de(p-e.xyx).x,
-			de(p+e.xxy).x-de(p-e.xxy).x
-			)
-		);	
-}
-
-float shadow(vec3 pos, vec3 sdir) {//THIS ONLY RUNS WHEN WITH HARD SHADOWS
-	float sh=1.0;
-	float totdist =2.0*det;
-	float dist=5.;
-		for (int steps=0; steps<SHADOW_STEPS; steps++) {
-			if (totdist<4. && dist>detail) {
-				vec3 p = pos - totdist * sdir;
-				dist = de(p).x;
-				sh = min( sh, max(20.*dist/totdist,0.0) );
-				totdist += max(.01,dist);
-			}
-		}
-	
-    return clamp(sh,0.1,1.0);
-}
-
-
-float calcAO( const vec3 pos, const vec3 nor ) {
-	float aodet=detail*75.;
-	float totao = 0.0;
-    float sca = 10.0;
-    for( int aoi=0; aoi<5; aoi++ ) {
-        float hr = aodet*float(aoi*aoi);
-        vec3 aopos =  nor * hr + pos;
-        float dd = de( aopos ).x;
-        totao += -(dd-hr)*sca;
-        sca *= 0.7;
-    }
-    return clamp( 1.0 - 5.0*totao, 0., 1. );
-}
-
-
-vec3 light(in vec3 p, in vec3 dir, in vec3 n, in float hid) {//PASSING IN THE NORMAL
-	#ifdef ENABLE_HARD_SHADOWS
-		float sh=shadow(p, lightdir);
-	#else
-		float sh=calcAO(p,-2.5*lightdir);//USING AO TO MAKE VERY SOFT SHADOWS
-	#endif
-	float ao=calcAO(p,n);
-	float diff=max(0.,dot(lightdir,-n))*sh*.95;
-	float y=3.16-p.y;
-	vec3 amb=max(.6,dot(dir,-n))*.7*AMBIENT_COLOR;
-	vec3 r = reflect(lightdir,n);
-	float spec=pow(max(0.,dot(dir,-r))*sh,15.)*.5;
-	vec3 col;
-	float energysource=pow(max(0.,.1-abs(y))/.1,3.)*1.5;
-		float k=texture2(p); 
-		col=mix(vec3(k,k*k,k*k*k)*.9+.1,vec3(k)*1.5,.4);
-		if (abs(hid-1.)<.001) col=FLOOR_COLOR;
-	col=col*(amb*ao+diff*(.3+ao*.5)*LIGHT_COLOR)+spec*LIGHT_COLOR;	
-	return col;
-}
-
-vec3 raymarch(in vec3 from, in vec3 dir) 
-
-{
-	float ey=mod(t*.5,1.);
-	float glow,eglow,ref,sphdist,totdist=glow=eglow=ref=sphdist=0.;
-	vec2 d=vec2(1.,0.);
-	vec3 p, col=vec3(0.);
-	vec3 origdir=dir,origfrom=from,sphNorm;
-	
-    for (int i=0; i<RAY_STEPS; i++) {
-		if (d.x>det && totdist<6.0) {
-			p=from+totdist*dir;
-			d=de(p);
-			det=detail*(1.+totdist*60.)*(1.+ref*5.);
-			totdist+=max(detail,d.x); 
-			if (d.y<.5) glow+=max(0.,.02-d.x)/.02;
-		}
-	}
-	vec3 ov=normalize(vec3(1.,.5,1.));
-	vec3 sol=dir+lightdir;
-    float l=pow(max(0.,dot(normalize(-dir*ov),normalize(lightdir*ov))),1.5)+sin(atan(sol.x,sol.y)*20.+length(from)*50.)*.002;
-    totdist=min(5.9,totdist);
-    p=from+dir*(totdist-detail);
-    vec3 backg=.4*(1.2-l)+LIGHT_COLOR*l*.75;
-	backg*=AMBIENT_COLOR*(1.-max(0.2,dot(normalize(dir),vec3(0.,1.,0.)))*.2);
-	float fondo=0.;
-	vec3 pp=p*.5+sin(t*2.)*.5;
-    for (int i=0; i<15; i++) {
-        fondo+=clamp(0.,1.,texture1(pp+dir*float(i)*.02))*max(0.,1.-exp(-.03*float(i)));
-    }
-    vec3 backg2=backg*(1.+fondo*(LIGHT_COLOR)*.75);
-    if (d.x<.01) {
-        vec3 norm=normal(p);
-		col=mix(light(p-abs(d.x-det)*dir, dir, norm, d.y),backg,1.-exp(-.3*totdist*totdist)); 
-		col = mix(col, backg2, 1.0-exp(-.02*pow(abs(totdist),2.)));
-	} else { 
-		col=backg2;
-	}
-	vec3 lglow=LIGHT_COLOR*pow(abs(l),30.)*.5;
-    col+=glow*(.3+backg+lglow)*.005;
-	col+=lglow*min(1.,totdist*totdist*.03)*1.2;
-	return col; 
-}
-
-vec3 move(inout mat2 rotview1,inout mat2 rotview2) {
-	vec3 go=path(t);
-	vec3 adv=path(t+.5);
-	vec3 advec=normalize(adv-go);
-	float an=atan(advec.x,advec.z);
-	rotview1=mat2(cos(an),sin(an),-sin(an),cos(an));
-		  an=advec.y*1.5-.2;
-	rotview2=mat2(cos(an),sin(an),-sin(an),cos(an));
-	return go;
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    pth1 = path(t+.3)+origin+vec3(0.,.01,0.);
-	vec2 uv = fragCoord.xy / iResolution.xy*2.-1.;
-    vec2 uv2=uv;
-	uv.y*=iResolution.y/iResolution.x;
-#ifdef MOUSE
-	vec2 mouse=(iMouse.xy/iResolution.xy-.5)*3.;
-	if (iMouse.z<1.) mouse=vec2(0.);
-##else
-	vec2 mouse=(0.0 / iResolution.xy-.5)*3.;
-#endif
-	mat2 rotview1, rotview2;
-	vec3 from=origin+move(rotview1,rotview2);
-	vec3 dir=normalize(vec3(uv*1.5,1.));
-	dir.yz*=rot(mouse.y);
-	dir.xz*=rot(mouse.x-1.);
-	dir.yz*=rotview2;
-	dir.xz*=rotview1;
-	vec3 color=raymarch(from,dir); 
-	color=clamp(color,vec3(.0),vec3(1.));
-	color=pow(abs(color),vec3(GAMMA))*BRIGHTNESS;
-	color=mix(vec3(length(color)),color,SATURATION);
-	color*=1.2-length(pow(abs(uv2),vec2(4.)))*.3;
-	float fadein=clamp(iGlobalTime-.5,0.,1.);
-    fragColor = vec4(color*vec3(.93,.95,.91),1.)*fadein;
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/kali-generators.slang b/procedural/kali-generators.slang
deleted file mode 100644
index bb40858b40..0000000000
--- a/procedural/kali-generators.slang
+++ /dev/null
@@ -1,326 +0,0 @@
-#version 450
-// Generators -  Kali - 2013-10-10
-// https://www.shadertoy.com/view/Xtf3Rn
-
-// Generators!
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// "GENERATORS REDUX" by Kali 
-
-// Same fractal as "Ancient Temple" + rotations, improved shading 
-// (better coloring, AO and  shadows), some lighting effects, and a path for the camera  
-// following a liquid metal ball. 
-
-
-#define ENABLE_HARD_SHADOWS // turn off to enable faster AO soft shadows 
-//#define ENABLE_VIBRATION
-//#define ENABLE_POSTPROCESS // Works better on window view rather than full screen
-
-
-#define RAY_STEPS 70
-#define SHADOW_STEPS 50
-#define LIGHT_COLOR vec3(.85,.9,1.)
-#define AMBIENT_COLOR vec3(.8,.83,1.)
-#define FLOOR_COLOR vec3(1.,.7,.9)
-#define ENERGY_COLOR vec3(1.,.7,.4)
-#define BRIGHTNESS .9
-#define GAMMA 1.3
-#define SATURATION .85
-
-
-#define detail .00005
-#define t iGlobalTime*.25
-
-
-
-vec3 lightdir=normalize(vec3(0.5,-0.3,-1.));
-vec3 ambdir=normalize(vec3(0.,0.,1.));
-const vec3 origin=vec3(0.,3.11,0.);
-vec3 energy=vec3(0.01);
-#ifdef ENABLE_VIBRATION
-float vibration=sin(iGlobalTime*60.)*.0013;
-#else
-float vibration=0.;
-#endif
-float det=0.0;
-vec3 pth1;
-
-
-mat2 rot(float a) {
-	return mat2(cos(a),sin(a),-sin(a),cos(a));	
-}
-
-
-vec3 path(float ti) {
-return vec3(sin(ti),.3-sin(ti*.632)*.3,cos(ti*.5))*.5;
-}
-
-float Sphere(vec3 p, vec3 rd, float r){//A RAY TRACED SPHERE
-	float b = dot( -p, rd );
-	float inner = b * b - dot( p, p ) + r * r;
-	if( inner < 0.0 ) return -1.0;
-	return b - sqrt( inner );
-}
-
-vec2 de(vec3 pos) {
-	float hid=0.;
-	vec3 tpos=pos;
-	tpos.xz=abs(.5-mod(tpos.xz,1.));
-	vec4 p=vec4(tpos,1.);
-	float y=max(0.,.35-abs(pos.y-3.35))/.35;
-	for (int i=0; i<7; i++) {//LOWERED THE ITERS
-		p.xyz = abs(p.xyz)-vec3(-0.02,1.98,-0.02);
-		p=p*(2.0+vibration*y)/clamp(dot(p.xyz,p.xyz),.4,1.)-vec4(0.5,1.,0.4,0.);
-		p.xz*=mat2(-0.416,-0.91,0.91,-0.416);
-	}
-	float fl=pos.y-3.013;
-	float fr=(length(max(abs(p.xyz)-vec3(0.1,5.0,0.1),vec3(0.0)))-0.05)/p.w;//RETURN A RRECT
-	//float fr=length(p.xyz)/p.w;
-	float d=min(fl,fr);
-	d=min(d,-pos.y+3.95);
-	if (abs(d-fl)<.001) hid=1.;
-	return vec2(d,hid);
-}
-
-
-vec3 normal(vec3 p) {
-	vec3 e = vec3(0.0,det,0.0);
-	
-	return normalize(vec3(
-			de(p+e.yxx).x-de(p-e.yxx).x,
-			de(p+e.xyx).x-de(p-e.xyx).x,
-			de(p+e.xxy).x-de(p-e.xxy).x
-			)
-		);	
-}
-
-float shadow(vec3 pos, vec3 sdir) {//THIS ONLY RUNS WHEN WITH HARD SHADOWS
-	float sh=1.0;
-	float totdist =2.0*det;
-	float dist=10.;
-	float t1=Sphere((pos-.005*sdir)-pth1,-sdir,0.015);
-	if (t1>0. && t1<.5) {
-		vec3 sphglowNorm=normalize(pos-t1*sdir-pth1);
-		sh=1.-pow(max(.0,dot(sphglowNorm,sdir))*1.2,3.);
-	} 
-		for (int steps=0; steps<SHADOW_STEPS; steps++) {
-			if (totdist<.6 && dist>detail) {
-				vec3 p = pos - totdist * sdir;
-				dist = de(p).x;
-				sh = min( sh, max(50.*dist/totdist,0.0) );
-				totdist += max(.01,dist);
-			}
-		}
-	
-    return clamp(sh,0.1,1.0);
-}
-
-
-float calcAO( const vec3 pos, const vec3 nor ) {
-	float aodet=detail*40.;
-	float totao = 0.0;
-    float sca = 14.0;
-    for( int aoi=0; aoi<5; aoi++ ) {
-        float hr = aodet*float(aoi*aoi);
-        vec3 aopos =  nor * hr + pos;
-        float dd = de( aopos ).x;
-        totao += -(dd-hr)*sca;
-        sca *= 0.7;
-    }
-    return clamp( 1.0 - 5.0*totao, 0., 1.0 );
-}
-
-float _texture(vec3 p) {
-	p=abs(.5-fract(p*10.));
-	vec3 c=vec3(3.);
-	float es, l=es=0.;
-	for (int i = 0; i < 10; i++) { 
-			p = abs(p + c) - abs(p - c) - p; 
-			p/= clamp(dot(p, p), .0, 1.);
-			p = p* -1.5 + c;
-			if ( mod(float(i), 2.) < 1. ) { 
-				float pl = l;
-				l = length(p);
-				es+= exp(-1. / abs(l - pl));
-			}
-	}
-	return es;
-}
-
-vec3 light(in vec3 p, in vec3 dir, in vec3 n, in float hid) {//PASSING IN THE NORMAL
-	#ifdef ENABLE_HARD_SHADOWS
-		float sh=shadow(p, lightdir);
-	#else
-		float sh=calcAO(p,-2.5*lightdir);//USING AO TO MAKE VERY SOFT SHADOWS
-	#endif
-	float ao=calcAO(p,n);
-	float diff=max(0.,dot(lightdir,-n))*sh;
-	float y=3.35-p.y;
-	vec3 amb=max(.5,dot(dir,-n))*.5*AMBIENT_COLOR;
-	if (hid<.5) {
-		amb+=max(0.2,dot(vec3(0.,1.,0.),-n))*FLOOR_COLOR*pow(max(0.,.2-abs(3.-p.y))/.2,1.5)*2.;
-		amb+=energy*pow(max(0.,.4-abs(y))/.4,2.)*max(0.2,dot(vec3(0.,-sign(y),0.),-n))*2.;
-	}
-	vec3 r = reflect(lightdir,n);
-	float spec=pow(max(0.,dot(dir,-r))*sh,10.);
-	vec3 col;
-	float energysource=pow(max(0.,.04-abs(y))/.04,4.)*2.;
-	if (hid>1.5) {col=vec3(1.); spec=spec*spec;}
-	else{
-		float k=_texture(p)*.23+.2; 
-		k=min(k,1.5-energysource);
-		col=mix(vec3(k,k*k,k*k*k),vec3(k),.3);
-		if (abs(hid-1.)<.001) col*=FLOOR_COLOR*1.3;
-	}
-	col=col*(amb+diff*LIGHT_COLOR)+spec*LIGHT_COLOR;	
-	if (hid<.5) { 
-		col=max(col,energy*2.*energysource);
-	}
-	col*=min(1.,ao+length(energy)*.5*max(0.,.1-abs(y))/.1);
-	return col;
-}
-
-vec3 raymarch(in vec3 from, in vec3 dir) 
-
-{
-	float ey=mod(t*.5,1.);
-	float glow,eglow,ref,sphdist,totdist=glow=eglow=ref=sphdist=0.;
-	vec2 d=vec2(1.,0.);
-	vec3 p, col=vec3(0.);
-	vec3 origdir=dir,origfrom=from,sphNorm;
-	
-	//FAKING THE SQUISHY BALL BY MOVING A RAY TRACED BALL
-	vec3 wob=cos(dir*500.0*length(from-pth1)+(from-pth1)*250.+iGlobalTime*10.)*0.0005;
-	float t1=Sphere(from-pth1+wob,dir,0.015);
-	float tg=Sphere(from-pth1+wob,dir,0.02);
-	if(t1>0.){
-		ref=1.0;from+=t1*dir;sphdist=t1;
-		sphNorm=normalize(from-pth1+wob);
-		dir=reflect(dir,sphNorm);
-	} 
-	else if (tg>0.) { 
-		vec3 sphglowNorm=normalize(from+tg*dir-pth1+wob);
-		glow+=pow(max(0.,dot(sphglowNorm,-dir)),5.);
-	};
-	
-	for (int i=0; i<RAY_STEPS; i++) {
-		if (d.x>det && totdist<3.0) {
-			p=from+totdist*dir;
-			d=de(p);
-			det=detail*(1.+totdist*60.)*(1.+ref*5.);
-			totdist+=d.x; 
-			energy=ENERGY_COLOR*(1.5+sin(iGlobalTime*20.+p.z*10.))*.25;
-			if(d.x<0.015)glow+=max(0.,.015-d.x)*exp(-totdist);
-			if (d.y<.5 && d.x<0.03){//ONLY DOING THE GLOW WHEN IT IS CLOSE ENOUGH
-				float glw=min(abs(3.35-p.y-ey),abs(3.35-p.y+ey));//2 glows at once
-				eglow+=max(0.,.03-d.x)/.03*
-				(pow(max(0.,.05-glw)/.05,5.)
-				+pow(max(0.,.15-abs(3.35-p.y))/.15,8.))*1.5;
-			}
-		}
-	}
-	float l=pow(max(0.,dot(normalize(-dir.xz),normalize(lightdir.xz))),2.);
-	l*=max(0.2,dot(-dir,lightdir));
-	vec3 backg=.5*(1.2-l)+LIGHT_COLOR*l*.7;
-	backg*=AMBIENT_COLOR;
-	if (d.x<=det) {
-		vec3 norm=normal(p-abs(d.x-det)*dir);//DO THE NORMAL CALC OUTSIDE OF LIGHTING (since we already have the sphere normal)
-		col=light(p-abs(d.x-det)*dir, dir, norm, d.y)*exp(-.2*totdist*totdist); 
-		col = mix(col, backg, 1.0-exp(-1.*pow(totdist,1.5)));
-	} else { 
-		col=backg;
-	}
-	vec3 lglow=LIGHT_COLOR*pow(l,30.)*.5;
-	col+=glow*(backg+lglow)*1.3;
-	col+=pow(eglow,2.)*energy*.015;
-	col+=lglow*min(1.,totdist*totdist*.3);
-	if (ref>0.5) {
-		vec3 sphlight=light(origfrom+sphdist*origdir,origdir,sphNorm,2.);
-		col=mix(col*.3+sphlight*.7,backg,1.0-exp(-1.*pow(sphdist,1.5)));
-	}
-	return col; 
-}
-
-vec3 move(inout mat2 rotview1,inout mat2 rotview2) {
-	vec3 go=path(t);
-	vec3 adv=path(t+.7);
-	vec3 advec=normalize(adv-go);
-	float an=atan(advec.x,advec.z);
-	rotview1=mat2(cos(an),sin(an),-sin(an),cos(an));
-		  an=advec.y*1.7;
-	rotview2=mat2(cos(an),sin(an),-sin(an),cos(an));
-	return go;
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	pth1 = path(t+.3)+origin+vec3(0.,.01,0.);
-	vec2 uv = fragCoord.xy / iResolution.xy*2.-1.;
-	vec2 uv2=uv;
-#ifdef ENABLE_POSTPROCESS
-	uv*=1.+pow(length(uv2*uv2*uv2*uv2),4.)*.07;
-#endif
-	uv.y*=iResolution.y/iResolution.x;
-#ifdef MOUSE
-	vec2 mouse=(iMouse.xy/iResolution.xy-.5)*3.;
-	if (iMouse.z<1.) mouse=vec2(0.);
-#else
-   vec2 mouse = vec2(0.0, 0.0);
-#endif
-	mat2 rotview1, rotview2;
-	vec3 from=origin+move(rotview1,rotview2);
-	vec3 dir=normalize(vec3(uv*.8,1.));
-	dir.yz*=rot(mouse.y);
-	dir.xz*=rot(mouse.x);
-	dir.yz*=rotview2;
-	dir.xz*=rotview1;
-	vec3 color=raymarch(from,dir); 
-	color=clamp(color,vec3(.0),vec3(1.));
-	color=pow(color,vec3(GAMMA))*BRIGHTNESS;
-	color=mix(vec3(length(color)),color,SATURATION);
-#ifdef ENABLE_POSTPROCESS
-	vec3 rain=pow(texture(iChannel0,uv2+iGlobalTime*7.25468).rgb,vec3(1.5));
-	color=mix(rain,color,clamp(iGlobalTime*.5-.5,0.,1.));
-	color*=1.-pow(length(uv2*uv2*uv2*uv2)*1.1,6.);
-	uv2.y *= iResolution.y / 360.0;
-	color.r*=(.5+abs(.5-mod(uv2.y     ,.021)/.021)*.5)*1.5;
-	color.g*=(.5+abs(.5-mod(uv2.y+.007,.021)/.021)*.5)*1.5;
-	color.b*=(.5+abs(.5-mod(uv2.y+.014,.021)/.021)*.5)*1.5;
-	color*=.9+rain*.35;
-#endif
-	fragColor = vec4(color,1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/kali-rule34fractal.slang b/procedural/kali-rule34fractal.slang
deleted file mode 100644
index ba564f403f..0000000000
--- a/procedural/kali-rule34fractal.slang
+++ /dev/null
@@ -1,57 +0,0 @@
-#version 450
-// a 'famous' shader by Kali
-// ported by mudlord 2016
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-
-float orgy(vec2 p) {
-    float time = float(global.FrameCount)*0.015;
-    float pl=1., expsmo=0.;
-    float t=sin(time*20.);
-    float a=-.35+t*.02;
-    p*=mat2(cos(a),sin(a),-sin(a),cos(a));
-    p=p*.07+vec2(.718,-.565)+t*.017+vec2(0.,t*.014);
-    for (int i=0; i<13; i++) {
-        p.x=abs(p.x);
-        p=p*2.+vec2(-2.,.85)-t*.04;
-        p/=min(dot(p,p),1.03);  
-        float l=length(p*p);
-        expsmo+=exp(-1.2/abs(l-pl));
-        pl=l;
-    }
-    return expsmo;
-}
-
-
-void main( void )
-{
-    vec2 uv = (vTexCoord.xy*global.OutputSize.xy) /global.OutputSize.xy-.5;
-    uv.y = -uv.y;
-    uv.x*=global.OutputSize.x/global.OutputSize.y;
-    vec2 p=uv; p.x*=1.2; p*=2.1;
-    p.y+=.2; p.x += .1;
-    float o=clamp(orgy(p)*.07,.13,1.); o=pow(o,1.8);
-    vec3 col=vec3(o*.8,o*o*.87,o*o*o*.9);
-    float hole=length(uv+vec2(.09,0.252))-.45;
-    FragColor = vec4(col*2.1+.1, 1.0 );
-}
diff --git a/procedural/knarkowicz-bokeh-parallax.slang b/procedural/knarkowicz-bokeh-parallax.slang
deleted file mode 100644
index 1f7e76bf81..0000000000
--- a/procedural/knarkowicz-bokeh-parallax.slang
+++ /dev/null
@@ -1,108 +0,0 @@
-#version 450
-// Bokeh Parallax -  knarkowicz - 2017-04-12
-// https://www.shadertoy.com/view/4s2yW1
-
-// Feeling artsy
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-const float MATH_PI	= float( 3.14159265359 );
-
-void Rotate( inout vec2 p, float a ) 
-{
-	p = cos( a ) * p + sin( a ) * vec2( p.y, -p.x );
-}
-
-float Circle( vec2 p, float r )
-{
-    return ( length( p / r ) - 1.0 ) * r;
-}
-
-float Rand( vec2 c )
-{
-	return fract( sin( dot( c.xy, vec2( 12.9898, 78.233 ) ) ) * 43758.5453 );
-}
-
-float saturate( float x )
-{
-	return clamp( x, 0.0, 1.0 );
-}
-
-void BokehLayer( inout vec3 color, vec2 p, vec3 c )   
-{
-    float wrap = 450.0;    
-    if ( mod( floor( p.y / wrap + 0.5 ), 2.0 ) == 0.0 )
-    {
-        p.x += wrap * 0.5;
-    }    
-    
-    vec2 p2 = mod( p + 0.5 * wrap, wrap ) - 0.5 * wrap;
-    vec2 cell = floor( p / wrap + 0.5 );
-    float cellR = Rand( cell );
-        
-    c *= fract( cellR * 3.33 + 3.33 );    
-    float radius = mix( 30.0, 70.0, fract( cellR * 7.77 + 7.77 ) );
-    p2.x *= mix( 0.9, 1.1, fract( cellR * 11.13 + 11.13 ) );
-    p2.y *= mix( 0.9, 1.1, fract( cellR * 17.17 + 17.17 ) );
-    
-    float sdf = Circle( p2, radius );
-    float circle = 1.0 - smoothstep( 0.0, 1.0, sdf * 0.04 );
-    float glow	 = exp( -sdf * 0.025 ) * 0.3 * ( 1.0 - circle );
-    color += c * ( circle + glow );
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{    
-	vec2 uv = fragCoord.xy / iResolution.xy;
-	vec2 p = ( 2.0 * fragCoord - iResolution.xy ) / iResolution.x * 1000.0;
-    
-    // background
-	vec3 color = mix( vec3( 0.3, 0.1, 0.3 ), vec3( 0.1, 0.4, 0.5 ), dot( uv, vec2( 0.2, 0.7 ) ) );
-
-    float time = iGlobalTime - 15.0;
-    
-    Rotate( p, 0.2 + time * 0.03 );
-    BokehLayer( color, p + vec2( -50.0 * time +  0.0, 0.0  ), 3.0 * vec3( 0.4, 0.1, 0.2 ) );
-	Rotate( p, 0.3 - time * 0.05 );
-    BokehLayer( color, p + vec2( -70.0 * time + 33.0, -33.0 ), 3.5 * vec3( 0.6, 0.4, 0.2 ) );
-	Rotate( p, 0.5 + time * 0.07 );
-    BokehLayer( color, p + vec2( -60.0 * time + 55.0, 55.0 ), 3.0 * vec3( 0.4, 0.3, 0.2 ) );
-    Rotate( p, 0.9 - time * 0.03 );
-    BokehLayer( color, p + vec2( -25.0 * time + 77.0, 77.0 ), 3.0 * vec3( 0.4, 0.2, 0.1 ) );    
-    Rotate( p, 0.0 + time * 0.05 );
-    BokehLayer( color, p + vec2( -15.0 * time + 99.0, 99.0 ), 3.0 * vec3( 0.2, 0.0, 0.4 ) );     
-
-	fragColor = vec4( color, 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/leon-mam-stairs.slang b/procedural/leon-mam-stairs.slang
deleted file mode 100644
index c5772e5be5..0000000000
--- a/procedural/leon-mam-stairs.slang
+++ /dev/null
@@ -1,243 +0,0 @@
-#version 450
-// M.A.M. Stairs -  leon - 2017-11-24
-// https://www.shadertoy.com/view/MIIBR7
-
-// Another raymarching sketch inspired by Marc-Antoine Mathieu.
-
-// M.A.M. Stairs by Leon Denise aka ponk
-// another raymarching sketch inspired by Marc-Antoine Mathieu.
-// using code from IQ, Mercury, LJ, Duke, Koltes
-// made with Atom Editor GLSL viewer (that's why there is 2 space tabulations)
-// 2017-11-24
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define STEPS 50.
-#define VOLUME 0.01
-#define PI 3.14159
-#define TAU (2.*PI)
-#define time iGlobalTime
-#define repeat(v,c) (mod(v,c)-c/2.)
-#define sDist(v,r) (length(v)-r)
-
-mat2 rot (float a) { float c=cos(a),s=sin(a); return mat2(c,-s,s,c); }
-float rng (vec2 seed) { return fract(sin(dot(seed*.1684,vec2(32.649,321.547)))*43415.); }
-float sdBox( vec3 p, vec3 b ) { vec3 d = abs(p) - b; return min(max(d.x,max(d.y,d.z)),0.0) + length(max(d,0.0)); }
-float amod (inout vec2 p, float count) { float an = TAU/count; float a = atan(p.y,p.x)+an/2.; float c = floor(a/an); c = mix(c,abs(c),step(count*.5,abs(c))); a = mod(a,an)-an/2.; p.xy = vec2(cos(a),sin(a))*length(p); return c; }
-float aindex (vec2 p, float count) { float an = TAU/count; float a = atan(p.y,p.x)+an/2.; float c = floor(a/an); return mix(c,abs(c),step(count*.5,abs(c))); }
-float map (vec3);
-vec3 getNormal (vec3 p) { vec2 e = vec2(.001,0); return normalize(vec3(map(p+e.xyy)-map(p-e.xyy),map(p+e.yxy)-map(p-e.yxy),map(p+e.yyx)-map(p-e.yyx))); }
-float hardShadow (vec3 pos, vec3 light) {
-    vec3 dir = normalize(light - pos);
-    float maxt = length(light - pos);
-    float t = .02;
-    for (float i = 0.; i <= 1.; i += 1./30.) {
-        float dist = map(pos + dir * t);
-        if (dist < VOLUME) return 0.;
-        t += dist;
-        if (t >= maxt) break;
-    }
-    return 1.;
-}
-
-float map (vec3 pos) {
-  float scene = 1000.;
-  float wallThin = .2;
-  float wallRadius = 8.;
-  float wallOffset = .2;
-  float wallCount = 10.;
-  float floorThin = .1;
-  float stairRadius = 5.;
-  float stairHeight = .4;
-  float stairCount = 40.;
-  float stairDepth = .31;
-  float bookCount = 100.;
-  float bookRadius = 9.5;
-  float bookSpace = 1.75;
-  vec3 bookSize = vec3(1.,.2,.2);
-  vec3 panelSize = vec3(.03,.2,.7);
-  vec2 cell = vec2(1.4,3.);
-  float paperRadius = 4.;
-  vec3 paperSize = vec3(.3,.01,.4);
-  vec3 p;
-
-  // move it
-  pos.y += time;
-
-  // twist it
-  // pos.xz *= rot(pos.y*.05+time*.1);
-  // pos.xz += normalize(pos.xz) * sin(pos.y*.5+time);
-
-  // holes
-  float holeWall = sDist(pos.xz, wallRadius);
-  float holeStair = sDist(pos.xz, stairRadius);
-
-  // walls
-  p = pos;
-  amod(p.xz, wallCount);
-  p.x -= wallRadius;
-  scene = min(scene, max(-p.x, abs(p.z)-wallThin));
-  scene = max(scene, -sDist(pos.xz, wallRadius-wallOffset));
-
-  // floors
-  p = pos;
-  p.y = repeat(p.y, cell.y);
-  float disk = max(sDist(p.xz, 1000.), abs(p.y)-floorThin);
-  disk = max(disk, -sDist(pos.xz, wallRadius));
-  scene = min(scene, disk);
-
-  // stairs
-  p = pos;
-  float stairIndex = amod(p.xz, stairCount);
-  p.y -= stairIndex*stairHeight;
-  p.y = repeat(p.y, stairCount*stairHeight);
-  float stair = sdBox(p, vec3(100,stairHeight,stairDepth));
-  scene = min(scene, max(stair, max(holeWall, -holeStair)));
-  p = pos;
-  p.xz *= rot(PI/stairCount);
-  stairIndex = amod(p.xz, stairCount);
-  p.y -= stairIndex*stairHeight;
-  p.y = repeat(p.y, stairCount*stairHeight);
-  stair = sdBox(p, vec3(100,stairHeight,stairDepth));
-  scene = min(scene, max(stair, max(holeWall, -holeStair)));
-  p = pos;
-  p.y += stairHeight*.5;
-  p.y -= stairHeight*stairCount*atan(p.z,p.x)/TAU;
-  p.y = repeat(p.y, stairCount*stairHeight);
-  scene = min(scene, max(max(sDist(p.xz, wallRadius), abs(p.y)-stairHeight), -holeStair));
-
-  // books
-  p = pos;
-  p.y -= cell.y*.5;
-  vec2 seed = vec2(floor(p.y/cell.y), 0);
-  p.y = repeat(p.y, cell.y);
-  p.xz *= rot(PI/wallCount);
-  seed.y += amod(p.xz, wallCount)/10.;
-  seed.y += floor(p.z/(bookSize.z*bookSpace));
-  p.z = repeat(p.z, bookSize.z*bookSpace);
-  float salt = rng(seed);
-  bookSize.x *= .5+.5*salt;
-  bookSize.y += salt;
-  bookSize.z *= .5+.5*salt;
-  p.x -= bookRadius + wallOffset;
-  p.x += cos(p.z*2.) - bookSize.x - salt * .25;
-  p.x += .01*smoothstep(.99,1.,sin(p.y*(1.+10.*salt)));
-  scene = min(scene, max(sdBox(p, vec3(bookSize.x,100.,bookSize.z)), p.y-bookSize.y));
-
-  // panel
-  p = pos;
-  p.y = repeat(p.y, cell.y);
-  p.xz *= rot(PI/wallCount);
-  amod(p.xz, wallCount);
-  p.x -= wallRadius;
-  float panel = sdBox(p, panelSize);
-  float pz = p.z;
-  p.z = repeat(p.z, .2+.3*salt);
-  panel = min(panel, max(sdBox(p, vec3(.1,.1,.04)), abs(pz)-panelSize.z*.8));
-  scene = min(scene, panel);
-
-  // papers
-  p = pos;
-  p.y -= stairHeight;
-  p.y += time*2.;
-  p.xz *= rot(PI/stairCount);
-  float ry = 8.;
-  float iy = floor(p.y/ry);
-  salt = rng(vec2(iy));
-  float a = iy;
-  p.xz -= vec2(cos(a),sin(a))*paperRadius;
-  p.y = repeat(p.y, ry);
-  p.xy *= rot(p.z);
-  p.xz *= rot(PI/4.+salt+time);
-  scene = min(scene, sdBox(p, paperSize));
-
-  return scene;
-}
-
-vec3 getCamera (vec3 eye, vec2 uv) {
-  vec3 lookAt = vec3(0.);
-#ifdef MOUSE
-  float click = clamp(iMouse.w,0.,1.);
-  lookAt.x += mix(0.,((iMouse.x/iResolution.x)*2.-1.) * 10., click);
-  lookAt.y += mix(0.,iMouse.y/iResolution.y * 10., click);
-#else
-  float click = clamp(0.,0.,1.);
-  lookAt.x += mix(0.,((0./iResolution.x)*2.-1.) * 10., click);
-  lookAt.y += mix(0.,0./iResolution.y * 10., click);
-#endif
-  float fov = .65;
-  vec3 forward = normalize(lookAt - eye);
-  vec3 right = normalize(cross(vec3(0,1,0), forward));
-  vec3 up = normalize(cross(forward, right));
-  return normalize(fov * forward + uv.x * right + uv.y * up);
-}
-
-float getLight (vec3 pos, vec3 eye) {
-  vec3 light = vec3(-.5,7.,1.);
-  vec3 normal = getNormal(pos);
-  vec3 view = normalize(eye-pos);
-  float shade = dot(normal, view);
-  shade *= hardShadow(pos, light);
-  return shade;
-}
-
-vec4 raymarch () {
-  vec2 uv = (gl_FragCoord.xy-.5*iResolution.xy)/iResolution.y;
-  float dither = rng(uv+fract(time));
-  vec3 eye = vec3(0,5,-4.5);
-  vec3 ray = getCamera(eye, uv);
-  vec3 pos = eye;
-  float shade = 0.;
-  for (float i = 0.; i <= 1.; i += 1./STEPS) {
-    float dist = map(pos);
-		if (dist < VOLUME) {
-			shade = 1.-i;
-			break;
-		}
-    dist *= .5 + .1 * dither;
-    pos += ray * dist;
-  }
-
-  vec4 color = vec4(shade);
-  color *= getLight(pos, eye);
-  color = smoothstep(.0, .5, color);
-  color = sqrt(color);
-  return color;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	fragColor = raymarch();
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/leon-smoke-rings.slang b/procedural/leon-smoke-rings.slang
deleted file mode 100644
index 8f8840c38e..0000000000
--- a/procedural/leon-smoke-rings.slang
+++ /dev/null
@@ -1,120 +0,0 @@
-#version 450
-// Smoke Rings -  leon - 2017-05-09
-// https://www.shadertoy.com/view/4sSyDd
-
-// Experimenting shapes
-
-// training for modeling shapes
-// using koltes code as base https://www.shadertoy.com/view/XdByD3
-// using iq articles
-// using mercury library
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define PI 3.1415926535897932384626433832795
-#define TAU 6.283185307179586476925286766559
-#define t iGlobalTime
-
-mat2 rz2 (float a) { float c=cos(a), s=sin(a); return mat2(c,s,-s,c); }
-float sphere (vec3 p, float r) { return length(p)-r; }
-float iso (vec3 p, float r) { return dot(p, normalize(sign(p)))-r; }
-float cyl (vec2 p, float r) { return length(p)-r; }
-float cube (vec3 p, vec3 r) { return length(max(abs(p)-r,0.)); }
-vec2 modA (vec2 p, float count) {
-    float an = TAU/count;
-    float a = atan(p.y,p.x)+an*.5;
-    a = mod(a, an)-an*.5;
-    return vec2(cos(a),sin(a))*length(p);
-}
-float smin (float a, float b, float r)
-{
-    float h = clamp(.5+.5*(b-a)/r,0.,1.);
-    return mix(b, a, h) - r*h*(1.-h);
-}
-
-float map (vec3 p)
-{
-    float sph3 = sphere(p, 3.);
-    p.yz *= rz2(t*.2);
-    p.xy *= rz2(t*.3);
-    
-    float d = length(p);
-    
-    float a = atan(p.y,p.x);
-    float l = length(p.xy)-2.;
-    p.xy = vec2(l,a);
-    
-    float as = PI*0.3;
-    p.z += sin(a*2.+sin(l*4.))*.5;
-    
-    float wave1 = sin(p.y*6.)*.5+.5;
-    float wave2 = .5+.5*sin(p.z*3.+t);
-    
-    p.x -= sin(p.z*1.+t)*.5;
-    p.z = mod(p.z+t,as)-as*.5;
-    
-    float sphR = .2-.1*wave1;
-    float sphC = .3;
-    float sphN = 0.2;
-    float sph1 = sphere(vec3(p.x,mod(sphN*p.y/TAU+t*.1,sphC)-sphC*.5,p.z), sphR);
-    
-    p.xz *= rz2(p.y*3.);
-    p.xz = modA(p.xz, 3.);
-    p.x -= 0.3*wave2;
-    float cyl1 = cyl(p.xz, 0.02);
-    float sph2 = sphere(vec3(p.x,mod(p.y*2.-t,1.)-.5,p.z), .1);
-    
-    return smin(sph1, smin(cyl1,sph2,.2), .2);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    vec2 uv = (fragCoord.xy-.5*iResolution.xy)/iResolution.y;
-    vec3 ro = vec3(uv,-5), rp = vec3(uv,1), mp = ro;
-    int i = 0;
-    const int count = 50;
-    for(;i<count;++i) {
-		float md = map(mp);
-        if (md < 0.001) {
-            break;
-        }
-        mp += rp*md*.35;
-    }
-    float r = float(i)/float(count);
-    fragColor = vec4(1);
-    fragColor *= smoothstep(.0,10.,length(mp-ro));
-  	fragColor *= r;
-    fragColor = 1. - fragColor;
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/leon-spell-demons-souls.slang b/procedural/leon-spell-demons-souls.slang
deleted file mode 100644
index 7e4549c4e0..0000000000
--- a/procedural/leon-spell-demons-souls.slang
+++ /dev/null
@@ -1,195 +0,0 @@
-#version 450
-// Spell Demon's Souls -  leon - 2017-10-21
-// https://www.shadertoy.com/view/XljcD1
-
-// A sketch inspired by Dark Souls. Sometime you can see the twisted souls emerging from the distorted shapes. I could tweak this for days and nights...
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-
-#define STEPS 1./50.
-#define VOLUME_BIAS 0.01
-#define MIN_DIST 0.005
-#define STEP_DAMPING .9
-#define PI 3.14159
-#define TAU PI*2.
-
-// raymarch toolbox
-float rng (vec2 seed) { return fract(sin(dot(seed*.1684,vec2(54.649,321.547)))*450315.); }
-mat2 rot (float a) { float c=cos(a),s=sin(a); return mat2(c,-s,s,c); }
-float sdSphere (vec3 p, float r) { return length(p)-r; }
-float sdCylinder (vec2 p, float r) { return length(p)-r; }
-float sdIso(vec3 p, float r) { return max(0.,dot(p,normalize(sign(p))))-r; }
-float sdBox( vec3 p, vec3 b ) {
-  vec3 d = abs(p) - b;
-  return min(max(d.x,max(d.y,d.z)),0.0) + length(max(d,0.0));
-}
-float amod (inout vec2 p, float count) {
-    float an = TAU/count;
-    float a = atan(p.y,p.x)+an/2.;
-    float c = floor(a/an);
-    a = mod(a,an)-an/2.;
-    p.xy = vec2(cos(a),sin(a))*length(p);
-    return c;
-}
-
-float repeat (float v, float c) { return mod(v,c)-c/2.; }
-float smin (float a, float b, float r) {
-    float h = clamp(.5+.5*(b-a)/r, 0., 1.);
-    return mix(b,a,h)-r*h*(1.-h);
-}
-
-// geometry for spell
-float tubes (vec3 pos) {
-    
-    // cylinder made of 8 tube
-    float cylinderRadius = .02; // change shape
-    vec3 p = pos;
-    p.xz *= rot(p.y*.5); // twist amount
-    float c = amod(p.xz, 8.); // amount of tubes
-    p.x -= 2.; // tube cylinder radius
-    float tube = sdCylinder(p.xz, cylinderRadius);
-    
-    // another cylinder made of tubes 16
-    p = pos;
-    p.xz *= rot(-p.y*.5); // twist amount
-    c = amod(p.xz, 16.); // amount of tubes
-    p.x -= 2.; // tube cylinder radius
-    tube = smin(tube, sdCylinder(p.xz, cylinderRadius), .15);
-    return tube;
-}
-
-// geometry for spell
-float disks (vec3 pos) {
-    float radius = 1.5;
-    float radiusInner = .57;
-    float thin = .01;
-    float repeatY = 2.;
-    float cellY = floor(pos.y/repeatY);
-    float a = atan(pos.z,pos.x)-iGlobalTime*.3+cellY*.1;
-    vec3 p = pos;
-    p.y += sin(a*6.)*.1;
-    p.y = repeat(p.y, repeatY);
-    float disk = max(-sdCylinder(p.xz, radiusInner), sdCylinder(p.xz, radius));
-    disk = max(abs(p.y)-thin,disk);
-    return disk;
-}
-
-vec3 anim1 (vec3 p) {
-    float t = iGlobalTime*.5;
-    p.xz *= rot(t);
-    p.xy *= rot(t*.7);
-    p.yz *= rot(t*.5);
-    return p;
-}
-
-vec3 anim2 (vec3 p) {
-    float t = -iGlobalTime*.4;
-    p.xz *= rot(t*.9);
-    p.xy *= rot(t*.6);
-    p.yz *= rot(t*.3);
-    return p;
-}
-
-float map (vec3 pos) {
-    float scene = 1000.;
-    
-    // ground and ceiling
-#ifdef BUMP
-    float bump = texture(iChannel0, pos.xz*.1).r;
-#else
-    float bump = 0.0;
-#endif
-    float ground = 2. - bump*.1;
-    scene = min(scene, pos.y+ground);
-    scene = min(scene, -(pos.y-ground));
-    
-    // spell geometry 1
-    vec3 p = pos;
-    p.y += sin(atan(p.z,p.x)*10.)*3.; // change numbers to get new distortion
-    p.xz *= rot(p.y*.2-iGlobalTime);
-    p = anim1(p);
-    p.x = length(p.xyz)-3.;
-    scene = smin(scene, tubes(p), .5);
-    scene = smin(scene, disks(p), .5);
-    
-    // spell geometry 2
-    p = pos;
-    p.y += sin(atan(p.z,p.x)*3.)*2.; // change numbers to get new distortion
-    p = anim2(p);
-    p.xz *= rot(p.y+iGlobalTime);
-    p.x = length(p.xyz)-3.;
-    scene = smin(scene, tubes(p), .3);
-    scene = smin(scene, disks(p), .3);
-    
-    return scene;
-}
-
-void camera (inout vec3 p) {
-#ifdef MOUSE
-    p.xz *= rot((-PI*(iMouse.x/iResolution.x-.5)));
-#else
-    p.xz *= rot((-PI*(0.0/iResolution.x-.5)));
-#endif
-}
-
-void mainImage( out vec4 color, in vec2 uv )
-{
-	uv = (uv.xy-.5*iResolution.xy)/iResolution.y;
-#ifdef MOUSE
-    vec2 mouse = iMouse.xy/iResolution.xy;
-#else
-    vec2 mouse = 0.0/iResolution.xy;
-#endif
-    vec3 eye = vec3(0.,0.,-7.+mouse.y*3.);
-    vec3 ray = normalize(vec3(uv,.7));
-    camera(eye);
-    camera(ray);
-    vec3 pos = eye;
-    float shade = 0.;
-    for (float i = 0.; i <= 1.; i += STEPS) {
-        float dist = map(pos);
-        if (dist < VOLUME_BIAS) {
-            shade += STEPS;
-        }
-        if (shade >= 1.) break;
-        dist *= STEP_DAMPING + .1 * rng(uv+fract(iGlobalTime));
-        dist = max(MIN_DIST, dist);
-        pos += dist * ray;
-    }
-	color = vec4(1);
-    color.rgb *= shade;
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/leon-tribute-to-marc-antoine-mathieu.slang b/procedural/leon-tribute-to-marc-antoine-mathieu.slang
deleted file mode 100644
index 2ea41503dc..0000000000
--- a/procedural/leon-tribute-to-marc-antoine-mathieu.slang
+++ /dev/null
@@ -1,239 +0,0 @@
-#version 450
-// Tribute to Marc-Antoine Mathieu -  leon - 2017-11-21
-// https://www.shadertoy.com/view/XlfBR7
-
-// Raymarching skectch inspired by the work of Marc-Antoine Mathieu
-
-// Raymarching sketch inspired by the work of Marc-Antoine Mathieu
-// Leon 2017-11-21
-// using code from IQ, Mercury, LJ, Duke, Koltes
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// tweak it
-#define donut 30.
-#define cell 4.
-#define height 2.
-#define thin .04
-#define radius 15.
-#define speed 1.
-
-#define STEPS 100.
-#define VOLUME 0.001
-#define PI 3.14159
-#define TAU (2.*PI)
-#define time iGlobalTime
-
-// raymarching toolbox
-float rng (vec2 seed) { return fract(sin(dot(seed*.1684,vec2(54.649,321.547)))*450315.); }
-mat2 rot (float a) { float c=cos(a),s=sin(a); return mat2(c,-s,s,c); }
-float sdSphere (vec3 p, float r) { return length(p)-r; }
-float sdCylinder (vec2 p, float r) { return length(p)-r; }
-float sdDisk (vec3 p, vec3 s) { return max(max(length(p.xz)-s.x, s.y), abs(p.y)-s.z); }
-float sdIso(vec3 p, float r) { return max(0.,dot(p,normalize(sign(p))))-r; }
-float sdBox( vec3 p, vec3 b ) { vec3 d = abs(p) - b; return min(max(d.x,max(d.y,d.z)),0.0) + length(max(d,0.0)); }
-float sdTorus( vec3 p, vec2 t ) { vec2 q = vec2(length(p.xz)-t.x,p.y); return length(q)-t.y; }
-float amod (inout vec2 p, float count) { float an = TAU/count; float a = atan(p.y,p.x)+an/2.; float c = floor(a/an); c = mix(c,abs(c),step(count*.5,abs(c))); a = mod(a,an)-an/2.; p.xy = vec2(cos(a),sin(a))*length(p); return c; }
-float amodIndex (vec2 p, float count) { float an = TAU/count; float a = atan(p.y,p.x)+an/2.; float c = floor(a/an); c = mix(c,abs(c),step(count*.5,abs(c))); return c; }
-float repeat (float v, float c) { return mod(v,c)-c/2.; }
-vec2 repeat (vec2 v, vec2 c) { return mod(v,c)-c/2.; }
-vec3 repeat (vec3 v, float c) { return mod(v,c)-c/2.; }
-float smoo (float a, float b, float r) { return clamp(.5+.5*(b-a)/r, 0., 1.); }
-float smin (float a, float b, float r) { float h = smoo(a,b,r); return mix(b,a,h)-r*h*(1.-h); }
-float smax (float a, float b, float r) { float h = smoo(a,b,r); return mix(a,b,h)+r*h*(1.-h); }
-vec2 displaceLoop (vec2 p, float r) { return vec2(length(p.xy)-r, atan(p.y,p.x)); }
-float map (vec3);
-float getShadow (vec3 pos, vec3 at, float k) {
-    vec3 dir = normalize(at - pos);
-    float maxt = length(at - pos);
-    float f = 01.;
-    float t = VOLUME*50.;
-    for (float i = 0.; i <= 1.; i += 1./15.) {
-        float dist = map(pos + dir * t);
-        if (dist < VOLUME) return 0.;
-        f = min(f, k * dist / t);
-        t += dist;
-        if (t >= maxt) break;
-    }
-    return f;
-}
-vec3 getNormal (vec3 p) { vec2 e = vec2(.01,0); return normalize(vec3(map(p+e.xyy)-map(p-e.xyy),map(p+e.yxy)-map(p-e.yxy),map(p+e.yyx)-map(p-e.yyx))); }
-
-void camera (inout vec3 p) {
-    p.xz *= rot(PI/8.);
-    p.yz *= rot(PI/6.);
-}
-
-float windowCross (vec3 pos, vec4 size, float salt) {
-    vec3 p = pos;
-    float sx = size.x * (.6+salt*.4);
-    float sy = size.y * (.3+salt*.7);
-    vec2 sxy = vec2(sx,sy);
-    p.xy = repeat(p.xy+sxy/2., sxy);
-    float scene = sdBox(p, size.zyw*2.);
-    scene = min(scene, sdBox(p, size.xzw*2.));
-    scene = max(scene, sdBox(pos, size.xyw));
-    return scene;
-}
-
-float window (vec3 pos, vec2 dimension, float salt) {
-    float thinn = .008;
-    float depth = .04;
-    float depthCadre = .06;
-    float padding = .08;
-    float scene = windowCross(pos, vec4(dimension,thinn,depth), salt);
-    float cadre = sdBox(pos, vec3(dimension, depthCadre));
-    cadre = max(cadre, -sdBox(pos, vec3(dimension - padding, depthCadre*2.)));
-    scene = min(scene, cadre);
-    return scene;
-}
-
-float boxes (vec3 pos, float salt) {
-    vec3 p = pos;
-    float ry = cell * .43*(.3+salt);
-    float rz = cell * .2*(.5+salt);
-    float salty = rng(vec2(floor(pos.y/ry), floor(pos.z/rz)));
-    pos.y = repeat(pos.y, ry);
-    pos.z = repeat(pos.z, rz);
-    float scene = sdBox(pos, vec3(.1+.8*salt+salty,.1+.2*salt,.1+.2*salty));
-    scene = max(scene, sdBox(p, vec3(cell*.2)));
-    return scene;
-}
-
-float map (vec3 pos) {
-    vec3 camOffset = vec3(-4,0,0.);
-
-    float scene = 1000.;
-    vec3 p = pos + camOffset;
-    float segments = PI*radius;
-    float indexX, indexY, salt;
-    vec2 seed;
-
-    // donut distortion
-    vec3 pDonut = p;
-    pDonut.x += donut;
-    pDonut.y += radius;
-    pDonut.xz = displaceLoop(pDonut.xz, donut);
-    pDonut.z *= donut;
-    pDonut.xzy = pDonut.xyz;
-    pDonut.xz *= rot(time*.05*speed);
-
-    // ground
-    p = pDonut;
-    scene = min(scene, sdCylinder(p.xz, radius-height));
-
-    // walls
-    p = pDonut;
-    float py = p.y + time * speed;
-    indexY = floor(py / (cell+thin));
-    p.y = repeat(py, cell+thin);
-    scene = min(scene, max(abs(p.y)-thin, sdCylinder(p.xz, radius)));
-    amod(p.xz, segments);
-    p.x -= radius;
-    scene = min(scene, max(abs(p.z)-thin, p.x));
-
-    // horizontal windot
-    p = pDonut;
-    p.xz *= rot(PI/segments);
-    py = p.y + time * speed;
-    indexY = floor(py / (cell+thin));
-    p.y = repeat(py, cell+thin);
-    indexX = amodIndex(p.xz, segments);
-    amod(p.xz, segments);
-    seed = vec2(indexX, indexY);
-    salt = rng(seed);
-    p.x -= radius;
-    vec2 dimension = vec2(.75,.5);
-    p.x +=  dimension.x * 1.5;
-    scene = max(scene, -sdBox(p, vec3(dimension.x, .1, dimension.y)));
-    scene = min(scene, window(p.xzy, dimension, salt));
-
-    // vertical window
-    p = pDonut;
-    py = p.y + cell/2. + time * speed;
-    indexY = floor(py / (cell+thin));
-    p.y = repeat(py, cell+thin);
-    indexX = amodIndex(p.xz, segments);
-    amod(p.xz, segments);
-    seed = vec2(indexX, indexY);
-    salt = rng(seed);
-    p.x -= radius;
-    dimension.y = 1.5;
-    p.x +=  dimension.x * 1.25;
-    scene = max(scene, -sdBox(p, vec3(dimension, .1)));
-    scene = min(scene, window(p, dimension, salt));
-
-    // elements
-    p = pDonut;
-    p.xz *= rot(PI/segments);
-    py = p.y + cell/2. + time * speed;
-    indexY = floor(py / (cell+thin));
-    p.y = repeat(py, cell+thin);
-    indexX = amodIndex(p.xz, segments);
-    amod(p.xz, segments);
-    seed = vec2(indexX, indexY);
-    salt = rng(seed);
-    p.x -= radius - height;
-    scene = min(scene, boxes(p, salt));
-
-    return scene;
-}
-
-void mainImage( out vec4 color, in vec2 coord ) {
-    vec2 uv = (coord.xy-.5*iResolution.xy)/iResolution.y;
-    vec3 eye = vec3(0,0,-20);
-    vec3 ray = normalize(vec3(uv, 1.3));
-    camera(eye);
-    camera(ray);
-    float dither = rng(uv+fract(time));
-    vec3 pos = eye;
-    float shade = 0.;
-    for (float i = 0.; i <= 1.; i += 1./STEPS) {
-        float dist = map(pos);
-        if (dist < VOLUME) {
-            shade = 1.-i;
-            break;
-        }
-        dist *= .5 + .1 * dither;
-        pos += ray * dist;
-    }
-    vec3 light = vec3(40.,100.,-10.);
-    float shadow = getShadow(pos, light, 4.);
-    color = vec4(1);
-    color *= shade;
-    color *= shadow;
-    color = smoothstep(.0, .5, color);
-    color.rgb = sqrt(color.rgb);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/mattz-gabor-to-the-power-of-2.slang b/procedural/mattz-gabor-to-the-power-of-2.slang
deleted file mode 100644
index fbf8e39c3f..0000000000
--- a/procedural/mattz-gabor-to-the-power-of-2.slang
+++ /dev/null
@@ -1,243 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/* Gabor^2, by mattz.
-   License: Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-   Goal: render the face of Zsa Zsa Gabor using the basis function proposed by Dennis Gabor.
-
-   Original image: http://www.instyle.com/celebrity/gallery-vintage-photos-zsa-zsa-gabor
-   Gabor filter: https://en.wikipedia.org/wiki/Gabor_filter
-   More about Dennis: https://en.wikipedia.org/wiki/Dennis_Gabor
-   More about Zsa Zsa: https://en.wikipedia.org/wiki/Zsa_Zsa_Gabor
-
-   Fitting these 128 basis functions took several days (!) on my Macbook Pro (CPU only, no GPU).
-
-   See https://mzucker.github.io/2016/08/01/gabor-2.html for more details.
-
-   There was probably a faster way of doing it.
-
-*/
-
-const vec4 scl = vec4(0.00391389432485, 0.0122958616579, 0.00782778864971, 0.00391389432485);
-
-float cnt = 0.0;
-
-float gabor(vec2 p, vec4 q) {
-    
-    // Here we decode the vec4 q into 8 individual parameters:
-    //
-    //   q0 = (x, a, l, s)
-    //   q1 = (y, p, t, h)
-    //
-    // with parameters given by
-    //
-    //   x: function center x coordinate
-    //   y: function center y coordinate
-    //   a: Gabor function spatial angle/orientation
-    //   p: Gabor function phase offset
-    //   l: Spatial wavelength
-    //   s: Filter width perpendicular to sinusoidal component 
-    //   t: Filter width parallel to sinusoidal component
-    //   h: Amplitude
-    //
-    vec4 q0 = floor(q*0.001953125)*scl;
-    vec4 q1 = mod(q, 512.0)*scl;     
-            
-    float cr = cos(q0.y);
-    float sr = sin(q0.y);
-        
-    vec2 st = vec2(q0.w, q1.z);
-
-    // Rotate and translate point
-    p = mat2(cr, -sr, sr, cr) * (p - vec2(q0.x, q1.x));    
-        	
-    // Handle appearing at the start of filter
-    q1.w *= smoothstep(cnt, cnt+0.5, iGlobalTime*32.0);
-    ++cnt;
-
-    // amplitude * gaussian * sinusoid
-    return q1.w * exp(dot(vec2(-0.5), p*p/(st*st))) * cos(p.x*6.2831853/q0.z+q1.y);
-    
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
-        
-	vec2 p = (fragCoord.xy - 0.5*iResolution.xy) * 1.2 / iResolution.y;
-    p.y = -p.y;
-    p += 1.0;
-    
-    float k = 0.0;
-
-    k += gabor(p, vec4(138752.,150667.,261821.,93447.));
-    k += gabor(p, vec4(226145.,131739.,77399.,33587.));
-    k += gabor(p, vec4(63748.,240999.,76311.,23447.));
-    k += gabor(p, vec4(150173.,43128.,50197.,22225.));
-    k += gabor(p, vec4(116939.,73605.,57898.,7679.));
-    k += gabor(p, vec4(51.,227699.,261732.,68280.));
-    k += gabor(p, vec4(50687.,129029.,38508.,17512.));
-    k += gabor(p, vec4(117913.,117281.,32319.,32324.));
-    k += gabor(p, vec4(96910.,174542.,26669.,26719.));
-    k += gabor(p, vec4(117600.,70656.,17940.,16010.));
-    k += gabor(p, vec4(108871.,58049.,51302.,47654.));
-    k += gabor(p, vec4(167609.,91829.,28204.,28213.));
-    k += gabor(p, vec4(90467.,245116.,36375.,7167.));
-    k += gabor(p, vec4(82369.,164365.,30329.,30267.));
-    k += gabor(p, vec4(225089.,129997.,6684.,4095.));
-    k += gabor(p, vec4(205005.,127709.,12815.,12982.));
-    k += gabor(p, vec4(175993.,130600.,23563.,11978.));
-    k += gabor(p, vec4(30069.,10115.,23055.,2559.));
-    k += gabor(p, vec4(137435.,215947.,14350.,14446.));
-    k += gabor(p, vec4(226165.,115949.,47659.,18501.));
-    k += gabor(p, vec4(71368.,123529.,23052.,12515.));
-    k += gabor(p, vec4(102042.,215281.,7176.,2857.));
-    k += gabor(p, vec4(68218.,214988.,25632.,25694.));
-    k += gabor(p, vec4(115954.,5782.,40979.,2930.));
-    k += gabor(p, vec4(123338.,133796.,77334.,23039.));
-    k += gabor(p, vec4(203913.,117.,38944.,33329.));
-    k += gabor(p, vec4(227964.,132231.,189988.,12174.));
-    k += gabor(p, vec4(63649.,26205.,10763.,10940.));
-    k += gabor(p, vec4(97912.,45398.,12810.,1739.));
-    k += gabor(p, vec4(106690.,166508.,16387.,2559.));
-    k += gabor(p, vec4(54873.,146884.,58426.,58402.));
-    k += gabor(p, vec4(178346.,81559.,14341.,2559.));
-    k += gabor(p, vec4(185649.,144747.,16391.,1535.));
-    k += gabor(p, vec4(120084.,199932.,10249.,4361.));
-    k += gabor(p, vec4(100115.,63452.,18981.,18968.));
-    k += gabor(p, vec4(180941.,96255.,18962.,18500.));
-    k += gabor(p, vec4(63718.,126911.,34827.,11485.));
-    k += gabor(p, vec4(61203.,92616.,23582.,18498.));
-    k += gabor(p, vec4(172754.,196259.,16390.,6559.));
-    k += gabor(p, vec4(177015.,230484.,25173.,24616.));
-    k += gabor(p, vec4(157875.,57828.,4618.,4837.));
-    k += gabor(p, vec4(105263.,51711.,17997.,17939.));
-    k += gabor(p, vec4(167049.,203925.,24612.,15906.));
-    k += gabor(p, vec4(144087.,67302.,14874.,14931.));
-    k += gabor(p, vec4(150391.,43665.,53778.,4032.));
-    k += gabor(p, vec4(207569.,22528.,15906.,8795.));
-    k += gabor(p, vec4(137039.,173193.,27653.,2559.));
-    k += gabor(p, vec4(206047.,207878.,18958.,7797.));
-    k += gabor(p, vec4(228200.,131090.,5678.,5799.));
-    k += gabor(p, vec4(113976.,64789.,7689.,6396.));
-    k += gabor(p, vec4(83114.,62975.,15903.,13894.));
-    k += gabor(p, vec4(117517.,132261.,12814.,11335.));
-    k += gabor(p, vec4(149162.,180114.,75786.,4971.));
-    k += gabor(p, vec4(219290.,259568.,7701.,3469.));
-    k += gabor(p, vec4(9233.,249362.,21102.,14898.));
-    k += gabor(p, vec4(12348.,105446.,15436.,10340.));
-    k += gabor(p, vec4(147344.,213862.,14917.,14877.));
-    k += gabor(p, vec4(205125.,182142.,82962.,5368.));
-    k += gabor(p, vec4(161978.,187391.,5644.,5760.));
-    k += gabor(p, vec4(88210.,61601.,16388.,2047.));
-    k += gabor(p, vec4(78650.,114304.,15885.,2047.));
-    k += gabor(p, vec4(115065.,71687.,15886.,7819.));
-    k += gabor(p, vec4(93059.,235007.,12814.,10350.));
-    k += gabor(p, vec4(196884.,27136.,12303.,5338.));
-    k += gabor(p, vec4(171860.,258580.,24079.,15418.));
-    k += gabor(p, vec4(183655.,243097.,21510.,2559.));
-    k += gabor(p, vec4(191277.,128656.,12293.,3583.));
-    k += gabor(p, vec4(157553.,43644.,22026.,2014.));
-    k += gabor(p, vec4(76369.,27135.,14370.,10903.));
-    k += gabor(p, vec4(194876.,76800.,7683.,3357.));
-    k += gabor(p, vec4(150218.,45734.,3076.,2201.));
-    k += gabor(p, vec4(230711.,259797.,3613.,3813.));
-    k += gabor(p, vec4(143536.,47519.,32771.,2435.));
-    k += gabor(p, vec4(73356.,64451.,16409.,6741.));
-    k += gabor(p, vec4(228480.,129023.,2581.,2683.));
-    k += gabor(p, vec4(193434.,117680.,17930.,4095.));
-    k += gabor(p, vec4(71419.,126168.,4112.,2190.));
-    k += gabor(p, vec4(94887.,188293.,41993.,4095.));
-    k += gabor(p, vec4(221843.,258986.,4634.,4788.));
-    k += gabor(p, vec4(254463.,215580.,25241.,24612.));
-    k += gabor(p, vec4(36217.,144383.,23056.,9348.));
-    k += gabor(p, vec4(110799.,84416.,10835.,10767.));
-    k += gabor(p, vec4(92864.,216574.,22019.,2047.));
-    k += gabor(p, vec4(21781.,110203.,209421.,13785.));
-    k += gabor(p, vec4(42162.,246368.,12299.,11902.));
-    k += gabor(p, vec4(178010.,28532.,27661.,2559.));
-    k += gabor(p, vec4(75445.,144528.,29199.,3583.));
-    k += gabor(p, vec4(66694.,194418.,24581.,5119.));
-    k += gabor(p, vec4(230325.,1590.,13360.,7865.));
-    k += gabor(p, vec4(92351.,97505.,5635.,2956.));
-    k += gabor(p, vec4(75010.,124415.,12335.,7234.));
-    k += gabor(p, vec4(97906.,169101.,54817.,5119.));
-    k += gabor(p, vec4(106161.,83324.,3589.,2713.));
-    k += gabor(p, vec4(113835.,235844.,9225.,3708.));
-    k += gabor(p, vec4(208627.,241050.,10768.,10482.));
-    k += gabor(p, vec4(168661.,177062.,8706.,2559.));
-    k += gabor(p, vec4(181467.,127455.,17938.,7786.));
-    k += gabor(p, vec4(197869.,146292.,28173.,2559.));
-    k += gabor(p, vec4(117558.,187903.,9736.,3285.));
-    k += gabor(p, vec4(222982.,25466.,20483.,3071.));
-    k += gabor(p, vec4(235759.,128791.,8256.,8275.));
-    k += gabor(p, vec4(29057.,162597.,13888.,8215.));
-    k += gabor(p, vec4(190357.,256223.,13345.,4260.));
-    k += gabor(p, vec4(119069.,231138.,8715.,6737.));
-    k += gabor(p, vec4(170876.,121183.,16906.,10329.));
-    k += gabor(p, vec4(154320.,242687.,6147.,3239.));
-    k += gabor(p, vec4(115981.,136703.,12808.,6807.));
-    k += gabor(p, vec4(120081.,193574.,9734.,2257.));
-    k += gabor(p, vec4(134533.,188242.,26635.,1665.));
-    k += gabor(p, vec4(138043.,77525.,7686.,2271.));
-    k += gabor(p, vec4(130835.,198313.,5122.,1988.));
-    k += gabor(p, vec4(102193.,56831.,6148.,1687.));
-    k += gabor(p, vec4(111902.,152880.,20531.,7206.));
-    k += gabor(p, vec4(174288.,78489.,3075.,3151.));
-    k += gabor(p, vec4(96671.,127941.,6669.,4272.));
-    k += gabor(p, vec4(210122.,17650.,13840.,13455.));
-    k += gabor(p, vec4(203063.,194037.,33825.,33307.));
-    k += gabor(p, vec4(149725.,95402.,11796.,11817.));
-    k += gabor(p, vec4(66297.,11373.,17922.,2559.));
-    k += gabor(p, vec4(179440.,110836.,5633.,1319.));
-    k += gabor(p, vec4(43681.,262028.,25090.,3071.));
-    k += gabor(p, vec4(101192.,233983.,8200.,8304.));
-    k += gabor(p, vec4(202536.,155036.,12293.,2559.));
-    k += gabor(p, vec4(197017.,107008.,8719.,2338.));
-    k += gabor(p, vec4(163006.,200413.,3076.,2203.));
-    k += gabor(p, vec4(122700.,196047.,6149.,5280.));
-    k += gabor(p, vec4(138048.,193231.,17925.,1322.));
-    k += gabor(p, vec4(205566.,243712.,10761.,9529.));   
-
-    // Don't add speckles in preview!
-    if (iResolution.y >= 200.0) {
-        // borrowed Dave Hoskins' hash from https://www.shadertoy.com/view/4djSRW
-        p = fract(p * vec2(443.8975,397.2973));
-        p += dot(p.xy, p.yx+19.19);
-        k += 0.12 * (fract(p.x * p.y)*2.0 - 1.0);
-    }
-    
-    fragColor.xyz = vec3(0.5*k + 0.5);                 
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/mudlord-emeraldenvy4.slang b/procedural/mudlord-emeraldenvy4.slang
deleted file mode 100644
index ea17ad92ae..0000000000
--- a/procedural/mudlord-emeraldenvy4.slang
+++ /dev/null
@@ -1,112 +0,0 @@
-#version 450
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-    uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in  vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-
-float time      = float(global.FrameCount)*0.0325;
-vec2 resolution = global.OutputSize.xy;
-float fade      = 0.45;
-
-const float PI  = 3.14159265358979323846;
-
-float speed     = time*0.25;
-float ground_x  = 0.125 - 0.25*cos(PI*speed*0.25);
-float ground_y  = 0.125 + 0.25*sin(PI*speed*0.25);
-float ground_z  = speed*0.125;
-
-vec2 rotate(vec2 k, float t)
-{
-    return vec2(cos(t)*k.x - sin(t)*k.y, sin(t)*k.x + cos(t)*k.y);
-}
-
-float scene(vec3 p)
-{
-    float ball_p = 0.25;
-    float ball_w = ball_p*1.0;
-    float ball   = length(mod(p.xyz, ball_p) - ball_p*0.5) - ball_w;
-    float hole_w = ball_p*0.55;
-    float hole   = length(mod(p.xyz, ball_p) - ball_p*0.5) - hole_w;
-    float pipe_p = 0.015;
-    float pipe_w = pipe_p*0.42; //-0.00375*sync;
-    float pipe_y = length(max(abs(mod(p.xy, pipe_p) - pipe_p*0.5) - pipe_w,0.0));
-    float pipe_z = length(max(abs(mod(p.xz, pipe_p) - pipe_p*0.5) - pipe_w,0.0));
-
-    return max(max(ball, -hole), max(pipe_y, max(pipe_y, pipe_z)));
-}
-
-vec3 getNormal(vec3 pos) 
-{ 
-    vec3 e = vec3(0.0, 0.0001, 0.0); 
-
-    return normalize(vec3(scene(pos + e.yxx) - scene(pos - e.yxx),
-                          scene(pos + e.xyx) - scene(pos - e.xyx),
-                          scene(pos + e.xxy) - scene(pos - e.xxy))); 
-}
-
-float render_scene(vec3 ray_origin, vec3 ray_dir, float t)
-{
-    const int ray_n = 96;
-    for (int i = 0; i < ray_n; i++)
-    {
-        float k = scene(ray_origin + ray_dir*t);
-        t      += k*fade;
-    }
-    return t;   
-}
-
-void main(void)
-{
-    vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-    FragCoord.y    = -FragCoord.y;
-
-    vec2 position = (FragCoord.xy/resolution.xy);
-    vec2 p        = -1.0 + 2.0*position;
-    
-    //set up camera
-    float speed = time*0.5;
-    vec3 dir = normalize(vec3(p*vec2(1.0, 1.0), 1.));
-    dir.yz   = rotate(dir.yz,PI*1.0*sin(speed*0.25));     // rotation x
-    dir.zx   = rotate(dir.zx,PI*1.0*cos(speed*0.25));     // rotation y
-    dir.xy   = rotate(dir.xy, -speed*0.5);                 // rotation z
-    vec3 ray = vec3(ground_x, ground_y, ground_z);
-    
-    //the raymarch
-    float t  = 0.0;
-    t        = render_scene(ray, dir, t);
-    vec3 hit = ray + dir*t;
-    t       += hit.x;
-    
-    //get normal for reflection
-    vec3 n = getNormal(hit);
-    
-    //render reflection
-    dir        = reflect(dir, n);
-    dir        = normalize(refract(dir, n, .82));   
-    t          = render_scene(ray, dir, t); 
-    float c    = (n.x*1.0 + n.y + n.z)*0.5;   
-    vec3 color = vec3(0., c*t*0.125*p.x + t*0.1, c*t*0.);
-    color     *= 2.412;
-    
-    FragColor = vec4(color, 1.0);
-}
diff --git a/procedural/mudlord-imsosorry.slang b/procedural/mudlord-imsosorry.slang
deleted file mode 100644
index 9ad7543696..0000000000
--- a/procedural/mudlord-imsosorry.slang
+++ /dev/null
@@ -1,147 +0,0 @@
-#version 450
-// im so sorry 
-// done for Flashback 2019 cracktro
-// written by mudlord.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-   float SPEED;
-} global;
-
-#pragma parameter SPEED "Animation Speed" 0.5 0.0 1.0 0.05
-#define time global.FrameCount / 10. * global.SPEED
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-
-vec3 rotatex(in vec3 p, float ang) { return vec3(p.x, p.y*cos(ang) - p.z*sin(ang), p.y*sin(ang) + p.z*cos(ang)); }
-vec3 rotatey(in vec3 p, float ang) { return vec3(p.x*cos(ang) - p.z*sin(ang), p.y, p.x*sin(ang) + p.z*cos(ang)); }
-vec3 rotatez(in vec3 p, float ang) { return vec3(p.x*cos(ang) - p.y*sin(ang), p.x*sin(ang) + p.y*cos(ang), p.z); }
-
-float SuperFormula(float phi, float a, float b, float m, float n1, float n2, float n3)
-{
-	return pow((pow(abs(cos(m*phi/4.0)/a),n2) + pow(abs(sin(m*phi/4.0)/b), n3)), -(1.0/n1));
-}
-
-vec2 scene(vec3 p)
-{
-	p = rotatex(p, 0.18*time);
-	p = rotatez(p, 0.20*time);
-	p = rotatey(p, 0.22*time);
-    float d=length(p);
-	float sn=p.z/d;
-	vec4 w =vec4(12.,6.,6.,16.);
-	float r1=SuperFormula(atan(p.y,p.x),1.0+0.0025*sin(time),1.0,w.x,w.y,w.z,w.w);
-	float r2=SuperFormula(asin(sn),1.0,1.0,w.x,w.y,w.z,w.w);
-	d-=r2*sqrt(r1*r1*(1.0-sn*sn)+sn*sn);
-	return vec2(d,1.0);
-}
-vec2 castRay( in vec3 ro, in vec3 rd )
-{
-    float t = 0.0;
-    float m = -1.0;
-    for( int i=0; i<64; i++ )
-    {
-	    vec2 res = scene( ro+rd*t );
-      t += res.x;
-	    m = res.y;
-      if (res.x <= 0.001)return vec2( t, m );
-    }
-    return vec2( t, m );
-}
-vec3 get_normal(vec3 p)
-{
-	vec3 eps = vec3(0.11, 0.0, 0.0);
-	float nx = scene(p + eps.xyy).x - scene(p - eps.xyy).x;
-	float ny = scene(p + eps.yxy).x - scene(p - eps.yxy).x;
-	float nz = scene(p + eps.yyx).x - scene(p - eps.yyx).x;
-	return normalize(vec3(nx, ny, nz));
-}
-
-float hex(vec2 p) {
-  p.x *= 0.57735*2.0;
-	p.y += mod(floor(p.x), 2.0)*0.5;
-	p = abs((mod(p, 1.0) - 0.5));
-	return abs(max(p.x*1.5 + p.y, p.y*2.0) - 1.0);
-}
-vec2 noise(vec2 t)
-{
-t=vec2(dot(t,vec2(127.1,311.7)),dot(t,vec2(269.5,183.3)));
-t=fract(sin(t)*43758.5);
-return t;
-}
-
-float voronoi(vec2 v)
-	{
-	vec2 r=floor(v);
-	vec2 e=fract(v);
-	float f=8.;
-	for(float u=-1.;u<=1.;u++)
-	for(float m=-1.;m<=1.;m++)
-	{
-	vec2 g=vec2(m,u);
-	vec2 d=noise(r+g);
-	d=.1+.5*sin(time+4.2831*d);
-	vec2 s=g+d-e;
-	float o=dot(s,s);
-	f=min(f,o);
-	}
-	return f;
-}
-
-float getBorder( in vec2 p )
-{
-    float dis = voronoi( p );
-    
-    return 1.0 - smoothstep( 0.0, .26, dis );
-}
-
-void main(void)
-{
-	vec2 p = 2.0 * (vTexCoord.xy*global.OutputSize.xy) / global.OutputSize.xy - 1.0;
-	p.x *= global.OutputSize.x / global.OutputSize.y;
-	vec3 ro = vec3(-0.5, 0., 4.);
-	vec3 rd = normalize(vec3(p, -1.4));
-	vec3 pos = ro;
-	float dist = 0.0;
-	vec2 result_raymarch = castRay(ro,rd);
-	dist = result_raymarch.x;
-
-		float f=1-hex(p*8.);
-    float voron = getBorder(1.8*p)*sin(f);
-    vec3 color2=(f*voron)*vec4(43./255.,73./255.,112./255.,0.0).rgb;
-	vec3 color = color2.rgb;
-	if (dist < 20.)
-	{
-	    vec3 pos = ro + dist*rd;
-		vec3 n = get_normal(pos);
-		vec3 r = reflect(normalize(pos - ro), n);
-		vec3 h = -normalize(n + pos - ro);
-		vec3 gold = vec3(170./255.,127./255.,57./255.);
-		float diff = 1.0*clamp(dot(n, normalize(vec3(1, 1, 1))), 0.0, 1.0);
-		float diff2 = 0.2*clamp(dot(n, normalize(vec3(0.7, -1, 0.5))), 0.0, 1.0);
-		float diff3 = 0.1*clamp(dot(n, normalize(vec3(-0.7, -0.4, 0.7))), 0.0, 1.0);
-		float spec = pow(clamp(dot(h, normalize(vec3(1, 223./255., 170./255.))), 0.0, 1.0), 50.0);
-		float amb = 2.5;
-		color = diff*vec3(1, 1, 1) + diff2*gold + diff3*gold + spec*vec3(1, 0, 0) + amb*gold;
-		color /= dist;
-	}
-	FragColor = vec4(color, 1.0);
-}
diff --git a/procedural/mudlord-poc.slang b/procedural/mudlord-poc.slang
deleted file mode 100644
index ed1997c291..0000000000
--- a/procedural/mudlord-poc.slang
+++ /dev/null
@@ -1,87 +0,0 @@
-#version 450
-// proof of concept procedural shader 
-// done for RA Vulkan backend
-// written by mudlord.
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-
-vec3 rotatex(in vec3 p, float ang) { return vec3(p.x, p.y*cos(ang) - p.z*sin(ang), p.y*sin(ang) + p.z*cos(ang)); }
-
-vec3 rotatey(in vec3 p, float ang) { return vec3(p.x*cos(ang) - p.z*sin(ang), p.y, p.x*sin(ang) + p.z*cos(ang)); }
-
-vec3 rotatez(in vec3 p, float ang) { return vec3(p.x*cos(ang) - p.y*sin(ang), p.x*sin(ang) + p.y*cos(ang), p.z); }
-
-float scene(vec3 p)
-{
-  float time = float(global.FrameCount)*0.015;
-  p = rotatex(p, 0.18*time);
-  p = rotatez(p, 0.20*time);
-  p = rotatey(p, 0.22*time);
-
-  float d0 = length(max(abs(p) - 0.5, 0.0)) - 0.01 + clamp(sin((p.x +p.y + p.z)*20.0)*0.03, 0.0, 1.0);
-  float d1 = length(p) - 0.5;
-  return sin(max(d0, -d1));
-}
-
-vec3 get_normal(vec3 p)
-{
-  vec3 eps = vec3(0.01, 0.0, 0.0);
-  float nx = scene(p + eps.xyy) - scene(p - eps.xyy);
-  float ny = scene(p + eps.yxy) - scene(p - eps.yxy);
-  float nz = scene(p + eps.yyx) - scene(p - eps.yyx);
-  return normalize(vec3(nx, ny, nz));
-}
-
-void main(void)
-{
-
-  vec2 p = 2.0 * (vTexCoord.xy*global.OutputSize.xy) / global.OutputSize.xy - 1.0;
-  p.x *= global.OutputSize.x / global.OutputSize.y;
-  vec3 ro = vec3(0.0, 0.0, 1.7);
-  vec3 rd = normalize(vec3(p.x, p.y, -1.4));
-  vec3 color = (1.0 - vec3(length(p*0.5)))*0.2;
-  vec3 pos = ro;
-  float dist = 0.0;
-  for (int i = 0; i < 64; i++)
-  {
-    float d = scene(pos);
-    pos += rd*d;
-    dist += d;
-  }
-
-  if (dist < 100.0)
-  {
-    vec3 n = get_normal(pos);
-    vec3 r = reflect(normalize(pos - ro), n);
-    vec3 h = -normalize(n + pos - ro);
-    float diff = 1.0*clamp(dot(n, normalize(vec3(1, 1, 1))), 0.0, 1.0);
-    float diff2 = 0.2*clamp(dot(n, normalize(vec3(0.7, -1, 0.5))), 0.0, 1.0);
-    float diff3 = 0.1*clamp(dot(n, normalize(vec3(-0.7, -0.4, 0.7))), 0.0, 1.0);
-    float spec = pow(clamp(dot(h, normalize(vec3(1, 1, 1))), 0.0, 1.0), 50.0);
-    float amb = 0.2 + pos.y;
-    color = diff*vec3(1, 1, 1) + diff2*vec3(1, 0, 0) + diff3*vec3(1, 0, 1) + spec*vec3(1, 1, 1) + amb*vec3(0.2, 0.2, 0.2);
-    color /= dist;
-  }
-  FragColor = vec4(color, 1.0);
-}
\ No newline at end of file
diff --git a/procedural/nimitz-somewhere-in-1993.slang b/procedural/nimitz-somewhere-in-1993.slang
deleted file mode 100644
index ba3bee2965..0000000000
--- a/procedural/nimitz-somewhere-in-1993.slang
+++ /dev/null
@@ -1,349 +0,0 @@
-#version 450
-// Somewhere in 1993 -  nimitz - 2014-10-10
-// https://www.shadertoy.com/view/Md2XDD
-
-// Experiments in making low poly terrain.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-//Somewhere in 1993 by nimitz (twitter: @stormoid)
-
-#define PALETTE 6.8
-
-//3 to 5 works best
-#define TERRAIN_COMPLEXITY 4.
-#define ITR 100
-#define FAR 700.
-#define time mod(iGlobalTime,500.)
-
-mat2 mm2(in float a){float c = cos(a), s = sin(a);return mat2(c,-s,s,c);}
-float smoothfloor(const in float x, const in float w)
-{
-    return floor(x)+smoothstep(w, 1.-w,fract(x));
-}
-
-vec3 enpos()
-{
-    return vec3(sin(time)*100.+50.,sin(time)*30.+30.,300.+sin(time*.9+sin(time*0.88+0.2))*100.);
-}
-
-//--------------------------------------------------------
-//---------------------------HUD--------------------------
-//--------------------------------------------------------
-
-float square(in vec2 p){ return max(abs(p.x),abs(p.y));}
-float loz(in vec2 p){ return abs(p.x)+abs(p.y);}
-
-//from Dave (https://www.shadertoy.com/view/4djSRW)
-vec2 hash2(float p)
-{
-	vec2 p2  = fract(p * vec2(5.3983, 5.4427));
-    p2 += dot(p2.yx, p2.xy +  vec2(21.5351, 14.3137));
-	return fract(vec2(p2.x * p2.y * 95.4337, p2.x * p2.y * 97.597));
-}
-
-float line( in vec2 a, in vec2 b, in vec2 p )
-{
-	vec2 pa = p - a, ba = b - a;
-	float h = clamp( dot(pa,ba)/dot(ba,ba), 0.0, 1.0 );
-	return length( pa - ba*h );
-}
-
-float crosshair(in vec2 p , in float tk, in float rt)
-{
-    float d = abs(p.x)+abs(p.y);
-    float a = atan(p.y,p.x);
-    float rz = smoothstep(0.03*tk,.04*tk,abs(d-0.5));
-    d = sin(a*3.+1.59-time*3.5-rt);
-    rz += smoothstep(0.0,.07*tk,d);
-    return rz;
-}
-
-//inspired by otaviogood "runes" (https://www.shadertoy.com/view/MsXSRn)
-float text2(in vec2 p)
-{
-    p = (p+vec2(1.75,-.8))*7.;
-    p.x *= 1.5;
-    float sd = floor(time*8.);
-    vec2 p1 = vec2(0), p2 = hash2(sd);
-    float d= 1.;
-    vec2 fl = vec2(2.,2.);
-    for(float i=0.;i<7.;i++)
-    {
-    	if(hash2(sd+i+10.).x<0.3)continue;
-        p1 = hash2(i+sd);
-    	p2 = hash2(i+sd+1.);
-		p1 = (floor(p1*fl) + .5)/fl;
-		p2 = (floor(p2*fl) + .5)/fl;
-        if (p1 == p2) p2 = vec2(.5);
-    	d = min(line(p1, p2, p), d);        
-        p1 = p2;
-    	p2 = hash2(i+sd+3.);
-		p2 = (floor(p2*fl) + .5)/fl;
-    	d = min(line(p1, p2, p), d);
-        p1 = p2;
-    	p2 = hash2(i+sd+5.);
-		p2 = (floor(p2*fl) + .5)/fl;
-        if (p1 == p2)
-        {
-            p2 = hash2(i+sd+7.);
-			p2 = (floor(p2*fl) + .5)/fl;
-        }
-    	d = min(line(p1,p2,p),d);
-        p.x -= .8;
-    }
-
-    d = smoothstep(0.03, .08,d);
-    return d;
-}
-
-vec3 makeHud(in vec2 p, in float seek)
-{
-    float sk1 = smoothstep(0.99, 1., seek);
-    float sk2 = step(1.-sk1, .5);
-    //lens deformation
-    float ll = abs(p.x)+abs(p.y)*0.25;
-    p *= ll * -.3+1.29;
-    p *= 2.;
-    vec3 col = vec3(0);
-    float d= 1.;
-    //crosshairs
-    float rz = crosshair(p*1.1, .9,1.+sk1);
-    rz = min(rz,crosshair(p*2.7,2., -time*6.5-1.1-sk1));
-    //minimap (top right)
-    float d2 = square(p+vec2(-1.45, -0.67))+0.02;
-    d = smoothstep(0.3,0.31,d2);
-    d = max(d,smoothstep(0.35,.55,min(sin(p.x*80.+1.9),sin(p.y*80.+time*15.))+1.4));
-    d = min(d,smoothstep(0.002,0.009,abs(d2-0.3)));
-    vec3 enp = enpos()/1000.;
-    enp.z = 1.-enp.z;
-    float en = smoothstep(0.025, 0.033, loz(enp.xz+p-vec2(1.47, 1.4))) ;
-    en += mod(floor(time*2.5), 2.);
-    d = min(d,en);
-    rz = min(d,rz);
-    //text (top left)
-    rz= min(rz,text2(p));
-    //altitude bars
-    d = min(rz,sin(p.y*100.+sin(time)*20.)*3.+3.);
-    d2 = max(d,(p.x+0.59)*200.);
-    d2 = max(d2,-(p.x+0.66)*200.);
-    float d3 = max(d,(p.x-0.66)*200.);
-    d3 = max(d3,-(p.x-.59)*200.);
-    d2 = min(d2,d3);
-    d2 += smoothstep(0.59, .6, -p.y);
-    d2 += smoothstep(0.59, .6, p.y);
-    rz = min(rz,d2);    
-    //bottom left "status"
-    float num = mod(floor(time*12.),12.);
-    vec2 p2 = p+vec2(-1.32,.94);
-    d = 1.;
-    for(float i=0.;i<5.;i++)
-    {
-        d = min(d,length(p2)+float(num==i));
-    	p2.x -= 0.1;
-    }
-    d = smoothstep(0.023,.03,d);
-    rz = min(d,rz);
-    
-    vec3 hcol = (sin(vec3(0.35,0.4,0.48)*(3.35)*PALETTE)*0.5+.5);
-    hcol.gb -= sk2;
-    hcol.r += sk2;
-    return hcol*(1.-rz);
-}
-
-//--------------------------------------------------------
-//--------------------------------------------------------
-//--------------------------------------------------------
-
-float tri(in float x)
-{
-    return abs(fract(x)-0.5);
-}
-
-mat2 m2 = mat2( 0.80,  0.60, -0.60,  0.80 );
-float tnoise(in vec2 p)
-{
-    p*=.008;
-    float z=2.;
-	float rz = 0.;
-	for (float i= 1.;i < TERRAIN_COMPLEXITY;i++ )
-	{
-        rz+= tri(p.x+tri(p.y*1.))/z;
-		z = z*2.;
-		p = p*1.8;
-        p*= m2;
-	}
-	return rz*9.;
-}
-
-float oct(in vec3 p){ return dot(vec3(0.5773),abs(p));}
-vec2 ou( vec2 d1, vec2 d2 ){return (d1.x<d2.x) ? d1 : d2;}
-
-vec3 roty(vec3 p, float a)
-{
-    float s = sin(a), c = cos(a);
-    return vec3(c*p.x + s*p.z, p.y, -s*p.x + c*p.z);
-}
-
-vec2 map(vec3 p)
-{   
-    //terrain
-    vec2 d = vec2(6.*tnoise(p.xz)+p.y+20.+(tri(p.z*0.001)-0.4)*22.,1.);
-    //xlog(x) seems to work nicely for a valley
-    d.x -= abs(p.x*0.5*log(abs(p.x)))*0.05-8.;
-    //flat water
-    d = ou(d,vec2(p.y+30., 2.));
-    //"enemy"
-    vec3 enp = enpos();
-    enp.z += time*50.;
-    d = ou(d,vec2((oct(roty(p-enp, time*2.5))-6.)*0.66,8.));
-    
-	return d;
-}
-
-vec2 march(in vec3 ro, in vec3 rd)
-{
-	float precis = .1;
-    float h=precis*2.0;
-    float d = 0.;
-    float c = 1.;
-    for( int i=0; i<ITR; i++ )
-    {
-        if( abs(h)<precis || d>FAR ) break;
-        d += h;
-	    vec2 res = map(ro+rd*d);
-        h = res.x*1.4;
-        c = res.y;
-    }
-	return vec2(d,c);
-}
-
-vec3 normal(const in vec3 p)
-{  
-    vec2 e = vec2(-1., 1.)*.1;
-	return normalize(e.yxx*map(p + e.yxx).x + e.xxy*map(p + e.xxy).x + 
-					 e.xyx*map(p + e.xyx).x + e.yyy*map(p + e.yyy).x );   
-}
-
-//(from eiffie, who thought it was from iq, dont know who actually wrote it)
-float segm(vec3 ro, vec3 rd, vec3 p1, vec3 p2)
-{
-	vec3 p = p1-ro;
-	vec3 di = p2-ro-p;
-	float proj = dot(rd, di);
-	float m = clamp((dot(rd,p)*proj-dot(p,di))/(dot(di,di)-proj*proj), 0., 1.);
-	p += di*m;
-	p = dot(p, rd)*rd-p;
-    return smoothstep(0.9985,.999,1.-dot(p,p));
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{	
-	vec2 p = fragCoord.xy/iResolution.xy-0.5;
-    vec2 bp = p+0.5;
-	p.x*=iResolution.x/iResolution.y;
-	vec2 um = vec2(0);
-    um.x = 0.5+(smoothstep(-2.,2.,sin(time*.7-0.1))-0.5)*.1;
-    um.y = sin(time+1.)*0.02;
-	
-    //camera
-    vec3 ro = vec3((smoothstep(-2., 2., sin(time*0.7+1.57))-0.5)*50., sin(time)*5.-1., time*50.);
-    um.x *= 3.;
-    vec3 eye = normalize(vec3(cos(um.x),um.y*5.,sin(um.x)));
-    vec3 right = normalize(vec3(cos(um.x+1.5708),0.,sin(um.x+1.5708)));
-    mat2 ori = mm2( smoothstep(-.5,.5,sin(time*0.7+0.78))-.5 + smoothfloor(time*0.04,.45)*6.28 );
-    right.xy *= ori;
-    vec3 up = normalize(cross(right,eye));
-	vec3 rd=normalize((p.x*right+p.y*up)*.75+eye);
-	
-    vec3 bg = sin(vec3(0.35,0.4,0.48)*11.3*PALETTE)*0.5+.5;
-    vec3 col = bg*floor(-rd.y*50.+6.)*0.06;
-    
-    //march
-	vec2 rz = march(ro,rd);
-    if ( rz.x < FAR )
-    {
-        vec3 pos = ro+rz.x*rd;
-        vec3 nor = normal( pos );
-        vec3 ligt = normalize(vec3(-.7,0.2, 0.1));
-        float dif = clamp(dot(nor, ligt), 0., 1.);
-        float fre = pow(clamp(1. + dot(nor, rd), 0., 1.), 2.);
-        if (rz.y == 1.)
-        {
-            float mx = abs(pos.x*.1)-10.;
-            mx = smoothstep(-20.,10.,mx);
-            col = mix(vec3(0.,0.37,0),vec3(0.2,.17,0.15),mx);
-        }
-        else
-            col = sin(vec3(0.35,0.4,0.48)*rz.y*PALETTE)*0.5+.55;
-        col = col*dif + col*0.4 + .3*fre*col;
-    }
-    
-    //lasers
-    vec3 enp =enpos();
-    enp.z += time*50.;
-    vec3 rn = enp - ro;
-    float tgt = dot(eye, normalize(rn));
-    if (tgt > .997)
-    {
-        vec3 ray1 = vec3(0.7, 1., -1);
-        vec3 ray2 = vec3(-0.7, 1., -1);
-        ray1.xy *= ori; ray2.xy *= ori;
-        float lz = segm(ro,rd,ro-ray1,up*0.5+ro+(eye-ray1*0.01)*30.);
-        lz += segm(ro,rd,ro-ray2,up*.5+ro+(eye-ray2*0.01)*30.);
-        float sw = mod(floor(time*20.),2.);
-        lz *= sw;
-        col = col*(1.-smoothstep(0.0,1.,lz))+lz*vec3(1.,0.,0.);
-        //hit (cant really have explosions since I don't have a function for hit times)
-        if (tgt > .999)
-        {
-            vec2 d = hash2(time);
-            rd.xy += d*0.03;
-            rn.xy += d*10.;
-            float s = sw*smoothstep(0.9998, .9999,dot(rd,normalize(rn)));
-            col = col*(1.-smoothstep(0., 1., s))+s*vec3(1.-d.x, .0, 0.1);
-        }
-    }
-    
-    //hud
-    float lk = 0.;
-    if (tgt > .99)lk = 4.;
-    vec3 hud = makeHud(p,tgt);
-    col = col*(1.-smoothstep(0., 1., hud.y+hud.x+hud.z))+hud;   
-    //scanlines
-    col *= (sin(p.y*1.3*iResolution.x)*0.15)*(sin(p.y*10.+time*410.)*0.4)+1.;
-    
-	fragColor = vec4( col, 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/nrx-voxel-pacman.slang b/procedural/nrx-voxel-pacman.slang
deleted file mode 100644
index 0a2c0c6fd6..0000000000
--- a/procedural/nrx-voxel-pacman.slang
+++ /dev/null
@@ -1,330 +0,0 @@
-#version 450
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-//  GGGG IIIII  AAA  N   N TTTTT     PPPP   AAA   CCCC     M   M  AAA  N   N //
-// G       I   A   A NN  N   T       P   P A   A C         MM MM A   A NN  N //
-// G  GG   I   AAAAA N N N   T       PPPP  AAAAA C     --- M M M AAAAA N N N //
-// G   G   I   A   A N  NN   T       P     A   A C         M   M A   A N  NN //
-//  GGGG IIIII A   A N   N   T       P     A   A  CCCC     M   M A   A N   N //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// Parameters
-#define VOXEL_RESOLUTION	1.5
-#define VOXEL_LIGHTING
-#define SHADOW
-#define GROUND
-#define GHOST
-//#define MOUSE
-#define HSV2RGB_FAST
-
-#define CAMERA_FOCAL_LENGTH	2.0
-#define DELTA				0.01
-#define RAY_LENGTH_MAX		500.0
-#define RAY_STEP_MAX		100.0
-#define AMBIENT				0.2
-#define SPECULAR_POWER		2.0
-#define SPECULAR_INTENSITY	0.3
-#define SHADOW_LENGTH		150.0
-#define SHADOW_POWER		3.0
-#define FADE_POWER			1.0
-#define BACKGROUND			0.7
-#define GLOW				0.4
-#define GAMMA				0.8
-
-// Math constants
-#define PI		3.14159265359
-#define SQRT3	1.73205080757
-
-// Global variable to handle the glow effect
-float glowCounter;
-
-// PRNG (from https://www.shadertoy.com/view/4djSRW)
-float rand (in vec3 seed) {
-	seed = fract (seed * vec3 (5.3983, 5.4427, 6.9371));
-	seed += dot (seed.yzx, seed.xyz + vec3 (21.5351, 14.3137, 15.3219));
-	return fract (seed.x * seed.y * seed.z * 95.4337);
-}
-
-// Distance to the voxel
-float distVoxel (in vec3 p) {
-
-	// Update the glow counter
-	++glowCounter;
-
-	// Rounded box
-	const float voxelRadius = 0.25;
-	return length (max (abs (p) - 0.5 + voxelRadius, 0.0)) - voxelRadius;
-}
-
-// Distance to the scene and color of the closest point
-vec2 distScene (in vec3 p, out vec3 P) {
-
-	// Update the glow counter
-	++glowCounter;
-
-	// Scaling
-	p *= VOXEL_RESOLUTION;
-
-	// Velocity, period of the waves, spacing of the gums
-	float v = VOXEL_RESOLUTION * floor (iGlobalTime * 100.0 / VOXEL_RESOLUTION);
-	const float k1 = 0.05;
-	const float k2 = 60.0;
-
-	// Giant Pac-Man
-	float body = length (p);
-	body = max (body - 32.0, 27.0 - body);
-	float eyes = 6.0 - length (vec3 (abs (p.x) - 12.5, p.y - 19.5, p.z - 20.0));
-	float mouthAngle = PI * (0.07 + 0.07 * cos (2.0 * v * PI / k2));
-	float mouthTop = dot (p, vec3 (0.0, -cos (mouthAngle), sin (mouthAngle))) - 2.0;
-	mouthAngle *= 2.5;
-	float mouthBottom = dot (p, vec3 (0.0, cos (mouthAngle), sin (mouthAngle)));
-	float pacMan = max (max (body, eyes), min (mouthTop, mouthBottom));
-	vec2 d = vec2 (pacMan, 0.13);
-	P = p;
-
-	// Gums
-	vec3 q = vec3 (p.xy, mod (p.z + v, k2) - k2 * 0.5);
-	float gum = max (length (q) - 6.0, -p.z);
-	if (gum < d.x) {
-		d = vec2 (gum, 0.35);
-		P = q;
-	}
-
-	// Ground
-	#ifdef GROUND
-	q = vec3 (p.xy, p.z + v);
-	float ground = (q.y + 50.0 + 14.0 * cos (q.x * k1) * cos (q.z * k1)) * 0.7;
-	if (ground < d.x) {
-		d = vec2 (ground, 0.55);
-		P = q;
-	}
-	#endif
-
-	// Ghost
-	#ifdef GHOST
-	v = VOXEL_RESOLUTION * floor ((130.0 + 60.0 * cos (iGlobalTime * 3.0)) / VOXEL_RESOLUTION);
-	q = vec3 (p.xy, p.z + v);
-	body = length (vec3 (q.x, max (q.y - 4.0, 0.0), q.z));
-	body = max (body - 28.0, 22.0 - body);
-	eyes = 8.0 - length (vec3 (abs (q.x) - 12.0, q.y - 10.0, q.z - 22.0));
-	float bottom = (q.y + 28.0 + 4.0 * cos (p.x * 0.4) * cos (p.z * 0.4)) * 0.7;
-	float ghost = max (max (body, eyes), -bottom);
-	if (ghost < d.x) {
-		d = vec2 (ghost, 0.76);
-		P = q;
-	}
-	#endif
-
-	// Scaling
-	d.x /= VOXEL_RESOLUTION;
-	return d;
-}
-
-// Distance to the (voxelized?) scene
-vec4 dist (inout vec3 p, in vec3 ray, in float voxelized, in float rayLengthMax) {
-	vec3 P = p;
-	vec2 d = vec2 (0.0, 0.0);
-	float rayLength = 0.0;
-	float rayLengthInVoxel = 0.0;
-	float rayLengthCheckVoxel = 0.0;
-	vec3 raySign = sign (ray);
-	vec3 rayDeltaVoxel = raySign / ray;
-	for (float rayStep = 0.0; rayStep < RAY_STEP_MAX; ++rayStep) {
-		if (rayLength < rayLengthInVoxel) {
-			d.x = distVoxel (fract (p + 0.5) - 0.5);
-			if (d.x < DELTA) {
-				break;
-			}
-		} else if (rayLength < rayLengthCheckVoxel) {
-			vec3 rayDelta = (0.5 - raySign * (fract (p + 0.5) - 0.5)) * rayDeltaVoxel;
-			float dNext = min (rayDelta.x, min (rayDelta.y, rayDelta.z));
-			d = distScene (floor (p + 0.5), P);
-			if (d.x < 0.0) {
-				rayDelta = rayDeltaVoxel - rayDelta;
-				d.x = max (rayLengthInVoxel - rayLength, DELTA - min (rayDelta.x, min (rayDelta.y, rayDelta.z)));
-				rayLengthInVoxel = rayLength + dNext;
-			} else {
-				d.x = DELTA + dNext;
-			}
-		} else {
-			d = distScene (p, P);
-			if (voxelized > 0.5) {
-				if (d.x < SQRT3 * 0.5) {
-					rayLengthCheckVoxel = rayLength + abs (d.x) + SQRT3 * 0.5;
-					d.x = max (rayLengthInVoxel - rayLength + DELTA, d.x - SQRT3 * 0.5);
-				}
-			} else if (d.x < DELTA) {
-				break;
-			}
-		}
-		rayLength += d.x;
-		if (rayLength > rayLengthMax) {
-			break;
-		}
-		p += d.x * ray;
-	}
-	return vec4 (d, rayLength, rand (P));
-}
-
-// Normal at a given point
-vec3 normal (in vec3 p, in float voxelized) {
-	vec2 h = vec2 (DELTA, -DELTA);
-	vec3 n;
-	if (voxelized > 0.5) {
-		p = fract (p + 0.5) - 0.5;
-		n = h.xxx * distVoxel (p + h.xxx) +
-			h.xyy * distVoxel (p + h.xyy) +
-			h.yxy * distVoxel (p + h.yxy) +
-			h.yyx * distVoxel (p + h.yyx);
-	} else {
-		n = h.xxx * distScene (p + h.xxx, n).x +
-			h.xyy * distScene (p + h.xyy, n).x +
-			h.yxy * distScene (p + h.yxy, n).x +
-			h.yyx * distScene (p + h.yyx, n).x;
-	}
-	return normalize (n);
-}
-
-// HSV to RGB
-vec3 hsv2rgb (in vec3 hsv) {
-	#ifdef HSV2RGB_SAFE
-	hsv.yz = clamp (hsv.yz, 0.0, 1.0);
-	#endif
-	#ifdef HSV2RGB_FAST
-	return hsv.z * (1.0 + 0.5 * hsv.y * (cos (2.0 * PI * (hsv.x + vec3 (0.0, 2.0 / 3.0, 1.0 / 3.0))) - 1.0));
-	#else
-	return hsv.z * (1.0 + hsv.y * clamp (abs (fract (hsv.x + vec3 (0.0, 2.0 / 3.0, 1.0 / 3.0)) * 6.0 - 3.0) - 2.0, -1.0, 0.0));
-	#endif
-}
-
-// Main function
-void mainImage (out vec4 fragColor, in vec2 fragCoord) {
-
-	// Get the fragment
-	vec2 frag = (2.0 * fragCoord.xy - iResolution.xy) / iResolution.y;
-
-	// Define the rendering mode
-	float modeTiming = iGlobalTime * 0.234;
-	float modeAngle = PI * cos (iGlobalTime * 0.2);
-	modeAngle = dot (frag - vec2 (cos (iGlobalTime * 2.0), 0.0), vec2 (cos (modeAngle), sin (modeAngle)));
-	float modeVoxel = step (0.5, fract (modeTiming / (4.0 * PI)));
-	modeTiming = cos (modeTiming);
-	float mode3D = smoothstep (0.8, 0.5, modeTiming);
-	float modeSwitch = smoothstep (0.995, 1.0, modeTiming) + smoothstep (0.02, 0.0, abs (modeAngle)) * (1.0 - modeVoxel);
-	modeVoxel += step (0.0, modeAngle) * (1.0 - modeVoxel);
-
-	// Define the ray corresponding to this fragment
-	vec3 ray = normalize (vec3 (frag, mix (8.0, CAMERA_FOCAL_LENGTH, mode3D)));
-
-	// Compute the orientation of the camera
-	float yawAngle = PI * (1.2 + 0.2 * cos (iGlobalTime * 0.5));
-	float pitchAngle = PI * (0.1 * cos (iGlobalTime * 0.3) - 0.05);
-	#ifdef MOUSE
-	yawAngle += 4.0 * PI * iMouse.x / iResolution.x;
-	pitchAngle += PI * 0.3 * (1.0 - iMouse.y / iResolution.y);
-	#endif
-	yawAngle = mix (PI * 1.5, yawAngle, mode3D);
-	pitchAngle *= mode3D;
-
-	float cosYaw = cos (yawAngle);
-	float sinYaw = sin (yawAngle);
-	float cosPitch = cos (pitchAngle);
-	float sinPitch = sin (pitchAngle);
-
-	mat3 cameraOrientation;
-	cameraOrientation [0] = vec3 (cosYaw, 0.0, -sinYaw);
-	cameraOrientation [1] = vec3 (sinYaw * sinPitch, cosPitch, cosYaw * sinPitch);
-	cameraOrientation [2] = vec3 (sinYaw * cosPitch, -sinPitch, cosYaw * cosPitch);
-
-	ray = cameraOrientation * ray;
-
-	// Compute the origin of the ray
-	float cameraDist = mix (300.0, 95.0 + 50.0 * cos (iGlobalTime * 0.8), mode3D);
-	vec3 origin = (vec3 (0.0, 0.0, 40.0 * sin (iGlobalTime * 0.2)) - cameraOrientation [2] * cameraDist) / VOXEL_RESOLUTION;
-
-	// Compute the distance to the scene
-	glowCounter = 0.0;
-	vec4 d = dist (origin, ray, modeVoxel, RAY_LENGTH_MAX / VOXEL_RESOLUTION);
-
-	// Set the background color
-	vec3 finalColor = hsv2rgb (vec3 (0.2 * ray.y + 0.4 * modeVoxel - 0.37, 1.0, mode3D * BACKGROUND));
-	vec3 glowColor = GLOW * vec3 (1.0, 0.3, 0.0) * glowCounter / RAY_STEP_MAX;
-	if (d.x < DELTA) {
-
-		// Set the object color
-		vec3 color = hsv2rgb (vec3 (d.y + 0.1 * d.w * modeVoxel, 0.5 + 0.5 * modeVoxel, 1.0));
-
-		// Lighting
-		vec3 l = normalize (mix (vec3 (1.0, 0.0, 0.0), vec3 (1.25 + cos (iGlobalTime * 0.2), 1.0, 1.0), mode3D));
-		#ifdef VOXEL_LIGHTING
-		if (modeVoxel > 0.5) {
-			vec3 n = normal (floor (origin + 0.5), 0.0);
-			float diffuse = max (0.0, dot (n, l));
-			float specular = pow (max (0.0, dot (reflect (ray, n), l)), SPECULAR_POWER) * SPECULAR_INTENSITY;
-			color = (AMBIENT + diffuse) * color + specular;
-		}
-		#endif
-		vec3 n = normal (origin, modeVoxel);
-		float diffuse = dot (n, l);
-		float specular;
-		if (diffuse < 0.0) {
-			diffuse = 0.0;
-			specular = 0.0;
-		} else {
-			specular = pow (max (0.0, dot (reflect (ray, n), l)), SPECULAR_POWER) * SPECULAR_INTENSITY;
-			#ifdef SHADOW
-			origin += n * DELTA * 2.0;
-			vec4 shadow = dist (origin, l, modeVoxel, SHADOW_LENGTH / VOXEL_RESOLUTION);
-			if (shadow.x < DELTA) {
-				shadow.z = pow (min (1.0, shadow.z * VOXEL_RESOLUTION / SHADOW_LENGTH), SHADOW_POWER);
-				diffuse *= shadow.z;
-				specular *= shadow.z;
-			}
-			#endif
-		}
-		color = (AMBIENT + diffuse) * color + specular;
-
-		// Fading
-		float fade = pow (max (0.0, 1.0 - d.z * VOXEL_RESOLUTION / RAY_LENGTH_MAX), FADE_POWER);
-		finalColor = mix (finalColor, color, fade);
-	}
-
-	// Set the fragment color
-	finalColor = mix (pow (finalColor, vec3 (GAMMA)) + glowColor, vec3 (1.0), modeSwitch);
-	fragColor = vec4 (finalColor, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/reinder-alotofspheres.slang b/procedural/reinder-alotofspheres.slang
deleted file mode 100644
index e758ae0a14..0000000000
--- a/procedural/reinder-alotofspheres.slang
+++ /dev/null
@@ -1,281 +0,0 @@
-#version 450
-// A lot of spheres. Created by Reinder Nijhoff 2013
-// @reindernijhoff
-// 
-// https://www.shadertoy.com/view/lsX3WH
-//
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define SHADOW
-#define REFLECTION
-
-
-#define RAYCASTSTEPS 40
-
-#define EXPOSURE 0.9
-#define EPSILON 0.0001
-#define MAXDISTANCE 400.
-#define GRIDSIZE 8.
-#define GRIDSIZESMALL 5.
-#define MAXHEIGHT 10.
-#define SPEED 0.5
-
-#define time iGlobalTime
-
-//
-// math functions
-//
-
-const mat2 mr = mat2 (0.84147,  0.54030,
-					  0.54030, -0.84147 );
-float hash( float n ) {
-	return fract(sin(n)*43758.5453);
-}
-vec2 hash2( float n ) {
-	return fract(sin(vec2(n,n+1.0))*vec2(2.1459123,3.3490423));
-}
-vec2 hash2( vec2 n ) {
-	return fract(sin(vec2( n.x*n.y, n.x+n.y))*vec2(2.1459123,3.3490423));
-}
-vec3 hash3( float n ) {
-	return fract(sin(vec3(n,n+1.0,n+2.0))*vec3(3.5453123,4.1459123,1.3490423));
-}
-vec3 hash3( vec2 n ) {
-	return fract(sin(vec3(n.x, n.y, n+2.0))*vec3(3.5453123,4.1459123,1.3490423));
-}
-//
-// intersection functions
-//
-
-bool intersectPlane(vec3 ro, vec3 rd, float height, out float dist) {	
-	if (rd.y==0.0) {
-		return false;
-	}
-	
-	float d = -(ro.y - height)/rd.y;
-	d = min(100000.0, d);
-	if( d > 0. ) {
-		dist = d;
-		return true;
-	}
-	return false;
-}
-
-bool intersectUnitSphere ( in vec3 ro, in vec3 rd, in vec3 sph, out float dist, out vec3 normal ) {
-	vec3  ds = ro - sph;
-	float bs = dot( rd, ds );
-	float cs = dot(  ds, ds ) - 1.0;
-	float ts = bs*bs - cs;
-	
-	if( ts > 0.0 ) {
-		ts = -bs - sqrt( ts );
-		if( ts>0. ) {
-			normal = normalize( (ro+ts*rd)-sph );
-			dist = ts;
-			return true;
-		}
-	}
-	
-	return false;
-}
-
-//
-// Scene
-//
-
-void getSphereOffset( vec2 grid, inout vec2 center ) {
-	center = (hash2( grid+vec2(43.12,1.23) ) - vec2(0.5) )*(GRIDSIZESMALL);
-}
-void getMovingSpherePosition( vec2 grid, vec2 sphereOffset, inout vec3 center ) {
-	// falling?
-	float s = 0.1+hash( grid.x*1.23114+5.342+754.324231*grid.y );
-	float t = 14.*s + time/s;
-	
-	float y =  s * MAXHEIGHT * abs( cos( t ) );
-	vec2 offset = grid + sphereOffset;
-	
-	center = vec3( offset.x, y, offset.y ) + 0.5*vec3( GRIDSIZE, 2., GRIDSIZE );
-}
-void getSpherePosition( vec2 grid, vec2 sphereOffset, inout vec3 center ) {
-	vec2 offset = grid + sphereOffset;
-	center = vec3( offset.x, 0., offset.y ) + 0.5*vec3( GRIDSIZE, 2., GRIDSIZE );
-}
-vec3 getSphereColor( vec2 grid ) {
-	return normalize( hash3( grid+vec2(43.12*grid.y,12.23*grid.x) ) );
-}
-
-vec3 trace(vec3 ro, vec3 rd, out vec3 intersection, out vec3 normal, out float dist, out int material) {
-	material = 0; // sky
-	dist = MAXDISTANCE;
-	float distcheck;
-	
-	vec3 sphereCenter, col, normalcheck;
-	
-	if( intersectPlane( ro,  rd, 0., distcheck) && distcheck < MAXDISTANCE ) {
-		dist = distcheck;
-		material = 1;
-		normal = vec3( 0., 1., 0. );
-		col = vec3( 1. );
-	} else {
-		col = vec3( 0. );
-	}
-	
-		
-	// trace grid
-	vec3 pos = floor(ro/GRIDSIZE)*GRIDSIZE;
-	vec3 ri = 1.0/rd;
-	vec3 rs = sign(rd) * GRIDSIZE;
-	vec3 dis = (pos-ro + 0.5  * GRIDSIZE + rs*0.5) * ri;
-	vec3 mm = vec3(0.0);
-	vec2 offset;
-		
-	for( int i=0; i<RAYCASTSTEPS; i++ )	{
-		if( material > 1 || distance( ro.xz, pos.xz ) > dist+GRIDSIZE ) break;
-		vec2 offset;
-		getSphereOffset( pos.xz, offset );
-		
-		getMovingSpherePosition( pos.xz, -offset, sphereCenter );
-		
-		if( intersectUnitSphere( ro, rd, sphereCenter, distcheck, normalcheck ) && distcheck < dist ) {
-			dist = distcheck;
-			normal = normalcheck;
-			material = 2;
-		}
-		
-		getSpherePosition( pos.xz, offset, sphereCenter );
-		if( intersectUnitSphere( ro, rd, sphereCenter, distcheck, normalcheck ) && distcheck < dist ) {
-			dist = distcheck;
-			normal = normalcheck;
-			col = vec3( 2. );
-			material = 3;
-		}
-		mm = step(dis.xyz, dis.zyx);
-		dis += mm * rs * ri;
-		pos += mm * rs;		
-	}
-	
-	vec3 color = vec3( 0. );
-	if( material > 0 ) {
-		intersection = ro + rd*dist;
-		vec2 map = floor(intersection.xz/GRIDSIZE)*GRIDSIZE;
-		
-		if( material == 1 || material == 3 ) {
-			// lightning
-			vec3 c = vec3( -GRIDSIZE,0., GRIDSIZE );
-			for( int x=0; x<3; x++ ) {
-				for( int y=0; y<3; y++ ) {
-					vec2 mapoffset = map+vec2( c[x], c[y] );		
-					vec2 offset;
-					getSphereOffset( mapoffset, offset );
-					vec3 lcolor = getSphereColor( mapoffset );
-					vec3 lpos;
-					getMovingSpherePosition( mapoffset, -offset, lpos );
-					
-					float shadow = 1.;
-#ifdef SHADOW
-					if( material == 1 ) {
-						for( int sx=0; sx<3; sx++ ) {
-							for( int sy=0; sy<3; sy++ ) {
-								if( shadow < 1. ) continue;
-								
-								vec2 smapoffset = map+vec2( c[sx], c[sy] );		
-								vec2 soffset;
-								getSphereOffset( smapoffset, soffset );
-								vec3 slpos, sn;
-								getSpherePosition( smapoffset, soffset, slpos );
-								float sd;
-								if( intersectUnitSphere( intersection, normalize( lpos - intersection ), slpos, sd, sn )  ) {
-									shadow = 0.;
-								}							
-							}
-						}
-					}
-#endif
-					color += col * lcolor * ( shadow * max( dot( normalize(lpos-intersection), normal ), 0.) *
-											 (1. - clamp( distance( lpos, intersection )/GRIDSIZE, 0., 1.) ) );
-				}
-			}
-		} else {
-			// emitter
-			color = (1.5+dot(normal, vec3( 0.5, 0.5, -0.5) )) *getSphereColor( map );
-		}
-	}
-	return color;
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
-	vec2 q = fragCoord.xy/iResolution.xy;
-	vec2 p = -1.0+2.0*q;
-	p.x *= iResolution.x/iResolution.y;
-	
-	// camera	
-	vec3 ce = vec3( cos( 0.232*time) * 10., 6.+3.*cos(0.3*time), GRIDSIZE*(time/SPEED) );
-	vec3 ro = ce;
-	vec3 ta = ro + vec3( -sin( 0.232*time) * 10., -2.0+cos(0.23*time), 10.0 );
-	
-	float roll = -0.15*sin(0.5*time);
-	
-	// camera tx
-	vec3 cw = normalize( ta-ro );
-	vec3 cp = vec3( sin(roll), cos(roll),0.0 );
-	vec3 cu = normalize( cross(cw,cp) );
-	vec3 cv = normalize( cross(cu,cw) );
-	vec3 rd = normalize( p.x*cu + p.y*cv + 1.5*cw );
-	
-	// raytrace
-	int material;
-	vec3 normal, intersection;
-	float dist;
-	
-	vec3 col = trace(ro, rd, intersection, normal, dist, material);
-
-#ifdef REFLECTION
-	if( material > 0 ) {
-		vec3 ro = intersection + EPSILON*normal;
-		rd = reflect( rd, normal );
-		col += 0.05 * trace(ro, rd, intersection, normal, dist, material);
-	}
-#endif
-	
-	col = pow( col, vec3(EXPOSURE, EXPOSURE, EXPOSURE) );	
-	col = clamp(col, 0.0, 1.0);
-	
-	// vigneting
-	col *= 0.25+0.75*pow( 16.0*q.x*q.y*(1.0-q.x)*(1.0-q.y), 0.15 );
-	
-	fragColor = vec4( col,1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/reinder-tokyo.slang b/procedural/reinder-tokyo.slang
deleted file mode 100644
index 72f4b66de9..0000000000
--- a/procedural/reinder-tokyo.slang
+++ /dev/null
@@ -1,403 +0,0 @@
-#version 450
-// Created by Reinder Nijhoff 2014
-// @reindernijhoff
-//
-// https://www.shadertoy.com/view/Xtf3zn
-//
-// car model is made by Eiffie
-// shader 'Shiny Toy': https://www.shadertoy.com/view/ldsGWB
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define BUMPMAP
-#define MARCHSTEPS 128
-#define MARCHSTEPSREFLECTION 48
-#define LIGHTINTENSITY 5.
-
-//----------------------------------------------------------------------
-
-const vec3 backgroundColor = vec3(0.2,0.4,0.6) * 0.09;
-#define time (iGlobalTime + 90.)
-
-//----------------------------------------------------------------------
-// noises
-
-float hash( float n ) {
-    return fract(sin(n)*687.3123);
-}
-
-float noise( in vec2 x ) {
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float n = p.x + p.y*157.0;
-    return mix(mix( hash(n+  0.0), hash(n+  1.0),f.x),
-               mix( hash(n+157.0), hash(n+158.0),f.x),f.y);
-}
-
-const mat2 m2 = mat2( 0.80, -0.60, 0.60, 0.80 );
-
-float fbm( vec2 p ) {
-    float f = 0.0;
-    f += 0.5000*noise( p ); p = m2*p*2.02;
-    f += 0.2500*noise( p ); p = m2*p*2.03;
-    f += 0.1250*noise( p ); p = m2*p*2.01;
-//    f += 0.0625*noise( p );
-    
-    return f/0.9375;
-}
-
-//----------------------------------------------------------------------
-// distance primitives
-
-float udRoundBox( vec3 p, vec3 b, float r ) {
-  return length(max(abs(p)-b,0.0))-r;
-}
-
-float sdBox( in vec3 p, in vec3 b ) {
-    vec3 d = abs(p) - b;
-    return min(max(d.x,max(d.y,d.z)),0.0) + length(max(d,0.0));
-}
-
-float sdSphere( in vec3 p, in float s ) {
-    return length(p)-s;
-}
-
-float sdCylinder( in vec3 p, in vec2 h ) {
-    vec2 d = abs(vec2(length(p.xz),p.y)) - h;
-    return min(max(d.x,d.y),0.0) + length(max(d,0.0));
-}
-
-//----------------------------------------------------------------------
-// distance operators
-
-float opU( float d2, float d1 ) { return min( d1,d2); }
-float opS( float d2, float d1 ) { return max(-d1,d2); }
-float smin( float a, float b, float k ) { return -log(exp(-k*a)+exp(-k*b))/k; } //from iq
-
-//----------------------------------------------------------------------
-// Map functions
-
-// car model is made by Eiffie
-// shader 'Shiny Toy': https://www.shadertoy.com/view/ldsGWB
-
-float mapCar(in vec3 p0){ 
-	vec3 p=p0+vec3(0.0,1.24,0.0);
-	float r=length(p.yz);
-	float d= length(max(vec3(abs(p.x)-0.35,r-1.92,-p.y+1.4),0.0))-0.05;
-	d=max(d,p.z-1.0);
-	p=p0+vec3(0.0,-0.22,0.39);
-	p.xz=abs(p.xz)-vec2(0.5300,0.9600);p.x=abs(p.x);
-	r=length(p.yz);
-	d=smin(d,length(max(vec3(p.x-0.08,r-0.25,-p.y-0.08),0.0))-0.04,8.0);
-	d=max(d,-max(p.x-0.165,r-0.24));
-	float d2=length(vec2(max(p.x-0.13,0.0),r-0.2))-0.02;
-	d=min(d,d2);
-
-	return d;
-}
-
-float dL; // minimal distance to light
-
-float map( const in vec3 p ) {
-	vec3 pd = p;
-    float d;
-    
-    pd.x = abs( pd.x );
-    pd.z *= -sign( p.x );
-    
-    float ch = hash( floor( (pd.z+18.*time)/40. ) );
-    float lh = hash( floor( pd.z/13. ) );
-    
-    vec3 pdm = vec3( pd.x, pd.y, mod( pd.z, 10.) - 5. );
-    dL = sdSphere( vec3(pdm.x-8.1,pdm.y-4.5,pdm.z), 0.1 );
-    
-    dL = opU( dL, sdBox( vec3(pdm.x-12., pdm.y-9.5-lh,  mod( pd.z, 91.) - 45.5 ), vec3(0.2,4.5, 0.2) ) );
-    dL = opU( dL, sdBox( vec3(pdm.x-12., pdm.y-11.5+lh, mod( pd.z, 31.) - 15.5 ), vec3(0.22,5.5, 0.2) ) );
-    dL = opU( dL, sdBox( vec3(pdm.x-12., pdm.y-8.5-lh,  mod( pd.z, 41.) - 20.5 ), vec3(0.24,3.5, 0.2) ) );
-   
-    if( lh > 0.5 ) {
-	    dL = opU( dL, sdBox( vec3(pdm.x-12.5,pdm.y-2.75-lh,  mod( pd.z, 13.) - 6.5 ), vec3(0.1,0.25, 3.2) ) );
-    }
-    
-    vec3 pm = vec3( mod( pd.x + floor( pd.z * 4. )*0.25, 0.5 ) - 0.25, pd.y, mod( pd.z, 0.25 ) - 0.125 );
-	d = udRoundBox( pm, vec3( 0.245,0.1, 0.12 ), 0.005 ); 
-    
-    d = opS( d, -(p.x+8.) );
-    d = opU( d, pd.y );
-
-    vec3 pdc = vec3( pd.x, pd.y, mod( pd.z+18.*time, 40.) - 20. );
-    
-    // car
-    if( ch > 0.75 ) {
-        pdc.x += (ch-0.75)*4.;
-	    dL = opU( dL, sdSphere( vec3( abs(pdc.x-5.)-1.05, pdc.y-0.55, pdc.z ),    0.025 ) );
-	    dL = opU( dL, sdSphere( vec3( abs(pdc.x-5.)-1.2,  pdc.y-0.65,  pdc.z+6.05 ), 0.025 ) );
-
-        d = opU( d,  mapCar( (pdc-vec3(5.,-0.025,-2.3))*0.45 ) );
- 	}
-    
-    d = opU( d, 13.-pd.x );
-    d = opU( d, sdCylinder( vec3(pdm.x-8.5, pdm.y, pdm.z), vec2(0.075,4.5)) );
-    d = opU( d, dL );
-    
-	return d;
-}
-
-//----------------------------------------------------------------------
-
-vec3 calcNormalSimple( in vec3 pos ) {   
-    const vec2 e = vec2(1.0,-1.0)*0.005;
-
-    vec3 n = normalize( e.xyy*map( pos + e.xyy ) + 
-					    e.yyx*map( pos + e.yyx )   + 
-					    e.yxy*map( pos + e.yxy )   + 
-					    e.xxx*map( pos + e.xxx )   );  
-    return n;
-}
-
-vec3 calcNormal( in vec3 pos ) {
-    vec3 n = calcNormalSimple( pos );
-    if( pos.y > 0.12 ) return n;
-
-#ifdef BUMPMAP
-    vec2 oc = floor( vec2(pos.x+floor( pos.z * 4. )*0.25, pos.z) * vec2( 2., 4. ) );
-
-    if( abs(pos.x)<8. ) {
-		oc = pos.xz;
-    }
-    
-     vec3 p = pos * 250.;
-   	 vec3 xn = 0.05*vec3(noise(p.xz)-0.5,0.,noise(p.zx)-0.5);
-     xn += 0.1*vec3(fbm(oc.xy)-0.5,0.,fbm(oc.yx)-0.5);
-    
-    n = normalize( xn + n );
-#endif
-    
-    return n;
-}
-
-vec3 integer1, integer2, nor1;
-vec4 lint1, lint2;
-
-float intersect( in vec3 ro, in vec3 rd ) {
-	const float precis = 0.001;
-    float h = precis*2.0;
-    float t = 0.;
-    integer1 = integer2 = vec3( -500. );
-    lint1 = lint2 = vec4( -500. );
-    float mld = 100.;
-    
-	for( int i=0; i < MARCHSTEPS; i++ ) {
-        h = map( ro+rd*t );
-		if(dL < mld){
-			mld=dL;
-            lint1.xyz = ro+rd*t;
-			lint1.w = abs(dL);
-		}
-        if( h < precis ) {
-            integer1.xyz = ro+rd*t;
-            break;
-        } 
-        t += max(h, precis*2.);
-    }
-    
-    if( integer1.z < -400. || t > 300.) {
-        // check intersection with plane y = -0.1;
-        float d = -(ro.y + 0.1)/rd.y;
-		if( d > 0. ) {
-			integer1.xyz = ro+rd*d;
-	    } else {
-        	return -1.;
-    	}
-    }
-    
-    ro = ro + rd*t;
-    nor1 = calcNormal(ro);
-    ro += 0.01*nor1;
-    rd = reflect( rd, nor1 );
-    t = 0.0;
-    h = precis*2.0;
-    mld = 100.;
-    
-    for( int i=0; i < MARCHSTEPSREFLECTION; i++ ) {
-        h = map( ro+rd*t );
-		if(dL < mld){
-			mld=dL;            
-            lint2.xyz = ro+rd*t;
-			lint2.w = abs(dL);
-		}
-        if( h < precis ) {
-   			integer2.xyz = ro+rd*t;
-            return 1.;
-        }   
-        t += max(h, precis*2.);
-    }
-
-    return 0.;
-}
-
-//----------------------------------------------------------------------
-// shade
-
-vec3 shade( in vec3 ro, in vec3 pos, in vec3 nor ) {
-    vec3  col = vec3(0.5);
-    
-    if( abs(pos.x) > 15. || abs(pos.x) < 8. ) col = vec3( 0.02 );
-    if( pos.y < 0.01 ) {
-        if( abs( integer1.x ) < 0.1 ) col = vec3( 0.9 );
-        if( abs( abs( integer1.x )-7.4 ) < 0.1 ) col = vec3( 0.9 );
-    }    
-    
-    float sh = clamp( dot( nor, normalize( vec3( -0.3, 0.3, -0.5 ) ) ), 0., 1.);
-  	col *= (sh * backgroundColor);  
- 
-    if( abs( pos.x ) > 12.9 && pos.y > 9.) { // windows
-        float ha = hash(  133.1234*floor( pos.y / 3. ) + floor( (pos.z) / 3. ) );
-        if( ha > 0.95) {
-            col = ( (ha-0.95)*10.) * vec3( 1., 0.7, 0.4 );
-        }
-    }
-    
-	col = mix(  backgroundColor, col, exp( min(max(0.1*pos.y,0.25)-0.065*distance(pos, ro),0.) ) );
-  
-    return col;
-}
-
-vec3 getLightColor( in vec3 pos ) {
-    vec3 lcol = vec3( 1., .7, .5 );
-    
-	vec3 pd = pos;
-    pd.x = abs( pd.x );
-    pd.z *= -sign( pos.x );
-    
-    float ch = hash( floor( (pd.z+18.*time)/40. ) );
-    vec3 pdc = vec3( pd.x, pd.y, mod( pd.z+18.*time, 40.) - 20. );
-
-    if( ch > 0.75 ) { // car
-        pdc.x += (ch-0.75)*4.;
-        if(  sdSphere( vec3( abs(pdc.x-5.)-1.05, pdc.y-0.55, pdc.z ), 0.25) < 2. ) {
-            lcol = vec3( 1., 0.05, 0.01 );
-        }
-    }
-    if( pd.y > 2. && abs(pd.x) > 10. && pd.y < 5. ) {
-        float fl = floor( pd.z/13. );
-        lcol = 0.4*lcol+0.5*vec3( hash( .1562+fl ), hash( .423134+fl ), 0. );
-    }
-    if(  abs(pd.x) > 10. && pd.y > 5. ) {
-        float fl = floor( pd.z/2. );
-        lcol = 0.5*lcol+0.5*vec3( hash( .1562+fl ),  hash( .923134+fl ), hash( .423134+fl ) );
-    }
-   
-    return lcol;
-}
-
-float randomStart(vec2 co){return 0.8+0.2*hash(dot(co,vec2(123.42,117.853))*412.453);}
-
-//----------------------------------------------------------------------
-// main
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {    
-    vec2 q = fragCoord.xy / iResolution.xy;
-	vec2 p = -1.0 + 2.0*q;
-	p.x *= iResolution.x / iResolution.y;
-        
-    if (q.y < .12 || q.y >= .88) {
-		fragColor=vec4(0.,0.,0.,1.);
-		return;
-	}
-    
-    // camera
-    float z = time;
-    float x = -10.9+1.*sin(time*0.2);
-	vec3 ro = vec3(x,  1.3+.3*cos(time*0.26), z-1.);
-    vec3 ta = vec3(-8.,1.3+.4*cos(time*0.26), z+4.+cos(time*0.04));
-    
-    vec3 ww = normalize( ta - ro );
-    vec3 uu = normalize( cross(ww,vec3(0.0,1.0,0.0) ) );
-    vec3 vv = normalize( cross(uu,ww));
-	vec3 rd = normalize( -p.x*uu + p.y*vv + 2.2*ww );
-    
-    vec3 col = backgroundColor;
-
-    // raymarch
-    float ints = intersect(ro+randomStart(p)*rd ,rd );
-    if(  ints > -0.5 ) {
-        
-        // calculate reflectance
-		float r = 0.09;     	        
-        if( integer1.y > 0.129 ) r = 0.025 * hash(  133.1234*floor( integer1.y / 3. ) + floor( integer1.z / 3. ) );
-        if( abs(integer1.x) < 8. ) {
-            if( integer1.y < 0.01 ) { // road
-	            r = 0.007*fbm(integer1.xz);
-            } else { // car
-                r = 0.02;
-            }
-        }
-        if( abs( integer1.x ) < 0.1 ) r *= 4.;
-        if( abs( abs( integer1.x )-7.4 ) < 0.1 ) r *= 4.;
-        
-        r *= 2.;
-        
-        col = shade( ro, integer1.xyz, nor1 );
-        
-        if( ints > 0.5 ) {
-            col += r * shade( integer1.xyz, integer2.xyz, calcNormalSimple(integer2.xyz) );
-        }  
-        if( lint2.w > 0. ) {            
-            col += (r*LIGHTINTENSITY*exp(-lint2.w*7.0)) * getLightColor(lint2.xyz);
-        } 
-    } 
-      
-    // Rain (by Dave Hoskins)
-	vec2 st = 256. * ( p* vec2(.5, .01)+vec2(time*.13-q.y*.6, time*.13) );
-    float f = noise( st ) * noise( st*0.773) * 1.55;
-	f = 0.25+ clamp(pow(abs(f), 13.0) * 13.0, 0.0, q.y*.14);
-    
-    if( lint1.w > 0. ) {
-        col += (f*LIGHTINTENSITY*exp(-lint1.w*7.0)) * getLightColor(lint1.xyz);
-    }  
-    
-	col += 0.25*f*(0.2+backgroundColor);
-
-    // post processing
-	col = pow( clamp(col,0.0,1.0), vec3(0.4545) );
-	col *= 1.2*vec3(1.,0.99,0.95);   
-	col = clamp(1.06*col-0.03, 0., 1.);  
-    q.y = (q.y-.12)*(1./0.76);
-	col *= 0.5 + 0.5*pow( 16.0*q.x*q.y*(1.0-q.x)*(1.0-q.y), 0.1 ); 
-
-    fragColor = vec4( col, 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/reinder-wolfenstein3d.slang b/procedural/reinder-wolfenstein3d.slang
deleted file mode 100644
index d7db23d9ac..0000000000
--- a/procedural/reinder-wolfenstein3d.slang
+++ /dev/null
@@ -1,470 +0,0 @@
-#version 450
-// Wolfenstein. Created by Reinder Nijhoff 2013
-// @reindernijhoff
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define NUM_MATERIALS 3
-#define NUM_OBJECTS 1
-#define SECONDS_IN_ROOM 3.
-#define ROOM_SIZE 10.
-#define MAXSTEPS 17
-#define MATERIAL_DOOR 200
-#define MATERIAL_DOORWAY 201
-
-#define COL(r,g,b) vec3(r/255.,g/255.,b/255.)
-
-#define time (iGlobalTime+40.)
-vec3 rdcenter;
-
-//----------------------------------------------------------------------
-// Math functions
-
-float hash( const float n ) {
-    return fract(sin(n*14.1234512)*51231.545341231);
-}
-float hash( const vec2 x ) {
-	float n = dot( x, vec2(14.1432,1131.15532) );
-    return fract(sin(n)*51231.545341231);
-}
-float crossp( const vec2 a, const vec2 b ) { return a.x*b.y - a.y*b.x; }
-vec3 rotate(vec3 r, float v){ return vec3(r.x*cos(v)+r.z*sin(v),r.y,r.z*cos(v)-r.x*sin(v));}
-bool intersectSegment(const vec3 ro, const vec3 rd, const vec2 a, const vec2 b, out float dist, out float u) {
-	vec2 p = ro.xz;	vec2 r = rd.xz;
-	vec2 q = a-p;	vec2 s = b-a;
-	float rCrossS = crossp(r, s);
-	
-	if( rCrossS == 0.){
-		return false;
-    } else {
-		dist = crossp(q, s) / rCrossS;
-		u = crossp(q, r) / rCrossS;
-	
-		if(0. <= dist && 0. <= u && u <= 1.){
-			return true;
-        } else {
-			return false;
-        }
-    }
-}
-
-//----------------------------------------------------------------------
-// Material helper functions
-
-float onCircle( const vec2 c, const vec2 centre, const float radius ) {
-	return clamp( 4.*(radius - distance(c,centre)), 0., 1. );
-}
-float onCircleLine( const vec2 c, const vec2 centre, const float radius ) {
-	return clamp( 1.-1.5*abs(radius - distance(c,centre)), 0., 1. );
-}
-float onLine( const float c, const float b ) {
-	return clamp( 1.-abs(b-c), 0., 1. );
-}
-float onBand( const float c, const float mi, const float ma ) {
-	return clamp( (ma-c+1.), 0., 1. )*clamp( (c-mi+1.), 0., 1. );
-}
-float onLineSegmentX( const vec2 c, const float b, const float mi, const float ma ) {
-	return onLine( c.x, b )*onBand( c.y, mi, ma );
-}
-float onLineSegmentY( const vec2 c, const float b, const float mi, const float ma ) {
-	return onLine( c.y, b )*onBand( c.x, mi, ma );
-}
-float onRect( const vec2 c, const vec2 lt, const vec2 rb ) {
-	return onBand( c.x, lt.x, rb.x )*onBand( c.y, lt.y, rb.y );
-}
-vec3 addBevel( const vec2 c, const vec2 lt, const vec2 rb, const float size, const float strength, const float lil, const float lit, const vec3 col ) {
-	float xl = clamp( (c.x-lt.x)/size, 0., 1. ); 
-	float xr = clamp( (rb.x-c.x)/size, 0., 1. );	
-	float yt = clamp( (c.y-lt.y)/size, 0., 1. ); 
-	float yb = clamp( (rb.y-c.y)/size, 0., 1. );	
-
-	return mix( col, col*clamp(1.0+strength*(lil*(xl-xr)+lit*(yb-yt)), 0., 2.), onRect( c, lt, rb ) );
-}
-vec3 addKnob( const vec2 c, const vec2 centre, const float radius, const float strength, const vec3 col ) {
-	vec2 lv = normalize( centre-c );
-	return mix( col, col*(1.0+strength*dot(lv,vec2(-0.7071,0.7071))), onCircle(c, centre, radius ) );
-}
-float stepeq( float a, float b ) { 
-	return step( a, b )*step( b, a );
-}
-//----------------------------------------------------------------------
-// Generate materials!
-
-void getMaterialColor( const int material, in vec2 uv, const float decorationHash, out vec3 col ) {	
-	vec3 fgcol;
-	
-	uv = floor( mod(uv+64., vec2(64.)) );
-	vec2 uvs = uv / 64.;
-	
-	// basecolor
-	vec3 basecol = vec3( mix(55./255.,84./255.,uvs.y ) );	
-	float br = hash(uv);
-	col = basecol;
-// grey bricks
-	if( material == 0 || material == 1 ) {
-		vec2 buv = vec2( mod(uv.x+1. + (floor((uv.y+1.) / 16.) * 16.), 32.) , mod( uv.y+1., 16.) );
-		float bbr = mix( 190./255., 91./255., (buv.y)/14. ) + 0.05*br;
-		if ( buv.x < 2. || buv.y < 2.) {
-			bbr = 72./255.; 
-		}
-		col = vec3(bbr*0.95);
-		col = addBevel( buv, vec2(1.,1.), vec2( 31.5, 15.), 2., 0.35, 1., 1., col);
-	// blue wall
-		if( material == 1 ) {
-			col *= 1.3*COL(11.,50.,209.);
-			col = mix( col, COL(2.,15.,86.), onBand(uv.y,14.,49.));
-			col = mix( col, COL(9.,44.,185.)*(0.9+0.1*br), onBand(uv.y,16.,47.));
-			col = mix( col, COL(3.,25.,122.), onBand(uv.y,21.,42.));
-			col = addBevel( uv, vec2(-1.,16.), vec2( 65., 21.), 1., 0.35, 1., 1., col);
-			col = addBevel( uv, vec2(-1.,43.), vec2( 65., 48.), 1., 0.35, 1., 1., col);
-			
-			col = mix( col, COL(2.,11.,74.), onRect(uv, vec2(22.,22.), vec2(42.,42.)));		
-			col = mix( col, COL(9.,44.,185.)*(0.95+0.1*br), onRect(uv, vec2(22.,23.), vec2(42.,40.)));
-			col = addBevel( uv, vec2(22.,23.), vec2(42.,40.), 1., 0.2, -1., 1., col);
-			col = mix( col, mix(COL(2.,11.,74.), COL(3.,25.,122.), (uv.x-26.)/3.), onRect(uv, vec2(26.,23.), vec2(29.,29.)));
-			col = mix( col, mix(COL(2.,11.,74.), COL(3.,25.,122.), (uv.y-34.)/2.), onRect(uv, vec2(22.,34.), vec2(29.,36.)));
-			col = mix( col, mix(COL(2.,11.,74.), COL(3.,25.,122.), (uv.y-27.)/2.), onRect(uv, vec2(35.,27.), vec2(42.,29.)));
-			col = mix( col, mix(COL(2.,11.,74.), COL(3.,25.,122.), (uv.y-34.)/8.), onRect(uv, vec2(35.,34.), vec2(38.,42.)));
-		}
-	}
-// wooden wall
-	else if( material == 2 ) {
-		float mx = mod( uv.x, 64./5. ); 
-		float h1 = hash( floor(uv.x/(64./5.)) );
-		float h2 = hash( 1.+1431.16*floor(uv.x/(64./5.)) );
-		col = mix( COL(115.,75.,43.),COL( 71.,56.,26.), smoothstep( 0.2, 1., (0.7+h2)*abs(mod( h2-uv.y*(0.05+0.1*h2)+(1.+h1+h2)*sin(mx*(0.1+0.2*h2)), 2. )-1.) ) );
-
-		col = mix( col, mix(COL(40.,31.,13.), COL(142.,91.,56.), (uv.x)/2.), step(uv.x,2.) );
-		col = mix( col, mix(COL(40.,31.,13.), COL(142.,91.,56.), (uv.x-10.)/2.), step(10.,uv.x)*step(uv.x,12.) );
-		col = mix( col, mix(COL(40.,31.,13.), COL(142.,91.,56.), (uv.x-26.)/2.), step(26.,uv.x)*step(uv.x,28.) );
-		col = mix( col, mix(COL(40.,31.,13.), COL(142.,91.,56.), (uv.x-40.)/2.), step(40.,uv.x)*step(uv.x,42.) );
-		col = mix( col, mix(COL(40.,31.,13.), COL(142.,91.,56.), (uv.x-54.)/2.), step(54.,uv.x)*step(uv.x,56.) );
-
-		col = mix( col, mix(COL(83.,60.,31.), COL(142.,91.,56.), (uv.x- 8.)), step( 8.,uv.x)*step(uv.x,9.) );
-		col = mix( col, mix(COL(83.,60.,31.), COL(142.,91.,56.), (uv.x-24.)), step(24.,uv.x)*step(uv.x,25.) );
-		col = mix( col, mix(COL(83.,60.,31.), COL(142.,91.,56.), (uv.x-38.)), step(38.,uv.x)*step(uv.x,39.) );
-		col = mix( col, mix(COL(83.,60.,31.), COL(142.,91.,56.), (uv.x-52.)), step(52.,uv.x)*step(uv.x,53.) );
-		col = mix( col, mix(COL(83.,60.,31.), COL(142.,91.,56.), (uv.x-62.)), step(62.,uv.x) );
-		
-		col = mix( col, mix(COL(40.,31.,13.), COL(142.,91.,56.), (uv.y)/2.), step(uv.y,2.) );
-		col *= 1.-0.3*stepeq(uv.y,3.);
-	}
-// door
-	else if( material == MATERIAL_DOOR ) {
-		fgcol = COL(44., 176., 175.)*(0.95+0.15*sin(-0.25+ 4.*((-0.9-uvs.y)/(1.3-0.8*uvs.x)) ) );
-		fgcol = addBevel( uv, vec2(-1.,1.), vec2(62.,66.), 2., 0.4, -1., -1., fgcol);
-		fgcol = addBevel( uv, vec2( 6.,6.), vec2(57.,57.), 2.25, 0.5, -1., -1., fgcol);	
-		fgcol = mix( addKnob( mod( uv, vec2(8.) ), vec2(3.5), 1.65, 0.5, fgcol ), fgcol, onRect( uv,  vec2( 6.,6.), vec2(57.,57.)) ) ;
-		
-		//knob
-		fgcol *= 1.-0.2*onRect( uv, vec2( 13.5, 28.5 ), vec2( 22.5, 44.5 ) );
-		fgcol = mix( fgcol, mix( COL(44.,44.,44.),COL(152.,152.,152.), ((uv.x+(43.-uv.y)-15.)/25. ) ), onRect( uv, vec2( 15., 27. ), vec2( 24., 43. ) ) );
-		fgcol = addBevel( uv, vec2( 15., 27. ), vec2( 24., 43. ), 1., 0.45, 1., 1., fgcol);	
-		fgcol = mix( fgcol, addKnob( mod( uv, vec2(6.) ), vec2(4.25,5.5), 1.15, 0.75, fgcol ), onRect( uv,  vec2( 15., 27. ), vec2( 24., 43. ) ) ) ;
-
-		fgcol *= 1.-0.5*onRect( uv, vec2( 16.5, 33.5 ), vec2( 20.5, 38.5 ) );
-		fgcol = mix( fgcol, mix( COL(88.,84.,11.),COL(251.,242.,53.), ((uv.x+(37.-uv.y)-18.)/7. ) ), onRect( uv, vec2( 18., 33. ), vec2( 21., 37. ) ) );
-		fgcol = mix( fgcol, COL(0.,0.,0.), onRect( uv, vec2( 19., 34. ), vec2( 20., 35.7 ) ) );
-
-		fgcol *= 1.-0.2*onRect( uv, vec2( 6.5, 29.5 ), vec2( 10.5, 41.5 ) );
-		fgcol = mix( fgcol, mix( COL(88.,84.,11.),COL(251.,242.,53.), ((uv.x+(40.-uv.y)-9.)/13. ) ), onRect( uv, vec2( 9., 29. ), vec2( 11., 40. ) ) );
-		fgcol = addBevel( uv, vec2( 9., 29. ), vec2( 11., 40. ), 0.75, 0.5, 1., 1., fgcol);	
-		
-		col = mix( basecol, fgcol, onRect( uv, vec2(1.,1.), vec2(62.,62.) ) );	
-	}
-// doorway
-	else if( material == MATERIAL_DOORWAY ) {
-		fgcol = COL(44., 176., 175.)*(0.95+0.15*sin(-0.25+ 4.*((-0.9-uvs.y)/(1.3-0.8*uvs.x)) ) );
-		vec2 uvhx = vec2( 32.-abs(uv.x-32.), uv.y );
-		fgcol = addBevel( uvhx, vec2(-1.,1.), vec2(28.,66.), 2., 0.4, -1., -1., fgcol);
-		fgcol = addBevel( uvhx, vec2( 6.,6.), vec2(23.,57.), 2.25, 0.5, -1., -1., fgcol);	
-		fgcol = mix( addKnob( vec2( mod( uvhx.x, 22. ), mod( uvhx.y, 28. )), vec2(3.5), 1.65, 0.5, fgcol ), fgcol, onRect( uvhx,  vec2( 6.,6.), vec2(24.,57.)) ) ;
-		fgcol = mix( fgcol, vec3(0.), onRect( uv, vec2( 29., 1.), vec2( 35., 63.) ) );
-		col = mix( basecol, fgcol, onRect( uv, vec2(1.,1.), vec2(62.,62.) ) );	
-	}
-	
-// prison door	
-	if( decorationHash > 0.93 && material < (NUM_MATERIALS+1) ) {	
-		vec4 prisoncoords = vec4(12.,14.,52.,62.);
-	// shadow
-		col *= 1.-0.5*onRect( uv,  vec2( 11., 13. ), vec2( 53., 63. ) );
-	// hinge
-		col = mix( col, COL(72.,72.,72.), stepeq(uv.x, 53.)*step( mod(uv.y+2.,25.), 5.)*step(13.,uv.y) );
-		col = mix( col, COL(100.,100.,100.), stepeq(uv.x, 53.)*step( mod(uv.y+1.,25.), 3.)*step(13.,uv.y) );
-		
-		vec3 pcol = vec3(0.)+COL(100.,100.,100.)*step( mod(uv.x-4., 7.), 0. ); 
-		pcol += COL(55.,55.,55.)*step( mod(uv.x-5., 7.), 0. ); 
-		pcol = addBevel(uv, vec2(0.,17.), vec2(63.,70.), 3., 0.8, 0., -1., pcol);
-		pcol = addBevel(uv, vec2(0.,45.), vec2(22.,70.), 3., 0.8, 0., -1., pcol);
-		
-		fgcol = COL(72.,72.,72.);
-		fgcol = addBevel(uv, prisoncoords.xy, prisoncoords.zw+vec2(1.,1.), 1., 0.5, -1., 1., fgcol );
-		fgcol = addBevel(uv, prisoncoords.xy+vec2(3.,3.), prisoncoords.zw-vec2(2.,1.), 1., 0.5, 1., -1., fgcol );
-		fgcol = mix( fgcol, pcol, onRect( uv, prisoncoords.xy+vec2(3.,3.), prisoncoords.zw-vec2(3.,2.) ) );
-		fgcol = mix( fgcol, COL(72.,72.,72.), onRect( uv, vec2(15.,32.5), vec2(21.,44.) ) );
-		
-		fgcol = mix( fgcol, mix( COL(0.,0.,0.), COL(43.,43.,43.), (uv.y-37.) ), stepeq(uv.x, 15.)*step(37.,uv.y)*step(uv.y,38.) );
-		fgcol = mix( fgcol, mix( COL(0.,0.,0.), COL(43.,43.,43.), (uv.y-37.)/3. ), stepeq(uv.x, 17.)*step(37.,uv.y)*step(uv.y,40.) );
-		fgcol = mix( fgcol, COL(43.,43.,43.), stepeq(uv.x, 18.)*step(37.,uv.y)*step(uv.y,41.) );
-		fgcol = mix( fgcol, mix( COL(0.,0.,0.), COL(100.,100.,100.), (uv.y-37.)/3. ), stepeq(uv.x, 18.)*step(36.,uv.y)*step(uv.y,40.) );
-		fgcol = mix( fgcol, COL(43.,43.,43.), stepeq(uv.x, 19.)*step(37.,uv.y)*step(uv.y,40.) );
-
-		fgcol = mix( fgcol, mix( COL(84.,84.,84.), COL(108.,108.,108.), (uv.x-15.)/2. ), stepeq(uv.y, 32.)*step(15.,uv.x)*step(uv.x,17.) );
-		fgcol = mix( fgcol, COL(81.,81.,81.), stepeq(uv.y, 32.)*step(20.,uv.x)*step(uv.x,21.) );
-
-		col = mix( col, fgcol, onRect( uv, prisoncoords.xy, prisoncoords.zw ) );
-	}
-// flag
-	else if( decorationHash > 0.63 && material < (NUM_MATERIALS+1) ) {		
-		vec2 uvc = uv-vec2(32.,30.);
-	
-	// shadow	
-		vec4 shadowcoords = vec4( 14., 7., 
-								  54., max( 56. + sin( uv.x*0.32-1. ),56.) ); 
-		col *= 1.-0.3*onRect( uv,  vec2( 6., 6. ), vec2( 61., 7. ) );
-		col *= 1.-0.3*clamp( 0.25*(56.-uv.x), 0., 1.)*onRect( uv, shadowcoords.xy, shadowcoords.zw );
-
-	// rod
-		col = mix( col, COL(250.,167.,98.), onLineSegmentX( vec2( abs(uv.x-32.), uv.y ), 26., 4., 6.5 ) );
-		col = mix( col, COL(251.,242.,53.), onLineSegmentY( uv, 5., 4., 60. ) );
-		col = mix( col, COL(155.,76.,17.), onLineSegmentY( uv, 6., 4., 60. ) );
-		col = mix( col, COL(202.,96.,25.), onLineSegmentY( vec2( abs(uv.x-32.), uv.y ), 6., 26., 28. ) );
-		col = mix( col, COL(251.,242.,53.), onLineSegmentX( vec2( abs(uv.x-32.), uv.y ), 25., 3., 7. ) );
-		col = mix( col, COL(252.,252.,217.), onLineSegmentX( vec2( abs(uv.x-32.), uv.y ), 25., 4.3, 5.5 ) );
-		col = mix( col, COL(252.,252.,217.), onLineSegmentX( vec2( abs(uv.x-32.), uv.y ), 26., 5.3, 5.5 ) );
-		col = mix( col, COL(0.,0.,0.), onLineSegmentY( vec2( abs(uv.x-32.), uv.y ), 6., 18.3, 19.5 ) );
-
-	// flag	
-		vec4 flagcoords = vec4( 13., min( 9.5 - pow(5.5* (uvs.x-0.5), 2.), 9. ), 
-						    51., max( 55. + sin( uv.x*0.4+2.7 ),55.) ); 
-	
-		fgcol = COL(249.,41.,27.);
-		
-		fgcol = mix( fgcol, COL(255.,255.,255.), onBand( min(abs(uvc.x), abs(uvc.y)), 2., 4. ) );
-		fgcol = mix( fgcol, COL(72.,72.,72.), onLine( min(abs(uvc.x), abs(uvc.y)), 3. ) );		
-		
-		fgcol = mix( fgcol, COL(255.,255.,255.), onCircle( uv, vec2(32.,30.), 12.5 ) );	
-		fgcol = mix( fgcol, COL(0.,0.,0.), onCircleLine( uv, vec2(32.,30.), 11. ) );	
-		fgcol = mix( fgcol, COL(0.,0.,0.), onCircleLine( uv, vec2(32.,30.), 9. ) );
-		
-		vec2 uvr = vec2( (uvc.x-uvc.y)*0.7071, (uvc.y+uvc.x)*0.7071)*sign( uvc.x+0.5 );
-		fgcol = mix( fgcol, COL(72.,72.,72.), onRect( uvr, vec2(-1.,-1.), vec2(1.,4.) ) );
-		fgcol = mix( fgcol, COL(72.,72.,72.), onRect( uvr, vec2(-4.2, 4.2), vec2(1.,6.15) ) );
-		fgcol = mix( fgcol, COL(72.,72.,72.), onRect( uvr, vec2(-1.,-1.), vec2(4.,1.) ) );
-		fgcol = mix( fgcol, COL(72.,72.,72.), onRect( uvr, vec2( 4.2,-1.), vec2(6.15,4.2) ) );
-	
-		fgcol *= (0.8+0.2*sin( uv.x*0.4+2.7 ));
-		fgcol *= (0.8+0.2*clamp( 0.5*(uv.y-7.), 0., 1.));
-	
-	// mix flag on background
-		col = mix( col, fgcol, onRect( uv, flagcoords.xy, flagcoords.zw ) );
-	}
-	
-// fake 8-bit color palette and dithering	
-	col = floor( (col+0.5*mod(uv.x+uv.y,2.)/32.)*32.)/32.;
-}
-bool getObjectColor( const int object, in vec2 uv, inout vec3 icol ) {
-	uv = floor( mod(uv, vec2(64.)) );
-	vec2 uvs = uv / 64.;
-	vec3 col = vec3(20./255.);
-	float d;
-	
-// only a lamp for now
-	
-	// lamp top
-	d = distance( uv*vec2(1.,2.), vec2(28.1, 5.8)*vec2(1.,2.) );
-	col = mix( col, mix( COL(41.,250.,46.), COL(13.,99.,12.), clamp( d/8.-0.2, 0., 1.) ), 
-			  onCircle(uv, vec2(31.,13.6), 11.7 )*step( uv.y, 6. )); 
-	col = mix( col, COL(9.,75.,6.), onCircleLine( uv, vec2(31.,14.), 11.6 ) *
-			  step( length(uv-vec2(31.,13.6)), 11.7 )*step( uv.y, 6. ) );
-	col = mix( col, COL(100.,100.,100.), onLine( abs(uv.x-31.), 1. )*step( uv.y, 1. ) );
-	col = mix( col, COL(140.,140.,140.), onLine( abs(uv.x-31.), 0.25 )*step( uv.y, 1. )*step( 1., uv.y ) );
-	
-	// lamp bottom
-	d = distance( uv*vec2(1.,2.), vec2(30.5, 6.5)*vec2(1.,2.) );
-	col = mix( col, mix( COL(41.,250.,46.), COL(13.,99.,12.), clamp( abs(uv.x-31.)/4.-1.25, 0., 1. )), step( abs(uv.x-31.), 9. )*stepeq( uv.y, 7.) );
-	col = mix( col, mix( COL(41.,250.,46.), COL(16.,123.,17.), clamp( abs(uv.x-31.)/4.-1.25, 0., 1. )), step( abs(uv.x-31.), 9. )*stepeq( uv.y, 8.) );
-	col = mix( col, mix( COL(133.,250.,130.), COL(22.,150.,23.), clamp( abs(uv.x-31.)/4.-0.75, 0., 1. )), step( abs(uv.x-31.), 7. )*stepeq( uv.y, 9.) );
-
-	col = mix( col, mix( COL(255.,251.,187.), col, clamp( d/4.5-0.6, 0., 1.) ), 
-			  onCircle(uv, vec2(31.,1.), 10.2 )*step( uv.y, 8. )*step( 7., uv.y )); 
-	col = mix( col, mix( COL(255.,255.,255.), col, clamp( d/4.-0.7, 0., 1.) ), 
-			  onCircle(uv, vec2(31.,1.), 7.2 )*step( uv.y, 8. )*step( 7., uv.y )); 
-		
-	// floor
-	d = distance( vec2(mod(uv.x, 32.),uv.y)*vec2(1.5,30./3.), vec2(16., 61.5)*vec2(1.5,30./3.) );
-	col = mix( col, mix( COL(168.,168.,168.), COL(124.,124.,124.), clamp(d/15.-0.5, 0., 1.) ), step(d,24.5)); 
-	col = mix( col, mix( COL(124.,124.,124.), COL(140.,140.,140.), clamp((uv.y-59.)/1., 0., 1.)), step(59.,uv.y)*step(uv.x, 57.)*step(7.,uv.x)); 
-	col = mix( col, mix( COL(168.,168.,168.), COL(124.,124.,124.), clamp(abs(32.-uv.x)/10.-2., 0., 1.)), step(uv.y, 62.)*step(62.,uv.y)*step(uv.x, 61.)*step(3.,uv.x)); 
-	col = mix( col, mix( COL(152.,152.,152.), COL(124.,124.,124.), clamp(abs(32.-uv.x)/10.-2.25, 0., 1.)), step(uv.y, 61.)*step(61.,uv.y)*step(uv.x, 59.)*step(5.,uv.x)); 
-
-	col = floor( (col)*32.)/32.;
-	if( any(notEqual(col, vec3(floor((20./255.)*32.)/32.))) ) {
-		icol = col;
-		return true;
-	}
-	return false;
-}
-
-//----------------------------------------------------------------------
-// Proocedural MAP functions
-
-bool isWall( const vec2 vos ) {
-	return vos.y<0.4*ROOM_SIZE || vos.y>2.75*ROOM_SIZE || any( equal( mod( vos, vec2( ROOM_SIZE ) ), vec2(0.,0.) ) );
-}
-bool isDoor( const vec2 vos ) {
-	return isWall(vos) && ((hash(vos)>0.75 &&  any( equal( mod( vos, vec2( ROOM_SIZE*0.5 ) ), vec2(2.) ) )) 
-		    || any( equal( mod( vos, vec2( ROOM_SIZE ) ), vec2(ROOM_SIZE*0.5) ) )); 
-}
-bool isObject( const vec2 vos ) {
-	return hash( vos*10. ) > 0.95;
-}
-bool map( const vec2 vos ) {
-	return isObject( vos ) || isWall( vos );
-}
-
-//----------------------------------------------------------------------
-// Render MAP functions
-
-bool intersectSprite( const vec3 ro, const vec3 rd, const vec3 vos, const vec3 nor, out vec2 uv ) {
-	float dist, u;
-	vec2 a = vos.xz + nor.zx*vec2(-0.5,0.5) + vec2(0.5, 0.5);
-	vec2 b = vos.xz - nor.zx*vec2(-0.5,0.5) + vec2(0.5, 0.5);
-	if( intersectSegment( ro, rd, a, b, dist, u) ) {
-		uv.x = u; uv.y = 1.-(ro+dist*rd).y;
-		if( sign(nor.x)<0. ) uv.x = 1.-uv.x;
-		return uv.y>0.&&uv.y<1.;
-	}
-	return false;
-}
-int getMaterialId( const vec2 vos ) {
-	return int( mod( 521.21 * hash( floor((vos-vec2(0.5))/ROOM_SIZE )  ), float(NUM_MATERIALS)) );
-}
-bool getColorForPosition( const vec3 ro, const vec3 rd, const vec3 vos, const vec3 pos, const vec3 nor, inout vec3 col ) {	
-	vec2 uv;
-
-	if( isWall( vos.xz ) ) {
-		if( isDoor( vos.xz ) ) {
-			if( intersectSprite( ro, rd, vos+nor*0.03, nor, uv ) ) {
-				// open the door
-				uv.x -= clamp( 2.-0.75*distance( ro.xz, vos.xz+vec2(0.5) ), 0., 1.);
-				if( uv.x > 0. ) {
-					getMaterialColor( MATERIAL_DOOR, uv*64., 0., col );
-					return true;
-				}	
-			}	
-			return false;
-		}
-		// a wall is hit
-		if( pos.y <= 1. && pos.y >= 0. ) {
-			vec2 mpos = vec2( dot(vec3(-nor.z,0.0,nor.x),pos), -pos.y );
-    		float sha = 0.6 + 0.4*abs(nor.z);		
-			getMaterialColor( isDoor( vos.xz+nor.xz )?MATERIAL_DOORWAY:getMaterialId(vos.xz), mpos*64., hash( vos.xz ), col );
-			col *= sha;
-			return true;
-		}
-		return true;
-	}
-	if( isObject( vos.xz ) && !isWall( vos.xz+vec2(1.,0.) ) && !isWall( vos.xz+vec2(-1.,0.) )
-	    && !isWall( vos.xz+vec2(0.,-1.) ) && !isWall( vos.xz+vec2(0.,1.) ) &&
-	    intersectSprite( ro, rd, vos, rdcenter, uv ) ) {
-		return getObjectColor( 0, uv*64., col );
-	}
-	return false;
-}
-
-bool castRay( const vec3 ro, const vec3 rd, inout vec3 col ) {
-	vec3 pos = floor(ro);
-	vec3 ri = 1.0/rd;
-	vec3 rs = sign(rd);
-	vec3 dis = (pos-ro + 0.5 + rs*0.5) * ri;
-	
-	float res = 0.0;
-	vec3 mm = vec3(0.0);
-	bool hit = false;
-	
-	for( int i=0; i<MAXSTEPS; i++ )	{
-		if( hit ) continue;
-		
-		mm = step(dis.xyz, dis.zyx);
-		dis += mm * rs * ri;
-        pos += mm * rs;
-		
-		if( map(pos.xz) ) { 
-			vec3 mini = (pos-ro + 0.5 - 0.5*vec3(rs))*ri;
-			float t = max ( mini.x, mini.z );			
-			hit = getColorForPosition( ro, rd, pos, ro+rd*t, -mm*sign(rd), col );
-		}
-	}
-	return hit;
-}
-
-//----------------------------------------------------------------------
-// Some really ugly code
-
-#define CCOS(a) cos(clamp(a,0.,1.)*1.57079632679)
-#define CSIN(a) sin(clamp(a,0.,1.)*1.57079632679)
-vec3 path( const float t ) {
-	float tmod = mod( t/SECONDS_IN_ROOM, 8. );
-	float tfloor = floor( tmod );
-	
-	vec3 pos = vec3( 4.*ROOM_SIZE*floor(t/(SECONDS_IN_ROOM*8.))+0.5, 0.5, 0.5*ROOM_SIZE+0.5 );	
-	return pos + ROOM_SIZE*vec3(
-		clamp(tmod,0.,1.)+clamp(tmod-4.,0.,1.)+0.5*(2.+CSIN(tmod-1.)-CCOS(tmod-3.)+CSIN(tmod-5.)-CCOS(tmod-7.)), 0.,
-		clamp(tmod-2.,0.,1.)-clamp(tmod-6.,0.,1.)+0.5*(-CCOS(tmod-1.)+CSIN(tmod-3.)+CCOS(tmod-5.)-CSIN(tmod-7.)) );
-}
-
-
-//----------------------------------------------------------------------
-// Main
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
-	vec2 q = fragCoord.xy / iResolution.xy;
-    vec2 p = -1.0 + 2.0*q;
-    p.x *= iResolution.x/ iResolution.y;
-	
-	vec3 ro = path( time );
-	vec3 ta = path( time+0.1 );
-	
-    rdcenter = rotate( normalize( ta - ro), 0.3*cos(time*0.75) );
-    vec3 uu = normalize(cross( vec3(0.,1.,0.), rdcenter ));
-    vec3 vv = normalize(cross(rdcenter,uu));
-    vec3 rd = normalize( p.x*uu + p.y*vv + 2.5*rdcenter );
-	
-	vec3 col = rd.y>0.?vec3(56./255.):vec3(112./255.);
-	castRay( ro, rd, col );
-		
-	fragColor = vec4( col, 1.0 );
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/sdf-platform.slang b/procedural/sdf-platform.slang
deleted file mode 100644
index 55d37f7893..0000000000
--- a/procedural/sdf-platform.slang
+++ /dev/null
@@ -1,443 +0,0 @@
-#version 450
-// Xafer - 2017-04-30
-// https://www.shadertoy.com/view/4dlyzl
-
-// Reflections, refractions, lights such
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define NEAR 0.01
-#define FAR 12.0
-
-#define STEP_SIZE 0.1
-#define MAX_ITER 300
-#define MAX_CYCLES 2
-#define DELTA 0.01
-#define A_SPEED 0.3
-#define CAM_DIST 3.3
-
-#define RECAST_MAX 5
-
-#define GLOW_POWER 6.0
-#define GLOW_COLOR vec3(0.2,0.4,0.4)
-#define GRASS_SIZE vec2(0.005,0.4)
-
-#define SKY_COLOR vec3(0.1,0.3,0.4)
-
-
-//Structures
-
-struct Light
-{
-    vec3 pos;
-    vec3 color;
-    float radius;
-    float intensity;
-};
-    
-struct lComp
-{
-	vec3 specular;
-    float specularIntensity;
-    vec3 diffuse;
-};
-
-struct Ray
-{
-    vec3 pos;
-    vec3 dir;
-    float dist;
-    float near;
-};
-    
-struct Material
-{
-    vec3 color;
-    float specular;
-    float diffuse;//
-    float ambient;//Ambient light factor
-    float refl;//How reflective is a surface
-    float refr;//Refraction index
-    float opacity;//For refractions
-};
-
-    
-//Signed Distance Functions    
-
-float sdSphere(vec3 p)
-{
-    return length(p) - 1.0;
-}
-
-float sdPlane(vec3 p)
-{
-    return -p.y;
-}
-
-float sdBox( vec3 p)
-{
-  vec3 d = abs(p) - vec3(1.0);
-  return min(max(d.x,max(d.y,d.z)),0.0) + length(max(d,0.0));
-}
-
-float opAdd(float d1, float d2)
-{
-    return min(d1,d2);
-}
-
-float opSub(float d1, float d2)
-{
-    return max(-d1,d2);
-}
-
-float opInter(float d1, float d2)
-{
-    return max(d1,d2);
-}
-
-
-//Combinations
-    
-float walls(vec3 p)
-{
-    p.y -= 1.0;
-    p.y * 2.0;
-    
-    vec3 p2 = p;
-    vec3 p3 = p;
-    
-    float width = 0.1;
-    vec2 dist = vec2(5.0);
-    
-    p2.xz = mod(p2.xz,dist)-(dist/2.0);
-    p2.x /= width;
-    p2.z /= 2.0;
-    
-    p3.xz = mod(p3.xz,dist)-(dist/2.0);
-    p3.z /= width;
-    p3.x /= 2.0;
-    
-    float env = opAdd(sdPlane(p),opAdd(sdBox(p2),sdBox(p3)));
-    
-    env = opSub(max(-p.y - 0.3, p.y + 0.2),max(env,sdSphere(p/(CAM_DIST-0.4))));
-    
-    env = opAdd(env,sdSphere(p/0.7 + vec3(0,0.5,0)));
-    
-    return opSub(sdSphere(p),env);
-}
-
-float map(vec3 pos, float factor)
-{
-    return walls(pos);
-}
-
-float map(vec3 pos)
-{
- 	return map(pos,0.0);
-}
-
-//Environment propreties
-
-vec3 getNormal(vec3 p)
-{
-	vec2 delta = vec2 (DELTA, 0.0);
-	vec3 normal = normalize (vec3 (
-		map (p + delta.xyy) - map (p - delta.xyy),
-		map (p + delta.yxy) - map (p - delta.yxy),
-		map (p + delta.yyx) - map (p - delta.yyx)));
-	
-	return normalize(normal);
-}
-
-
-
-Material getMaterial(vec3 pos)
-{
-    Material mat;
-    mat.color = vec3(sin(pos.y),cos(pos.x),sin(pos.z))/2.0 + 0.5;
-    mat.refl = 0.0;
-    mat.refr = 0.8;
-    mat.opacity = 0.7;
-    
-    mat.color = mix(mat.color,getNormal(pos),0.2);
-    
-    return mat;
-}
-
-//RayMarching
-
-Ray march(Ray ray, int iterations)
-{
-    float n = 1.0 / min(iResolution.x, iResolution.y);
-    
-    for(int i = 0; i < iterations; i++)
-    {
-    	ray.near = map(ray.pos,sqrt(ray.dist)*n);
-        
-        if(ray.near < DELTA || ray.dist > FAR)
-            break;
-        
-        float n = ray.near * STEP_SIZE;
-        ray.pos += ray.dir * n;
-        ray.dist += n;
-    }
-    
-    return ray;
-}
-
-lComp getLighting(Ray ray)
-{
-    lComp lightComposition;
-    
-    //Looping through lights
-    Light light;
-    light.radius = 3.5;
-    light.intensity = 1.0;
-    light.pos = vec3(0,-1,0);
-    light.color = vec3(1.0,0.8,0.6);
-    
-    float specular;
-    float diffuse;
-    
-    vec3 rayPos = ray.pos;
-    vec3 dir = light.pos - ray.pos;
-    float lDist = length(dir);
-    
-    dir = normalize(dir);
-    
-    rayPos += DELTA*dir;
-    
-    float near = 0.0;
-    float dist = 0.0;
-    
-    float l;
-    
-    for(int i =0 ; i < MAX_ITER;i++)
-    {
-        near = map(rayPos);
-        l = length(rayPos-light.pos);
-        if(near < DELTA || dist > lDist)
-            break;
-        
-        float n = abs(near * 0.1);
-        
-        rayPos += n*dir;
-        dist += n;
-    }
-    
-    if(near < DELTA)
-        diffuse = 0.0;
-    else if(dist > lDist)
-    {
-        diffuse = max(0.0,1.0 - (lDist/light.radius));
-        specular = dot(reflect(ray.dir,getNormal(ray.pos)),dir)/2.0 + 0.5;
-        specular = -cos(specular*3.1416)/2.0 + 0.5;
-        specular = pow(specular,lDist*lDist);
-        //if(specular > 0.9);
-        //	specular /= 20.0;
-    }
-    
-    vec3 normal = getNormal(ray.pos);
-        
-    lightComposition.diffuse = mix(SKY_COLOR, light.color, diffuse);
-    lightComposition.specular = light.color;
-    lightComposition.specularIntensity = specular;
-    
-    return lightComposition;
-}
-
-//Marching through refractions
-
-vec3 getRefraction(Ray ray)
-{
-    vec3 color;
-    float colorFactor;
-    
-    float intensity = 1.0;
-   	Material mat = getMaterial(ray.pos);;
-    
-    for(int i = 0; i < MAX_CYCLES; i++)
-    {
-        vec3 normal = getNormal(ray.pos);
-        ray.dir = refract(ray.dir, normal, mat.refr);
-        
-        vec3 m = ray.dir*DELTA*2.0;
-        
-        int inside = 0;
-        
-        for(int j = 0; j < MAX_ITER && (ray.near < DELTA || inside == 1); j++)
-        {
-            ray.pos += m;
-            ray.dist += DELTA*2.0;
-            ray.near = map(ray.pos);
-        }
-        
-        ray.dir = refract(ray.dir,normal,mat.refr);
-        ray = march(ray,MAX_ITER);
-        
-        if(ray.near > DELTA || ray.dist > FAR)
-        {
-            color += SKY_COLOR*intensity;
-            colorFactor += intensity;
-            break;
-        }
-        
-        lComp lightComposition = getLighting(ray);
-        
-        mat = getMaterial(ray.pos);
-        
-        vec3 col = mix(mat.color * lightComposition.diffuse,lightComposition.specular, lightComposition.specularIntensity);
-        
-        color += mix(col,SKY_COLOR,ray.dist/FAR)*intensity;
-        colorFactor += intensity;
-        
-        intensity *= 1.0 - mat.opacity;
-    }
-    
-    return color/colorFactor;
-}
-
-//Marching through reflections
-
-vec3 getReflection(Ray ray)
-{
-    vec3 color;
-    float colorFactor;
-    
-    float intensity = 1.0;
-    
-    for(int i = 0; i < MAX_CYCLES; i++)
-    {
-        vec3 normal = getNormal(ray.pos);
-        ray.dir = reflect(ray.dir,normal);
-        ray.pos += ray.dir * DELTA;
-        
-        ray = march(ray, MAX_ITER);
-        
-        Material mat = getMaterial(ray.pos);
-        
-        intensity *= mat.refl;
-        
-        lComp lightComposition = getLighting(ray);
-        
-        vec3 col = mix(mat.color * lightComposition.diffuse, lightComposition.specular, lightComposition.specularIntensity);
-        
-        color += mix(col,SKY_COLOR,ray.dist/FAR)*intensity;
-        colorFactor += intensity;
-    }
-    
-    return color/colorFactor;
-}
-
-//Getting the color at the specified point
-
-vec3 getColor(Ray ray)
-{
-    
-    vec3 color;
-    vec3 normal = getNormal(ray.pos);
-    
-    if(ray.dist > FAR)
-    {
-		color = SKY_COLOR;
-    }
-    else if(ray.near <= DELTA)
-    {
-        Material mat = getMaterial(ray.pos);
-        
-        color = mat.color;
-        
-        lComp lightComposition = getLighting(ray);
-       	color *= lightComposition.diffuse;
-        
-        if(mat.refr > 0.0)
-            color = mix(getRefraction(ray),color,mat.opacity);
-        
-    	if(mat.refl > 0.0)
-            color = mix(color,getReflection(ray),mat.refl);
-        
-        color = mix(color, lightComposition.specular, lightComposition.specularIntensity);
-    
-    	color = mix(color, SKY_COLOR , ray.dist/FAR);
-        color = mix(color, SKY_COLOR , dot(ray.dir,normal)/2.0 + 0.5);
-    }
-    
-	return color;
-}
-
-vec3 castRay(vec3 origin, vec3 direction)
-{
-    //Generating ray
-    Ray ray;
-    ray.pos = origin;
-    ray.dir = direction;
-    ray.dist = 0.0;
-    
-    //Move the ray to a surface up to far distance
-    ray = march(ray, MAX_ITER*2);
-    
-    return getColor(ray);
-}
-
-//Initialisation
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    
-    //Setting up screen-correct uv
-	vec2 uv = ( fragCoord.xy / iResolution.xy ) * 2.0 - vec2( 1 );
-    uv.x *= iResolution.x/iResolution.y;
-    
-    //Setting up rotation
-    float sa = sin( iGlobalTime * A_SPEED );
-    float ca = cos( iGlobalTime * A_SPEED );
-    
-    float cDist = CAM_DIST + sin(iGlobalTime * A_SPEED);
-    
-    //Creating ray
-    vec3 or = vec3(sa*cDist,0.5,-ca*cDist);
-    vec3 di = -normalize(vec3(uv.x,uv.y,-1.0));
-    
-    //Rotating orientation
-    mat3 r;
-    r[0] = vec3(ca,0,sa);
-    r[1] = vec3(0,1,0);
-    r[2] = vec3(-sa,0,ca);
-    di = r*di;
-    
-    vec3 color = castRay(or,di);
-    
-	fragColor = vec4(color,1);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/shane-fractal-flythrough.slang b/procedural/shane-fractal-flythrough.slang
deleted file mode 100644
index 00bfea4ec8..0000000000
--- a/procedural/shane-fractal-flythrough.slang
+++ /dev/null
@@ -1,573 +0,0 @@
-#version 450
-/*
-	Quasi Infinite Zoom Voronoi
-	---------------------------
-
-	The infinite zoom effect has been keeping me amused for years.
-
-	This one is based on something I wrote some time ago, but was inspired by Fabrice Neyret's 
-	"Infinite Fall" shader. I've aired on the side of caution and called it "quasi infinite," 
-	just in case it doesn't adhere to his strict infinite zoom standards. :)
-
-	Seriously though, I put together a couple of overly optimized versions a couple of days ago,
-	just for fun, and Fabrice's comments were pretty helpful. I also liked the way he did the 
-	layer rotation in his "Infinite Fall" version, so I'm using that. The rest is stock standard 
-	infinite zoom stuff that has been around for years.
-
-	Most people like to use noise for this effect, so I figured I'd do something different
-	and use Voronoi. I've also bump mapped it, added specular highlights, etc. It was 
-	tempting to add a heap of other things, but I wanted to keep the example relatively simple.
-
-	By the way, most of the code is basic bump mapping and lighting. The infinite zoom code 
-	takes up just a small portion.
-	
-
-	Fabrice Neyret's versions:
-
-	infinite fall - short
-	https://www.shadertoy.com/view/ltjXWW
-
-    infinite fall - FabriceNeyret2
-    https://www.shadertoy.com/view/4sl3RX
-
-	Other examples:
-
-    Fractal Noise - mu6k
-    https://www.shadertoy.com/view/Msf3Wr
-
-    Infinite Sierpinski - gleurop
-    https://www.shadertoy.com/view/MdfGR8
-
-    Infinite Zoom - fizzer
-    https://www.shadertoy.com/view/MlXGW7
-
-	Private link to a textured version of this.
-	Bumped Infinite Zoom Texture - Shane
-	https://www.shadertoy.com/view/Xl2XWw
-*/
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/*
-
-	Fractal Flythrough
-	------------------
-
-	Moving a camera through a fractal object. It's a work in progress.
-
-	I was looking at one of Dr2's shaders that involved moving a camera through a set of way points (set
-	out on the XZ plane), and thought it'd be cool to do a similar 3D version. The idea was to create a
-	repetitive kind of fractal object, give the open space nodes a set random direction, create some 
-	spline points, then run a smooth camera through them. Simple... right? It always seems simple in my
-	head, but gets progressively harder when I try it in a shader. :)
-
-	I've run into that classic up-vector, camera flipping problem... At least, I think that's the problem? 
-	Anyway, I'm hoping the solution is simple, and that someone reading this will be able to point me in 
-	the right direction.
-
-	For now, I've set up a set of 16 random looping points that the camera seems reasonably comfortable 
-	with. Just for the record, the general setup works nicely, until the camera loops back on itself in 
-	the YZ plane. I'm guessing that increasing the number of way points may eradicate some of the
-    intermittent camera spinning, but I figured I'd leave things alone and treat it as a feature. :)
-
-	By the way, I was thankful to have Otavio Good's spline setup in his "Alien Beacon" shader as a 
-	reference. On a side note, that particular shader is one of my all time favorites on this site.
-
-	The rendering materials are slightly inspired by the Steampunk genre. Timber, granite, brass, etc. 
-	It needs spinning turbines, gears, rivots, and so forth, but that stuff's expensive. Maybe later. 
-	Tambako	Jaguar did a really cool shader in the Steampunk aesthetic. The link is below.
-
-	Besides camera path, there's a whole bunch of improvements I'd like to make to this. I've relied on
-	occlusion to mask the fact that there are no shadows. I'm hoping to free up some cycles, so I can put
-	them back in. I'd also like to add extra detail, but that also slows things down. As for the comments,
-	they're very rushed, but I'll tidy those up as well.
-
-	References:
-
-	Alien Beacon - Otavio Good
-	https://www.shadertoy.com/view/ld2SzK
-
-    Steampunk Turbine - TambakoJaguar
-    https://www.shadertoy.com/view/lsd3zf
-    
-    // The main inspiration for this shader.
-	Mandelmaze in Daylight - dr2
-    https://www.shadertoy.com/view/MdVGRc
-
-*/
-
-const float FAR = 50.0; // Far plane.
-
-// Used to identify individual scene objects. In this case, there are only three: The metal framework, the gold
-// and the timber.
-float objID = 0.; // Wood = 1., Metal = 2., Gold = 3..
-
-// Simple hash function.
-float hash( float n ){ return fract(cos(n)*45758.5453); }
-
-
-
-// Tri-Planar blending function. Based on an old Nvidia writeup:
-// GPU Gems 3 - Ryan Geiss: https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch01.html
-vec3 tex3D(sampler2D t, in vec3 p, in vec3 n ){
-    
-    n = max(abs(n), 0.001);
-    n /= dot(n, vec3(1));
-	vec3 tx = texture(t, p.yz).xyz;
-    vec3 ty = texture(t, p.zx).xyz;
-    vec3 tz = texture(t, p.xy).xyz;
-    
-    // Textures are stored in sRGB (I think), so you have to convert them to linear space 
-    // (squaring is a rough approximation) prior to working with them... or something like that. :)
-    // Once the final color value is gamma corrected, you should see correct looking colors.
-    return (tx*tx*n.x + ty*ty*n.y + tz*tz*n.z);
-    
-}
-
-// Common formula for rounded squares, for all intended purposes.
-float lengthN(in vec2 p, in float n){ p = pow(abs(p), vec2(n)); return pow(p.x + p.y, 1.0/n); }
-
-
-// The camera path: There are a few spline setups on Shadertoy, but this one is a slight variation of
-// Otavio Good's spline setup in his "Alien Beacon" shader: https://www.shadertoy.com/view/ld2SzK
-//
-// Spline point markers ("cp" for camera point). The camera visits each point in succession, then loops
-// back to the first point, when complete, in order to repeat the process. In case it isn't obvious, each 
-// point represents an open space juncture in the object that links to the previous and next point.
-// Of course, running a camera in a straight line between points wouldn't produce a smooth camera effect, 
-// so we apply the Catmull-Rom equation to the line segment.
-vec3 cp[16];
-
-void setCamPath(){
-    
-    // The larger fractal object has nodes in a 4x4x4 grid.
-    // The smaller one in a 2x2x2 grid. The following points
-    // map a path to various open areas throughout the object.
-    const float sl = 2.*.96;
-    const float bl = 4.*.96;
-    
-    cp[0] = vec3(0, 0, 0);
-    cp[1] = vec3(0, 0, bl);
-    cp[2] = vec3(sl, 0, bl);
-    cp[3] = vec3(sl, 0, sl);
-    cp[4] = vec3(sl, sl, sl);	
-    cp[5] = vec3(-sl, sl, sl);	
-    cp[6] = vec3(-sl, 0, sl);
-    cp[7] = vec3(-sl, 0, 0);
-    
-    cp[8] = vec3(0, 0, 0);	
-    cp[9] = vec3(0, 0, -bl);
-    cp[10] = vec3(0, bl, -bl);	
-    cp[11] = vec3(-sl, bl, -bl);
-    cp[12] = vec3(-sl, 0, -bl);
-    cp[13] = vec3(-sl, 0, 0);
-    cp[14] = vec3(-sl, -sl, 0);
-    cp[15] = vec3(0, -sl, 0); 
-    
-    // Tighening the radius a little, so that the camera doesn't hit the walls.
-    // I should probably hardcode this into the above... Done.
-    //for(int i=0; i<16; i++) cp[i] *= .96;
-    
-}
-
-// Standard Catmull-Rom equation. The equation takes in the line segment end points (p1 and p2), the
-// points on either side (p0 and p3), the current fractional distance (t) along the segment, then
-// returns the the smooth (cubic interpolated) position. The end result is a smooth transition 
-// between points... Look up a diagram on the internet. That should make it clearer.
-vec3 Catmull(vec3 p0, vec3 p1, vec3 p2, vec3 p3, float t){
-
-    return (((-p0 + p1*3. - p2*3. + p3)*t*t*t + (p0*2. - p1*5. + p2*4. - p3)*t*t + (-p0 + p2)*t + p1*2.)*.5);
-   
-}
- 
-// Camera path. Determine the segment number (segNum), and how far - timewise - we are along it (segTime).
-// Feed the segment, the appropriate adjoining segments, and the segment time into the Catmull-Rom
-// equation to produce a camera position. The process is pretty simple, once you get the hang of it.
-vec3 camPath(float t){
-    
-    const int aNum = 16;
-    
-    t = fract(t/float(aNum))*float(aNum);	// Repeat every 16 time units.
-    
-    // Segment number. Range: [0, 15], in this case.
-    float segNum = floor(t);
-    // Segment portion. Analogous to how far we are alone the individual line segment. Range: [0, 1].
-    float segTime = t - segNum; 
-    
-    
-    if (segNum == 0.) return Catmull(cp[aNum-1], cp[0], cp[1], cp[2], segTime); 
-    
-    for(int i=1; i<aNum-2; i++){
-        if (segNum == float(i)) return Catmull(cp[i-1], cp[i], cp[i+1], cp[i+2], segTime); 
-    }
-    
-    if (segNum == float(aNum-2)) return Catmull(cp[aNum-3], cp[aNum-2], cp[aNum-1], cp[0], segTime); 
-    if (segNum == float(aNum-1)) return Catmull(cp[aNum-2], cp[aNum-1], cp[0], cp[1], segTime);
-
-    return vec3(0);
-    
-}
-
-// Smooth minimum function. There are countless articles, but IQ explains it best here:
-// http://iquilezles.org/www/articles/smin/smin.htm
-float sminP( float a, float b, float s ){
-
-    float h = clamp( 0.5+0.5*(b-a)/s, 0.0, 1.0 );
-    return mix( b, a, h ) - s*h*(1.0-h);
-}
-
-// Creating the scene geometry.
-//
-// There are two intertwined fractal objects. One is a gold and timber lattice, spread out in a 4x4x4
-// grid. The second is some metallic tubing spread out over a 2x2x2 grid. Each are created by combining
-// repeat objects with various operations. All of it is pretty standard.
-//
-// The code is a little fused together, in order to save some cycles, but if you're interested in the 
-// process, I have a "Menger Tunnel" example that's a little easier to decipher.
-float map(in vec3 q){
-
-    
-///////////
-
-    // The grey section. I have another Menger example, if you'd like to look into that more closely.
-    // Layer one.
- 	vec3 p = abs(fract(q/4.)*4. - 2.);
- 	float tube = min(max(p.x, p.y), min(max(p.y, p.z), max(p.x, p.z))) - 4./3. - .015;// + .05;
-    
-
-    // Layer two.
-    p = abs(fract(q/2.)*2. - 1.);
- 	//d = max(d, min(max(p.x, p.y), min(max(p.y, p.z), max(p.x, p.z))) - s/3.);// + .025
- 	tube = max(tube, sminP(max(p.x, p.y), sminP(max(p.y, p.z), max(p.x, p.z), .05), .05) - 2./3.);// + .025
-   
-///////
-    // The gold and timber paneling.
-    //
-    // A bit of paneling, using a combination of repeat objects. We're doing it here in layer two, just
-    // to save an extra "fract" call. Very messy, but saves a few cycles... maybe.
-    
-    //float panel = sminP(length(p.xy),sminP(length(p.yz),length(p.xz), 0.25), 0.125)-0.45; // EQN 1
-    //float panel = sqrt(min(dot(p.xy, p.xy),min(dot(p.yz, p.yz),dot(p.xz, p.xz))))-0.5; // EQN 2
-    //float panel = min(max(p.x, p.y),min(max(p.y, p.z),max(p.x, p.z)))-0.5; // EQN 3
-    float panel = sminP(max(p.x, p.y),sminP(max(p.y, p.z),max(p.x, p.z), .125), .125)-0.5; // EQN 3
-    
-
-    // Gold strip. Probably not the best way to do this, but it gets the job done.
-    // Identifying the gold strip region, then edging it out a little... for whatever reason. :)
-    float strip = step(p.x, .75)*step(p.y, .75)*step(p.z, .75);
-    panel -= (strip)*.025;     
-    
-    // Timber bulge. Just another weird variation.
-    //float bulge = (max(max(p.x, p.y), p.z) - .55);//length(p)-1.;//
-    //panel -= bulge*(1.-step(p.x, .75)*step(p.y, .75)*step(p.z, .75))*bulge*.25;    
-    
-    // Repeat field entity two, which is just an abstract object repeated every half unit. 
-    p = abs(fract(q*2.)*.5 - .25);
-    float pan2 = min(p.x, min(p.y,p.z))-.05;    
-    
-    // Combining the two entities above.
-    panel = max(abs(panel), abs(pan2)) - .0425;    
-/////////
-    
-    // Layer three. 3D space is divided by three.
-    p = abs(fract(q*1.5)/1.5 - 1./3.);
- 	tube = max(tube, min(max(p.x, p.y), min(max(p.y, p.z), max(p.x, p.z))) - 2./9. + .025); // + .025 
-
-
-    // Layer three. 3D space is divided by two, instead of three, to give some variance.
-    p = abs(fract(q*3.)/3. - 1./6.);
- 	tube = max(tube, min(max(p.x, p.y), min(max(p.y, p.z), max(p.x, p.z))) - 1./9. - .035); //- .025 
-    
-
-    
-    
-    // Object ID: Equivalent to: if(tube<panel)objID=2; else objID = 1.; //etc.
-    //
-    // By the way, if you need to identify multiple objects, you're better off doing it in a seperate pass, 
-    // after the raymarching function. Having multiple "if" statements in a distance field equation can 
-    // slow things down considerably.
-        
-    //objID = 2. - step(tube, panel) + step(panel, tube)*(strip);
-    objID = 1.+ step(tube, panel) + step(panel, tube)*(strip)*2.;
-    //objID = 1. + step(panel, tube)*(strip) + step(tube, panel)*2.;
-    
-
-    return min(panel, tube);
-    
-    
-}
-
-float trace(in vec3 ro, in vec3 rd){
-
-    float t = 0.0, h;
-    for(int i = 0; i < 92; i++){
-    
-        h = map(ro+rd*t);
-        // Note the "t*b + a" addition. Basically, we're putting less emphasis on accuracy, as
-        // "t" increases. It's a cheap trick that works in most situations... Not all, though.
-        if(abs(h)<0.001*(t*.25 + 1.) || t>FAR) break; // Alternative: 0.001*max(t*.25, 1.)
-        t += h*.8;
-        
-    }
-
-    return t;
-}
-
-
-// The reflections are pretty subtle, so not much effort is being put into them. Only eight iterations.
-float refTrace(vec3 ro, vec3 rd){
-
-    float t = 0.0;
-    for(int i=0; i<16; i++){
-        float d = map(ro + rd*t);
-        if (d < 0.0025*(t*.25 + 1.) || t>FAR) break;
-        t += d;
-    } 
-    return t;
-}
-
-
-
-/*
-// Tetrahedral normal, to save a couple of "map" calls. Courtesy of IQ.
-vec3 calcNormal(in vec3 p){
-
-    // Note the slightly increased sampling distance, to alleviate artifacts due to hit point inaccuracies.
-    vec2 e = vec2(0.0025, -0.0025); 
-    return normalize(e.xyy * map(p + e.xyy) + e.yyx * map(p + e.yyx) + e.yxy * map(p + e.yxy) + e.xxx * map(p + e.xxx));
-}
-*/
-
-// Standard normal function. It's not as fast as the tetrahedral calculation, but more symmetrical. Due to 
-// the intricacies of this particular scene, it's kind of needed to reduce jagged effects.
-vec3 calcNormal(in vec3 p) {
-	const vec2 e = vec2(0.005, 0);
-	return normalize(vec3(map(p + e.xyy) - map(p - e.xyy), map(p + e.yxy) - map(p - e.yxy),	map(p + e.yyx) - map(p - e.yyx)));
-}
-
-// I keep a collection of occlusion routines... OK, that sounded really nerdy. :)
-// Anyway, I like this one. I'm assuming it's based on IQ's original.
-float calcAO(in vec3 pos, in vec3 nor)
-{
-	float sca = 2.0, occ = 0.0;
-    for( int i=0; i<5; i++ ){
-    
-        float hr = 0.01 + float(i)*0.5/4.0;        
-        float dd = map(nor * hr + pos);
-        occ += (hr - dd)*sca;
-        sca *= 0.7;
-    }
-    return clamp( 1.0 - occ, 0.0, 1.0 );    
-}
-
-
-// Texture bump mapping. Four tri-planar lookups, or 12 texture lookups in total. I tried to 
-// make it as concise as possible. Whether that translates to speed, or not, I couldn't say.
-vec3 texBump( sampler2D tx, in vec3 p, in vec3 n, float bf){
-   
-    const vec2 e = vec2(0.001, 0);
-    
-    // Three gradient vectors rolled into a matrix, constructed with offset greyscale texture values.    
-    mat3 m = mat3( tex3D(tx, p - e.xyy, n), tex3D(tx, p - e.yxy, n), tex3D(tx, p - e.yyx, n));
-    
-    vec3 g = vec3(0.299, 0.587, 0.114)*m; // Converting to greyscale.
-    g = (g - dot(tex3D(tx,  p , n), vec3(0.299, 0.587, 0.114)) )/e.x; g -= n*dot(n, g);
-                      
-    return normalize( n + g*bf ); // Bumped normal. "bf" - bump factor.
-	
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ){
-   
-    
-	// Screen coordinates.
-	vec2 u = (fragCoord - iResolution.xy*0.5)/iResolution.y;
-    
-    float speed = iGlobalTime*0.35 + 8.;
-    
-    // Initiate the camera path spline points. Kind of wasteful not making this global, but I wanted
-    // it self contained... for better or worse. I'm not really sure what the GPU would prefer.
-    setCamPath();
-
-    
-	// Camera Setup.
-    vec3 ro = camPath(speed); // Camera position, doubling as the ray origin.
-    vec3 lk = camPath(speed + .5);  // "Look At" position.
-    vec3 lp = camPath(speed + .5) + vec3(0, .25, 0); // Light position, somewhere near the moving camera.
-   
-    
-    // Using the above to produce the unit ray-direction vector.
-    float FOV = 1.57; // FOV - Field of view.
-    vec3 fwd = normalize(lk-ro);
-    vec3 rgt = normalize(vec3(fwd.z, 0, -fwd.x));
-    vec3 up = (cross(fwd, rgt));
-    
-        // Unit direction ray.
-    vec3 rd = normalize(fwd + FOV*(u.x*rgt + u.y*up));
-    
-    
-    // Raymarch the scene.
-    float t = trace(ro, rd);
-    
-    // Initialize the scene color.
-    vec3 col = vec3(0);
-    
-    // Scene hit, so color the pixel. Technically, the object should always be hit, so it's tempting to
-    // remove this entire branch... but I'll leave it, for now.
-    if(t<FAR){
-        
-        // This looks a little messy and haphazard, but it's really just some basic lighting, and application
-        // of the following material properties: Wood = 1., Metal = 2., Gold = 3..
-    
-        float ts = 1.;  // Texture scale.
-        
-        // Global object ID. It needs to be saved just after the raymarching equation, since other "map" calls,
-        // like normal calculations will give incorrect results. Found that out the hard way. :)
-        float saveObjID = objID; 
-        
-        
-        vec3 pos = ro + rd*t; // Scene postion.
-        vec3 nor = calcNormal(pos); // Normal.
-        vec3 sNor = nor;
-        
-        
-        // Apply some subtle texture bump mapping to the panels and the metal tubing.
-        nor = texBump(iChannel0, pos*ts, nor, 0.002); // + step(saveObjID, 1.5)*0.002
-    
-        // Reflected ray. Note that the normal is only half bumped. It's fake, but it helps
-        // taking some of the warping effect off of the reflections.
-        vec3 ref = reflect(rd, normalize(sNor*.5 + nor*.5)); 
-         
-        
-		col = tex3D(iChannel0, pos*ts, nor); // Texture pixel at the scene postion.
-        
-        
-        vec3  li = lp - pos; // Point light.
-        float lDist = max(length(li), .001); // Surface to light distance.
-        float atten = 1./(1.0 + lDist*0.125 + lDist*lDist*.05); // Light attenuation.
-        li /= lDist; // Normalizing the point light vector.
-        
-        float occ = calcAO( pos, nor ); // Occlusion.
-		
-        float dif = clamp(dot(nor, li), 0.0, 1.0); // Diffuse.
-        dif = pow(dif, 4.)*2.;
-        float spe = pow(max(dot(reflect(-li, nor), -rd), 0.), 8.); // Object specular.
-        float spe2 = spe*spe; // Global specular.
-        
-        float refl = .35; // Reflection coefficient. Different for different materials.
-
-            
-
-        // Reflection color. Mostly fake.
-        // Cheap reflection: Not entirely accurate, but the reflections are pretty subtle, so not much 
-        // effort is being put in.
-        float rt = refTrace(pos + ref*0.1, ref); // Raymarch from "sp" in the reflected direction.
-        float rSaveObjID = objID; // IDs change with reflection. Learned that the hard way. :)
-        vec3 rsp = pos + ref*rt; // Reflected surface hit point.
-        vec3 rsn = calcNormal(rsp); // Normal at the reflected surface. Too costly to bump reflections.
-        vec3 rCol = tex3D(iChannel0, rsp*ts, rsn); // Texel at "rsp."
-        vec3 rLi = lp-rsp;
-        float rlDist = max(length(rLi), 0.001);
-        rLi /= rlDist;
-        float rDiff = max(dot(rsn, rLi), 0.); // Diffuse light at "rsp."
-        rDiff = pow(rDiff, 4.)*2.;
-        float rAtten = 1./(1. + rlDist*0.125 + rlDist*rlDist*.05);
-        
-        if(rSaveObjID>1.5 && rSaveObjID<2.5){
-            rCol = vec3(1)*dot(rCol, vec3(.299, .587, .114))*.7 + rCol*.15;//*.7+.2
-            //rDiff *= 1.35;
-        }
-        if(rSaveObjID>2.5){
-             //float rc = dot(rCol, vec3(.299, .587, .114));
-             vec3 rFire = pow(vec3(1.5, 1, 1)*rCol, vec3(8, 2, 1.5));//*.5+rc*.5;
-             rCol = min(mix(vec3(1.5, .9, .375), vec3(.75, .375, .3), rFire), 2.)*.5 + rCol;         
-        }
-        
-        rCol *= (rDiff + .35)*rAtten; // Reflected color. Not accurate, but close enough.         
-        
-        
-        
-        // Grey metal inner tubing.
-        if(saveObjID>1.5 && saveObjID<2.5){ 
-			
-            // Grey out the limestone wall color.
-            col = vec3(1)*dot(col, vec3(.299, .587, .114))*.7 + col*.15;
-            
-            refl = .5;
-            //dif *= 1.35;
-            //spe2 *= 1.35;
-            
-        }         
-        
-        // Gold trimming properties. More effort should probably be put in here.
-        // I could just write "saveObjID == 3.," but I get a little paranoid where floats are concerned. :)
-        if(saveObjID>2.5){
-
-            // For the screen image, we're interested in the offset height and depth positions. Ie: pOffs.zy.
-            
-            // Pixelized dot pattern shade.
-            //float c = dot(col, vec3(.299, .587, .114));
-            
-            vec3 fire = pow(vec3(1.5, 1, 1)*col, vec3(8, 2, 1.5));//*.5+c*.5;
-            col = min(mix(vec3(1, .9, .375), vec3(.75, .375, .3), fire), 2.)*.5 + col;//
-            
-            refl = .65;
-            //dif *= 1.5;
-            //spe2 *= 1.5;
-            
-        }
-        
-     
-        // Combining everything together to produce the scene color.
-        col = col*(dif + .35  + vec3(.35, .45, .5)*spe) + vec3(.7, .9, 1)*spe2 + rCol*refl;
-        col *= occ*atten; // Applying occlusion.
-       
-        
-    }
-
-    
-    // Applying some very slight fog in the distance. This is technically an inside scene...
-    // Or is it underground... Who cares, it's just a shader. :)
-    col = mix(min(col, 1.), vec3(0), 1.-exp(-t*t/FAR/FAR*20.));//smoothstep(0., FAR-20., t)
-    //col = mix(min(col, 1.), vec3(0), smoothstep(0., FAR-35., t));//smoothstep(0., FAR-20., t)
-    
-    
-    
-    // Done.
-    fragColor = vec4(sqrt(max(col, 0.)), 1.0);
-    
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/shane-latticetutorial.slang b/procedural/shane-latticetutorial.slang
deleted file mode 100644
index 56feeac8c3..0000000000
--- a/procedural/shane-latticetutorial.slang
+++ /dev/null
@@ -1,304 +0,0 @@
-#version 450
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/*
-	
-    Transparent Lattice
-	-------------------
-
-	Just a transparent lattice. Not much different to my other transparent examples, 
-	except this one is point lit... In case it needs to be said, a lot of it is faked, 
-	so is more of a novelty than anything else. 
-
-	I wrote it some time ago, then forgot about it. I thought I'd put it up just in 
-	case it's of any use to anyone. It runs reasonably fast, considering that the 
-	lighting is calculated multiple times a pass, but could benefit from a little more 
-	tweaking.
-
-	Related shaders:
-
-	Cloudy Spikeball - Duke
-    https://www.shadertoy.com/view/MljXDw
-    // Port from a demo by Las - Worth watching.
-    // http://www.pouet.net/topic.php?which=7920&page=29&x=14&y=9
-
-	Virtually the same thing, but with rounded cubes and less interesting lighting.
-	Transparent Cube Field - Shane
-	https://www.shadertoy.com/view/ll2SRy
-	
-*/
-
-
-
-// Cheap vec3 to vec3 hash. Works well enough, but there are other ways.
-vec3 hash33(vec3 p){ 
-    
-    float n = sin(dot(p, vec3(7, 157, 113)));    
-    return fract(vec3(2097152, 262144, 32768)*n); 
-}
-
-
-/*
-// Rounded cube field, for comparison. It runs at full speed, believe it or not.
-float map(vec3 p){
-   
-	// Creating the repeat cubes, with slightly convex faces. Standard,
-    // flat faced cubes don't capture the light quite as well.
-    
-    // 3D space repetition.
-    p = fract(p)-.5; // + o 
-    
-    // A bit of roundness. Used to give the cube faces a touch of convexity.
-    float r = dot(p, p) - 0.21;
-    
-    // Max of abs(x), abs(y) and abs(z) minus a constant gives a cube.
-    // Adding a little bit of "r," above, rounds off the surfaces a bit.
-    p = abs(p); 
-	return max(max(p.x, p.y), p.z)*.95 + r*0.25 - 0.21;
-   
-    
-    // Alternative. Egg shapes... kind of.
-    //float perturb = sin(p.x*10.)*sin(p.y*10.)*sin(p.z*10.);
-	//p += hash33(floor(p))*.15;
-	//return length(fract(p)-.5)-0.3 + perturb*0.05;
-	
-}
-*/
-
-/*
-// A fake noise looking field. Pretty interesting.
-float map(vec3 p){
-
-   
-	p = (cos(p*.315*2.5 + sin(p.zxy*.875*2.5)));	    // + iGlobalTime*.5
-     
-    float n = length(p);
-    
-    p = sin(p*6. + cos(p.yzx*6.));
-    
-    return n - 1. - abs(p.x*p.y*p.z)*.05;
-
-    
-}
-*/
-
-float map(vec3 p){
-
-    
-    
-    vec2 c;
- 
-    // SECTION 1
-    //
-    // Repeat field entity one, which is just some tubes repeated in all directions every 
-    // two units, then combined with a smooth minimum function. Otherwise known as a lattice.
-    p = abs(fract(p/3.)*3.-1.5);
-    //c.x = sminP(length(p.xy),sminP(length(p.yz),length(p.xz), 0.25), 0.25)-0.75; // EQN 1
-    //c.x = sqrt(min(dot(p.xy, p.xy),min(dot(p.yz, p.yz),dot(p.xz, p.xz))))-0.75; // EQN 2
-    c.x = min(max(p.x, p.y),min(max(p.y, p.z),max(p.x, p.z)))-0.75; // EQN 3
-    //p = abs(p); c.x = max(p.x,max(p.y,p.z)) - .5;
-    
-
-    // SECTION 2
-    //
-    // Repeat field entity two, which is just an abstract object repeated every half unit. 
-    p = abs(fract(p*4./3.)*.75 - 0.375);
-    c.y = min(p.x,min(p.y,p.z)); // EQN 1
-    //c.y = min(max(p.x, p.y),min(max(p.y, p.z),max(p.x, p.z)))-0.125; //-0.175, etc. // EQN 2    
-    //c.y = max(p.x,max(p.y,p.z)) - .4;
-    
-    // SECTION 3
-    //
-    // Combining the two entities above.
-    //return length(c)-.1; // EQN 1
-    //return max(c.x, c.y)-.05; // EQN 2
-    return max(abs(c.x), abs(c.y))*.75 + length(c)*.25 - .1;
-    //return max(abs(c.x), abs(c.y))*.75 + abs(c.x+c.y)*.25 - .1;
-    //return max(abs(c.x), abs(c.y)) - .1;
-    
-}
-
-
-
-
-// Not big on accuracy, but lower on operations. Few distance function calls are important
-// during volumetric passes.
-vec3 calcNormal(in vec3 p, float d) {
-	const vec2 e = vec2(0.01, 0);
-	return normalize(vec3(d - map(p - e.xyy), d - map(p - e.yxy),	d - map(p - e.yyx)));
-}
-
-/*
-// Tetrahedral normal, to save a couple of "map" calls. Courtesy of IQ. Unfortunately, still
-// not fast enough in this particular instance.
-vec3 calcNormal(in vec3 p){
-
-    // Note the slightly increased sampling distance, to alleviate artifacts due to hit point inaccuracies.
-    vec2 e = vec2(0.0025, -0.0025); 
-    return normalize(e.xyy * map(p + e.xyy) + e.yyx * map(p + e.yyx) + e.yxy * map(p + e.yxy) + e.x * map(p + e.xxx));
-}
-*/
-
-
-void mainImage( out vec4 fragColor, vec2 fragCoord ) {
-
-    
-    // Screen coordinates.
-	vec2 uv = (fragCoord.xy - iResolution.xy*.5 )/iResolution.y;
-	
-    // Unit direction ray. The last term is one of many ways to fish-lens the camera.
-    // For a regular view, set "rd.z" to something like "0.5."
-    vec3 rd = normalize(vec3(uv, (1.-dot(uv, uv)*.5)*.5)); // Fish lens, for that 1337, but tryhardish, demo look. :)
-    
-    // There are a few ways to hide artifacts and inconsistencies. Making things go fast is one of them. :)
-    // Ray origin, scene color, and surface postion vector.
-    vec3 ro = vec3(0., 0., iGlobalTime*1.5), col=vec3(0), sp, sn, lp, ld, rnd;
-    
-	
-    // Swivel the unit ray to look around the scene.
-    // Compact 2D rotation matrix, courtesy of Shadertoy user, "Fabrice Neyret."
-    vec2 a = sin(vec2(1.5707963, 0) + iGlobalTime*0.375);
-    rd.xz = mat2(a, -a.y, a.x)*rd.xz;    
-    rd.xy = mat2(a, -a.y, a.x)*rd.xy; 
-    
-    
-    lp = vec3(0, 1, 4);
-    lp.xz = mat2(a, -a.y, a.x)*lp.xz;    
-    lp.xy = mat2(a, -a.y, a.x)*lp.xy; 
-    lp += ro;
-    
-    
-    // Unit ray jitter is another way to hide artifacts. It can also trick the viewer into believing
-    // something hard core, like global illumination, is happening. :)
-    //rd *= 0.99 + hash33(rd)*0.02;
-    
-    // Some more randomization, to be used for color based jittering inside the loop.
-    rnd = hash33(rd+311.);
-    
-    
-	// Ray distance, bail out layer number, surface distance and normalized accumulated distance.
-	float t=0., layers=0., d, aD;
-	
-	// Light variables.
-	float lDist, s, l;
-    
-    // Surface distance threshold. Smaller numbers gives a thinner membrane, but lessens detail... 
-    // hard to explain. It's easier to check it out for yourself.
-    float thD = .0125; // + smoothstep(-0.2, 0.2, sin(iGlobalTime*0.75 - 3.14159*0.4))*0.025;
- 
-	
-    // Only a few iterations seemed to be enough. Obviously, more looks better, but is slower.
-	for(float i=0.; i<64.; i++)	{
-        
-        // Break conditions. Anything that can help you bail early usually increases frame rate.
-        if(layers>31. || dot(col, vec3(.299, .587, .114)) > 1. || t>16.) break;
-        
-        // Current ray postion. Slightly redundant here, but sometimes you may wish to reuse
-        // it during the accumulation stage.
-        sp = ro+rd*t;
-		
-        d = map(sp); // Distance to nearest point on the noise surface.
-        
-        // If we get within a certain distance of the surface, accumulate some surface values.
-        // Values further away have less influence on the total.
-        //
-        // aD - Accumulated distance. You could smoothly interpolate it, if you wanted.
-        //
-        // 1/.(1. + t*t*0.1) - Basic distance attenuation. Feel free to substitute your own.
-        
-         // Normalized distance from the surface threshold value to our current isosurface value.
-        aD = (thD-abs(d)*31./32.)/thD;
-        
-        // If we're within the surface threshold, accumulate some color.
-        // Two "if" statements in a shader loop makes me nervous. I don't suspect there'll be any
-        // problems, but if there are, let us know.
-        if(aD>0.) { 
-        
-            
-            // Add the accumulated surface distance value, along with some basic falloff using the 
-            // camera to light distance, "lDist." There's a bit of color jitter there, too.
-            
-            sn = calcNormal(sp, d)*sign(d);
-            ld = (lp - sp); //vec3(.5773)
-            lDist = max(length(ld), .001);
-            ld /= lDist;
-            s = pow(max(dot(reflect(-ld, sn), -rd), 0.), 8.);
-            l = max(dot(ld, sn), 0.);
-            
-
-            //float c = dot(sin(sp*128. - cos(sp.yzx*64.)), vec3(.166))+.5;
-            col += ((l + .1) + vec3(.5, .7, 1)*s)*aD/(1. + lDist*0.25 + lDist*lDist*0.05)*.2;
-            // Failed experiment with color jitter to take out more banding.
-            //col += ((l + .05 + fract(rnd + i*27.)*.1) + vec3(.5, .7, 1)*s)*aD/(1. + lDist*0.25 + lDist*lDist*0.05)*.2;
-            
-            
-            // The layer number is worth noting. Accumulating more layers gives a bit more glow.
-            // Lower layer numbers allow a quicker bailout. A lot of it is guess work.
-            layers++;
-            
-        }
-		
-        // Kind of weird the way this works. I think not allowing the ray to hone in properly is
-        // the very thing that gives an even spread of values. The figures are based on a bit 
-        // of knowledge versus trial and error. If you have a faster computer, feel free to tweak
-        // them a bit.
-        t += max(abs(d)*.75, thD*.25);
-        
-			    
-	}
-	
-	t = min(t, 16.);
-    
-     
-    col = mix(col, vec3(0), 1.-exp(-0.025*t*t));////1.-exp(-0.01*t*t) 1.-1./(1. + t*t*.1)
-  
-    // Mixing the greytone color with a firey orange vignette. There's no meaning
-    // behind it. I just thought the artsy greyscale was a little too artsy.
-    uv = abs(fragCoord.xy/iResolution.xy - .5); // Wasteful, but the GPU can handle it.
-    col = mix(col, vec3(min(col.x*1.5, 1.), pow(col.x, 2.5), pow(col.x, 12.)).yxz,
-               min( dot(pow(uv, vec2(4.)), vec2(1))*8., 1.));
-               
-    //col = vec3(min(col.z*1.5, 1.), pow(col.z, 2.5), pow(col.z, 12.));
-
-    
-	// Mixing the vignette colors up a bit more.
-    col = mix(col, col.zxy, dot(sin(rd*5.), vec3(.166)) + 0.166);
-
-    
-	// Presenting the color to the screen.
-	fragColor = vec4( sqrt(clamp(col, 0., 1.)), 1.0 );
-    
-     
- }
-
- void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
\ No newline at end of file
diff --git a/procedural/shane-quasi-infinite-zoom-voronoi.slang b/procedural/shane-quasi-infinite-zoom-voronoi.slang
deleted file mode 100644
index c9911a95c5..0000000000
--- a/procedural/shane-quasi-infinite-zoom-voronoi.slang
+++ /dev/null
@@ -1,338 +0,0 @@
-#version 450
-/*
-	Quasi Infinite Zoom Voronoi
-	---------------------------
-
-	The infinite zoom effect has been keeping me amused for years.
-
-	This one is based on something I wrote some time ago, but was inspired by Fabrice Neyret's 
-	"Infinite Fall" shader. I've aired on the side of caution and called it "quasi infinite," 
-	just in case it doesn't adhere to his strict infinite zoom standards. :)
-
-	Seriously though, I put together a couple of overly optimized versions a couple of days ago,
-	just for fun, and Fabrice's comments were pretty helpful. I also liked the way he did the 
-	layer rotation in his "Infinite Fall" version, so I'm using that. The rest is stock standard 
-	infinite zoom stuff that has been around for years.
-
-	Most people like to use noise for this effect, so I figured I'd do something different
-	and use Voronoi. I've also bump mapped it, added specular highlights, etc. It was 
-	tempting to add a heap of other things, but I wanted to keep the example relatively simple.
-
-	By the way, most of the code is basic bump mapping and lighting. The infinite zoom code 
-	takes up just a small portion.
-	
-
-	Fabrice Neyret's versions:
-
-	infinite fall - short
-	https://www.shadertoy.com/view/ltjXWW
-
-    infinite fall - FabriceNeyret2
-    https://www.shadertoy.com/view/4sl3RX
-
-	Other examples:
-
-    Fractal Noise - mu6k
-    https://www.shadertoy.com/view/Msf3Wr
-
-    Infinite Sierpinski - gleurop
-    https://www.shadertoy.com/view/MdfGR8
-
-    Infinite Zoom - fizzer
-    https://www.shadertoy.com/view/MlXGW7
-
-	Private link to a textured version of this.
-	Bumped Infinite Zoom Texture - Shane
-	https://www.shadertoy.com/view/Xl2XWw
-*/
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-vec2 hash22(vec2 p) { 
-
-    // Faster, but doesn't disperse things quite as nicely. However, when framerate
-    // is an issue, and it often is, this is a good one to use. Basically, it's a tweaked 
-    // amalgamation I put together, based on a couple of other random algorithms I've 
-    // seen around... so use it with caution, because I make a tonne of mistakes. :)
-    float n = sin(dot(p, vec2(41, 289)));
-    return fract(vec2(262144, 32768)*n); 
-    
-    // Animated.
-    //p = fract(vec2(262144, 32768)*n); 
-    //return sin( p*6.2831853 + time )*0.5 + 0.5; 
-    
-}
-
-// One of many 2D Voronoi algorithms getting around, but all are based on IQ's 
-// original. I got bored and roughly explained it. It was a slow day. :) The
-// explanations will be obvious to many, but not all.
-float Voronoi(vec2 p)
-{	
-    // Partitioning the 2D space into repeat cells.
-    vec2 ip = floor(p); // Analogous to the cell's unique ID.
-    p = fract(p); // Fractional reference point within the cell.
-
-    // Set the minimum distance (squared distance, in this case, because it's 
-    // faster) to a maximum of 1. Outliers could reach as high as 2 (sqrt(2)^2)
-    // but it's being capped to 1, because it covers a good portion of the range
-    // (basically an inscribed unit circle) and dispenses with the need to 
-    // normalize the final result.
-    //
-    // If you're finding that your Voronoi patterns are a little too contrasty,
-    // you could raise "d" to something like "1.5." Just remember to divide
-    // the final result by the same amount.
-    float d = 1.;
-    
-    // Put a "unique" random point in the cell (using the cell ID above), and it's 8 
-    // neighbors (using their cell IDs), then check for the minimum squared distance 
-    // between the current fractional cell point and these random points.
-    for (float i = -1.; i < 1.1; i++){
-	    for (float j = -1.; j < 1.1; j++){
-	    
-     	    vec2 cellRef = vec2(i, j); // Base cell reference point.
-            
-            vec2 offset = hash22(ip + cellRef); // 2D offset.
-            
-            // Vector from the point in the cell to the offset point.
-            vec2 r = cellRef + offset - p; 
-            float d2 = dot(r, r); // Squared length of the vector above.
-            
-            d = min(d, d2); // If it's less than the previous minimum, store it.
-        }
-    }
-    
-    // In this case, the distance is being returned, but the squared distance
-    // can be used too, if prefered.
-    return sqrt(d); 
-}
-
-/*
-// 2D 2nd-order Voronoi: Obviously, this is just a rehash of IQ's original. I've tidied
-// up those if-statements. Since there's less writing, it should go faster. That's how 
-// it works, right? :)
-//
-float Voronoi2(vec2 p){
-    
-	vec2 g = floor(p), o;
-	p -= g;// p = fract(p);
-	
-	vec2 d = vec2(1); // 1.4, etc.
-    
-	for(int y = -1; y <= 1; y++){
-		for(int x = -1; x <= 1; x++){
-            
-			o = vec2(x, y);
-            o += hash22(g + o) - p;
-            
-			float h = dot(o, o);
-            d.y = max(d.x, min(d.y, h)); 
-            d.x = min(d.x, h);            
-		}
-	}
-	
-	//return sqrt(d.y) - sqrt(d.x);
-    return (d.y - d.x); // etc.
-}
-*/
-
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ){
-
-    // Screen coordinates.
-	vec2 uv = (fragCoord - iResolution.xy*.5)/iResolution.y;
-
-    // Variable setup, plus rotation.
-	float t = iGlobalTime, s, a, b, e;
-    
-    
-    // Rotation the canvas back and forth.
-    float th = sin(iGlobalTime*0.1)*sin(iGlobalTime*0.13)*4.;
-    float cs = cos(th), si = sin(th);
-    uv *= mat2(cs, -si, si, cs);
-    
-
-    // Setup: I find 2D bump mapping more intuitive to pretend I'm raytracing, then lighting a bump mapped plane 
-    // situated at the origin. Others may disagree. :)  
-    vec3 sp = vec3(uv, 0); // Surface posion. Hit point, if you prefer. Essentially, a screen at the origin.
-    vec3 ro = vec3(0, 0, -1); // Camera position, ray origin, etc.
-    vec3 rd = normalize(sp-ro); // Unit direction vector. From the origin to the screen plane.
-    vec3 lp = vec3(cos(iGlobalTime)*0.375, sin(iGlobalTime)*0.1, -1.); // Light position - Back from the screen.
- 
-    
-    // The number of layers. More gives you a more continous blend, but is obviously slower.
-    // If you change the layer number, you'll proably have to tweak the "gFreq" value.
-    const float L = 8.;
-     // Global layer frequency, or global zoom, if you prefer.
-    const float gFreq = 0.5;
-    float sum = 0.; // Amplitude sum, of sorts.
-    
-    
-    // Setting up the layer rotation matrix, used to rotate each layer.
-    // Not completely necessary, but it helps mix things up. It's standard practice, but 
-    // this one is based on Fabrice's example.
-    th = 3.14159265*0.7071/L;
-    cs = cos(th), si = sin(th);
-    mat2 M = mat2(cs, -si, si, cs);
-    
-    
-    // The overall scene color. Initiated to zero.
-    vec3 col = vec3(0);
-    
-    
-    
-    
-    // Setting up the bump mapping variables and initiating them to zero.
-    // f - Function value
-    // fx - Change in "f" in in the X-direction.
-    // fy - Change in "f" in in the Y-direction.
-    float f=0., fx=0., fy=0.;
-    vec2 eps = vec2(4./iResolution.y, 0.);
-    
-    // I've had to off-center this just a little to avoid an annoying white speck right
-    // in the middle of the canvas. If anyone knows how to get rid of it, I'm all ears. :)
-    vec2 offs = vec2(0.1);
-    
-    
-    // Infinite Zoom.
-    //
-    // The first three lines are a little difficult to explain without describing what infinite 
-    // zooming is in the first place. A lot of it is analogous to fBm. Sum a bunch of increasing
-    // frequencies with decreasing amplitudes.
-    //
-    // Anyway, the effect is nothing more than a series of layers being expanded from an initial
-    // size to a final size, then being snapped back to its original size to repeat the process 
-    // again. However, each layer is doing it at diffent incremental stages in time, which tricks
-    // the brain into believing the process is continuous. If you wish to spoil the illusion, 
-    // simply reduce the layer count. If you wish to completely ruin the effect, set it to one.
-	
-    // Infinite zoom loop.
-	for (float i = 0.; i<L; i++){
-	
-        // Fractional time component. Obviously, incremented by "1./L" and ranging from
-        // zero to one, whist on a repeat cycle.
-		s = fract((i - t*2.)/L);
-        
-        // Using the fractional time component to determine the layer frequency. It increases
-        // with time, then snaps back to one in a cyclic fashion.
-        // Note that exp2(t) is just another way to write pow(2., s). The latter is more
-        // intuitive, but slower... Well, I assume it is.
-        e = exp2(s*L)*gFreq; // Range (approx): [ 1, pow(2., L)*gFreq ]
-        
-        // Layer ampltude component. Inversely propotional to the frequency, which makes sense.
-        // Because the layers are finite, you need to smoothly interpolate between them, 
-        // and the "cos" setup below is just one of many ways to do it.
-        a = (1.-cos(s*6.283))/e;  // Smooth transition.
-        //a = (1. - abs(s-.5)*2.)/e; // Alternative linear fade. Not as smooth, or accurate.
-        //a = (1. - abs(s-.5)*2.); a *= a*(3.-2.*a)/e; // Smooth linear fade, if so desired.
-        
-        
-        // Accumulating each layer.
-        
-        // I had to have a bit of a think as to how to bump map this. Normally, you'd write a function
-        // then call it three times, but that'd be too expensive, so it's all being done simultaneously.
-        //
-        // Either way, it's still pretty simple. In addition to accumulating the pixel value, accumulate 
-        // sample values just to the left of it and above. The X-gradient and Y-gradient can then be 
-        // determined outside the loop.
-        //
-        f += Voronoi(M*sp.xy*e + offs) * a; // Sample value multiplied by the amplitude.
-        fx += Voronoi(M*(sp.xy-eps.xy)*e + offs) * a; // Same for the nearby sample in the X-direction.
-        fy += Voronoi(M*(sp.xy-eps.yx)*e + offs) * a; // Same for the nearby sample in the Y-direction.
-        
-        // Sum each amplitude. Used to normalize the results once the loop is complete.
-        sum += a;
-        
-        // Rotating each successive layer is pretty standard, but this is the way Fabrice does
-        // it.
-        M *= M;
-
-	}
-    
-    // I doubt it'd happen, but just in case sum is zero.
-    sum = max(sum, 0.001);
-    
-    // Normalizing the three Voronoi samples.
-    f /= sum;
-    fx /= sum;
-    fy /= sum;
-   
- 
-    // Common bump mapping stuff.
-    float bumpFactor = 0.2;
-    // Using the above to determine the dx and dy function gradients.
-    fx = (fx-f)/eps.x; // Change in X
-    fy = (fy-f)/eps.x; // Change in Y.
-    // Using the gradient vector, "vec3(fx, fy, 0)," to perturb the XY plane normal ",vec3(0, 0, -1)."
-    vec3 n = normalize( vec3(0, 0, -1) + vec3(fx, fy, 0)*bumpFactor );           
-   
-    
-    
-    
-	// Determine the light direction vector, calculate its distance, then normalize it.
-	vec3 ld = lp - sp;
-	float lDist = max(length(ld), 0.001);
-	ld /= lDist;
-    
-    
-
-    // Light attenuation.    
-    float atten = 1.25/(1. + lDist*0.15 + lDist*lDist*0.15);
-	//float atten = min(1./(dist*dist*2.), 1.);
-	
-
-	// Diffuse value.
-	float diff = max(dot(n, ld), 0.);  
-    // Enhancing the diffuse value a bit. Made up.
-    diff = pow(diff, 2.)*0.66 + pow(diff, 4.)*0.34; 
-    // Specular highlighting.
-    float spec = pow(max(dot( reflect(-ld, n), -rd), 0.), 16.); 
-
-
-	// Using the infinite Voronoi value to produce a purplish color.
-	vec3 objCol = vec3(f*f, pow(f, 5.)*0.05, f*f*0.36);
-    // Blood... ruby red.
-    //vec3 objCol = vec3(f*f, pow(f, 16.), pow(f, 8.)*.5);
-    
-
-    // Using the values above to produce the final color.   
-    col = (objCol * (diff + .5) + vec3(.4, .6, 1.)*spec*1.5) * atten;
-
-
-    // Done. 
-	fragColor = vec4(sqrt(min(col, 1.)), 1.);
-}
-
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/shane-raymarched-reflections.slang b/procedural/shane-raymarched-reflections.slang
deleted file mode 100644
index 5fa3dd2902..0000000000
--- a/procedural/shane-raymarched-reflections.slang
+++ /dev/null
@@ -1,386 +0,0 @@
-#version 450
-/*
-	Raymarched Reflections
-	----------------------
-
-	A very basic demonstration of raymarching a distance field with reflections 
-	and reasonably passable shadows. Definitely not cutting edge, but hopefully, 
-	interesting to anyone who isn't quite familiar with the process.
-
-	Reflections are pretty easy: Raymarch to the hit point, then obtain the color 
-	at that point. Continue on from the hit point in the direction of the reflected 
-	ray until you reach a new hit point. Obtain the color at the new point, then
-	add a portion of it to your original color. Repeat the process.
-
-	Unfortunately, the extra work can slow things down, especially when you apply
-	shadows, which is probably why you don't see too many shadowed,	reflected 
-	examples. However, for relatively simple distance fields, it's pretty doable.
-
-	It was tempting to do this up, but I figured a simpler example would be more
-	helpful. Take away the rambling comments, and there isn't a great deal of code.
-	I'll post a more sophisticated one later.
-
-    // Reasonably simple examples featuring reflection:
-
-    To the road of ribbon - XT95
-    https://www.shadertoy.com/view/MsfGzr
-
-    704.2 - PauloFalcao
-    https://www.shadertoy.com/view/Xdj3Dt
-
-    // Reflections and refraction. Really cool.
-    Glass Polyhedron - Nrx
-    https://www.shadertoy.com/view/4slSzj
-
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/*
-	Raymarched Reflections
-	----------------------
-
-	A very basic demonstration of raymarching a distance field with reflections 
-	and reasonably passable shadows. Definitely not cutting edge, but hopefully, 
-	interesting to anyone who isn't quite familiar with the process.
-
-	Reflections are pretty easy: Raymarch to the hit point, then obtain the color 
-	at that point. Continue on from the hit point in the direction of the reflected 
-	ray until you reach a new hit point. Obtain the color at the new point, then
-	add a portion of it to your original color. Repeat the process.
-
-	Unfortunately, the extra work can slow things down, especially when you apply
-	shadows, which is probably why you don't see too many shadowed,	reflected 
-	examples. However, for relatively simple distance fields, it's pretty doable.
-
-	It was tempting to do this up, but I figured a simpler example would be more
-	helpful. Take away the rambling comments, and there isn't a great deal of code.
-	I'll post a more sophisticated one later.
-
-    // Reasonably simple examples featuring reflection:
-
-    To the road of ribbon - XT95
-    https://www.shadertoy.com/view/MsfGzr
-
-    704.2 - PauloFalcao
-    https://www.shadertoy.com/view/Xdj3Dt
-
-    // Reflections and refraction. Really cool.
-    Glass Polyhedron - Nrx
-    https://www.shadertoy.com/view/4slSzj
-
-*/
-
-#define FAR 30.
-
-// Distance function. This one is pretty simple. I chose rounded
-// spherical boxes, because they're cheap and they display the 
-// reflections reasonably well.
-float map(vec3 p)
-{
-    
-    // Positioning the rounded cubes a little off center, in order
-    // to break up the space a little.
-    //
-    // "floor(p)" represents a unique number (ID) for each cube 
-    // (based on its unique position). Take that number and produce 
-    // a randomized 3D offset, then add it to it's regular position. 
-    // Simple.
-    float n = sin(dot(floor(p), vec3(7, 157, 113)));
-    vec3 rnd = fract(vec3(2097152, 262144, 32768)*n)*.16-.08;
-    
-    // Repeat factor. If irregularity isn't your thing, you can get 
-    // rid of "rnd" to line things up again.
-    p = fract(p + rnd) - .5;
-    
-    
-    // Rounded spherical boxes. The following is made up, but kind of
-    // makes sense. Box, minus a bit of sphericalness, gives you a 
-    // rounded box.
-    p = abs(p); 
-    return max(p.x, max(p.y, p.z)) - 0.25 + dot(p, p)*0.5;
-    
-    //return length(p) - 0.225; // Just spheres.
-}
-
-// Standard raymarching routine.
-float trace(vec3 ro, vec3 rd){
-   
-    float t = 0., d;
-    
-    for (int i = 0; i < 96; i++){
-
-        d = map(ro + rd*t);
-        
-        if(abs(d)<.002 || t>FAR) break; // Normally just "d<.0025"        
-        
-        t += d*.75;  // Using more accuracy, in the first pass.
-    }
-    
-    return t;
-}
-
-// Second pass, which is the first, and only, reflected bounce. 
-// Virtually the same as above, but with fewer iterations and less 
-// accuracy.
-//
-// The reason for a second, virtually identical equation is that 
-// raymarching is usually a pretty expensive exercise, so since the 
-// reflected ray doesn't require as much detail, you can relax things 
-// a bit - in the hope of speeding things up a little.
-float traceRef(vec3 ro, vec3 rd){
-    
-    float t = 0., d;
-    
-    for (int i = 0; i < 48; i++){
-
-        d = map(ro + rd*t);
-        
-        if(abs(d)<.0025 || t>FAR) break;
-        
-        t += d;
-    }
-    
-    return t;
-}
-
-
-// Cheap shadows are hard. In fact, I'd almost say, shadowing repeat objects - in a setting like this - with limited 
-// iterations is impossible... However, I'd be very grateful if someone could prove me wrong. :)
-float softShadow(vec3 ro, vec3 lp, float k){
-
-    // More would be nicer. More is always nicer, but not really affordable... Not on my slow test machine, anyway.
-    const int maxIterationsShad = 24; 
-    
-    vec3 rd = (lp-ro); // Unnormalized direction ray.
-
-    float shade = 1.;
-    float dist = .005;    
-    float end = max(length(rd), 0.001);
-    float stepDist = end/float(maxIterationsShad);
-    
-    rd /= end;
-
-    // Max shadow iterations - More iterations make nicer shadows, but slow things down. Obviously, the lowest 
-    // number to give a decent shadow is the best one to choose. 
-    for (int i=0; i<maxIterationsShad; i++){
-
-        float h = map(ro + rd*dist);
-        //shade = min(shade, k*h/dist);
-        shade = min(shade, smoothstep(0.0, 1.0, k*h/dist)); // Subtle difference. Thanks to IQ for this tidbit.
-        // So many options here, and none are perfect: dist += min(h, .2), dist += clamp(h, .01, .2), 
-        // clamp(h, .02, stepDist*2.), etc.
-        dist += clamp(h, .02, .2);
-        
-        // Early exits from accumulative distance function calls tend to be a good thing.
-        if (h<0.0 || dist > end) break; 
-        //if (h<0.001 || dist > end) break; // If you're prepared to put up with more artifacts.
-    }
-
-    // I've added 0.5 to the final shade value, which lightens the shadow a bit. It's a preference thing. 
-    // Really dark shadows look too brutal to me.
-    return min(max(shade, 0.) + 0.25, 1.0); 
-}
-
-/*
-// Standard normal function. It's not as fast as the tetrahedral calculation, but more symmetrical. Due to 
-// the intricacies of this particular scene, it's kind of needed to reduce jagged effects.
-vec3 getNormal(in vec3 p) {
-	const vec2 e = vec2(0.002, 0);
-	return normalize(vec3(map(p + e.xyy) - map(p - e.xyy), map(p + e.yxy) - map(p - e.yxy),	map(p + e.yyx) - map(p - e.yyx)));
-}
-*/
-
-// Tetrahedral normal, to save a couple of "map" calls. Courtesy of IQ.
-vec3 getNormal( in vec3 p ){
-
-    // Note the slightly increased sampling distance, to alleviate
-    // artifacts due to hit point inaccuracies.
-    vec2 e = vec2(0.0035, -0.0035); 
-    return normalize(
-        e.xyy * map(p + e.xyy) + 
-        e.yyx * map(p + e.yyx) + 
-        e.yxy * map(p + e.yxy) + 
-        e.xxx * map(p + e.xxx));
-}
-
-// Alternating the cube colors in a 3D checkered arrangement.
-// You could just return a single color, if you wanted, but I
-// thought I'd mix things up a bit.
-//
-// Color scheme mildly influenced by: Sound Experiment 3 - aiekick
-// https://www.shadertoy.com/view/Ml2XWt
-vec3 getObjectColor(vec3 p){
-    
-    vec3 col = vec3(1);
-    
-    // "floor(p)" is analogous to a unique ID - based on position.
-    // This could be stepped, but it's more intuitive this way.
-    if(fract(dot(floor(p), vec3(.5))) > 0.001) col = vec3(0.6, 0.3, 1.0);
-    
-    return col;
-    
-}
-
-// Using the hit point, unit direction ray, etc, to color the 
-// scene. Diffuse, specular, falloff, etc. It's all pretty 
-// standard stuff.
-vec3 doColor(in vec3 sp, in vec3 rd, in vec3 sn, in vec3 lp){
-    
-    vec3 ld = lp-sp; // Light direction vector.
-    float lDist = max(length(ld), 0.001); // Light to surface distance.
-    ld /= lDist; // Normalizing the light vector.
-    
-    // Attenuating the light, based on distance.
-    float atten = 1. / (1.0 + lDist*0.2 + lDist*lDist*0.1);
-    
-    // Standard diffuse term.
-    float diff = max(dot(sn, ld), 0.);
-    // Standard specualr term.
-    float spec = pow(max( dot( reflect(-ld, sn), -rd ), 0.0 ), 8.0);
-    
-    // Coloring the object. You could set it to a single color, to
-    // make things simpler, if you wanted.
-    vec3 objCol = getObjectColor(sp);
-    
-    // Combining the above terms to produce the final scene color.
-    vec3 sceneCol = (objCol*(diff + 0.15) + vec3(1., .6, .2)*spec*2.) * atten;
-
-    
-    // Return the color. Performed once every pass... of which there are
-    // only two, in this particular instance.
-    return sceneCol;
-    
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ){
-
-    // Screen coordinates.
-	vec2 uv = (fragCoord.xy - iResolution.xy*.5) / iResolution.y;
-    
-    // Unit direction ray.
-    vec3 rd = normalize(vec3(uv, 1.0));
-    
-
-    // Some cheap camera movement, for a bit of a look around. I use this far
-    // too often. I'm even beginning to bore myself, at this point. :)
-    float cs = cos(iGlobalTime * 0.25), si = sin(iGlobalTime * 0.25);
-    rd.xy = mat2(cs, si, -si, cs)*rd.xy;
-    rd.xz = mat2(cs, si, -si, cs)*rd.xz;
-    
-    // Ray origin. Doubling as the surface position, in this particular example.
-    // I hope that doesn't confuse anyone.
-    vec3 ro = vec3(0., 0., iGlobalTime*1.5);
-    
-    // Light position. Set in the vicinity the ray origin.
-    vec3 lp = ro + vec3(0., 1., -.5);
-    
-    
-    // FIRST PASS.
-    
-    float t = trace(ro, rd);
-    
-    // Fog based off of distance from the camera.
-    float fog = smoothstep(0., .95, t/FAR);
-    
-    // Advancing the ray origin, "ro," to the new hit point.
-    ro += rd*t;
-    
-    // Retrieving the normal at the hit point.
-    vec3 sn = getNormal(ro);
-    
-    // Retrieving the color at the hit point, which is now "ro." I agree, reusing 
-    // the ray origin to describe the surface hit point is kind of confusing. The reason 
-    // we do it is because the reflective ray will begin from the hit point in the 
-    // direction of the reflected ray. Thus the new ray origin will be the hit point. 
-    // See "traceRef" below.
-    vec3 sceneColor = doColor(ro, rd, sn, lp);
-    
-    // Checking to see if the surface is in shadow. Ideally, you'd also check to
-    // see if the reflected surface is in shadow. However, shadows are expensive, so
-    // it's only performed on the first pass. If you pause and check the reflections,
-    // you'll see that they're not shadowed. OMG! - Better call the shadow police. :)
-    float sh = softShadow(ro, lp, 16.);
-    
-    
-    // SECOND PASS - REFLECTED RAY
-    
-    // Standard reflected ray, which is just a reflection of the unit
-    // direction ray off of the intersected surface. You use the normal
-    // at the surface point to do that. Hopefully, it's common sense.
-    rd = reflect(rd, sn);
-    
-    
-    // The reflected pass begins where the first ray ended, which is the suface
-    // hit point, or in a few cases, beyond the far plane. By the way, for the sake
-    // of simplicity, we'll perform a reflective pass for non hit points too. Kind
-    // of wasteful, but not really noticeable. The direction of the new ray will
-    // obviously be in the direction of the reflected ray. See just above.
-    //
-    // To anyone who's new to this, don't forgot to nudge the ray off of the 
-    // initial surface point. Otherwise, you'll intersect with the surface
-    // you've just hit. After years of doing this, I still forget on occasion.
-    t = traceRef(ro +  rd*.01, rd);
-    
-    // Advancing the ray origin, "ro," to the new reflected hit point.
-    ro += rd*t;
-    
-    // Retrieving the normal at the reflected hit point.
-    sn = getNormal(ro);
-    
-    // Coloring the reflected hit point, then adding a portion of it to the final scene color.
-    // How much you add is up to you, but I'm going with 35 percent.
-    sceneColor += doColor(ro, rd, sn, lp)*.35;
-    
-    
-    // APPLYING SHADOWS
-    //
-    // Multiply the shadow from the first pass by the final scene color. Ideally, you'd check to
-    // see if the reflected point was in shadow, and incorporate that too, but we're cheating to
-    // save cycles and skipping it. It's not really noticeable anyway. By the way, ambient
-    // occlusion would make it a little nicer, but we're saving cycles and keeping things simple.
-    sceneColor *= sh;
-    
-    // Technically, it should be applied on the reflection pass too, but it's not that
-    // noticeable, in this case.
-    sceneColor = mix(sceneColor, vec3(0), fog); 
-    
-    
-   
-
-    // Clamping the scene color, performing some rough gamma correction (the "sqrt" bit), then 
-    // presenting it to the screen.
-	fragColor = vec4(sqrt(clamp(sceneColor, 0.0, 1.0)), 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/procedural/shane-tunneltutorial.slang b/procedural/shane-tunneltutorial.slang
deleted file mode 100644
index 17db063365..0000000000
--- a/procedural/shane-tunneltutorial.slang
+++ /dev/null
@@ -1,225 +0,0 @@
-#version 450
-/*
-    Simplified, Traced Minkowski Tube.
-    ----------------------------------
-    
-    This was inspired by Shadertoy user Akaitora's "Worley Tunnel" which you can find here:
-    https://www.shadertoy.com/view/XtjSzR
-    
-    Akaitora had a question, but I didn't have room to answer, so this is for anyone who's interested
-    in understanding the reasoning behind the oldschool tunnel effect. I see a "lot" of them around.
-    
-    I'll assume most know that the endless tunnel effect is a simplification of a raytraced, 
-    cylindrically-mapped inner cylinder. Without going into detail, by restricting the "XY" coordinates 
-	of 	the ray origin (camera position) "ro" to zero, the ray intersection equation becomes almost 
-	trivial. For a 3D unit ray-direction vector, "rd," the solution is something along the lines of:
-    
-    float distance = 1./length(rd.xy);
-    
-    The 3D surface point is then: sp = vec3(0., 0., ro.z) + rd/length(rd.xy); // Where "ro.z" is time.
-    
-    The surface point coordinates enable you to color the surface using a 3D method, or in the case of 
-	the endless tunnel effect, cylindrically map a texture, or texture-function, (preferably seamless) 
-	onto the surface:
-    
-	vec3 color = TexFunction(vec3 sp) { return texUV(scaleU*atan(sp.y, sp.x)/6.2832, scaleV*sp.z); }
-    
-    You can see that "sp.z" is equal to: ro.z(time)*scaleV + rd.z*scaleV(constant)/length(rd.xy);
-    
-    The light attenuation is usually a scaled inverse of the distance, or "k*length(rd.xy)" and the 
-    normal vector is about as straight forward as it gets: normalize(vec3(-sp.xy, 0.));
-    
-    Anyway, to save cycles, 1990s demo coders threw out the 3D surface information, bypassed the 
-    normalization of the ray-direction vector, and a bunch of other stuff, until there was virtually 
-	nothing left to calculate other than the texture coordinates and distance attenuation.
-
-	The point is, for the price of just a few extra lines and almost no extra effort on the part of the
-	GPU, you could have a 3D "lit" tunnel, which is more visually enticing. Like the oldschool tunnel 
-	demos, you could also have square, rounded square tunnels, etc.
-    
-    Hence, this simple demonstration. It's a point lit, rounded square tunnel, produced without the use 
-	of raymarching. As a point of interest that's probably not interesting, there's not a single "for 
-	loop" or "if statement" used in the code. Do I get points for that? :)
-
-	If you ignore the 3D Voronesque function (which I'll explain another time), bump mapping, amateur
-	camera movement and extra lighting, there's barely any code here. In fact, I believe you could fit 
-	a 3D lit, 3D-function mapped, possibly bumped, tunnel into a tweet or two... but I'll leave that to 
-	Fabrice Neyret, Greg Rostami, etc. ;-)
-
-	
-	Update: Here's a private link to a cylindrically mapped tube I put together. It's for those who'd 
-	like to see how to apply repeated 2D functions and textures:
-	https://www.shadertoy.com/view/ltSSR1
-
-*/
-
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-
-// 2D rotation. Always handy.
-mat2 rot(float th){ float cs = cos(th), si = sin(th); return mat2(cs, -si, si, cs); }
-
-// 3D Voronoi-like function. Cheap, low quality, 1st and 2nd order 3D Voronoi imitation.
-//
-// I wrote this a while back because I wanted a stand-alone algorithm fast enough to produce regular, or 2nd order, 
-// Voronoi-looking patterns in a raymarching setting. Anyway, this is what I came up with. Obviously, it wouldn't 
-// pass as genuine 3D Voronoi, but there's only so much you can do with a few lines. Even so, it has a Voronoi feel
-// to it. Hence, Voronesque.
-//
-// Here's a rough explanation of how it works: Instead of partitioning space into cubes, partition it into its 
-// simplex form, namely tetrahedrons. Use the four tetrahedral vertices to create some random falloff values, then 
-// pick off the two highest, or lowest, depending on perspective. That's it. If you'd like to know more, the 
-// function is roughly commented, plus there's a simplex noise related link below that should make it more clear.
-//
-// Credits: Ken Perlin, the creator of simplex noise, of course. Stefan Gustavson's paper - "Simplex Noise Demystified."
-// IQ, other "ShaderToy.com" people, Brian Sharpe (does interesting work), etc.
-//
-// My favorite simplex-related write up: "Simplex Noise, keeping it simple." - Jasper Flick?
-// http://catlikecoding.com/unity/tutorials/simplex-noise/
-//
-float Voronesque( in vec3 p ){
-    
-    // Skewing the cubic grid, then determining the first vertice.
-    vec3 i  = floor(p + dot(p, vec3(0.333333)) );  p -= i - dot(i, vec3(0.166666)) ;
-    
-    // Breaking the skewed cube into tetrahedra with partitioning planes, then determining which side of the 
-    // intersecting planes the skewed point is on. Ie: Determining which tetrahedron the point is in.
-    vec3 i1 = step(0., p-p.yzx), i2 = max(i1, 1.0-i1.zxy); i1 = min(i1, 1.0-i1.zxy);    
-    
-    // Using the above to calculate the other three vertices. Now we have all four tetrahedral vertices.
-    vec3 p1 = p - i1 + 0.166666, p2 = p - i2 + 0.333333, p3 = p - 0.5;
-    
-    vec3 rnd = vec3(7, 157, 113); // I use this combination to pay homage to Shadertoy.com. :)
-    
-    // Falloff values from the skewed point to each of the tetrahedral points.
-    vec4 v = max(0.5 - vec4(dot(p, p), dot(p1, p1), dot(p2, p2), dot(p3, p3)), 0.);
-    
-    // Assigning four random values to each of the points above. 
-    vec4 d = vec4( dot(i, rnd), dot(i + i1, rnd), dot(i + i2, rnd), dot(i + 1., rnd) ); 
-    
-    // Further randomizing "d," then combining it with "v" to produce the final random falloff values. Range [0, 1]
-    d = fract(sin(d)*262144.)*v*2.; 
- 
-    // Reusing "v" to determine the largest, and second largest falloff values. Analogous to distance.
-    v.x = max(d.x, d.y), v.y = max(d.z, d.w), v.z = max(min(d.x, d.y), min(d.z, d.w)), v.w = min(v.x, v.y); 
-   
-    return  max(v.x, v.y)- max(v.z, v.w); // Maximum minus second order, for that beveled Voronoi look. Range [0, 1].
-    //return max(v.x, v.y); // Maximum, or regular value for the regular Voronoi aesthetic.  Range [0, 1].
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ){
-    
-    // Screen coordinates, plus some movement about the center.
-    vec2 uv = (fragCoord.xy - iResolution.xy*0.5)/iResolution.y + vec2(0.5*cos(iGlobalTime*0.5), 0.25*sin(iGlobalTime*0.5));
-    
-    // Unit direction ray.
-    vec3 rd = normalize(vec3(uv, 1.));
-    rd.xy *= rot(sin(iGlobalTime*0.25)*0.5); // Very subtle look around, just to show it's a 3D effect.
-    rd.xz *= rot(sin(iGlobalTime*0.25)*0.5);
- 
-    // Screen color. Initialized to black.
-    vec3 col = vec3(0);
-    
-    // Ray intersection of a cylinder (radius one) - centered at the origin - from a ray-origin that has XY coordinates 
-    // also centered at the origin.
-    //float sDist = max(dot(rd.xy, rd.xy), 1e-16); // Analogous to the surface function.
-    //sDist = 1./sqrt(sDist); // Ray origin to surface distance.
-    
-    // Same as above, but using a Minkowski distance and scaling factor. I tried it on a whim, and it seemed to work.
-    // I know, not scientific at all, but it kind of makes sense. They'll let anyone get behind a computer these days. :)
-    vec2 scale = vec2(0.75, 1.);
-    float power = 6.;
-    float sDist = max(dot( pow(abs(rd.xy)*scale, vec2(power)), vec2(1.) ), 1e-16); // Analogous to the surface function.
-    sDist = 1./pow( sDist, 1./power ); // Ray origin to surface distance.
-    
-    //if(sDist>1e-8){
-        
-        // Using the the distance "sDist" above to calculate the surface position. Ie: sp = ro + rd*t;
-        // I've hardcoded "ro" to reduce line count. Note that "ro.xy" is centered on zero. The cheap
-        // ray-intersection formula above relies on that.
-        vec3 sp = vec3(0.0, 0.0, iGlobalTime*2.) + rd*sDist;
- 
-        // The surface normal. Based on the derivative of the surface description function. See above.
-        //vec3 sn = normalize(vec3(-sp.xy, 0.)); // Cylinder normal.
-        vec3 sn = normalize(-sign(sp)*vec3(pow(abs(sp.xy)*scale, vec2(power-1.)), 0.)); // Minkowski normal.
-        
-        // Bump mapping.
-        //
-        // I wanted to make this example as simple as possible, but it's only a few extra lines. Note the larger 
-        // "eps" number. Increasing the value spreads the samples out, which effectively blurs the result, thus 
-        // reducing the jaggies. The downside is loss of bump precision, which isn't noticeable in this particular 
-        // example. Decrease the value to "0.001" to see what I'm talking about.
-        const vec2 eps = vec2(0.025, 0.);
-        float c = Voronesque(sp*2.5); // Base value. Used below to color the surface.
-        // 3D gradient vector... of sorts. Based on the bump function. In this case, Voronoi.                
-        vec3 gr = (vec3(Voronesque((sp-eps.xyy)*2.5), Voronesque((sp-eps.yxy)*2.5), Voronesque((sp-eps.yyx)*2.5))-c)/eps.x;
-        gr -= sn*dot(sn, gr); // There's a reason for this... but I need more room. :)
-        sn = normalize(sn + gr*0.1); // Combining the bump gradient vector with the object surface normal.
-
-        // Lighting.
-        //
-        // The light is hovering just in front of the viewer.
-        vec3 lp = vec3(0.0, 0.0, iGlobalTime*2. + 3.);
-        vec3 ld = lp - sp; // Light direction.
-        float dist = max(length(ld), 0.001); // Distance from light to the surface.
-        ld /= dist; // Use the distance to normalize "ld."
-
-        // Light attenuation, based on the distance above.
-        float atten = min(1.0/max(0.75 + dist*0.25 + dist*dist*0.05, 0.001), 1.0);
-        
-       
-        float diff = max(dot(sn, ld), 0.); // Diffuse light value.
-        float spec = pow(max(dot(reflect(-ld, sn), -rd), 0.), 16.); // Specular highlighting.
-        // Adding some fake, reflective environment information.
-        float ref = Voronesque((sp + reflect(rd, sn)*0.5)*2.5);
-        
-        // Coloring the surface with the Voronesque function that is used to bump the surface. See "bump mapping" above.
-        vec3 objCol = vec3(min(c*1.5, 1.), pow(c, 2.5), pow(c, 12.)); // Cheap, but effective, red palette.
-        //vec3 objCol = vec3(c*c*0.9, c, c*c*0.4); // Cheap green palette.
-        //vec3 objCol = vec3(pow(c, 1.6), pow(c, 1.7), c); // Purpley blue.
-        //vec3 objCol = vec3(c); // Grey scale.
-
-        // Using the values above to produce the final color.
-        //col = (objCol*(diff + ref*0.25 + 0.25) + vec3(1., 0.8, 0.9)*ref*0.25 + spec*vec3(0.75, 0.9, 1.))*atten;
-        col = (objCol*(vec3(1.0, 0.97, 0.92)*diff + ref*0.5 + 0.25) + vec3(1., 0.8, 0.9)*ref*0.3 + vec3(1., 0.9, 0.7)*spec)*atten;
-        //col = ((vec3(1.0, 0.97, 0.92)*diff + ref*0.5 + 0.25)*c + vec3(1., 0.8, 0.9)*ref*0.3 + vec3(0.75, 0.9, 1.)*spec)*atten;
-         
-        
-    //}
-    
-    fragColor = vec4(min(col, 1.), 1.);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
\ No newline at end of file
diff --git a/procedural/srtuss-industry.slang b/procedural/srtuss-industry.slang
deleted file mode 100644
index 1fb1ed564a..0000000000
--- a/procedural/srtuss-industry.slang
+++ /dev/null
@@ -1,304 +0,0 @@
-#version 450
-// Industry -  srtuss - 2013-07-06
-// https://www.shadertoy.com/view/Msf3D7
-
-// Me beeing creative in 2D ;)
-// Its a work in progress, but you guys might still enjoy it.
-
-// by srtuss, 2013
-// a little expression of my love for complex machines and stuff
-// was going for some cartoonish 2d look
-// still could need some optimisation
-
-// * improved gears
-// * improved camera movement
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-float hash(float x)
-{
-	return fract(sin(x) * 43758.5453);
-}
-
-vec2 hash(vec2 p)
-{
-    p = vec2(dot(p, vec2(127.1, 311.7)), dot(p, vec2(269.5, 183.3)));
-	return fract(sin(p) * 43758.5453);
-}
-
-// simulates a resonant lowpass filter
-float mechstep(float x, float f, float r)
-{
-	float fr = fract(x);
-	float fl = floor(x);
-	return fl + pow(fr, 0.5) + sin(fr * f) * exp(-fr * 3.5) * r;
-}
-
-// voronoi cell id noise
-vec3 voronoi(in vec2 x)
-{
-	vec2 n = floor(x);
-	vec2 f = fract(x);
-
-	vec2 mg, mr;
-	
-	float md = 8.0;
-	for(int j = -1; j <= 1; j ++)
-	{
-		for(int i = -1; i <= 1; i ++)
-		{
-			vec2 g = vec2(float(i),float(j));
-			vec2 o = hash(n + g);
-			vec2 r = g + o - f;
-			float d = max(abs(r.x), abs(r.y));
-			
-			if(d < md)
-			{
-				md = d;
-				mr = r;
-				mg = g;
-			}
-		}
-	}
-	
-	return vec3(n + mg, mr);
-}
-
-vec2 rotate(vec2 p, float a)
-{
-	return vec2(p.x * cos(a) - p.y * sin(a), p.x * sin(a) + p.y * cos(a));
-}
-
-float stepfunc(float a)
-{
-	return step(a, 0.0);
-}
-
-float fan(vec2 p, vec2 at, float ang)
-{
-	p -= at;
-	p *= 3.0;
-	
-	float v = 0.0, w, a;
-	float le = length(p);
-	
-	v = le - 1.0;
-	
-	if(v > 0.0)
-		return 0.0;
-	
-	a = sin(atan(p.y, p.x) * 3.0 + ang);
-	
-	w = le - 0.05;
-	v = max(v, -(w + a * 0.8));
-	
-	w = le - 0.15;
-	v = max(v, -w);
-	
-	return stepfunc(v);
-}
-
-float gear(vec2 p, vec2 at, float teeth, float size, float ang)
-{
-	p -= at;
-	float v = 0.0, w;
-	float le = length(p);
-	
-	w = le - 0.3 * size;
-	v = w;
-	
-	w = sin(atan(p.y, p.x) * teeth + ang);
-	w = smoothstep(-0.7, 0.7, w) * 0.1;
-	v = min(v, v - w);
-	
-	w = le - 0.05;
-	v = max(v, -w);
-	
-	return stepfunc(v);
-}
-
-float car(vec2 p, vec2 at)
-{
-	p -= at;
-	float v = 0.0, w;
-	w = length(p + vec2(-0.05, -0.31)) - 0.03;
-	v = w;
-	w = length(p + vec2(0.05, -0.31)) - 0.03;
-	v = min(v, w);
-	
-	vec2 box = abs(p + vec2(0.0, -0.3 - 0.07));
-	w = max(box.x - 0.1, box.y - 0.05);
-	v = min(v, w);
-	return stepfunc(v);
-}
-
-float layerA(vec2 p, float seed)
-{
-	float v = 0.0, w, a;
-	
-	float si = floor(p.y);
-	float sr = hash(si + seed * 149.91);
-	vec2 sp = vec2(p.x, mod(p.y, 4.0));
-	float strut = 0.0;
-	strut += step(abs(sp.y), 0.3);
-	strut += step(abs(sp.y - 0.2), 0.1);
-	
-	float st = iGlobalTime + sr;
-	float ct = mod(st * 3.0, 5.0 + sr) - 2.5;
-	
-	v = step(2.0, abs(voronoi(p + vec2(0.35, seed * 194.9)).x));
-	
-	w = length(sp - vec2(-2.0, 0.0)) - 0.8;
-	v = min(v, 1.0 - step(w, 0.0));
-	
-	
-	a = st;
-	w = fan(sp, vec2(2.5, 0.65), a * 40.0);
-	v = min(v, 1.0 - w);
-	
-	
-	return v;
-}
-
-float layerB(vec2 p, float seed)
-{
-	float v = 0.0, w, a;
-	
-	float si = floor(p.y / 3.0) * 3.0;
-	vec2 sp = vec2(p.x, mod(p.y, 3.0));
-	float sr = hash(si + seed * 149.91);
-	sp.y -= sr * 2.0;
-	
-	float strut = 0.0;
-	strut += step(abs(sp.y), 0.3);
-	strut += step(abs(sp.y - 0.2), 0.1);
-	
-	float st = iGlobalTime + sr;
-	
-	float cs = 2.0;
-	if(hash(sr) > 0.5)
-		cs *= -1.0;
-	float ct = mod(st * cs, 5.0 + sr) - 2.5;
-
-	
-	v = step(2.0, abs(voronoi(p + vec2(0.35, seed * 194.9)).x) + strut);
-	
-	w = length(sp - vec2(-2.3, 0.6)) - 0.15;
-	v = min(v, 1.0 - step(w, 0.0));
-	w = length(sp - vec2(2.3, 0.6)) - 0.15;
-	v = min(v, 1.0 - step(w, 0.0));
-	
-	if(v > 0.0)
-		return 1.0;
-	
-	
-	w = car(sp, vec2(ct, 0.0));
-	v = w;
-	
-	if(hash(si + 81.0) > 0.5)
-		a = mechstep(st * 2.0, 20.0, 0.4) * 3.0;
-	else
-		a = st * (sr - 0.5) * 30.0;
-	w = gear(sp, vec2(-2.0 + 4.0 * sr, 0.5), 8.0, 1.0, a);
-	v = max(v, w);
-	
-	w = gear(sp, vec2(-2.0 + 0.65 + 4.0 * sr, 0.35), 7.0, 0.8, -a);
-	v = max(v, w);
-	if(hash(si - 105.13) > 0.8)
-	{
-		w = gear(sp, vec2(-2.0 + 0.65 + 4.0 * sr, 0.35), 7.0, 0.8, -a);
-		v = max(v, w);
-	}
-	if(hash(si + 77.29) > 0.8)
-	{
-		w = gear(sp, vec2(-2.0 - 0.55 + 4.0 * sr, 0.30), 5.0, 0.5, -a + 0.7);
-		v = max(v, w);
-	}
-	
-	return v;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	vec2 uv = fragCoord.xy / iResolution.xy;
-	uv = uv * 2.0 - 1.0;
-	vec2 p = uv;
-	p.x *= iResolution.x / iResolution.y;
-	
-	float t = iGlobalTime;
-	
-	vec2 cam = vec2(sin(t) * 0.2, t);
-	
-	// for future use
-	/*float quake = exp(-fract(t) * 5.0) * 0.5;
-	if(quake > 0.001)
-	{
-		cam.x += (hash(t) - 0.5) * quake;
-		cam.y += (hash(t - 118.29) - 0.5) * quake;
-	}*/
-	
-	p = rotate(p, sin(t) * 0.02);
-	
-	vec2 o = vec2(0.0, t);
-	float v = 0.0, w;
-	
-	
-	float z = 3.0 - sin(t * 0.7) * 0.1;
-	for(int i = 0; i < 5; i ++)
-	{
-		float f = 1.0;
-		
-		float zz = 0.3 + z;
-		
-		f = zz * 2.0 * 0.9;
-		
-		
-		if(i == 3 || i == 1)
-			w = layerA(vec2(p.x, p.y) * f + cam, float(i));
-		else
-			w = layerB(vec2(p.x, p.y) * f + cam, float(i));
-		v = mix(v, exp(-abs(zz) * 0.3 + 0.1), w);
-		
-		
-		z -= 0.6;
-	}
-	
-	
-	
-	
-	v = 1.0 - v;// * pow(1.0 - abs(uv.x), 0.1);
-	
-	fragColor = vec4(v, v, v, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/srtuss-relentless.slang b/procedural/srtuss-relentless.slang
deleted file mode 100644
index 03a02ba320..0000000000
--- a/procedural/srtuss-relentless.slang
+++ /dev/null
@@ -1,303 +0,0 @@
-#version 450
-// Relentless -  srtuss - 2013-09-09
-// https://www.shadertoy.com/view/Iss3WS
-
-// Collecting some design ideas for a new game project. Heavily inspired by movAX13h's io shader. Thanks to iq for his ray-plane-intersection code.
-
-// srtuss, 2013
-
-// collecting some design ideas for a new game project.
-// no raymarching is used.
-
-// if i could add a custom soundtrack, it'd use this one (essential for desired sensation)
-// http://www.youtube.com/watch?v=1uFAu65tZpo
-
-
-//#define GREEN_VERSION
-
-// ** improved camera shaking
-// ** cleaned up code
-// ** added stuff to the gates
-
-
-
-// *******************************************************************************************
-// Please do NOT use this shader in your own productions/videos/games without my permission!
-// If you'd still like to do so, please drop me a mail (stral@aon.at)
-// *******************************************************************************************
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define time iGlobalTime
-
-vec2 rotate(vec2 p, float a)
-{
-	return vec2(p.x * cos(a) - p.y * sin(a), p.x * sin(a) + p.y * cos(a));
-}
-float box(vec2 p, vec2 b, float r)
-{
-	return length(max(abs(p) - b, 0.0)) - r;
-}
-
-// iq's ray-plane-intersection code
-vec3 intersect(in vec3 o, in vec3 d, vec3 c, vec3 u, vec3 v)
-{
-	vec3 q = o - c;
-	return vec3(
-		dot(cross(u, v), q),
-		dot(cross(q, u), d),
-		dot(cross(v, q), d)) / dot(cross(v, u), d);
-}
-
-// some noise functions for fast developing
-float rand11(float p)
-{
-    return fract(sin(p * 591.32) * 43758.5357);
-}
-float rand12(vec2 p)
-{
-    return fract(sin(dot(p.xy, vec2(12.9898, 78.233))) * 43758.5357);
-}
-vec2 rand21(float p)
-{
-	return fract(vec2(sin(p * 591.32), cos(p * 391.32)));
-}
-vec2 rand22(in vec2 p)
-{
-	return fract(vec2(sin(p.x * 591.32 + p.y * 154.077), cos(p.x * 391.32 + p.y * 49.077)));
-}
-
-float noise11(float p)
-{
-	float fl = floor(p);
-	return mix(rand11(fl), rand11(fl + 1.0), fract(p));//smoothstep(0.0, 1.0, fract(p)));
-}
-float fbm11(float p)
-{
-	return noise11(p) * 0.5 + noise11(p * 2.0) * 0.25 + noise11(p * 5.0) * 0.125;
-}
-vec3 noise31(float p)
-{
-	return vec3(noise11(p), noise11(p + 18.952), noise11(p - 11.372)) * 2.0 - 1.0;
-}
-
-// something that looks a bit like godrays coming from the surface
-float sky(vec3 p)
-{
-	float a = atan(p.x, p.z);
-	float t = time * 0.1;
-	float v = rand11(floor(a * 4.0 + t)) * 0.5 + rand11(floor(a * 8.0 - t)) * 0.25 + rand11(floor(a * 16.0 + t)) * 0.125;
-	return v;
-}
-
-vec3 voronoi(in vec2 x)
-{
-	vec2 n = floor(x); // grid cell id
-	vec2 f = fract(x); // grid internal position
-	vec2 mg; // shortest distance...
-	vec2 mr; // ..and second shortest distance
-	float md = 8.0, md2 = 8.0;
-	for(int j = -1; j <= 1; j ++)
-	{
-		for(int i = -1; i <= 1; i ++)
-		{
-			vec2 g = vec2(float(i), float(j)); // cell id
-			vec2 o = rand22(n + g); // offset to edge point
-			vec2 r = g + o - f;
-			
-			float d = max(abs(r.x), abs(r.y)); // distance to the edge
-			
-			if(d < md)
-				{md2 = md; md = d; mr = r; mg = g;}
-			else if(d < md2)
-				{md2 = d;}
-		}
-	}
-	return vec3(n + mg, md2 - md);
-}
-
-#define A2V(a) vec2(sin((a) * 6.28318531 / 100.0), cos((a) * 6.28318531 / 100.0))
-
-float circles(vec2 p)
-{
-	float v, w, l, c;
-	vec2 pp;
-	l = length(p);
-	
-	
-	pp = rotate(p, time * 3.0);
-	c = max(dot(pp, normalize(vec2(-0.2, 0.5))), -dot(pp, normalize(vec2(0.2, 0.5))));
-	c = min(c, max(dot(pp, normalize(vec2(0.5, -0.5))), -dot(pp, normalize(vec2(0.2, -0.5)))));
-	c = min(c, max(dot(pp, normalize(vec2(0.3, 0.5))), -dot(pp, normalize(vec2(0.2, 0.5)))));
-	
-	// innerest stuff
-	v = abs(l - 0.5) - 0.03;
-	v = max(v, -c);
-	v = min(v, abs(l - 0.54) - 0.02);
-	v = min(v, abs(l - 0.64) - 0.05);
-	
-	pp = rotate(p, time * -1.333);
-	c = max(dot(pp, A2V(-5.0)), -dot(pp, A2V(5.0)));
-	c = min(c, max(dot(pp, A2V(25.0 - 5.0)), -dot(pp, A2V(25.0 + 5.0))));
-	c = min(c, max(dot(pp, A2V(50.0 - 5.0)), -dot(pp, A2V(50.0 + 5.0))));
-	c = min(c, max(dot(pp, A2V(75.0 - 5.0)), -dot(pp, A2V(75.0 + 5.0))));
-	
-	w = abs(l - 0.83) - 0.09;
-	v = min(v, max(w, c));
-	
-	return v;
-}
-
-float shade1(float d)
-{
-	float v = 1.0 - smoothstep(0.0, mix(0.012, 0.2, 0.0), d);
-	float g = exp(d * -20.0);
-	return v + g * 0.5;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	vec2 uv = fragCoord.xy / iResolution.xy;
-	uv = uv * 2.0 - 1.0;
-	uv.x *= iResolution.x / iResolution.y;
-	
-	
-	// using an iq styled camera this time :)
-	// ray origin
-	vec3 ro = 0.7 * vec3(cos(0.2 * time), 0.0, sin(0.2 * time));
-	ro.y = cos(0.6 * time) * 0.3 + 0.65;
-	// camera look at
-	vec3 ta = vec3(0.0, 0.2, 0.0);
-	
-	// camera shake intensity
-	float shake = clamp(3.0 * (1.0 - length(ro.yz)), 0.3, 1.0);
-	float st = mod(time, 10.0) * 143.0;
-	
-	// build camera matrix
-	vec3 ww = normalize(ta - ro + noise31(st) * shake * 0.01);
-	vec3 uu = normalize(cross(ww, normalize(vec3(0.0, 1.0, 0.2 * sin(time)))));
-	vec3 vv = normalize(cross(uu, ww));
-	// obtain ray direction
-	vec3 rd = normalize(uv.x * uu + uv.y * vv + 1.0 * ww);
-	
-	// shaking and movement
-	ro += noise31(-st) * shake * 0.015;
-	ro.x += time * 2.0;
-	
-	float inten = 0.0;
-	
-	// background
-	float sd = dot(rd, vec3(0.0, 1.0, 0.0));
-	inten = pow(1.0 - abs(sd), 20.0) + pow(sky(rd), 5.0) * step(0.0, rd.y) * 0.2;
-	
-	vec3 its;
-	float v, g;
-	
-	// voronoi floor layers
-	for(int i = 0; i < 4; i ++)
-	{
-		float layer = float(i);
-		its = intersect(ro, rd, vec3(0.0, -5.0 - layer * 5.0, 0.0), vec3(1.0, 0.0, 0.0), vec3(0.0, 0.0, 1.0));
-		if(its.x > 0.0)
-		{
-			vec3 vo = voronoi((its.yz) * 0.05 + 8.0 * rand21(float(i)));
-			v = exp(-100.0 * (vo.z - 0.02));
-			
-			float fx = 0.0;
-			
-			// add some special fx to lowest layer
-			if(i == 3)
-			{
-				float crd = 0.0;//fract(time * 0.2) * 50.0 - 25.0;
-				float fxi = cos(vo.x * 0.2 + time * 1.5);//abs(crd - vo.x);
-				fx = clamp(smoothstep(0.9, 1.0, fxi), 0.0, 0.9) * 1.0 * rand12(vo.xy);
-				fx *= exp(-3.0 * vo.z) * 2.0;
-			}
-			inten += v * 0.1 + fx;
-		}
-	}
-	
-	// draw the gates, 4 should be enough
-	float gatex = floor(ro.x / 8.0 + 0.5) * 8.0 + 4.0;
-	float go = -16.0;
-	for(int i = 0; i < 4; i ++)
-	{
-		its = intersect(ro, rd, vec3(gatex + go, 0.0, 0.0), vec3(0.0, 1.0, 0.0), vec3(0.0, 0.0, 1.0));
-		if(dot(its.yz, its.yz) < 2.0 && its.x > 0.0)
-		{
-			v = circles(its.yz);
-			inten += shade1(v);
-		}
-		
-		go += 8.0;
-	}
-	
-	// draw the stream
-	for(int j = 0; j < 20; j ++)
-	{
-		float id = float(j);
-		
-		vec3 bp = vec3(0.0, (rand11(id) * 2.0 - 1.0) * 0.25, 0.0);
-		vec3 its = intersect(ro, rd, bp, vec3(1.0, 0.0, 0.0), vec3(0.0, 0.0, 1.0));
-		
-		if(its.x > 0.0)
-		{
-			vec2 pp = its.yz;
-			float spd = (1.0 + rand11(id) * 3.0) * 2.5;
-			pp.y += time * spd;
-			pp += (rand21(id) * 2.0 - 1.0) * vec2(0.3, 1.0);
-			float rep = rand11(id) + 1.5;
-			pp.y = mod(pp.y, rep * 2.0) - rep;
-			float d = box(pp, vec2(0.02, 0.3), 0.1);
-			float foc = 0.0;
-			float v = 1.0 - smoothstep(0.0, 0.03, abs(d) - 0.001);
-			float g = min(exp(d * -20.0), 2.0);
-			
-			inten += (v + g * 0.7) * 0.5;
-			
-		}
-	}
-	
-	inten *= 0.4 + (sin(time) * 0.5 + 0.5) * 0.6;
-	
-	// find a color for the computed intensity
-#ifdef GREEN_VERSION
-	vec3 col = pow(vec3(inten), vec3(2.0, 0.15, 9.0));
-#else
-	vec3 col = pow(vec3(inten), 1.5 * vec3(0.15, 2.0, 9.0));
-#endif
-	
-	fragColor = vec4(col, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/srtuss-sound-digital-ambience.slang b/procedural/srtuss-sound-digital-ambience.slang
deleted file mode 100644
index 7529d8ea6e..0000000000
--- a/procedural/srtuss-sound-digital-ambience.slang
+++ /dev/null
@@ -1,131 +0,0 @@
-#version 450
-// Sound - Digital Ambience -  srtuss - 2014-07-31
-// https://www.shadertoy.com/view/MdXXW2
-
-// i tried to rebuild the technique that creates the ambience sounds in my game project. it's based on additive synthesis. go ahead and "listen" to various textures
-
-// srtuss, 2014
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-vec2 rotate(vec2 p, float a)
-{
-	return vec2(p.x * cos(a) - p.y * sin(a), p.x * sin(a) + p.y * cos(a));
-}
-
-#define ITS 8
-
-vec2 circuit(vec3 p)
-{
-	p = mod(p, 2.0) - 1.0;
-	float w = 1e38;
-	vec3 cut = vec3(1.0, 0.0, 0.0);
-	vec3 e1 = vec3(-1.0);
-	vec3 e2 = vec3(1.0);
-	float rnd = 0.23;
-	float pos, plane, cur;
-	float fact = 0.9;
-	float j = 0.0;
-	for(int i = 0; i < ITS; i ++)
-	{
-		pos = mix(dot(e1, cut), dot(e2, cut), (rnd - 0.5) * fact + 0.5);
-		plane = dot(p, cut) - pos;
-		if(plane > 0.0)
-		{
-			e1 = mix(e1, vec3(pos), cut);
-			rnd = fract(rnd * 9827.5719);
-			cut = cut.yzx;
-		}
-		else
-		{
-			e2 = mix(e2, vec3(pos), cut);
-			rnd = fract(rnd * 15827.5719);
-			cut = cut.zxy;
-		}
-		j += step(rnd, 0.2);
-		w = min(w, abs(plane));
-	}
-	return vec2(j / float(ITS - 1), w);
-}
-
-float scene(vec3 p)
-{
-	vec2 cir = circuit(p);
-	return exp(-100.0 * cir.y) + pow(cir.x * 1.8 * (sin(p.z * 10.0 + iGlobalTime * -5.0 + cir.x * 10.0) * 0.5 + 0.5), 8.0);
-}
-
-float nse(float x)
-{
-    return fract(sin(x * 297.9712) * 90872.2961);
-}
-
-float nseI(float x)
-{
-    float fl = floor(x);
-    return mix(nse(fl), nse(fl + 1.0), smoothstep(0.0, 1.0, fract(x)));
-}
-
-float fbm(float x)
-{
-    return nseI(x) * 0.5 + nseI(x * 2.0) * 0.25 + nseI(x * 4.0) * 0.125;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	vec2 uv = fragCoord.xy / iResolution.xy;
-	vec2 suv = uv;
-	uv = 2.0 * uv - 1.0;
-	uv.x *= iResolution.x / iResolution.y;
-	vec3 ro = vec3(0.0, iGlobalTime * 0.2, 0.1);
-	vec3 rd = normalize(vec3(uv, 0.9));
-	ro.xz = rotate(ro.xz, iGlobalTime * 0.1);
-	ro.xy = rotate(ro.xy, 0.2);
-	rd.xz = rotate(rd.xz, iGlobalTime * 0.2);
-	rd.xy = rotate(rd.xy, 0.2);
-	float acc = 0.0;
-	vec3 r = ro + rd * 0.5;
-	for(int i = 0; i < 50; i ++)
-	{
-		acc += scene(r + nse(r.x) * 0.03);
-		r += rd * 0.015;
-	}
-	vec3 col = pow(vec3(acc * 0.04), vec3(0.2, 0.6, 2.0) * 8.0) * 2.0;
-	//col -= exp(length(suv - 0.5) * -2.5 - 0.2);
-    col = clamp(col, vec3(0.0), vec3(1.0));
-    col *= fbm(iGlobalTime * 6.0) * 2.0;
-	col = pow(col, vec3(1.0 / 2.2));
-	//col = clamp(col, vec3(0.0), vec3(1.0));
-	fragColor = vec4(col, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/srtuss-star-swirl.slang b/procedural/srtuss-star-swirl.slang
deleted file mode 100644
index 6a04163694..0000000000
--- a/procedural/srtuss-star-swirl.slang
+++ /dev/null
@@ -1,104 +0,0 @@
-#version 450
-// Star Swirl -  srtuss - 2014-10-08
-// https://www.shadertoy.com/view/Xd2XDm
-
-// playing around in with 2d things. has an 178 bpm breakbeat in it ^^
-
-// srtuss, 2014
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-
-#define pi 3.1415926535897932384626433832795
-
-float tri(float x)
-{
-	return abs(fract(x) * 2.0 - 1.0);
-}
-
-float dt(vec2 uv, float t)
-{
-	vec2 p = mod(uv * 10.0, 2.0) - 1.0;
-	float v = 1.0 / (dot(p, p) + 0.01);
-	p = mod(uv * 11.0, 2.0) - 1.0;
-	v += 0.5 / (dot(p, p) + 0.01);
-	return v * (sin(uv.y * 2.0 + t * 8.0) + 1.5);
-}
-
-float fun(vec2 uv, float a, float t)
-{
-	float beat = t * 178.0 / 4.0 / 60.0;
-	float e = floor(beat) * 0.1 + 1.0;
-	beat = fract(beat) * 16.0;
-	float b1 = 1.0 - mod(beat, 10.0) / 10.0;
-	float b2 = mod(beat, 8.0) / 8.0;
-	b1 = exp(b1 * -1.0) * 0.1;
-	b2 = exp(b2 * -4.0);
-	e = floor(fract(sin(e * 272.0972) * 10802.5892) * 4.0) + 1.0;
-	float l = length(uv);
-	float xx = l - 0.5 + sin(mod(l * 0.5 - beat / 16.0, 1.0) * pi * 2.0);
-	a += exp(xx * xx * -10.0) * 0.05;
-	vec2 pp = vec2(a * e + l * sin(t * 0.4) * 2.0, l);
-	pp.y = exp(l * -2.0) * 10.0 + tri(pp.x) + t * 2.0 - b1 * 4.0;
-	float v = pp.y;
-	v = sin(v) + sin(v * 0.5) + sin(v * 3.0) * 0.2;
-	v = fract(v) + b2 * 0.2;
-	v += exp(l * -4.5);
-	v += dt(pp * vec2(0.5, 1.0), t) * 0.01;
-	return v;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	float t = iGlobalTime;
-	vec2 uv = fragCoord.xy / iResolution.xy * 2.0 - 1.0;
-	uv.x *= 0.7 * iResolution.x / iResolution.y;
-	float an = atan(uv.y, uv.x) / pi;
-	float a = 0.02;
-	float v =
-		fun(uv, an, t + a * -3.) +
-		fun(uv, an, t + a * -2.) * 6. +
-		fun(uv, an, t + a * -1.) * 15. +
-		fun(uv, an, t + a *  0.) * 20. +
-		fun(uv, an, t + a *  1.) * 15. +
-		fun(uv, an, t + a *  2.) * 6. +
-		fun(uv, an, t + a *  3.);
-	v /= 64.0;
-	vec3 col;
-	col = clamp(col, vec3(0.0), vec3(1.0));
-	col = pow(vec3(v, v, v), vec3(0.5, 2.0, 1.5) * 8.0) * 3.0;
-	col = pow(col, vec3(1.0 / 2.2));
-	fragColor = vec4(col, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/srtuss-the-eye.slang b/procedural/srtuss-the-eye.slang
deleted file mode 100644
index 525974d0ba..0000000000
--- a/procedural/srtuss-the-eye.slang
+++ /dev/null
@@ -1,113 +0,0 @@
-#version 450
-// The Eye -  srtuss - 2014-10-08
-// https://www.shadertoy.com/view/Xd2XDm
-
-// Another interesting, trippy 2D effect, with a cool retro colorset.
-
-// srtuss, 2014
-
-// a fun little effect based on repetition and motion-blur :)
-// enjoy staring at the center, in fullscreen :)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-
-#define pi2 3.1415926535897932384626433832795
-
-float tri(float x, float s)
-{
-    return (abs(fract(x / s) - 0.5) - 0.25) * s;
-}
-
-float hash(float x)
-{
-    return fract(sin(x * 171.2972) * 18267.978 + 31.287);
-}
-
-vec3 pix(vec2 p, float t, float s)
-{
-    s += floor(t * 0.25);
-    float scl = (hash(s + 30.0) * 4.0);
-    scl += sin(t * 2.0) * 0.25 + sin(t) * 0.5;
-    t *= 3.0;
-    vec2 pol = vec2(atan(p.y, p.x), length(p));
-    float v;
-    float id = floor(pol.y * 2.0 * scl);
-    pol.x += t * (hash(id + s) * 2.0 - 1.0) * 0.4;
-    float si = hash(id + s * 2.0);
-    float rp = floor(hash(id + s * 4.0) * 5.0 + 4.0);
-    v = (abs(tri(pol.x, pi2 / rp)) - si * 0.1) * pol.y;
-    v = max(v, abs(tri(pol.y, 1.0 / scl)) - (1.0 - si) * 0.11);
-    v = smoothstep(0.01, 0.0, v);
-    return vec3(v);
-}
-
-vec3 pix2(vec2 p, float t, float s)
-{
-    return clamp(pix(p, t, s) - pix(p, t, s + 8.0) + pix(p * 0.1, t, s + 80.0) * 0.2, vec3(0.0), vec3(1.0));
-}
-
-vec2 hash2(in vec2 p)
-{
-	return fract(1965.5786 * vec2(sin(p.x * 591.32 + p.y * 154.077), cos(p.x * 391.32 + p.y * 49.077)));
-}
-
-#define globaltime (iGlobalTime - 2.555)
-
-vec3 blur(vec2 p)
-{
-    vec3 ite = vec3(0.0);
-    for(int i = 0; i < 20; i ++)
-    {
-        float tc = 0.15;
-        ite += pix2(p, globaltime * 3.0 + (hash2(p + float(i)) - 0.5).x * tc, 5.0);
-    }
-    ite /= 20.0;
-    ite += exp(fract(globaltime * 0.25 * 6.0) * -40.0) * 2.0;
-    return ite;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	vec2 uv = fragCoord.xy / iResolution.xy;
-    uv = 2.0 * uv - 1.0;
-    uv.x *= iResolution.x / iResolution.y;
-    uv += (vec2(hash(globaltime), hash(globaltime + 9.999)) - 0.5) * 0.03;
-    vec3 c = vec3(blur(uv + vec2(0.005, 0.0)).x, blur(uv + vec2(0.0, 0.005)).y, blur(uv).z);
-    c = pow(c, vec3(0.4, 0.6, 1.0) * 2.0) * 1.5;
-    c *= exp(length(uv) * -1.0) * 2.5;
-    c = pow(c, vec3(1.0 / 2.2));
-	fragColor = vec4(c, 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/stellabialek-moonlight-sillyness.slang b/procedural/stellabialek-moonlight-sillyness.slang
deleted file mode 100644
index f2852b96d9..0000000000
--- a/procedural/stellabialek-moonlight-sillyness.slang
+++ /dev/null
@@ -1,326 +0,0 @@
-#version 450
-// stellabialek - Moonlight Sillyness - 2018-02-22
-// https://www.shadertoy.com/view/ld3czS
-// having some fun
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define CLOUDS_ON
-
-
-const float STEPS = 120.0;
-const float STEPSIZE = 0.05;
-const float DRAWDIST = STEPS * STEPSIZE;
-
-const float PI = 3.1415926535897932384626433832795;
-const float TWOPI = 2.0 * PI;
-
-const int OCTAVES = 3;
-
-struct ray
-{
-	vec3 o; //origin
-	vec3 d;	//direction
-};
-
-vec3 calcCameraRayDir(float fov, vec2 fragCoord, vec2 resolution) 
-{
-	float fx = tan(radians(fov) / 2.0) / resolution.x;
-	vec2 d = fx * (fragCoord * 2.0 - resolution);
-	vec3 rayDir = normalize(vec3(d, 1.0));
-	return rayDir;
-}
-
-float hash(vec3 p)
-{
-    p  = fract( p*0.3183099 + .1 );
-	p *= 17.0;
-    return fract( p.x*p.y*p.z*(p.x+p.y+p.z) );
-}
-
-float rand(float seed)
-{
-	return fract(sin(seed) * 1231534.9);
-}
-
-float rand(vec2 seed) 
-{ 
-    return rand(dot(seed, vec2(12.9898, 783.233)));
-}
-
-float noise( in vec3 x )
-{
-	x *= 2.0;
-    vec3 p = floor(x);
-    vec3 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-	
-    return mix(mix(mix( hash(p+vec3(0,0,0)), 
-                        hash(p+vec3(1,0,0)),f.x),
-                   mix( hash(p+vec3(0,1,0)), 
-                        hash(p+vec3(1,1,0)),f.x),f.y),
-               mix(mix( hash(p+vec3(0,0,1)), 
-                        hash(p+vec3(1,0,1)),f.x),
-                   mix( hash(p+vec3(0,1,1)), 
-                        hash(p+vec3(1,1,1)),f.x),f.y),f.z);
-}
-
-float fbm(vec3 p)
-{
-	p *= 1.4;
-	float f = 0.0;
-	float weight = 0.5;
-	for(int i = 0; i < OCTAVES; ++i)
-	{
-		f += weight * noise( p );
-		p.z -= iGlobalTime * float(i) * 0.5;
-		weight *= 0.5;
-		p *= 2.0;
-	}
-	return f;
-}
-
-float density(vec3 p)
-{
-    p.y += 1.2;
-	p.y += cos(p.x*1.4) * 0.2;
-	p.y += cos(p.z)*0.1;
-    p *= 1.2;
-	p.z += iGlobalTime * 0.4;
-	float noise = fbm(p);
-	float clouds = noise*1.5 - p.y - 1.3;
-	return clamp(clouds, 0.0, 1.0);
-}
-
-vec3 clouds(vec3 p, float d, float l, vec3 bg)
-{
-	vec3 lPos = vec3(0,0, DRAWDIST*1.75);
-	vec3 lDir = lPos - p;
-
-	float dL = density(p + normalize(lDir) * 0.2);
-	float dG = clamp(d - dL, 0.0, 1.0);
-	dG *= 1.0 - smoothstep(2.0,8.0, length(lDir));
-	dG *= 70.0;
-	vec3 cL = vec3(0, 0.1, 0.1) + vec3(1.0) * dG;
-	vec3 cA = mix( vec3(1.0, 1.0, 1.0), vec3(1.0)*0.01, d);
-	
-	float a = 0.2;
-	float t = exp(-a * l);	
-	return mix(bg, cL * cA, t);
-}
-
-float stars(vec2 uv, float amount, float radius)
-{
-	uv = uv * amount;
-	vec2 gridID = floor(uv);
-	vec2 starPos = vec2(rand(gridID),rand(gridID+1.0));
-	starPos = (starPos - 0.5) * 2.0;
-	starPos = vec2(0.5) + starPos * (0.5 - radius * 2.0);
-	float stars = distance(fract(uv), starPos);
-	float size = rand(gridID)*radius;
-	stars = 1.0 - smoothstep(size, size + radius, stars);
-	return stars;
-}
-
-float gradient(vec2 uv)
-{
-	uv.x *= 0.8;
-	uv *= 1.0 + sin(iGlobalTime*10.0) * 0.01;
-	float g = clamp(1.0 - length(uv), 0.0, 1.0);
-	return clamp(g, 0.0, 1.0);
-}
-
-float circle(vec2 uv, float r)
-{
-	return length(uv)-r;
-}
-
-float smin(float a, float b, float k)
-{
-	float h = clamp( 0.5+0.5*(b-a)/k, 0.0, 1.0 );
-    return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-vec2 rotate(vec2 p, float angle)
-{
-	mat2 mat = mat2(cos(angle),-sin(angle),
-					sin(angle),cos(angle));
-	return p * mat;
-}
-
-float timefunc(float scale, float k)
-{
-	float var = sin(iGlobalTime * scale);
-	var = (var + 1.0)/2.0;
-	var = mix(var,smoothstep(0.0, 1.0, var),k);
-	var = (var - 0.5)*2.0;
-	return var;
-}
-
-float ghost1(vec2 uv)
-{
-	float time = iGlobalTime * 6.0;
-	float t = timefunc(6.0, 0.5);
-
-	uv.x += 0.5;
-	uv = rotate(uv, t*max(0.0, uv.y)*0.2);
-	uv.y -= 0.4 + sin(time * 2.0) * 0.1 * smoothstep(-0.5, 1.5, uv.y);
-	vec2 originalUV = uv;
-		
-	uv.x *= 1.0 + uv.y;
-	uv.y += max(0.0, -uv.y*0.8); 	
-	float body = circle(uv, 0.2); 
-	
-	uv = originalUV;
-	uv += vec2(-0.2, 0.2);
-	uv = rotate(uv, -PI/4.0 + t*0.8*uv.x);
-	uv *= vec2(0.4, 2.0);
-	float arms = circle(uv, 0.1);
-	
-	uv = originalUV;
-	uv += vec2(0.2, 0.2);
-	uv = rotate(uv, PI/4.0 + t*0.8*(-uv.x));
-	uv *= vec2(0.4, 2.0);
-	arms = min(arms, circle(uv, 0.1));
-	
-	uv = originalUV;
-	uv.x -= 0.01;
-	uv.y += 0.05;
-	uv.y *= 1.0 + cos(time*2.0)*0.4;
-	float mouth = circle(uv, 0.02);
-	
-	uv = originalUV;
-	uv.x -= 0.11;
-	float eyeR = circle(uv, 0.02);
-	uv.x += 0.2;
-	float eyeL = circle(uv, 0.04);
-	
-	float d = body;
-	d = smin(arms,body, 0.1);
-	d = max(d, -eyeR);
-	d = max(d, -eyeL);
-	d = max(d, -mouth);
-	float threshold = mix(0.04, 0.06, (0.5 +sin(iGlobalTime)*0.5));
-	d = 1.0 - smoothstep(-threshold, threshold, d);	
-	return d;
-}
-
-float ghost2(vec2 uv)
-{
-	uv.x -= 0.4;	
-	uv.y += timefunc(6.0, 0.5)*0.2* smoothstep(-1.0, 0.0, uv.y);
-	vec2 originalUV = uv; 
-	
-	uv.x *= 1.0 + uv.y*0.4;
-	uv.y *= mix(0.0, 1.0, smoothstep(-0.1, 0.0, uv.y));
-	float body = circle(uv, 0.15);
-	
-	uv = originalUV;
-	uv.x -= 0.06;
-	float eyeR = circle(uv, 0.03);
-	uv.x += 0.14;
-	float eyeL = circle(uv, 0.025);
-	
-	float d = max(body,-eyeR);
-	d = max(d, -eyeL);
-	
-	float threshold = mix(0.04, 0.06, (0.5 +sin(iGlobalTime)*0.5));
-	d = 1.0 - smoothstep(-threshold, threshold, d);
-	d *= 0.6;
-	return d;
-}
-
-float ghosts(vec2 uv)
-{	
-	float d = ghost1(uv) + ghost2(uv);
-	return clamp(d, 0.0, 1.0);
-}
-
-vec3 tonemapping(vec3 color, float exposure, float gamma)
-{
-	color *= exposure/(1. + color / exposure);
-	color = pow(color, vec3(1. / gamma));
-	float lum = 0.3*color.r + 0.6*color.g + 0.1*color.b;
-	color = mix(color, color*color, 1.0 - smoothstep(0.0,0.4,lum));
-	return color;
-}
-
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-  	vec2 res = vec2(max(iResolution.x, iResolution.y));
-	vec2 uv = fragCoord.xy / res;
-    uv = (uv-vec2(0.5))*2.0;
-    uv.y += 0.5;
-    uv *= 1.3;
-
-			
-	ray r;
-	r.o = vec3(0.0);
-	r.d = calcCameraRayDir(60.0,  gl_FragCoord.xy, res);
-		
-	float gradient = gradient(uv);
-	float moon = distance(uv, vec2(0.0,0.1));
-	moon = 1.0 - smoothstep(0.05, 0.08, moon);
-	
-	vec3 bg = mix(vec3(0.0, 0.1, 0.1),vec3(0.1, 0.3, 0.5), min(1.0, gradient*2.0));
-	bg = mix(bg, vec3(0.6, 0.9, 1.0), (max(0.0, gradient - 0.5)) * 2.0);
-	bg += vec3(0.8) * moon;
-	bg += vec3(0.4) * stars(uv,5.0,0.01);
-	bg += vec3(0.4) * stars(uv, 100.0, 0.04);
-	bg += vec3(0.4) * ghosts(uv) * (uv.y+1.0)*0.5;
-	
-	vec4 sum = vec4(0);	
-	float t = 0.0;
-	#ifdef CLOUDS_ON
-	for(int i = 0; i < int(STEPS); i++)
-	{
-		vec3 p = r.o + r.d * t;
-		float d = density(p);
-		if(d > 0.01)
-		{
-			float a = d * (1.0 - smoothstep(DRAWDIST / 2.0, DRAWDIST, t))*0.4;
-			vec3 c = clouds(p, d, t, bg);
-			sum += vec4(c * a, a) * ( 1.0 - sum.a );		
-			if(sum.a > 0.99) break;
-		}
-		t += STEPSIZE;
-	}	
-	#endif
-	vec4 c;
-	c = vec4(bg, 1.0) * (1.0 - sum.a) + sum;
-	c.rgb = tonemapping(c.rgb, 1.5,1.2);
-	fragColor = c;
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/tdm-mountain-peak.slang b/procedural/tdm-mountain-peak.slang
deleted file mode 100644
index 079ce577fb..0000000000
--- a/procedural/tdm-mountain-peak.slang
+++ /dev/null
@@ -1,301 +0,0 @@
-#version 450
-// Mountain Peak -  TDM - 2014-09-26
-// https://www.shadertoy.com/view/llK3WR
-
-// Terrain with procedural hydraulic erosion.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-// "Mountain Peak" by Alexander Alekseev aka TDM - 2014
-// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-#define WIND
-
-const int NUM_STEPS = 38;
-const int NUM_STEPS_VOLUME = 10;
-const float STRIDE = 0.75;
-const float STRIDE_VOLUME = 1.0;
-const float PI	 	= 3.1415;
-const float EPSILON	= 1e-3;
-
-// terrain
-const int ITER_GEOMETRY = 4;
-const int ITER_FRAGMENT = 7;
-
-const float TERR_HEIGHT = 12.0;
-const float TERR_WARP = 0.7;
-const float TERR_OCTAVE_AMP = 0.55;
-const float TERR_OCTAVE_FREQ = 2.5;
-const float TERR_MULTIFRACT = 0.27;
-const float TERR_CHOPPY = 1.9;
-const float TERR_FREQ = 0.24;
-const vec2 TERR_OFFSET = vec2(13.5,15.);
-
-const vec3 SKY_COLOR = vec3(0.5,0.59,0.75) * 0.6;
-const vec3 SUN_COLOR = vec3(1.,1.,0.98) * 0.75;
-const vec3 COLOR_SNOW = vec3(1.0,1.0,1.1) * 2.0;
-const vec3 COLOR_ROCK = vec3(0.0,0.1,0.1);
-vec3 light = normalize(vec3(1.0,1.0,-0.3));
-
-// math
-mat3 fromEuler(vec3 ang) {
-	vec2 a1 = vec2(sin(ang.x),cos(ang.x));
-    vec2 a2 = vec2(sin(ang.y),cos(ang.y));
-    vec2 a3 = vec2(sin(ang.z),cos(ang.z));
-    mat3 m;
-    m[0] = vec3(a1.y*a3.y+a1.x*a2.x*a3.x,a1.y*a2.x*a3.x+a3.y*a1.x,-a2.y*a3.x);
-	m[1] = vec3(-a2.y*a1.x,a1.y*a2.y,a2.x);
-	m[2] = vec3(a3.y*a1.x*a2.x+a1.y*a3.x,a1.x*a3.x-a1.y*a3.y*a2.x,a2.y*a3.y);
-	return m;
-}
-float saturate(float x) { return clamp(x,0.,1.); }
-
-/*float hash(vec2 p) {
-	float h = dot(p,vec2(127.1,311.7));	
-    return fract(sin(h)*43758.5453123);
-}*/
-float hash(vec2 p) {
-    uint n = floatBitsToUint(p.x * 122.0 + p.y);
-	n = (n << 13U) ^ n;
-    n = n * (n * n * 15731U + 789221U) + 1376312589U;
-    return uintBitsToFloat( (n>>9U) | 0x3f800000U ) - 1.0;
-}
-
-float hash3(vec3 p) {
-    return fract(sin(p.x*p.y*p.z)*347624.531834);
-}
-
-// 3d noise
-float noise_3(in vec3 p) {
-    vec3 i = floor( p );
-    vec3 f = fract( p );	
-	vec3 u = f*f*(3.0-2.0*f);
-    
-    float a = hash3( i + vec3(0.0,0.0,0.0) );
-	float b = hash3( i + vec3(1.0,0.0,0.0) );    
-    float c = hash3( i + vec3(0.0,1.0,0.0) );
-	float d = hash3( i + vec3(1.0,1.0,0.0) ); 
-    float v1 = mix(mix(a,b,u.x), mix(c,d,u.x), u.y);
-    
-    a = hash3( i + vec3(0.0,0.0,1.0) );
-	b = hash3( i + vec3(1.0,0.0,1.0) );    
-    c = hash3( i + vec3(0.0,1.0,1.0) );
-	d = hash3( i + vec3(1.0,1.0,1.0) );
-    float v2 = mix(mix(a,b,u.x), mix(c,d,u.x), u.y);
-        
-    return abs(mix(v1,v2,u.z));
-}
-
-// noise with analytical derivatives (thanks to iq)
-vec3 noise_deriv(in vec2 p) {
-    vec2 i = floor( p );
-    vec2 f = fract( p );	
-	vec2 u = f*f*(3.0-2.0*f);
-    
-    float a = hash( i + vec2(0.0,0.0) );
-	float b = hash( i + vec2(1.0,0.0) );    
-    float c = hash( i + vec2(0.0,1.0) );
-	float d = hash( i + vec2(1.0,1.0) );    
-    float h1 = mix(a,b,u.x);
-    float h2 = mix(c,d,u.x);
-                                  
-    return vec3(abs(mix(h1,h2,u.y)),
-               6.0*f*(1.0-f)*(vec2(b-a,c-a)+(a-b-c+d)*u.yx));
-}
-
-// lighting
-float diffuse(vec3 n,vec3 l,float p) { return pow(max(dot(n,l),0.0),p); }
-float specular(vec3 n,vec3 l,vec3 e,float s) {    
-    float nrm = (s + 8.0) / (3.1415 * 8.0);
-    return pow(max(dot(reflect(e,n),l),0.0),s) * nrm;
-}
-
-// terrain
-vec3 octave(vec2 uv) {
-    vec3 n = noise_deriv(uv);
-    return vec3(pow(n.x,TERR_CHOPPY), n.y, n.z);
-}
-
-float map(vec3 p) {
-    float frq = TERR_FREQ;
-    float amp = 1.0;
-    vec2 uv = p.xz * frq + TERR_OFFSET;
-    vec2 dsum = vec2(0.0);
-    
-    float h = 0.0;    
-    for(int i = 0; i < ITER_GEOMETRY; i++) {          
-    	vec3 n = octave((uv - dsum * TERR_WARP) * frq);
-        h += n.x * amp;       
-        
-        dsum += n.yz * (n.x*2.0-1.0) * amp;
-        frq *= TERR_OCTAVE_FREQ;
-        amp *= TERR_OCTAVE_AMP;        
-        amp *= pow(n.x,TERR_MULTIFRACT);
-    }
-    h *= TERR_HEIGHT / (1.0 + dot(p.xz,p.xz) * 1e-3);
-    return p.y - h;
-}
-float map_detailed(vec3 p) {
-    float frq = TERR_FREQ;
-    float amp = 1.0;
-    vec2 uv = p.xz * frq + TERR_OFFSET;
-    vec2 dsum = vec2(0.0);
-    
-    float h = 0.0;    
-    for(int i = 0; i < ITER_FRAGMENT; i++) {        
-    	vec3 n = octave((uv - dsum * TERR_WARP) * frq);
-        h += n.x * amp;
-        
-        dsum += n.yz * (n.x*2.0-1.0) * amp;
-        frq *= TERR_OCTAVE_FREQ;
-        amp *= TERR_OCTAVE_AMP;
-        amp *= pow(n.x,TERR_MULTIFRACT);
-    }
-    h *= TERR_HEIGHT / (1.0 + dot(p.xz,p.xz) * 1e-3);
-    return p.y - h;
-}
-float map_noise(vec3 p) {
-    p *= 0.5;    
-    float ret = noise_3(p);
-    ret += noise_3(p * 2.0) * 0.5;
-    ret = (ret - 1.0) * 5.0;
-    return saturate(ret * 0.5 + 0.5);
-}
-
-// tracing
-vec3 getNormal(vec3 p, float eps) {
-    vec3 n;
-    n.y = map_detailed(p);    
-    n.x = map_detailed(vec3(p.x+eps,p.y,p.z)) - n.y;
-    n.z = map_detailed(vec3(p.x,p.y,p.z+eps)) - n.y;
-    n.y = eps;
-    return normalize(n);
-}
-
-float hftracing(vec3 ori, vec3 dir, out vec3 p, out float t) {
-    float d = 0.0;
-    t = 0.0;
-    for(int i = 0; i < NUM_STEPS; i++) {
-        p = ori + dir * t;
-        d = map(p);
-        if(d < 0.0) break;
-        t += d*0.6;
-    }
-    return d;
-}
-
-float volume_tracing(vec3 ori, vec3 dir, float maxt) { 
-    float d = 0.0;
-    float t = 0.0;
-    float count = 0.0;
-    for(int i = 0; i < NUM_STEPS_VOLUME; i++) {
-        vec3 p = ori + dir * t;
-        d += map_noise(p);
-        if(t >= maxt) break;  
-        t += STRIDE_VOLUME;
-        count += 1.0;
-    }
-    return d / count;
-}
-
-// color
-vec3 sky_color(vec3 e) {
-    e.y = max(e.y,0.0);
-    vec3 ret;
-    ret.x = pow(1.0-e.y,3.0);
-    ret.y = pow(1.0-e.y, 1.2);
-    ret.z = 0.7+(1.0-e.y)*0.3;    
-    return ret;
-}
-vec3 terr_color(in vec3 p, in vec3 n, in vec3 eye, in vec3 dist) {
-    float slope = 1.0-dot(n,vec3(0.,1.,0.));     
-    vec3 ret = mix(COLOR_SNOW,COLOR_ROCK,smoothstep(0.0,0.2,slope*slope));
-    ret = mix(ret,COLOR_SNOW,saturate(smoothstep(0.6,0.8,slope+(p.y-TERR_HEIGHT*0.5)*0.05)));
-    return ret;
-}
-
-// main
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
-	vec2 uv = fragCoord.xy / iResolution.xy;
-    uv = uv * 2.0 - 1.0;
-    uv.x *= iResolution.x / iResolution.y;    
-    float time = iGlobalTime * 0.1;
-        
-    // ray
-#ifdef MOUSE
-    vec3 ang = vec3(sin(time*6.0)*0.1,0.1,-time + iMouse.x*0.01);
-#else
-    vec3 ang = vec3(sin(time*6.0)*0.1,0.1,-time + 0.0*0.01);
-#endif
-	mat3 rot = fromEuler(ang);
-    
-    vec3 ori = vec3(0.0,5.0,40.0);
-    vec3 dir = normalize(vec3(uv.xy,-2.0));
-    dir.z += length(uv) * 0.12;
-    dir = normalize(dir) * rot;
-    ori = ori * rot;
-    ori.y -= map(ori) * 0.75 - 3.0;
-    
-    // tracing
-    vec3 p;
-    float t;
-    float dens = hftracing(ori,dir,p,t);
-    vec3 dist = p - ori;
-    vec3 n = getNormal(p, dot(dist,dist)* (1e-1 / iResolution.x));
-             
-    // terrain
-    vec3 color = terr_color(p,n,dir,dist) * SKY_COLOR;
-    color += vec3(diffuse(n,light,2.0) * SUN_COLOR);
-    color += vec3(specular(n,light,dir,20.0) * SUN_COLOR*0.4);
-        
-    // fog
-    vec3 fog = sky_color(vec3(dir.x,0.,dir.z));
-    color = mix(color,fog,saturate(min(length(dist)*0.018, dot(p.xz,p.xz)*0.001)));
-    
-    // sky
-    color = mix(sky_color(dir),color,step(dens,4.0));
-    color += pow(max(dot(dir,light),0.0),3.0)*0.3;
-    
-    // wind
-#ifdef WIND
-    float wind = volume_tracing(ori,dir,t) * saturate(1.8 - p.y * 0.2);
-    color = mix(color,fog, wind * 1.6);
-#endif
-    
-    // post
-    color = (1.0 - exp(-color)) * 1.5;
-    color = pow(color,vec3(0.85));
-	fragColor = vec4(color,1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/tdm-psx-rendering.slang b/procedural/tdm-psx-rendering.slang
deleted file mode 100644
index bee95a13da..0000000000
--- a/procedural/tdm-psx-rendering.slang
+++ /dev/null
@@ -1,379 +0,0 @@
-#version 450
-// PSX Rendering -  TDM - 2016-08-06
-// https://www.shadertoy.com/view/Mt3Gz2
-
-// Lack of perspective-correct texturing, z-buffer, float data type and bilinear filtering lead to this kind of buggy rendering.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/*
-"PSX rendering" by Alexander Alekseev aka TDM - 2016
-License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-*/
-
-#define PSX_MODE
-
-#ifdef PSX_MODE
-	#define INT_VERTICES
-	vec2 RESOLUTION = vec2(320.0, 240.0);
-#else
-	#define BILINEAR
-	vec2 RESOLUTION = iResolution.xy;
-#endif
-
-// math
-float _cross(vec2 a, vec2 b) {
-    return a.x * b.y - a.y * b.x;
-}
-vec3 barycentric(vec2 a, vec2 b, vec2 c, vec2 p) {    
-    vec2 ab = b - a, ac = c - a, ap = p - a;
-    vec2 vw = vec2(_cross(ap,ac),_cross(ab,ap)) / _cross(ab,ac);
-    return vec3(1.0-vw.x-vw.y, vw);
-}
-float quantization(float a, float b) {
-    return floor(a * b) / b;
-}
-vec2 quantization(vec2 a, float b) {
-    return floor(a * b) / b;
-}
-vec2 quantization(vec2 a, vec2 b) {
-    return floor(a * b) / b;
-}
-vec3 quantization(vec3 a, float b) {
-    return floor(a * b) / b;
-}
-float hash( vec2 p ) {
-	float h = dot(p,vec2(127.1,311.7));	
-    return fract(sin(h)*43758.5453123);
-}
-
-float noise1(vec2 p) {
-    #ifndef BILINEAR
-		return hash(floor(p));
-    #else    
-        vec2 i = floor(p);
-        vec2 f = fract(p);
-    	vec2 tx = mix(vec2(hash(i),hash(i+vec2(0.,1.))) ,
-                      vec2(hash(i+vec2(1.,0.)),hash(i+vec2(1.))),f.x);
-        return mix(tx.x,tx.y,f.y);
-    #endif
-}
-mat4 getRotMatrix(vec3 a) {
-    vec3 s = sin(a);
-    vec3 c = cos(a);    
-    mat4 ret;
-    ret[0] = vec4(c.y*c.z,c.y*s.z,-s.y,0.0);
-    ret[1] = vec4(s.x*s.y*c.z-c.x*s.z,s.x*s.y*s.z+c.x*c.z,s.x*c.y,0.0);
-    ret[2] = vec4(c.x*s.y*c.z+s.x*s.z, c.x*s.y*s.z-s.x*c.z,   c.x*c.y,0.0);    
-    ret[3] = vec4(0.0,0.0,0.0,1.0);
-    return ret;
-}
-mat4 getPosMatrix(vec3 p) {   
-    mat4 ret;
-    ret[0] = vec4(1.0,0.0,0.0,p.x);
-    ret[1] = vec4(0.0,1.0,0.0,p.y);
-    ret[2] = vec4(0.0,0.0,1.0,p.z);   
-    ret[3] = vec4(0.0,0.0,0.0,1.0);
-    return ret;
-}
-
-// textures
-vec4 textureGround(vec2 uv) {
-    const vec2 RES = vec2(8.0, 8.0);    
-    vec2 NEW       = uv * RES;
-    float n = noise1(NEW);
-    n = n * 0.2 + 0.5;
-    return vec4(n*0.9,n*0.6,n*0.4,1.0);
-}
-
-vec4 textureWall(vec2 uv) {
-    const vec2 RES = vec2(32.0, 16.0);
-    vec2 NEW       = uv * RES;
-    vec2 iuv = floor(NEW);    
-    float n = noise1(NEW);
-    n = n * 0.5 + 0.25;
-    float nc = n * (smoothstep(1.0,0.4, iuv.x / RES.x) * 0.5 + 0.5);    
-    return vec4(nc * 0.4, nc * 1.0, nc * 0.5, n + uv.x - abs(uv.y-0.5) );
-}
-
-vec4 textureBox(vec2 uv) {
-    const vec2 RES = vec2(8.0, 8.0);
-    vec2 NEW       = uv * RES;
-    vec2 iuv = (floor(NEW) + 0.5) / RES;  
-    float n = noise1(NEW);
-    n = max(abs(iuv.x - 0.5), abs(iuv.y - 0.5)) * 2.0;
-    n = n * n;
-    n = 0.5 + n * 0.4 + noise1(NEW) * 0.1;
-    return vec4(n, n*0.8, n*0.5, 1.0);
-}
-
-vec4 textureSky(vec2 uv) {
-    const vec2 RES = vec2(8.0, 32.0);    
-    vec2 NEW = uv * RES;
-    float n = noise1(NEW);
-    n = n * 0.05 + 0.8;
-    return vec4(0.5,n*1.0,n*1.1,1.0);
-}   
-
-// rasterization
-void triangle(vec2 p,
-         vec2 v0, vec2 v1, vec2 v2,
-         vec2 uv0, vec2 uv1, vec2 uv2,
-         in int tex, inout vec3 color) {
-    
-    if(_cross(v2-v0,v1-v0) <= 1e-4) return;
-    
-    vec3 bary = abs(barycentric(v0,v1,v2, p));
-    if(bary.x + bary.y + bary.z <= 1.0001) {
-        vec2 uv = uv0 * bary.x + uv1 * bary.y + uv2 * bary.z; 
-        vec4 frag;        
-        if(tex == 0) {
-    		frag = textureGround(uv);
-        } else if(tex == 1) {
-            frag = textureWall(uv);
-        } else {
-            frag = textureBox(uv);
-        }
-        if(frag.w > 0.5) color = frag.xyz;
-    }
-}
-void quad(vec2 p,
-         vec2 v0, vec2 v1, vec2 v2, vec2 v3,
-         vec2 uv0, vec2 uv1, vec2 uv2, vec2 uv3,
-        in int tex,  inout vec3 color) {    
-    triangle(p, v0,v1,v2, uv0,uv1,uv2, tex,color);
-    triangle(p, v2,v3,v0, uv2,uv3,uv0, tex,color);
-}
-
-// geometry transformation engine
-void gte(inout vec3 v, mat4 mat) {   
-    
-    // perspective
-    v = (vec4(v,1.0) * mat).xyz;
-    v.xy /= max(v.z, 1.0);
-    
-    v *= 2.0;
-    
-    // quantization to simulate int
-    #ifdef INT_VERTICES    	
-		const vec2 QUANT = vec2(320.0, 240.0) * 0.25;
-        v.xy = quantization(v.xy, QUANT);
-    #endif    
-}
-
-// renderer
-void gpu(vec2 p,
-         vec2 v0, vec2 v1, vec2 v2, vec2 v3,
-         vec2 uv0, vec2 uv1, vec2 uv2, vec2 uv3,
-         in int tex, inout vec3 color) {
-    
-    quad(p,
-         v0,v1,v2,v3,
-         uv0,uv1,uv2,uv3,
-         tex,color);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
-	vec2 uv = fragCoord.xy / iResolution.xy;
-    uv = uv * 2.0 - 1.0;
-    uv.x *= iResolution.x / iResolution.y;    
-    
-    uv = quantization(uv, RESOLUTION * 0.5);
-        
-    const float WIDTH = 1.3;
-    const float HEIGHT = 6.0;
-    const float DEPTH = 4.0;  
-    const float LOD = 4.0;
-    
-    float time = iGlobalTime * 2.;    
-    
-    vec3 posv = vec3(-WIDTH*3.0,-2.0, -time+5.0);
-    vec3 rotv = vec3(sin(time)*0.05 + 0.1,
-             sin(time*0.9)*0.05,
-             sin(time*0.7)*0.05);
-    
-    // int-like position
-    #ifdef INT_VERTICES    	
-        posv = quantization(posv, 64.0);
-        rotv = quantization(rotv, 256.0);    	
-    #endif
-    
-    mat4 cam = getPosMatrix(posv);    
-    mat4 rot = getRotMatrix(rotv); 
-    cam = cam * rot;
-        
-    vec3 c = textureSky(uv + vec2(rotv.y,-rotv.x) * 3.0).xyz;
-    
-    // ground
-    float z_offset = -floor((posv.z + DEPTH * 1.5) / DEPTH) * DEPTH * 0.5;
-    float poly_depth = DEPTH;
-    
-    for(int dip = 0; dip < 32; dip++) {
-        
-        // kinda LOD
-        z_offset += step(mod(float(dip),4.0), 0.5) * poly_depth * 0.5;
-        #ifdef PSX_MODE
-        if(dip > 11) poly_depth = DEPTH * LOD; 
-        #endif
-        
-        vec3 vert[4];
-        vert[0] = vec3(-WIDTH,0.0, poly_depth); 
-        vert[1] = vec3(-WIDTH,0.0, 0.0);   
-        vert[2] = vec3( WIDTH,0.0, 0.0);
-        vert[3] = vec3( WIDTH,0.0, poly_depth);
-   
-        vec3 posv = vec3(mod(float(dip),4.0) * WIDTH,
-                         0.0,
-                         z_offset);        
-
-        mat4 pos = getPosMatrix(posv * 2.0);
-        mat4 mat = pos * cam;
-
-        for(int i = 0; i < 4; i++) gte(vert[i], mat);             
-        
-        gpu(uv,
-            vert[3].xy,vert[2].xy,vert[1].xy,vert[0].xy,
-            vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-            0, c);
-    }
-    
-    // walls
-    z_offset = -floor((posv.z + DEPTH ) / DEPTH) * DEPTH * 0.5;
-    poly_depth = DEPTH;
-    
-    for(int dip = 0; dip < 8; dip++) {
-        
-        // kinda LOD
-        z_offset += poly_depth * 0.5;
-        #ifdef PSX_MODE
-        if(dip > 2) poly_depth = DEPTH * LOD;     
-        #endif
-        
-        vec3 vert[4];
-        vert[0] = vec3(0.0,HEIGHT, poly_depth); 
-        vert[1] = vec3(0.0,HEIGHT, 0.0);   
-        vert[2] = vec3(0.0,0.0, 0.0);
-        vert[3] = vec3(0.0,0.0, poly_depth);
-   
-        vec3 posv = vec3(WIDTH * 3.5,
-                         0.0,
-                         z_offset);
-        //posv.z -= z_offset;
-
-        mat4 posm = getPosMatrix(posv * 2.0);
-        mat4 mat = posm * cam;
-
-        for(int i = 0; i < 4; i++) gte(vert[i], mat);             
-        
-        gpu(uv,
-            vert[0].xy,vert[1].xy,vert[2].xy,vert[3].xy,
-            vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-            1, c);
-        
-        
-        vert[0] = vec3(0.0,HEIGHT, poly_depth); 
-        vert[1] = vec3(0.0,HEIGHT, 0.0);   
-        vert[2] = vec3( 0.0,0.0, 0.0);
-        vert[3] = vec3( 0.0,0.0, poly_depth);
-        
-        posv = vec3(-WIDTH * 0.5,
-                         0.0,
-                         z_offset);
-
-        posm = getPosMatrix(posv * 2.0);
-        mat = posm * cam;
-
-        for(int i = 0; i < 4; i++) gte(vert[i], mat);  
-        
-        gpu(uv,
-            vert[3].xy,vert[2].xy,vert[1].xy,vert[0].xy,
-            vec2(1.0,0.0), vec2(1.0), vec2(0.0,1.0),vec2(0.0),
-            1, c);
-    }
-    
-    // box
-    vec3 vert[8];
-    vert[0] = vec3(-1.0,-1.0, 1.0);
-    vert[1] = vec3(-1.0, 1.0, 1.0);    
-    vert[2] = vec3( 1.0, 1.0, 1.0);    
-    vert[3] = vec3( 1.0,-1.0, 1.0);
-    vert[4] = vec3(-1.0,-1.0,-1.0);
-    vert[5] = vec3(-1.0, 1.0,-1.0);    
-    vert[6] = vec3( 1.0, 1.0,-1.0);    
-    vert[7] = vec3( 1.0,-1.0,-1.0);
-
-    vec3 box_posv = vec3(-posv.x,
-                     2.0,
-                     -posv.z + 15.0);
-
-    rotv = vec3(time * 0.5, time * 0.6, time * 0.7);    
-    mat4 posm = getRotMatrix(rotv) * getPosMatrix(box_posv);
-    mat4 mat = posm * cam;
-
-    for(int i = 0; i < 8; i++) {
-        vert[i].y *= 0.65;
-        gte(vert[i], mat);
-    }
-
-    gpu(uv,
-        vert[3].xy,vert[2].xy,vert[1].xy,vert[0].xy,
-        vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-        2, c);
-    gpu(uv,
-        vert[4].xy,vert[5].xy,vert[6].xy,vert[7].xy,
-        vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-        2, c);
-    
-    gpu(uv,
-        vert[7].xy,vert[6].xy,vert[2].xy,vert[3].xy,
-        vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-        2, c);
-    gpu(uv,
-        vert[0].xy,vert[1].xy,vert[5].xy,vert[4].xy,
-        vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-        2, c);
-    
-    gpu(uv,
-        vert[2].xy,vert[6].xy,vert[5].xy,vert[1].xy,
-        vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-        2, c);    
-    gpu(uv,
-        vert[0].xy,vert[4].xy,vert[7].xy,vert[3].xy,
-        vec2(0.0),vec2(0.0,1.0),vec2(1.0),vec2(1.0,0.0),
-        2, c);
-    
-    // fragment
-	fragColor = vec4(c,1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/tdm-seascape.slang b/procedural/tdm-seascape.slang
deleted file mode 100644
index 4667df051f..0000000000
--- a/procedural/tdm-seascape.slang
+++ /dev/null
@@ -1,230 +0,0 @@
-#version 450
-// Seascape -  TDM - 2014-09-26
-// https://www.shadertoy.com/view/Ms2SD1
-
-// fully-procedural sea surface computing. without textures.
-
-// Android version: https://play.google.com/store/apps/details?id=com.nature.seascape
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-/*
- * "Seascape" by Alexander Alekseev aka TDM - 2014
- * License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
- * Contact: tdmaav@gmail.com
- */
-
-const int NUM_STEPS = 8;
-const float PI	 	= 3.141592;
-const float EPSILON	= 1e-3;
-#define EPSILON_NRM (0.1 / iResolution.x)
-
-// sea
-const int ITER_GEOMETRY = 3;
-const int ITER_FRAGMENT = 5;
-const float SEA_HEIGHT = 0.6;
-const float SEA_CHOPPY = 4.0;
-const float SEA_SPEED = 0.8;
-const float SEA_FREQ = 0.16;
-const vec3 SEA_BASE = vec3(0.1,0.19,0.22);
-const vec3 SEA_WATER_COLOR = vec3(0.8,0.9,0.6);
-#define SEA_TIME (1.0 + iGlobalTime * SEA_SPEED)
-const mat2 octave_m = mat2(1.6,1.2,-1.2,1.6);
-
-// math
-mat3 fromEuler(vec3 ang) {
-	vec2 a1 = vec2(sin(ang.x),cos(ang.x));
-    vec2 a2 = vec2(sin(ang.y),cos(ang.y));
-    vec2 a3 = vec2(sin(ang.z),cos(ang.z));
-    mat3 m;
-    m[0] = vec3(a1.y*a3.y+a1.x*a2.x*a3.x,a1.y*a2.x*a3.x+a3.y*a1.x,-a2.y*a3.x);
-	m[1] = vec3(-a2.y*a1.x,a1.y*a2.y,a2.x);
-	m[2] = vec3(a3.y*a1.x*a2.x+a1.y*a3.x,a1.x*a3.x-a1.y*a3.y*a2.x,a2.y*a3.y);
-	return m;
-}
-float hash( vec2 p ) {
-	float h = dot(p,vec2(127.1,311.7));	
-    return fract(sin(h)*43758.5453123);
-}
-float noise( in vec2 p ) {
-    vec2 i = floor( p );
-    vec2 f = fract( p );	
-	vec2 u = f*f*(3.0-2.0*f);
-    return -1.0+2.0*mix( mix( hash( i + vec2(0.0,0.0) ), 
-                     hash( i + vec2(1.0,0.0) ), u.x),
-                mix( hash( i + vec2(0.0,1.0) ), 
-                     hash( i + vec2(1.0,1.0) ), u.x), u.y);
-}
-
-// lighting
-float diffuse(vec3 n,vec3 l,float p) {
-    return pow(dot(n,l) * 0.4 + 0.6,p);
-}
-float specular(vec3 n,vec3 l,vec3 e,float s) {    
-    float nrm = (s + 8.0) / (PI * 8.0);
-    return pow(max(dot(reflect(e,n),l),0.0),s) * nrm;
-}
-
-// sky
-vec3 getSkyColor(vec3 e) {
-    e.y = max(e.y,0.0);
-    return vec3(pow(1.0-e.y,2.0), 1.0-e.y, 0.6+(1.0-e.y)*0.4);
-}
-
-// sea
-float sea_octave(vec2 uv, float choppy) {
-    uv += noise(uv);        
-    vec2 wv = 1.0-abs(sin(uv));
-    vec2 swv = abs(cos(uv));    
-    wv = mix(wv,swv,wv);
-    return pow(1.0-pow(wv.x * wv.y,0.65),choppy);
-}
-
-float map(vec3 p) {
-    float freq = SEA_FREQ;
-    float amp = SEA_HEIGHT;
-    float choppy = SEA_CHOPPY;
-    vec2 uv = p.xz; uv.x *= 0.75;
-    
-    float d, h = 0.0;    
-    for(int i = 0; i < ITER_GEOMETRY; i++) {        
-    	d = sea_octave((uv+SEA_TIME)*freq,choppy);
-    	d += sea_octave((uv-SEA_TIME)*freq,choppy);
-        h += d * amp;        
-    	uv *= octave_m; freq *= 1.9; amp *= 0.22;
-        choppy = mix(choppy,1.0,0.2);
-    }
-    return p.y - h;
-}
-
-float map_detailed(vec3 p) {
-    float freq = SEA_FREQ;
-    float amp = SEA_HEIGHT;
-    float choppy = SEA_CHOPPY;
-    vec2 uv = p.xz; uv.x *= 0.75;
-    
-    float d, h = 0.0;    
-    for(int i = 0; i < ITER_FRAGMENT; i++) {        
-    	d = sea_octave((uv+SEA_TIME)*freq,choppy);
-    	d += sea_octave((uv-SEA_TIME)*freq,choppy);
-        h += d * amp;        
-    	uv *= octave_m; freq *= 1.9; amp *= 0.22;
-        choppy = mix(choppy,1.0,0.2);
-    }
-    return p.y - h;
-}
-
-vec3 getSeaColor(vec3 p, vec3 n, vec3 l, vec3 eye, vec3 dist) {  
-    float fresnel = clamp(1.0 - dot(n,-eye), 0.0, 1.0);
-    fresnel = pow(fresnel,3.0) * 0.65;
-        
-    vec3 reflected = getSkyColor(reflect(eye,n));    
-    vec3 refracted = SEA_BASE + diffuse(n,l,80.0) * SEA_WATER_COLOR * 0.12; 
-    
-    vec3 color = mix(refracted,reflected,fresnel);
-    
-    float atten = max(1.0 - dot(dist,dist) * 0.001, 0.0);
-    color += SEA_WATER_COLOR * (p.y - SEA_HEIGHT) * 0.18 * atten;
-    
-    color += vec3(specular(n,l,eye,60.0));
-    
-    return color;
-}
-
-// tracing
-vec3 getNormal(vec3 p, float eps) {
-    vec3 n;
-    n.y = map_detailed(p);    
-    n.x = map_detailed(vec3(p.x+eps,p.y,p.z)) - n.y;
-    n.z = map_detailed(vec3(p.x,p.y,p.z+eps)) - n.y;
-    n.y = eps;
-    return normalize(n);
-}
-
-float heightMapTracing(vec3 ori, vec3 dir, out vec3 p) {  
-    float tm = 0.0;
-    float tx = 1000.0;    
-    float hx = map(ori + dir * tx);
-    if(hx > 0.0) return tx;   
-    float hm = map(ori + dir * tm);    
-    float tmid = 0.0;
-    for(int i = 0; i < NUM_STEPS; i++) {
-        tmid = mix(tm,tx, hm/(hm-hx));                   
-        p = ori + dir * tmid;                   
-    	float hmid = map(p);
-		if(hmid < 0.0) {
-        	tx = tmid;
-            hx = hmid;
-        } else {
-            tm = tmid;
-            hm = hmid;
-        }
-    }
-    return tmid;
-}
-
-// main
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
-	vec2 uv = fragCoord.xy / iResolution.xy;
-    uv = uv * 2.0 - 1.0;
-    uv.x *= iResolution.x / iResolution.y;    
-#ifdef MOUSE
-    float time = iGlobalTime * 0.3 + iMouse.x*0.01;
-#else
-    float time = iGlobalTime * 0.3 + 0.0 * 0.01;
-#endif
-        
-    // ray
-    vec3 ang = vec3(sin(time*3.0)*0.1,sin(time)*0.2+0.3,time);    
-    vec3 ori = vec3(0.0,3.5,time*5.0);
-    vec3 dir = normalize(vec3(uv.xy,-2.0)); dir.z += length(uv) * 0.15;
-    dir = normalize(dir) * fromEuler(ang);
-    
-    // tracing
-    vec3 p;
-    heightMapTracing(ori,dir,p);
-    vec3 dist = p - ori;
-    vec3 n = getNormal(p, dot(dist,dist) * EPSILON_NRM);
-    vec3 light = normalize(vec3(0.0,1.0,0.8)); 
-             
-    // color
-    vec3 color = mix(
-        getSkyColor(dir),
-        getSeaColor(p,n,light,dir,dist),
-    	pow(smoothstep(0.0,-0.05,dir.y),0.3));
-        
-    // post
-	fragColor = vec4(pow(color,vec3(0.75)), 1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/tdm-wet-stone.slang b/procedural/tdm-wet-stone.slang
deleted file mode 100644
index 4e5296b687..0000000000
--- a/procedural/tdm-wet-stone.slang
+++ /dev/null
@@ -1,290 +0,0 @@
-#version 450
-// Wet Stone -  TDM - 2014-10-20
-// https://www.shadertoy.com/view/ldSSzV
-
-// stone generation
-
-/*
-"Wet stone" by Alexander Alekseev aka TDM - 2014
-License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-Contact: tdmaav@gmail.com
-*/
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-#define SMOOTH
-
-const int NUM_STEPS = 32;
-const int AO_SAMPLES = 3;
-const vec2 AO_PARAM = vec2(1.2, 3.8);
-const vec2 CORNER_PARAM = vec2(0.25, 40.0);
-const float INV_AO_SAMPLES = 1.0 / float(AO_SAMPLES);
-const float TRESHOLD 	= 0.1;
-const float EPSILON 	= 1e-3;
-const float LIGHT_INTENSITY = 0.25;
-const vec3 RED 		= vec3(1.0,0.7,0.7) * LIGHT_INTENSITY;
-const vec3 ORANGE 	= vec3(1.0,0.67,0.43) * LIGHT_INTENSITY;
-const vec3 BLUE 	= vec3(0.54,0.77,1.0) * LIGHT_INTENSITY;
-const vec3 WHITE 	= vec3(1.2,1.07,0.98) * LIGHT_INTENSITY;
-
-const float DISPLACEMENT = 0.1;
-
-// math
-mat3 fromEuler(vec3 ang) {
-	vec2 a1 = vec2(sin(ang.x),cos(ang.x));
-    vec2 a2 = vec2(sin(ang.y),cos(ang.y));
-    vec2 a3 = vec2(sin(ang.z),cos(ang.z));
-    mat3 m;
-    m[0] = vec3(a1.y*a3.y+a1.x*a2.x*a3.x,a1.y*a2.x*a3.x+a3.y*a1.x,-a2.y*a3.x);
-	m[1] = vec3(-a2.y*a1.x,a1.y*a2.y,a2.x);
-	m[2] = vec3(a3.y*a1.x*a2.x+a1.y*a3.x,a1.x*a3.x-a1.y*a3.y*a2.x,a2.y*a3.y);
-	return m;
-}
-float hash11(float p) {
-    return fract(sin(p * 727.1)*435.545);
-}
-float hash12(vec2 p) {
-	float h = dot(p,vec2(127.1,311.7));	
-    return fract(sin(h)*437.545);
-}
-vec3 hash31(float p) {
-	vec3 h = vec3(127.231,491.7,718.423) * p;	
-    return fract(sin(h)*435.543);
-}
-
-// 3d noise
-float noise_3(in vec3 p) {
-    vec3 i = floor(p);
-    vec3 f = fract(p);	
-	vec3 u = f*f*(3.0-2.0*f);
-    
-    vec2 ii = i.xy + i.z * vec2(5.0);
-    float a = hash12( ii + vec2(0.0,0.0) );
-	float b = hash12( ii + vec2(1.0,0.0) );    
-    float c = hash12( ii + vec2(0.0,1.0) );
-	float d = hash12( ii + vec2(1.0,1.0) ); 
-    float v1 = mix(mix(a,b,u.x), mix(c,d,u.x), u.y);
-    
-    ii += vec2(5.0);
-    a = hash12( ii + vec2(0.0,0.0) );
-	b = hash12( ii + vec2(1.0,0.0) );    
-    c = hash12( ii + vec2(0.0,1.0) );
-	d = hash12( ii + vec2(1.0,1.0) );
-    float v2 = mix(mix(a,b,u.x), mix(c,d,u.x), u.y);
-        
-    return max(mix(v1,v2,u.z),0.0);
-}
-
-// fBm
-float fbm3(vec3 p, float a, float f) {
-    return noise_3(p);
-}
-
-float fbm3_high(vec3 p, float a, float f) {
-    float ret = 0.0;    
-    float amp = 1.0;
-    float frq = 1.0;
-    for(int i = 0; i < 4; i++) {
-        float n = pow(noise_3(p * frq),2.0);
-        ret += n * amp;
-        frq *= f;
-        amp *= a * (pow(n,0.2));
-    }
-    return ret;
-}
-
-// lighting
-float diffuse(vec3 n,vec3 l,float p) { return pow(max(dot(n,l),0.0),p); }
-float specular(vec3 n,vec3 l,vec3 e,float s) {    
-    float nrm = (s + 8.0) / (3.1415 * 8.0);
-    return pow(max(dot(reflect(e,n),l),0.0),s) * nrm;
-}
-
-// distance functions
-float plane(vec3 gp, vec4 p) {
-	return dot(p.xyz,gp+p.xyz*p.w);
-}
-float sphere(vec3 p,float r) {
-	return length(p)-r;
-}
-float capsule(vec3 p,float r,float h) {
-    p.y -= clamp(p.y,-h,h);
-	return length(p)-r;
-}
-float cylinder(vec3 p,float r,float h) {
-	return max(abs(p.y/h),capsule(p,r,h));
-}
-float box(vec3 p,vec3 s) {
-	p = abs(p)-s;
-    return max(max(p.x,p.y),p.z);
-}
-float rbox(vec3 p,vec3 s) {
-	p = abs(p)-s;
-    return length(p-min(p,0.0));
-}
-float quad(vec3 p,vec2 s) {
-	p = abs(p) - vec3(s.x,0.0,s.y);
-    return max(max(p.x,p.y),p.z);
-}
-
-// boolean operations
-float boolUnion(float a,float b) { return min(a,b); }
-float boolIntersect(float a,float b) { return max(a,b); }
-float boolSub(float a,float b) { return max(a,-b); }
-
-// smooth operations. thanks to iq
-float boolSmoothIntersect(float a, float b, float k ) {
-    float h = clamp(0.5+0.5*(b-a)/k, 0.0, 1.0);
-    return mix(a,b,h) + k*h*(1.0-h);
-}
-float boolSmoothSub(float a, float b, float k ) {
-    return boolSmoothIntersect(a,-b,k);
-}	
-
-// world
-float rock(vec3 p) {    
-    float d = sphere(p,1.0);    
-    for(int i = 0; i < 9; i++) {
-        float ii = float(i);
-        float r = 2.5 + hash11(ii);
-        vec3 v = normalize(hash31(ii) * 2.0 - 1.0);
-        #ifdef SMOOTH
-        d = boolSmoothSub(d,sphere(p+v*r,r * 0.8), 0.03);
-        #else
-    	d = boolSub(d,sphere(p+v*r,r * 0.8));
-        #endif        
-    }
-    return d;
-}
-
-float map(vec3 p) {
-    float d = rock(p) + fbm3(p*4.0,0.4,2.96) * DISPLACEMENT;
-    d = boolUnion(d,plane(p,vec4(0.0,1.0,0.0,1.0)));
-    return d;
-}
-
-float map_detailed(vec3 p) {
-    float d = rock(p) + fbm3_high(p*4.0,0.4,2.96) * DISPLACEMENT;
-    d = boolUnion(d,plane(p,vec4(0.0,1.0,0.0,1.0)));
-    return d;
-}
-
-// tracing
-vec3 getNormal(vec3 p, float dens) {
-    vec3 n;
-    n.x = map_detailed(vec3(p.x+EPSILON,p.y,p.z));
-    n.y = map_detailed(vec3(p.x,p.y+EPSILON,p.z));
-    n.z = map_detailed(vec3(p.x,p.y,p.z+EPSILON));
-    return normalize(n-map_detailed(p));
-}
-vec2 getOcclusion(vec3 p, vec3 n) {
-    vec2 r = vec2(0.0);
-    for(int i = 0; i < AO_SAMPLES; i++) {
-        float f = float(i)*INV_AO_SAMPLES;
-        float hao = 0.01+f*AO_PARAM.x;
-        float hc = 0.01+f*CORNER_PARAM.x;
-        float dao = map(p + n * hao) - TRESHOLD;
-        float dc = map(p - n * hc) - TRESHOLD;
-        r.x += clamp(hao-dao,0.0,1.0) * (1.0-f);
-        r.y += clamp(hc+dc,0.0,1.0) * (1.0-f);
-    }    
-    r.x = pow(clamp(1.0-r.x*INV_AO_SAMPLES*AO_PARAM.y,0.0,1.0),0.5);
-    r.y = clamp(r.y*INV_AO_SAMPLES*CORNER_PARAM.y,0.0,1.0);
-    return r;
-}
-vec2 spheretracing(vec3 ori, vec3 dir, out vec3 p) {
-    vec2 td = vec2(0.0);
-    for(int i = 0; i < NUM_STEPS; i++) {
-        p = ori + dir * td.x;
-        td.y = map(p);
-        if(td.y < TRESHOLD) break;
-        td.x += (td.y-TRESHOLD) * 0.9;
-    }
-    return td;
-}
-
-// stone
-vec3 getStoneColor(vec3 p, float c, vec3 l, vec3 n, vec3 e) {
-    c = min(c + pow(noise_3(vec3(p.x*20.0,0.0,p.z*20.0)),70.0) * 8.0, 1.0);
-    float ic = pow(1.0-c,0.5);
-    vec3 base = vec3(0.42,0.3,0.2) * 0.6;
-    vec3 sand = vec3(0.51,0.41,0.32);
-    vec3 color = mix(base,sand,c);
-        
-    float f = pow(1.0 - max(dot(n,-e),0.0), 1.5) * 0.75 * ic;
-    color = mix(color,vec3(1.0),f);    
-    color += vec3(diffuse(n,l,0.5) * WHITE);
-    color += vec3(specular(n,l,e,8.0) * WHITE * 1.5 * ic);
-    n = normalize(n - normalize(p) * 0.4);    
-    color += vec3(specular(n,l,e,80.0) * WHITE * 1.5 * ic);    
-    return color;
-}
-
-// main
-void mainImage( out vec4 fragColor, in vec2 fragCoord ) {
-	vec2 iuv = fragCoord.xy / iResolution.xy * 2.0 - 1.0;
-    vec2 uv = iuv;
-    uv.x *= iResolution.x / iResolution.y;    
-    float time = iGlobalTime * 0.3;
-        
-    // ray
-    vec3 ang = vec3(0.0,0.2,time);
-#ifdef MOUSE
-    if(iMouse.z > 0.0) ang = vec3(0.0,clamp(2.0-iMouse.y*0.01,0.0,3.1415),iMouse.x*0.01);
-#endif
-	mat3 rot = fromEuler(ang);
-    
-    vec3 ori = vec3(0.0,0.0,2.8);
-    vec3 dir = normalize(vec3(uv.xy,-2.0));    
-    ori = ori * rot;
-    dir = dir * rot;
-    
-    // tracing
-    vec3 p;
-    vec2 td = spheretracing(ori,dir,p);
-    vec3 n = getNormal(p,td.y);
-    vec2 occ = getOcclusion(p,n);
-    vec3 light = normalize(vec3(0.0,1.0,0.0)); 
-         
-    // color
-    vec3 color = vec3(1.0);    
-    if(td.x < 3.5 && p.y > -0.89) color = getStoneColor(p,occ.y,light,n,dir);
-    color *= occ.x;
-               
-    // post
-    float vgn = smoothstep(1.2,0.7,abs(iuv.y)) * smoothstep(1.1,0.8,abs(iuv.x));
-    color *= 1.0 - (1.0 - vgn) * 0.15;	
-	fragColor = vec4(color,1.0);
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragmentCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragmentCoord.y = -FragmentCoord.y;
-  mainImage(FragColor,FragmentCoord);
-}
diff --git a/procedural/xt9s-flame.slang b/procedural/xt9s-flame.slang
deleted file mode 100644
index 0c79aea844..0000000000
--- a/procedural/xt9s-flame.slang
+++ /dev/null
@@ -1,102 +0,0 @@
-#version 450
-// Simple flame in distance field.
-// XT9S - https://www.shadertoy.com/view/MdX3zr
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 OutputSize;
-   vec4 OriginalSize;
-   vec4 SourceSize;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in  vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-const vec2 madd = vec2(0.5, 0.5);
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = gl_Position.xy;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-float iGlobalTime = float(global.FrameCount)*0.025;
-vec2 iResolution = global.OutputSize.xy;
-
-float noise(vec3 p) //Thx to Las^Mercury
-{
-	vec3 i = floor(p);
-	vec4 a = dot(i, vec3(1., 57., 21.)) + vec4(0., 57., 21., 78.);
-	vec3 f = cos((p-i)*acos(-1.))*(-.5)+.5;
-	a = mix(sin(cos(a)*a),sin(cos(1.+a)*(1.+a)), f.x);
-	a.xy = mix(a.xz, a.yw, f.y);
-	return mix(a.x, a.y, f.z);
-}
-
-float sphere(vec3 p, vec4 spr)
-{
-	return length(spr.xyz-p) - spr.w;
-}
-
-float flame(vec3 p)
-{
-	float d = sphere(p*vec3(1.,.5,1.), vec4(.0,-1.,.0,1.));
-	return d + (noise(p+vec3(.0,iGlobalTime*2.,.0)) + noise(p*3.)*.5)*.25*(p.y) ;
-}
-
-float scene(vec3 p)
-{
-	return min(100.-length(p) , abs(flame(p)) );
-}
-
-vec4 raymarch(vec3 org, vec3 dir)
-{
-	float d = 0.0, glow = 0.0, eps = 0.02;
-	vec3  p = org;
-	bool glowed = false;
-	
-	for(int i=0; i<64; i++)
-	{
-		d = scene(p) + eps;
-		p += d * dir;
-		if( d>eps )
-		{
-			if(flame(p) < .0)
-				glowed=true;
-			if(glowed)
-       			glow = float(i)/64.;
-		}
-	}
-	return vec4(p,glow);
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-	vec2 v = -1.0 + 2.0 * fragCoord.xy / iResolution.xy;
-	v.x *= iResolution.x/iResolution.y;
-	
-	vec3 org = vec3(0., -2., 4.);
-	vec3 dir = normalize(vec3(v.x*1.6, -v.y, -1.5));
-	
-	vec4 p = raymarch(org, dir);
-	float glow = p.w;
-	
-	vec4 col = mix(vec4(1.,.5,.1,1.), vec4(0.1,.5,1.,1.), p.y*.02+.4);
-	
-	fragColor = mix(vec4(0.), col, pow(glow*2.,4.));
-	//fragColor = mix(vec4(1.), mix(vec4(1.,.5,.1,1.),vec4(0.1,.5,1.,1.),p.y*.02+.4), pow(glow*2.,4.));
-
-}
-
-void main(void)
-{
-  //just some shit to wrap shadertoy's stuff
-  vec2 FragCoord = vTexCoord.xy*global.OutputSize.xy;
-  FragCoord.y = -FragCoord.y;
-  mainImage(FragColor,FragCoord);
-}
diff --git a/quad/shaders/quad_interp.slang b/quad/shaders/quad_interp.slang
deleted file mode 100644
index 7bf9e520a5..0000000000
--- a/quad/shaders/quad_interp.slang
+++ /dev/null
@@ -1,113 +0,0 @@
-#version 450
-
-/*
-   Author: Themaister
-   License: Public domain
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float QUAD_INTERP_RESOLUTION_X;
-	float QUAD_INTERP_RESOLUTION_Y;
-	float QUAD_INTERP_SHARPNESS;
-} params;
-
-#pragma parameter QUAD_INTERP_RESOLUTION_X "QuadInterp Input Resolution X" 0.0 0.0 1920.0 1.0
-#pragma parameter QUAD_INTERP_RESOLUTION_Y "QuadInterp Input Resolution Y" 0.0 0.0 1920.0 1.0
-#pragma parameter QUAD_INTERP_SHARPNESS     "QuadInterp Sharpness"           2.01 0.0 10.0 0.01
-
-#define QUAD_INTERP_RESOLUTION_X params.QUAD_INTERP_RESOLUTION_X
-#define QUAD_INTERP_RESOLUTION_Y params.QUAD_INTERP_RESOLUTION_Y
-#define QUAD_INTERP_SHARPNESS params.QUAD_INTERP_SHARPNESS
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define saturate(c) clamp(c, 0.0, 1.0)
-#define lerp(c) mix(c)
-#define mul(a,b) (b*a)
-#define fmod(c) mod(c)
-#define frac(c) fract(c)
-#define tex2D(c,d) texture(c,d)
-#define float2 vec2
-#define float3 vec3
-#define float4 vec4
-#define int2 ivec2
-#define int3 ivec3
-#define int4 ivec4
-#define bool2 bvec2
-#define bool3 bvec3
-#define bool4 bvec4
-#define float2x2 mat2x2
-#define float3x3 mat3x3
-#define float4x4 mat4x4
-
-#define s0 Source
-#define tex vTexCoord
-
-#define QUAD_INTERP_RESOLUTION_X_DEF params.SourceSize.x
-#define QUAD_INTERP_RESOLUTION_Y_DEF params.SourceSize.y
-
-float3 quad_inter(float3 x0, float3 x1, float3 x2, float x)
-{
-   float3 poly[3];
-   poly[2] =  0.5 * x0 - x1 + 0.5*x2;
-   poly[1] = -1.5 * x0 + 2.0 * x1 - 0.5*x2;
-   poly[0] = x0;
-   return poly[2] * x * x + poly[1] * x + poly[0];
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   /* messy I know but we need to make it possible to have it default to input resolution x/y in case RESOLUTION_X is 0.0 */
-	float2 texsize = float2(1.0/((QUAD_INTERP_RESOLUTION_X == 0) ? QUAD_INTERP_RESOLUTION_X_DEF : QUAD_INTERP_RESOLUTION_X), 1.0/((QUAD_INTERP_RESOLUTION_Y == 0) ? QUAD_INTERP_RESOLUTION_Y_DEF : QUAD_INTERP_RESOLUTION_Y));
-   float dx = float(pow(QUAD_INTERP_SHARPNESS * texsize.x, -1.0));
-   float dy = float(pow(QUAD_INTERP_SHARPNESS * texsize.y, -1.0));
-
-   float3 c00 = tex2D(s0, tex + float2(-dx, -dy)).xyz;
-   float3 c01 = tex2D(s0, tex + float2(-dx, 0)).xyz;
-   float3 c02 = tex2D(s0, tex + float2(-dx, dy)).xyz;
-   float3 c10 = tex2D(s0, tex + float2(0, -dy)).xyz;
-   float3 c11 = tex2D(s0, tex + float2(0, 0)).xyz;
-   float3 c12 = tex2D(s0, tex + float2(0, dy)).xyz;
-   float3 c20 = tex2D(s0, tex + float2(dx, -dy)).xyz;
-   float3 c21 = tex2D(s0, tex + float2(dx, 0)).xyz;
-   float3 c22 = tex2D(s0, tex + float2(dx, dy)).xyz;
-
-   float frac_amt_x = frac(tex.x * texsize.x);
-   float frac_amt_y = frac(tex.y * texsize.y);
-   float3 loval = quad_inter(c00, c10, c20, frac_amt_x + 0.5);
-   float3 midval = quad_inter(c01, c11, c21, frac_amt_x + 0.5);
-   float3 hival = quad_inter(c02, c12, c22, frac_amt_x + 0.5);
-   float3 res = quad_inter(loval, midval, hival, frac_amt_y + 0.5);
-
-// Bilinear!
-//   float3 first = lerp(c00, c20, frac(tex.x * texsize.x + 0.5));
-//   float3 second = lerp(c02, c22, frac(tex.x * texsize.x + 0.5));
-//   float3 res = lerp(first, second, frac(tex.y * texsize.y + 0.5));
-//   OUT.color = float4(res, 1.0);
-
-   FragColor = vec4(res, 1.0);
-}
\ No newline at end of file
diff --git a/reshade/FilmGrain.slangp b/reshade/FilmGrain.slangp
deleted file mode 100644
index 6a3b3a9e3a..0000000000
--- a/reshade/FilmGrain.slangp
+++ /dev/null
@@ -1,3 +0,0 @@
-shaders = 1
-
-shader0 = shaders/FilmGrain.slang
diff --git a/reshade/NormalsDisplacement.slangp b/reshade/NormalsDisplacement.slangp
deleted file mode 100644
index 1b4842582e..0000000000
--- a/reshade/NormalsDisplacement.slangp
+++ /dev/null
@@ -1,7 +0,0 @@
-shaders = 1
-
-shader0 = shaders/NormalsDisplacement/NormalsDisplacement.slang
-scale_type0 = viewport
-
-textures = "displacementMap"
-displacementMap = shaders/NormalsDisplacement/CurveNormals.png
diff --git a/reshade/blendoverlay.slangp b/reshade/blendoverlay.slangp
deleted file mode 100644
index 344ebe67bc..0000000000
--- a/reshade/blendoverlay.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-shaders = 1
-shader0 = shaders/blendoverlay/blendoverlay.slang
-scale_type0 = viewport
-
-textures = "overlay"
-# change this path to point to your overlay image
-overlay = shaders/blendoverlay/grayscale_slotmask.png
-
-parameters = "LUTWidth;LUTHeight"
-# set these to the width/height of your overlay image
-LUTWidth = 6.0
-LUTHeight = 4.0
diff --git a/reshade/bloom.slangp b/reshade/bloom.slangp
deleted file mode 100644
index 1847f6488e..0000000000
--- a/reshade/bloom.slangp
+++ /dev/null
@@ -1,53 +0,0 @@
-shaders = 9
-
-shader0 = shaders/bloom/BloomPass0.slang
-alias0 = SamplerBloom1
-float_framebuffer0 = true
-
-shader1 = shaders/bloom/BloomPass1.slang
-alias1 = SamplerBloom2
-float_framebuffer1 = true
-
-shader2 = shaders/bloom/BloomPass2.slang
-alias2 = SamplerBloom3
-float_framebuffer2 = true
-scale2 = 0.5
-scale_type2 = viewport
-
-shader3 = shaders/bloom/BloomPass3.slang
-alias3 = SamplerBloom4
-float_framebuffer3 = true
-scale3 = 0.25
-scale_type3 = viewport
-
-shader4 = shaders/bloom/BloomPass4.slang
-alias4 = SamplerBloom5
-float_framebuffer4 = true
-scale4 = 0.125
-scale_type4 = viewport
-
-shader5 = shaders/bloom/LensFlarePass0.slang
-alias5 = LensFlare1
-float_framebuffer5 = true
-#scale_type5 = source
-
-shader6 = shaders/bloom/LensFlarePass1.slang
-alias6 = LensFlare2
-float_framebuffer6 = true
-#scale6 = 0.5
-scale_type6 = viewport
-
-shader7 = shaders/bloom/LensFlarePass2.slang
-alias7 = LensFlare3
-float_framebuffer7 = true
-#scale7 = 0.5
-scale_type7 = viewport
-
-shader8 = shaders/bloom/LightingCombine.slang
-scale8 = 2.0
-scale_type8 = viewport
-filter_linear8 = true
-
-textures = "Dirt;Sprite"
-Dirt = shaders/bloom/LensDB.png
-Sprite = shaders/bloom/LensSprite.png
diff --git a/reshade/bsnes-gamma-ramp.slangp b/reshade/bsnes-gamma-ramp.slangp
deleted file mode 100644
index 9e76aea2a5..0000000000
--- a/reshade/bsnes-gamma-ramp.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = shaders/LUT/bsnes.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
\ No newline at end of file
diff --git a/reshade/halftone-print.slangp b/reshade/halftone-print.slangp
deleted file mode 100644
index d1a3021b5b..0000000000
--- a/reshade/halftone-print.slangp
+++ /dev/null
@@ -1,11 +0,0 @@
-shaders = 2
-
-shader0 = shaders/LUT/LUT.slang
-shader1 = ../misc/shaders/cmyk-halftone-dot.slang
-filter_linear1 = true
-scale_type0 = viewport
-
-textures = SamplerLUT
-
-SamplerLUT = shaders/LUT/cmyk-16.png
-SamplerLUT_linear = true
diff --git a/reshade/handheld-color-LUTs/GBA-P3-dark.slangp b/reshade/handheld-color-LUTs/GBA-P3-dark.slangp
deleted file mode 100644
index 0ccba2a9ae..0000000000
--- a/reshade/handheld-color-LUTs/GBA-P3-dark.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBA-P3(dark).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBA-P3.slangp b/reshade/handheld-color-LUTs/GBA-P3.slangp
deleted file mode 100644
index 4cb09e4e59..0000000000
--- a/reshade/handheld-color-LUTs/GBA-P3.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBA-P3.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBA-rec2020-dark.slangp b/reshade/handheld-color-LUTs/GBA-rec2020-dark.slangp
deleted file mode 100644
index e25a8c35b2..0000000000
--- a/reshade/handheld-color-LUTs/GBA-rec2020-dark.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBA-2020(dark).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBA-rec2020.slangp b/reshade/handheld-color-LUTs/GBA-rec2020.slangp
deleted file mode 100644
index 946be50796..0000000000
--- a/reshade/handheld-color-LUTs/GBA-rec2020.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBA-2020.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBA-sRGB-dark.slangp b/reshade/handheld-color-LUTs/GBA-sRGB-dark.slangp
deleted file mode 100644
index d2a58a6c73..0000000000
--- a/reshade/handheld-color-LUTs/GBA-sRGB-dark.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBA-sRGB(dark).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBA-sRGB.slangp b/reshade/handheld-color-LUTs/GBA-sRGB.slangp
deleted file mode 100644
index 4a6d877277..0000000000
--- a/reshade/handheld-color-LUTs/GBA-sRGB.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBA-sRGB.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBC Dev Colorspace.slangp b/reshade/handheld-color-LUTs/GBC Dev Colorspace.slangp
deleted file mode 100644
index cb22e630ab..0000000000
--- a/reshade/handheld-color-LUTs/GBC Dev Colorspace.slangp	
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBC-dev.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBC-P3.slangp b/reshade/handheld-color-LUTs/GBC-P3.slangp
deleted file mode 100644
index 433a51552b..0000000000
--- a/reshade/handheld-color-LUTs/GBC-P3.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBC-P3.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBC-rec2020.slangp b/reshade/handheld-color-LUTs/GBC-rec2020.slangp
deleted file mode 100644
index c727ae10c1..0000000000
--- a/reshade/handheld-color-LUTs/GBC-rec2020.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBC-2020.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/GBC-sRGB.slangp b/reshade/handheld-color-LUTs/GBC-sRGB.slangp
deleted file mode 100644
index f421da626c..0000000000
--- a/reshade/handheld-color-LUTs/GBC-sRGB.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/GBC-sRGB.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/NDS-P3.slangp b/reshade/handheld-color-LUTs/NDS-P3.slangp
deleted file mode 100644
index cd37bd72b7..0000000000
--- a/reshade/handheld-color-LUTs/NDS-P3.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/NDS-P3.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/NDS-rec2020.slangp b/reshade/handheld-color-LUTs/NDS-rec2020.slangp
deleted file mode 100644
index 8bd8a2f75e..0000000000
--- a/reshade/handheld-color-LUTs/NDS-rec2020.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/NDS-2020.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/NDS-sRGB.slangp b/reshade/handheld-color-LUTs/NDS-sRGB.slangp
deleted file mode 100644
index 9273d0a918..0000000000
--- a/reshade/handheld-color-LUTs/NDS-sRGB.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/NDS-sRGB.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/NSO-GBA.slangp b/reshade/handheld-color-LUTs/NSO-GBA.slangp
deleted file mode 100644
index 0b0297e035..0000000000
--- a/reshade/handheld-color-LUTs/NSO-GBA.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/NSO-GBA.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/NSO-GBC.slangp b/reshade/handheld-color-LUTs/NSO-GBC.slangp
deleted file mode 100644
index a17e7d5b2f..0000000000
--- a/reshade/handheld-color-LUTs/NSO-GBC.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/NSO-GBC.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/PSP-P3(pure-gamma2.2).slangp b/reshade/handheld-color-LUTs/PSP-P3(pure-gamma2.2).slangp
deleted file mode 100644
index ce95282e1b..0000000000
--- a/reshade/handheld-color-LUTs/PSP-P3(pure-gamma2.2).slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/PSP-P3(pure-gamma).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/PSP-P3.slangp b/reshade/handheld-color-LUTs/PSP-P3.slangp
deleted file mode 100644
index 52ca14fa66..0000000000
--- a/reshade/handheld-color-LUTs/PSP-P3.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/PSP-P3.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/PSP-rec2020(sRGB-gamma2.2).slangp b/reshade/handheld-color-LUTs/PSP-rec2020(sRGB-gamma2.2).slangp
deleted file mode 100644
index 1a0ecb7974..0000000000
--- a/reshade/handheld-color-LUTs/PSP-rec2020(sRGB-gamma2.2).slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/PSP-2020(pure-gamma).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/PSP-rec2020.slangp b/reshade/handheld-color-LUTs/PSP-rec2020.slangp
deleted file mode 100644
index 48274fc1a9..0000000000
--- a/reshade/handheld-color-LUTs/PSP-rec2020.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/PSP-2020.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/PSP-sRGB(sRGB-gamma2.2).slangp b/reshade/handheld-color-LUTs/PSP-sRGB(sRGB-gamma2.2).slangp
deleted file mode 100644
index 88dc3701fe..0000000000
--- a/reshade/handheld-color-LUTs/PSP-sRGB(sRGB-gamma2.2).slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/PSP-sRGB(pure-gamma).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/PSP-sRGB.slangp b/reshade/handheld-color-LUTs/PSP-sRGB.slangp
deleted file mode 100644
index bb8d751d59..0000000000
--- a/reshade/handheld-color-LUTs/PSP-sRGB.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/PSP-sRGB.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/SwitchOLED-P3(sRGB-gamma2.2).slangp b/reshade/handheld-color-LUTs/SwitchOLED-P3(sRGB-gamma2.2).slangp
deleted file mode 100644
index 799632cdda..0000000000
--- a/reshade/handheld-color-LUTs/SwitchOLED-P3(sRGB-gamma2.2).slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/SWOLED-P3(pure-gamma).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/SwitchOLED-P3.slangp b/reshade/handheld-color-LUTs/SwitchOLED-P3.slangp
deleted file mode 100644
index bd24cbebde..0000000000
--- a/reshade/handheld-color-LUTs/SwitchOLED-P3.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/SWOLED-P3.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/SwitchOLED-rec2020(sRGB-gamma2.2).slangp b/reshade/handheld-color-LUTs/SwitchOLED-rec2020(sRGB-gamma2.2).slangp
deleted file mode 100644
index 296bc7ba15..0000000000
--- a/reshade/handheld-color-LUTs/SwitchOLED-rec2020(sRGB-gamma2.2).slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/SWOLED-2020(pure-gamma).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/SwitchOLED-rec2020.slangp b/reshade/handheld-color-LUTs/SwitchOLED-rec2020.slangp
deleted file mode 100644
index 16d0ecba84..0000000000
--- a/reshade/handheld-color-LUTs/SwitchOLED-rec2020.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/SWOLED-2020.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/SwitchOLED-sRGB(sRGB-Gamma2.2).slangp b/reshade/handheld-color-LUTs/SwitchOLED-sRGB(sRGB-Gamma2.2).slangp
deleted file mode 100644
index 8beae54864..0000000000
--- a/reshade/handheld-color-LUTs/SwitchOLED-sRGB(sRGB-Gamma2.2).slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/SWOLED-sRGB(pure-gamma).png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/SwitchOLED-sRGB.slangp b/reshade/handheld-color-LUTs/SwitchOLED-sRGB.slangp
deleted file mode 100644
index 1585e9a71e..0000000000
--- a/reshade/handheld-color-LUTs/SwitchOLED-sRGB.slangp
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/SWOLED-sRGB.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/handheld-color-LUTs/VBA Colorspace.slangp b/reshade/handheld-color-LUTs/VBA Colorspace.slangp
deleted file mode 100644
index ef1fe625db..0000000000
--- a/reshade/handheld-color-LUTs/VBA Colorspace.slangp	
+++ /dev/null
@@ -1,16 +0,0 @@
-shaders = 1
-
-shader0 = ../shaders/LUT/LUT.slang
-filter_linear0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-textures = SamplerLUT
-
-SamplerLUT = ../shaders/LUT/handheld/VBA.png
-SamplerLUT_linear = true
-
-parameters = "LUT_Size"
-LUT_Size = "32.000000"
diff --git a/reshade/lut.slangp b/reshade/lut.slangp
deleted file mode 100644
index a4ee9ef2fb..0000000000
--- a/reshade/lut.slangp
+++ /dev/null
@@ -1,9 +0,0 @@
-shaders = 1
-
-shader0 = shaders/LUT/LUT.slang
-scale_type0 = source
-
-textures = SamplerLUT
-
-SamplerLUT = shaders/LUT/16.png
-SamplerLUT_linear = true
diff --git a/reshade/magicbloom.slangp b/reshade/magicbloom.slangp
deleted file mode 100644
index f7a3735dec..0000000000
--- a/reshade/magicbloom.slangp
+++ /dev/null
@@ -1,98 +0,0 @@
-shaders = 12
-
-shader0 = ../stock.slang
-filter_linear0 = false
-wrap_mode0 = mirrored_repeat
-scale_type0 = viewport
-scale0 = 1.0
-alias0 = "PreBloomPass"
-
-shader1 = ./shaders/magicbloom/magicbloom_blur_pass_1.slang
-filter_linear1 = true
-mipmap_input1 = true
-wrap_mode1 = mirrored_repeat
-scale_type1 = absolute
-scale_x1 = 1920
-scale_y1 = 1080
-alias1 = "tMagicBloom_1"
-
-shader2 = ./shaders/magicbloom/magicbloom_blur_pass_2.slang
-filter_linear2 = true
-mipmap_input2 = true
-wrap_mode2 = mirrored_repeat
-scale_type2 = source
-scale2 = 0.75
-alias2 = "tMagicBloom_2"
-
-shader3 = ./shaders/magicbloom/magicbloom_blur_pass_3.slang
-filter_linear3 = true
-mipmap_input3 = true
-wrap_mode3 = mirrored_repeat
-scale_type3 = source
-scale3 = 0.75
-alias3 = "tMagicBloom_3"
-
-shader4 = ./shaders/magicbloom/magicbloom_blur_pass_4.slang
-filter_linear4 = true
-mipmap_input4 = true
-wrap_mode4 = mirrored_repeat
-scale_type4 = source
-scale4 = 0.75
-alias4 = "tMagicBloom_4"
-
-shader5 = ./shaders/magicbloom/magicbloom_blur_pass_5.slang
-filter_linear5 = true
-mipmap_input5 = true
-wrap_mode5 = mirrored_repeat
-scale_type5 = source
-scale5 = 0.75
-alias5 = "tMagicBloom_5"
-
-shader6 = ./shaders/magicbloom/magicbloom_blur_pass_6.slang
-filter_linear6 = true
-mipmap_input6 = true
-wrap_mode6 = mirrored_repeat
-scale_type6 = source
-scale6 = 0.5
-alias6 = "tMagicBloom_6"
-
-shader7 = ./shaders/magicbloom/magicbloom_blur_pass_7.slang
-filter_linear7 = true
-mipmap_input7 = true
-wrap_mode7 = mirrored_repeat
-scale_type7 = source
-scale7 = 0.5
-alias7 = "tMagicBloom_7"
-
-shader8 = ./shaders/magicbloom/magicbloom_blur_pass_8.slang
-filter_linear8 = true
-mipmap_input8 = true
-wrap_mode8 = mirrored_repeat
-scale_type8 = source
-scale8 = 0.5
-alias8 = "tMagicBloom_8"
-
-shader9 = ./shaders/magicbloom/magicbloom_get_small_luma.slang
-filter_linear9 = true
-mipmap_input9 = true
-scale_type9 = absolute
-scale_x9 = 256
-scale_y9 = 256
-alias9 = "tMagicBloom_Small"
-
-shader10 = ./shaders/magicbloom/magicbloom_get_adapt.slang
-filter_linear10 = true
-mipmap_input10 = true
-scale_type10 = source
-scale10 = 1.0
-alias10 = "tMagicBloom_Adapt"
-
-shader11 = ./shaders/magicbloom/magicbloom_blend.slang
-filter_linear11 = true
-mipmap_input11 = true
-scale_type11 = viewport
-scale11 = 1.0
-
-textures = "tMagicBloom_Dirt"
-
-tMagicBloom_Dirt = "./shaders/magicbloom/MagicBloom_Dirt.png"
\ No newline at end of file
diff --git a/reshade/shaders/FilmGrain.slang b/reshade/shaders/FilmGrain.slang
deleted file mode 100644
index 52476059d6..0000000000
--- a/reshade/shaders/FilmGrain.slang
+++ /dev/null
@@ -1,128 +0,0 @@
-#version 450
-
-/**
- * FilmGrain version 1.0
- * by Christian Cann Schuldt Jensen ~ CeeJay.dk
- *
- * Computes a noise pattern and blends it with the image to create a film grain look.
- * ----------------------------------------------------------------------------------
- * Ported from https://github.com/crosire/reshade-shaders/blob/019921117c49beb4d1569af48f33cbb4e13033af/Shaders/FilmGrain.fx
- */
-
-layout(push_constant) uniform Push
-{
-    /* How visible the grain is. Higher is more visible. */
-    float Intensity;
-
-    /* Controls the variance of the Gaussian noise. Lower values look smoother. */
-    float Variance;
-
-    /* Affects the brightness of the noise. */
-    float Mean;
-
-    /* Higher Signal-to-Noise Ratio values give less grain to brighter pixels. 0 disables this feature. */
-    float SignalToNoiseRatio;
-} params;
-
-#pragma parameter Intensity "Intensity"   0.50 0.00 1.00 0.01
-#pragma parameter Variance  "Variance - lower is smoother"    0.40 0.00 1.00 0.01
-#pragma parameter Mean      "Mean - affects brightness"        0.50 0.00 1.00 0.01
-#pragma parameter SignalToNoiseRatio "SNR - higher is less grain on brighter pixels." 6.00 0.00 16.00 1.00
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-    mat4 MVP;
-    vec4 OutputSize;
-    vec4 OriginalSize;
-    vec4 SourceSize;
-    uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-    gl_Position = global.MVP * Position;
-    vTexCoord   = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in  vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#define PI 3.1415927
-
-vec3 FilmGrainPass(vec4 vpos, vec2 texcoord)
-{
-    vec3 color = texture(Source, texcoord).rgb;
-
-    //float inv_luma = dot(color, vec3(-0.2126, -0.7152, -0.0722)) + 1.0;
-    float inv_luma = dot(color, vec3(-1.0/3.0, -1.0/3.0, -1.0/3.0)) + 1.0; //Calculate the inverted luma so it can be used later to control the variance of the grain
-
-    /*---------------------.
-    | :: Generate Grain :: |
-    '---------------------*/
-
-    /* We use slang's FrameCount uniform variable instead of ReShade's Timer */
-    /* We assume frame rate is 60 */
-    float t = global.FrameCount * 16.667 * 0.0022337;
-
-
-
-    //PRNG 2D - create two uniform noise values and save one DP2ADD
-    float seed = dot(texcoord, vec2(12.9898, 78.233));// + t;
-    float sine = sin(seed);
-    float cosine = cos(seed);
-    float uniform_noise1 = fract(sine * 43758.5453 + t); //I just salt with t because I can
-    float uniform_noise2 = fract(cosine * 53758.5453 - t); // and it doesn't cost any extra ASM
-
-    //Get settings
-    float stn = params.SignalToNoiseRatio < 1.0 ?  1.0 : pow(abs(inv_luma), params.SignalToNoiseRatio); // Signal to noise feature - Brighter pixels get less noise.
-    float variance = (params.Variance*params.Variance) * stn;
-    float mean = params.Mean;
-
-    //Box-Muller transform
-    uniform_noise1 = (uniform_noise1 < 0.0001) ? 0.0001 : uniform_noise1; //fix log(0)
-
-    float r = sqrt(-log(uniform_noise1));
-    r = (uniform_noise1 < 0.0001) ? PI : r; //fix log(0) - PI happened to be the right answer for uniform_noise == ~ 0.0000517.. Close enough and we can reuse a constant.
-    float theta = (2.0 * PI) * uniform_noise2;
-
-    float gauss_noise1 = variance * r * cos(theta) + mean;
-    //float gauss_noise2 = variance * r * sin(theta) + mean; //we can get two gaussians out of it :)
-
-    //gauss_noise1 = (ddx(gauss_noise1) - ddy(gauss_noise1)) * 0.50  + gauss_noise2;
-
-
-    //Calculate how big the shift should be
-    //float grain = mix(1.0 - params.Intensity,  1.0 + params.Intensity, gauss_noise1);
-    float grain = mix(1.0 + params.Intensity,  1.0 - params.Intensity, gauss_noise1);
-
-    //float grain2 = (2.0 * params.Intensity) * gauss_noise1 + (1.0 - params.Intensity);
-
-    //Apply grain
-    color = color * grain;
-
-    //color = (grain-1.0) *2.0 + 0.5;
-
-    //color = mix(color,colorInput.rgb,sqrt(luma));
-
-    /*-------------------------.
-    | :: Debugging features :: |
-    '-------------------------*/
-
-    //color.rgb = fract(gauss_noise1).xxx; //show the noise
-    //color.rgb = (gauss_noise1 > 0.999) ? vec3(1.0,1.0,0.0) : 0.0 ; //does it reach 1.0?
-
-    return color.rgb;
-}
-
-
-void main()
-{
-    FragColor.rgb = FilmGrainPass(FragColor, vTexCoord);
-}
diff --git a/reshade/shaders/LUT/16.png b/reshade/shaders/LUT/16.png
deleted file mode 100644
index 267b393cc6..0000000000
Binary files a/reshade/shaders/LUT/16.png and /dev/null differ
diff --git a/reshade/shaders/LUT/32.png b/reshade/shaders/LUT/32.png
deleted file mode 100644
index 6ea7003f1c..0000000000
Binary files a/reshade/shaders/LUT/32.png and /dev/null differ
diff --git a/reshade/shaders/LUT/64.png b/reshade/shaders/LUT/64.png
deleted file mode 100644
index 766dca07d2..0000000000
Binary files a/reshade/shaders/LUT/64.png and /dev/null differ
diff --git a/reshade/shaders/LUT/Kurozumi_64_D65_EBU.png b/reshade/shaders/LUT/Kurozumi_64_D65_EBU.png
deleted file mode 100644
index 233a434568..0000000000
Binary files a/reshade/shaders/LUT/Kurozumi_64_D65_EBU.png and /dev/null differ
diff --git a/reshade/shaders/LUT/Kurozumi_64_D65_Rec601.png b/reshade/shaders/LUT/Kurozumi_64_D65_Rec601.png
deleted file mode 100644
index 080e2e56a9..0000000000
Binary files a/reshade/shaders/LUT/Kurozumi_64_D65_Rec601.png and /dev/null differ
diff --git a/reshade/shaders/LUT/Kurozumi_64_D93_Rec601.png b/reshade/shaders/LUT/Kurozumi_64_D93_Rec601.png
deleted file mode 100644
index 83dfed2af9..0000000000
Binary files a/reshade/shaders/LUT/Kurozumi_64_D93_Rec601.png and /dev/null differ
diff --git a/reshade/shaders/LUT/LUT.slang b/reshade/shaders/LUT/LUT.slang
deleted file mode 100755
index 38b04035c0..0000000000
--- a/reshade/shaders/LUT/LUT.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D SamplerLUT;
-
-// This shouldn't be necessary but it seems some undefined values can
-// creep in and each GPU vendor handles that differently. This keeps
-// all values within a safe range
-vec4 mixfix(vec4 a, vec4 b, float c)
-{
-	return (a.z < 1.0) ? mix(a, b, c) : a;
-}
-
-void main()
-{
-   vec2 LUT_Size = textureSize(SamplerLUT, 0);
-	vec4 imgColor = texture(Source, vTexCoord.xy);
-	float red = ( imgColor.r * (LUT_Size.y - 1.0) + 0.4999 ) / (LUT_Size.y * LUT_Size.y);
-	float green = ( imgColor.g * (LUT_Size.y - 1.0) + 0.4999 ) / LUT_Size.y;
-	float blue1 = (floor( imgColor.b  * (LUT_Size.y - 1.0) ) / LUT_Size.y) + red;
-	float blue2 = (ceil( imgColor.b  * (LUT_Size.y - 1.0) ) / LUT_Size.y) + red;
-	float mixer = clamp(max((imgColor.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-	vec4 color1 = texture( SamplerLUT, vec2( blue1, green ));
-	vec4 color2 = texture( SamplerLUT, vec2( blue2, green ));
-	FragColor = mixfix(color1, color2, mixer);
-}
diff --git a/reshade/shaders/LUT/Mitsubishi_Diamond_Pro_750SB_9300K.png b/reshade/shaders/LUT/Mitsubishi_Diamond_Pro_750SB_9300K.png
deleted file mode 100644
index f1093d3732..0000000000
Binary files a/reshade/shaders/LUT/Mitsubishi_Diamond_Pro_750SB_9300K.png and /dev/null differ
diff --git a/reshade/shaders/LUT/NEC_MultiSync_FE990_9300K.png b/reshade/shaders/LUT/NEC_MultiSync_FE990_9300K.png
deleted file mode 100644
index 03e8df54e7..0000000000
Binary files a/reshade/shaders/LUT/NEC_MultiSync_FE990_9300K.png and /dev/null differ
diff --git a/reshade/shaders/LUT/NEC_XM29plus_capture.png b/reshade/shaders/LUT/NEC_XM29plus_capture.png
deleted file mode 100644
index cea2dcd58c..0000000000
Binary files a/reshade/shaders/LUT/NEC_XM29plus_capture.png and /dev/null differ
diff --git a/reshade/shaders/LUT/Sony_Trinitron_Std_50_no_gamma.png b/reshade/shaders/LUT/Sony_Trinitron_Std_50_no_gamma.png
deleted file mode 100644
index b4422ba98b..0000000000
Binary files a/reshade/shaders/LUT/Sony_Trinitron_Std_50_no_gamma.png and /dev/null differ
diff --git a/reshade/shaders/LUT/bsnes.png b/reshade/shaders/LUT/bsnes.png
deleted file mode 100644
index 1a04414b9a..0000000000
Binary files a/reshade/shaders/LUT/bsnes.png and /dev/null differ
diff --git a/reshade/shaders/LUT/cmyk-16.png b/reshade/shaders/LUT/cmyk-16.png
deleted file mode 100644
index 4c6518e5fd..0000000000
Binary files a/reshade/shaders/LUT/cmyk-16.png and /dev/null differ
diff --git a/reshade/shaders/LUT/grade-composite.png b/reshade/shaders/LUT/grade-composite.png
deleted file mode 100644
index 45c7fe64c3..0000000000
Binary files a/reshade/shaders/LUT/grade-composite.png and /dev/null differ
diff --git a/reshade/shaders/LUT/grade-rgb.png b/reshade/shaders/LUT/grade-rgb.png
deleted file mode 100644
index c702f8c321..0000000000
Binary files a/reshade/shaders/LUT/grade-rgb.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBA-2020(dark).png b/reshade/shaders/LUT/handheld/GBA-2020(dark).png
deleted file mode 100644
index 8ad53f3d82..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBA-2020(dark).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBA-2020.png b/reshade/shaders/LUT/handheld/GBA-2020.png
deleted file mode 100644
index 0c7e469a39..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBA-2020.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBA-P3(dark).png b/reshade/shaders/LUT/handheld/GBA-P3(dark).png
deleted file mode 100644
index df2214422d..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBA-P3(dark).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBA-P3.png b/reshade/shaders/LUT/handheld/GBA-P3.png
deleted file mode 100644
index 73a7173b53..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBA-P3.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBA-sRGB(dark).png b/reshade/shaders/LUT/handheld/GBA-sRGB(dark).png
deleted file mode 100644
index f82e636b8a..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBA-sRGB(dark).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBA-sRGB.png b/reshade/shaders/LUT/handheld/GBA-sRGB.png
deleted file mode 100644
index 36b2b6ac21..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBA-sRGB.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBC-2020.png b/reshade/shaders/LUT/handheld/GBC-2020.png
deleted file mode 100644
index ad0e4eb9f9..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBC-2020.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBC-P3.png b/reshade/shaders/LUT/handheld/GBC-P3.png
deleted file mode 100644
index 528b97cca1..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBC-P3.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBC-dev.png b/reshade/shaders/LUT/handheld/GBC-dev.png
deleted file mode 100644
index 949907ce03..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBC-dev.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/GBC-sRGB.png b/reshade/shaders/LUT/handheld/GBC-sRGB.png
deleted file mode 100644
index 98db2c4b73..0000000000
Binary files a/reshade/shaders/LUT/handheld/GBC-sRGB.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/NDS-2020.png b/reshade/shaders/LUT/handheld/NDS-2020.png
deleted file mode 100644
index b48401553b..0000000000
Binary files a/reshade/shaders/LUT/handheld/NDS-2020.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/NDS-P3.png b/reshade/shaders/LUT/handheld/NDS-P3.png
deleted file mode 100644
index 9148ca7889..0000000000
Binary files a/reshade/shaders/LUT/handheld/NDS-P3.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/NDS-sRGB.png b/reshade/shaders/LUT/handheld/NDS-sRGB.png
deleted file mode 100644
index a12e6c8946..0000000000
Binary files a/reshade/shaders/LUT/handheld/NDS-sRGB.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/NSO-GBA.png b/reshade/shaders/LUT/handheld/NSO-GBA.png
deleted file mode 100644
index b81c397bfd..0000000000
Binary files a/reshade/shaders/LUT/handheld/NSO-GBA.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/NSO-GBC.png b/reshade/shaders/LUT/handheld/NSO-GBC.png
deleted file mode 100644
index c16abcec77..0000000000
Binary files a/reshade/shaders/LUT/handheld/NSO-GBC.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/PSP-2020(pure-gamma).png b/reshade/shaders/LUT/handheld/PSP-2020(pure-gamma).png
deleted file mode 100644
index 594269e5a5..0000000000
Binary files a/reshade/shaders/LUT/handheld/PSP-2020(pure-gamma).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/PSP-2020.png b/reshade/shaders/LUT/handheld/PSP-2020.png
deleted file mode 100644
index ad9d86cef8..0000000000
Binary files a/reshade/shaders/LUT/handheld/PSP-2020.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/PSP-P3(pure-gamma).png b/reshade/shaders/LUT/handheld/PSP-P3(pure-gamma).png
deleted file mode 100644
index 90548586be..0000000000
Binary files a/reshade/shaders/LUT/handheld/PSP-P3(pure-gamma).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/PSP-P3.png b/reshade/shaders/LUT/handheld/PSP-P3.png
deleted file mode 100644
index e98847f989..0000000000
Binary files a/reshade/shaders/LUT/handheld/PSP-P3.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/PSP-sRGB(pure-gamma).png b/reshade/shaders/LUT/handheld/PSP-sRGB(pure-gamma).png
deleted file mode 100644
index 9b03f13683..0000000000
Binary files a/reshade/shaders/LUT/handheld/PSP-sRGB(pure-gamma).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/PSP-sRGB.png b/reshade/shaders/LUT/handheld/PSP-sRGB.png
deleted file mode 100644
index 6ba07d02be..0000000000
Binary files a/reshade/shaders/LUT/handheld/PSP-sRGB.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SP101-2020.png b/reshade/shaders/LUT/handheld/SP101-2020.png
deleted file mode 100644
index 401d608ca9..0000000000
Binary files a/reshade/shaders/LUT/handheld/SP101-2020.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SP101-P3.png b/reshade/shaders/LUT/handheld/SP101-P3.png
deleted file mode 100644
index 77f630ea61..0000000000
Binary files a/reshade/shaders/LUT/handheld/SP101-P3.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SP101-sRGB.png b/reshade/shaders/LUT/handheld/SP101-sRGB.png
deleted file mode 100644
index fd43725bce..0000000000
Binary files a/reshade/shaders/LUT/handheld/SP101-sRGB.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SWOLED-2020(pure-gamma).png b/reshade/shaders/LUT/handheld/SWOLED-2020(pure-gamma).png
deleted file mode 100644
index a88c853e40..0000000000
Binary files a/reshade/shaders/LUT/handheld/SWOLED-2020(pure-gamma).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SWOLED-2020.png b/reshade/shaders/LUT/handheld/SWOLED-2020.png
deleted file mode 100644
index 4899744db6..0000000000
Binary files a/reshade/shaders/LUT/handheld/SWOLED-2020.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SWOLED-P3(pure-gamma).png b/reshade/shaders/LUT/handheld/SWOLED-P3(pure-gamma).png
deleted file mode 100644
index 53141bc94c..0000000000
Binary files a/reshade/shaders/LUT/handheld/SWOLED-P3(pure-gamma).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SWOLED-P3.png b/reshade/shaders/LUT/handheld/SWOLED-P3.png
deleted file mode 100644
index 7550aa51ce..0000000000
Binary files a/reshade/shaders/LUT/handheld/SWOLED-P3.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SWOLED-sRGB(pure-gamma).png b/reshade/shaders/LUT/handheld/SWOLED-sRGB(pure-gamma).png
deleted file mode 100644
index de850624c1..0000000000
Binary files a/reshade/shaders/LUT/handheld/SWOLED-sRGB(pure-gamma).png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/SWOLED-sRGB.png b/reshade/shaders/LUT/handheld/SWOLED-sRGB.png
deleted file mode 100644
index 9fcba463e2..0000000000
Binary files a/reshade/shaders/LUT/handheld/SWOLED-sRGB.png and /dev/null differ
diff --git a/reshade/shaders/LUT/handheld/VBA.png b/reshade/shaders/LUT/handheld/VBA.png
deleted file mode 100644
index 052d25418e..0000000000
Binary files a/reshade/shaders/LUT/handheld/VBA.png and /dev/null differ
diff --git a/reshade/shaders/LUT/multiLUT.slang b/reshade/shaders/LUT/multiLUT.slang
deleted file mode 100755
index 462f64f111..0000000000
--- a/reshade/shaders/LUT/multiLUT.slang
+++ /dev/null
@@ -1,72 +0,0 @@
-#version 450
-
-// A version of the LUT shader that loads 2 LUTs.
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float LUT_selector_param;
-} params;
-
-#pragma parameter LUT_selector_param "LUT Selector" 1.0 1.0 2.0 1.0
-int LUT_selector = int(params.LUT_selector_param);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D SamplerLUT1;
-layout(set = 0, binding = 4) uniform sampler2D SamplerLUT2;
-
-// This shouldn't be necessary but it seems some undefined values can
-// creep in and each GPU vendor handles that differently. This keeps
-// all values within a safe range
-vec4 mixfix(vec4 a, vec4 b, float c)
-{
-	return (a.z < 1.0) ? mix(a, b, c) : a;
-}
-
-void main()
-{
-   float LUT_Size = mix(textureSize(SamplerLUT1, 0).y, textureSize(SamplerLUT2, 0).y, params.LUT_selector_param - 1.0);
-	vec4 imgColor = texture(Source, vTexCoord.xy);
-	vec4 color1, color2 = vec4(0.,0.,0.,0.);
-	float red, green, blue1, blue2, mixer = 0.0;
-	
-	red = ( imgColor.r * (LUT_Size - 1.0) + 0.4999 ) / (LUT_Size * LUT_Size);
-	green = ( imgColor.g * (LUT_Size - 1.0) + 0.4999 ) / LUT_Size;
-	blue1 = (floor( imgColor.b  * (LUT_Size - 1.0) ) / LUT_Size) + red;
-	blue2 = (ceil( imgColor.b  * (LUT_Size - 1.0) ) / LUT_Size) + red;
-	mixer = clamp(max((imgColor.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0);
-	
-	if(LUT_selector == 1)
-	{
-   	color1 = texture( SamplerLUT1, vec2( blue1, green ));
-   	color2 = texture( SamplerLUT1, vec2( blue2, green )); 
-	}
-	else
-	{
-		color1 = texture( SamplerLUT2, vec2( blue1, green ));
-		color2 = texture( SamplerLUT2, vec2( blue2, green ));
-	}
-	FragColor = mixfix(color1, color2, mixer);
-}
diff --git a/reshade/shaders/LUT/schindlers-list-17.png b/reshade/shaders/LUT/schindlers-list-17.png
deleted file mode 100644
index 5145f6ba73..0000000000
Binary files a/reshade/shaders/LUT/schindlers-list-17.png and /dev/null differ
diff --git a/reshade/shaders/NormalsDisplacement/CurveNormals.png b/reshade/shaders/NormalsDisplacement/CurveNormals.png
deleted file mode 100644
index aa7e178b21..0000000000
Binary files a/reshade/shaders/NormalsDisplacement/CurveNormals.png and /dev/null differ
diff --git a/reshade/shaders/NormalsDisplacement/NormalsDisplacement.slang b/reshade/shaders/NormalsDisplacement/NormalsDisplacement.slang
deleted file mode 100644
index 5eefaaa6af..0000000000
--- a/reshade/shaders/NormalsDisplacement/NormalsDisplacement.slang
+++ /dev/null
@@ -1,53 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float Displacement;
-} params;
-
-#pragma parameter Displacement "Displacement Factor" 20.0 0.0 60.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D displacementMap;
-
-vec2 DisplacementLevel()
-{
-	return (params.OutputSize.zw*params.Displacement);//Displacement's value is measured in half of a pixel. Don't need to waste resources on multiplying by two.
-}
-
-vec2 CoordDisplacement(vec2 coord)
-{
-	return (coord-((texture(displacementMap, coord).xy-0.5)*DisplacementLevel()))*1.1-0.05;
-//This reads the displacement texture and sets 0.5 to be 0, 1 to be 1, and 0 to be -1,
-//and then it scales it to the displacement level previously defined.
-//The multiplication and subtraction at the end is to scale it down so it doesn't exceed the window.
-//I think it's slightly faster if I do it here and not at the end in the fragColor = line in void main().
-}
-
-void main()
-{
-   FragColor = vec4(texture(Source, CoordDisplacement(vTexCoord)).rgb, 1.0);
-}
diff --git a/reshade/shaders/blendoverlay/blendoverlay.slang b/reshade/shaders/blendoverlay/blendoverlay.slang
deleted file mode 100644
index d5656297b8..0000000000
--- a/reshade/shaders/blendoverlay/blendoverlay.slang
+++ /dev/null
@@ -1,71 +0,0 @@
-#version 450
-
-// blendoverlay
-// based on:
-// https://github.com/jamieowen/glsl-blend for blendOverlay
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float OverlayMix;
-	float LUTWidth;
-	float LUTHeight;
-} params;
-
-#pragma parameter OverlayMix "Overlay Mix" 1.0 0.0 1.0 0.05
-#pragma parameter LUTWidth "LUT Width" 6.0 1.0 1920.0 1.0
-#pragma parameter LUTHeight "LUT Height" 4.0 1.0 1920.0 1.0
-
-#define OverlayMix params.OverlayMix
-#define LUTWidth params.LUTWidth
-#define LUTHeight params.LUTHeight
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D overlay;
-
-float blendOverlay(float base, float blend) {
-	return base<0.5?(2.0*base*blend):(1.0-2.0*(1.0-base)*(1.0-blend));
-}
-
-void main()
-{
-    vec3  Picture    = texture(Source, vTexCoord).xyz;
-
-    float Luminance    = 0.299*Picture.x + 0.587*Picture.y + 0.114*Picture.z;
-
-    vec2  LutCoord   = vec2(fract(vTexCoord.x*params.OutputSize.x/LUTWidth),fract(vTexCoord.y*params.OutputSize.y/LUTHeight));
-
-    vec3  ShadowMask = texture(overlay, LutCoord).xyz;
-    
-    vec3 ImageFinal  = Picture;
-    
-    ImageFinal.r = blendOverlay(ImageFinal.r,ShadowMask.r);
-    ImageFinal.g = blendOverlay(ImageFinal.g,ShadowMask.g);
-    ImageFinal.b = blendOverlay(ImageFinal.b,ShadowMask.b);
-    
-    ImageFinal   = mix(Picture,clamp(ImageFinal,0.0,1.0),OverlayMix);
-    
-    FragColor = vec4(ImageFinal,1.0);
-}
diff --git a/reshade/shaders/blendoverlay/grayscale_slotmask.png b/reshade/shaders/blendoverlay/grayscale_slotmask.png
deleted file mode 100644
index 2b211edc13..0000000000
Binary files a/reshade/shaders/blendoverlay/grayscale_slotmask.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/monochrome-matrix-3px.png b/reshade/shaders/blendoverlay/monochrome-matrix-3px.png
deleted file mode 100644
index f718f74e81..0000000000
Binary files a/reshade/shaders/blendoverlay/monochrome-matrix-3px.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/phosphorlut-10x10.png b/reshade/shaders/blendoverlay/phosphorlut-10x10.png
deleted file mode 100644
index 8f8c3d67f9..0000000000
Binary files a/reshade/shaders/blendoverlay/phosphorlut-10x10.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/phosphorlut-6x6.png b/reshade/shaders/blendoverlay/phosphorlut-6x6.png
deleted file mode 100644
index db76045b24..0000000000
Binary files a/reshade/shaders/blendoverlay/phosphorlut-6x6.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/phosphorlut-8x8.png b/reshade/shaders/blendoverlay/phosphorlut-8x8.png
deleted file mode 100644
index 312cf457b2..0000000000
Binary files a/reshade/shaders/blendoverlay/phosphorlut-8x8.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/shadowmask-4x4.png b/reshade/shaders/blendoverlay/shadowmask-4x4.png
deleted file mode 100644
index bc651933a4..0000000000
Binary files a/reshade/shaders/blendoverlay/shadowmask-4x4.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/shadowmask-6x3.png b/reshade/shaders/blendoverlay/shadowmask-6x3.png
deleted file mode 100644
index 22c0495dda..0000000000
Binary files a/reshade/shaders/blendoverlay/shadowmask-6x3.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/shenlong-4x2.png b/reshade/shaders/blendoverlay/shenlong-4x2.png
deleted file mode 100644
index 2895871571..0000000000
Binary files a/reshade/shaders/blendoverlay/shenlong-4x2.png and /dev/null differ
diff --git a/reshade/shaders/blendoverlay/shenlong-6x4.png b/reshade/shaders/blendoverlay/shenlong-6x4.png
deleted file mode 100644
index 2b211edc13..0000000000
Binary files a/reshade/shaders/blendoverlay/shenlong-6x4.png and /dev/null differ
diff --git a/reshade/shaders/bloom-pass-sh1nra358.slang b/reshade/shaders/bloom-pass-sh1nra358.slang
deleted file mode 100755
index d52582e2c1..0000000000
--- a/reshade/shaders/bloom-pass-sh1nra358.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-// Implementation based on the article "Efficient Gaussian blur with linear sampling"
-// http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
-/* A version for MasterEffect Reborn, a standalone version, and a custom shader version for SweetFX can be 
-   found at http://reshade.me/forum/shader-presentation/27-gaussian-blur-bloom-unsharpmask */
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float BloomIntensity;
-} params;
-
-#pragma parameter BloomIntensity "BloomIntensity" 3.0 1.0 4.0 0.1
-#define BloomIntensity params.BloomIntensity
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec4 color = texture(Source, vTexCoord);
-   FragColor = vec4(color.rgb * pow (abs (max (color.r, max (color.g, color.b))), 2.0), 2.0f)*BloomIntensity;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/BloomPass0.slang b/reshade/shaders/bloom/BloomPass0.slang
deleted file mode 100755
index a981dafcbc..0000000000
--- a/reshade/shaders/bloom/BloomPass0.slang
+++ /dev/null
@@ -1,57 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   vec4 bloom = vec4(0.);
-   vec4 tempbloom = vec4(0.);
-   vec2 bloomuv = vec2(0.);
-
-   const vec2 offset[4] = {
-      vec2(1.0, 1.0),
-      vec2(1.0, 1.0),
-      vec2(-1.0, 1.0),
-      vec2(-1.0, -1.0)
-   };
-
-   for (int i = 0; i < 4; i++)
-   {
-      bloomuv = offset[i] * PixelSize * 2.;
-      bloomuv += vTexCoord.xy;
-      tempbloom = textureLod(BackBuffer, vec2(bloomuv.xy), 0.);
-      tempbloom.w = max(0., dot(tempbloom.xyz, vec3(0.333)) - global.fAnamFlareThreshold);
-      tempbloom.xyz = max(vec3(0.), tempbloom.xyz - vec3(global.fBloomThreshold)); 
-      bloom += tempbloom;
-   }
-
-   bloom *= 0.25;
-   FragColor = bloom;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/BloomPass1.slang b/reshade/shaders/bloom/BloomPass1.slang
deleted file mode 100755
index 3fd1811947..0000000000
--- a/reshade/shaders/bloom/BloomPass1.slang
+++ /dev/null
@@ -1,57 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D SamplerBloom1;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   vec4 bloom = vec4(0.0);
-
-   const vec2 offset[8] = {
-      vec2(1.0, 1.0),
-      vec2(0.0, -1.0),
-      vec2(-1.0, 1.0),
-      vec2(-1.0, -1.0),
-      vec2(0.0, 1.0),
-      vec2(0.0, -1.0),
-      vec2(1.0, 0.0),
-      vec2(-1.0, 0.0)
-   };
-
-   for (int i = 0; i < 8; i++)
-   {
-      vec2 bloomuv = offset[i] * PixelSize * 4.;
-      bloomuv += vTexCoord;
-      bloom += textureLod(SamplerBloom1, vec2(bloomuv), 0);
-   }
-
-   bloom *= 0.125;
-   FragColor = bloom;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/BloomPass2.slang b/reshade/shaders/bloom/BloomPass2.slang
deleted file mode 100755
index 869c080847..0000000000
--- a/reshade/shaders/bloom/BloomPass2.slang
+++ /dev/null
@@ -1,57 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D SamplerBloom2;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   vec4 bloom = vec4(0.0);
-
-   const vec2 offset[8] = {
-      vec2(0.707, 0.707),
-      vec2(0.707, -0.707),
-      vec2(-0.707, 0.707),
-      vec2(-0.707, -0.707),
-      vec2(0.0, 1.0),
-      vec2(0.0, -1.0),
-      vec2(1.0, 0.0),
-      vec2(-1.0, 0.0)
-   };
-
-   for (int i = 0; i < 8; i++)
-   {
-      vec2 bloomuv = offset[i] * PixelSize * 8.;
-      bloomuv += vTexCoord.xy;
-      bloom += textureLod(SamplerBloom2, vec2(bloomuv), 0.);
-   }
-
-   bloom *= 0.5; // brighten up the sample, it will lose brightness in H/V Gaussian blur
-   FragColor = bloom;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/BloomPass3.slang b/reshade/shaders/bloom/BloomPass3.slang
deleted file mode 100755
index 3cfc1669ee..0000000000
--- a/reshade/shaders/bloom/BloomPass3.slang
+++ /dev/null
@@ -1,39 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D SamplerBloom3;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   vec4 bloom = GaussBlur22(vTexCoord.xy, SamplerBloom3, 16., 0., false);
-   bloom.w *= global.fAnamFlareAmount;
-   bloom.xyz *= global.fBloomAmount;
-   FragColor = bloom;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/BloomPass4.slang b/reshade/shaders/bloom/BloomPass4.slang
deleted file mode 100755
index b64e164437..0000000000
--- a/reshade/shaders/bloom/BloomPass4.slang
+++ /dev/null
@@ -1,39 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D SamplerBloom4;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   vec4 bloom = vec4(0.);
-   bloom.xyz = GaussBlur22(vTexCoord, SamplerBloom4, 16., 0., true).xyz * 2.5;   
-   bloom.w = GaussBlur22(vTexCoord, SamplerBloom4, 32 * global.fAnamFlareWideness, 0., false).w * 2.5; // to have anamflare texture (bloom.w) avoid vertical blur
-   FragColor = bloom;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/LensDB.png b/reshade/shaders/bloom/LensDB.png
deleted file mode 100644
index 646972e200..0000000000
Binary files a/reshade/shaders/bloom/LensDB.png and /dev/null differ
diff --git a/reshade/shaders/bloom/LensFlarePass0.slang b/reshade/shaders/bloom/LensFlarePass0.slang
deleted file mode 100755
index 33b568192b..0000000000
--- a/reshade/shaders/bloom/LensFlarePass0.slang
+++ /dev/null
@@ -1,174 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 OriginalSize;
-   vec4 OutputSize;
-   uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   vec4 lens = vec4(0.);
-
-   // Lenz
-   if (bLenzEnable)
-   {
-      const vec3 lfoffset[19] = {
-         vec3(0.9, 0.01, 4),
-         vec3(0.7, 0.25, 25),
-         vec3(0.3, 0.25, 15),
-         vec3(1, 1.0, 5),
-         vec3(-0.15, 20, 1),
-         vec3(-0.3, 20, 1),
-         vec3(6, 6, 6),
-         vec3(7, 7, 7),
-         vec3(8, 8, 8),
-         vec3(9, 9, 9),
-         vec3(0.24, 1, 10),
-         vec3(0.32, 1, 10),
-         vec3(0.4, 1, 10),
-         vec3(0.5, -0.5, 2),
-         vec3(2, 2, -5),
-         vec3(-5, 0.2, 0.2),
-         vec3(20, 0.5, 0),
-         vec3(0.4, 1, 10),
-         vec3(0.00001, 10, 20)
-      };
-      const vec3 lffactors[19] = {
-         vec3(1.5, 1.5, 0),
-         vec3(0, 1.5, 0),
-         vec3(0, 0, 1.5),
-         vec3(0.2, 0.25, 0),
-         vec3(0.15, 0, 0),
-         vec3(0, 0, 0.15),
-         vec3(1.4, 0, 0),
-         vec3(1, 1, 0),
-         vec3(0, 1, 0),
-         vec3(0, 0, 1.4),
-         vec3(1, 0.3, 0),
-         vec3(1, 1, 0),
-         vec3(0, 2, 4),
-         vec3(0.2, 0.1, 0),
-         vec3(0, 0, 1),
-         vec3(1, 1, 0),
-         vec3(1, 1, 0),
-         vec3(0, 0, 0.2),
-         vec3(0.012,0.313,0.588)
-      };
-
-      vec2 lfcoord = vec2(0.);
-      vec3 lenstemp = vec3(0.);
-      vec2 distfact = vTexCoord.xy - 0.5;
-      distfact.x *= params.SourceSize.x / params.SourceSize.y;
-
-      for (int i = 0; i < 19; i++)
-      {
-         lfcoord.xy = lfoffset[i].x * distfact;
-         lfcoord.xy *= pow(2.0 * length(distfact), lfoffset[i].y * 3.5);
-         lfcoord.xy *= lfoffset[i].z;
-         lfcoord.xy = 0.5 - lfcoord.xy;
-         vec2 tempfact = (lfcoord.xy - 0.5) * 2.;
-         float templensmult = clamp(1.0 - dot(tempfact, tempfact), 0., 1.);
-         vec3 lenstemp1 = vec3(dot(textureLod(BackBuffer, vec2(lfcoord.xy), 1.0).rgb, vec3(0.333)));
-/* Doesn't exist in RetroArch, so comment it out
-#if LENZ_DEPTH_CHECK
-         float templensdepth = texture(ReShade::DepthBuffer, lfcoord.xy).x;
-         if (templensdepth < 0.99999)
-            lenstemp1 = 0;
-#endif
-*/
-         lenstemp1 = max(vec3(0.), lenstemp1.xyz - vec3(global.fLenzThreshold));
-         lenstemp1 *= lffactors[i] * templensmult;
-
-         lenstemp += lenstemp1;
-      }
-
-      lens.rgb += lenstemp * global.fLenzIntensity;
-   }
-
-   // Chapman Lens
-   if (bChapFlareEnable)
-   {
-      vec2 sample_vector = (vec2(0.5, 0.5) - vTexCoord.xy) * global.fChapFlareDispersal;
-      vec2 halo_vector = normalize(sample_vector) * global.fChapFlareSize;
-
-      vec3 chaplens = GetDistortedTex(BackBuffer, vTexCoord.xy + halo_vector, halo_vector, fChapFlareCA * 2.5).rgb;
-
-      for (int j = 0; j < int(global.iChapFlareCount); ++j)
-      {
-         vec2 foffset = sample_vector * float(j);
-         chaplens += GetDistortedTex(BackBuffer, vTexCoord.xy + foffset, foffset, fChapFlareCA).rgb;
-      }
-
-      chaplens *= 1.0 / global.iChapFlareCount;
-      lens.xyz += chaplens;
-   }
-
-   // Godrays
-   if (bGodrayEnable)
-   {
-      const vec2 ScreenLightPos = vec2(0.5, 0.5);
-      vec2 texcoord2 = vTexCoord;
-      vec2 deltaTexCoord = (texcoord2 - ScreenLightPos);
-      deltaTexCoord *= 1.0 / global.iGodraySamples * global.fGodrayDensity;
-
-      float illuminationDecay = 1.0;
-
-      for (int g = 0; g < int(global.iGodraySamples); g++)
-      {
-         texcoord2 -= deltaTexCoord;;
-         vec4 sample2 = textureLod(BackBuffer, vec2(texcoord2), 0.);
-//         float sampledepth = textureLod(BackBuffer, vec2(texcoord2), 0.).x; //no depth checking in RA so just comment it out
-         sample2.w = clamp(dot(sample2.xyz, vec3(0.3333)) - global.fGodrayThreshold, 0., 1.);
-         sample2.r *= 1.00;
-         sample2.g *= 0.95;
-         sample2.b *= 0.85;
-         sample2 *= illuminationDecay * global.fGodrayWeight;
-#if GODRAY_DEPTH_CHECK == 1
-         if (sampledepth > 0.99999)
-            lens.rgb += sample2.xyz * sample2.w;
-#else
-         lens.rgb += sample2.xyz * sample2.w;
-#endif
-         illuminationDecay *= global.fGodrayDecay;
-      }
-   }
-
-   // Anamorphic flare
-   if (bAnamFlareEnable)
-   {
-      vec3 anamFlare = vec3(0.);
-      const float gaussweight[5] = { 0.2270270270, 0.1945945946, 0.1216216216, 0.0540540541, 0.0162162162 };
-
-      for (int z = -4; z < 5; z++)
-      {
-         anamFlare += GetAnamorphicSample(0, vTexCoord.xy + vec2(0, z * PixelSize.y * 2.), global.fFlareBlur) * fFlareTint * gaussweight[abs(z)];
-      }
-
-      lens.xyz += anamFlare * global.fFlareIntensity;
-   }
-   FragColor = lens;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/LensFlarePass1.slang b/reshade/shaders/bloom/LensFlarePass1.slang
deleted file mode 100755
index a541dfea55..0000000000
--- a/reshade/shaders/bloom/LensFlarePass1.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   FragColor = GaussBlur22(vTexCoord, Source, 2., 0., true);
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/LensFlarePass2.slang b/reshade/shaders/bloom/LensFlarePass2.slang
deleted file mode 100755
index 3db9da0225..0000000000
--- a/reshade/shaders/bloom/LensFlarePass2.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-
-#include "frag_funcs.inc"
-
-void main()
-{
-   FragColor = GaussBlur22(vTexCoord, Source, 2., 0., false);
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/LensSprite.png b/reshade/shaders/bloom/LensSprite.png
deleted file mode 100644
index 3e922dcf48..0000000000
Binary files a/reshade/shaders/bloom/LensSprite.png and /dev/null differ
diff --git a/reshade/shaders/bloom/LightingCombine.slang b/reshade/shaders/bloom/LightingCombine.slang
deleted file mode 100755
index daa2475e56..0000000000
--- a/reshade/shaders/bloom/LightingCombine.slang
+++ /dev/null
@@ -1,102 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D Original;
-layout(set = 0, binding = 4) uniform sampler2D SamplerBloom3;
-layout(set = 0, binding = 5) uniform sampler2D SamplerBloom5;
-layout(set = 0, binding = 6) uniform sampler2D Dirt;
-layout(set = 0, binding = 7) uniform sampler2D Sprite;
-layout(set = 0, binding = 8) uniform sampler2D LensFlare1;
-
-#include "frag_funcs.inc"
-
-#define saturate(c) clamp(c, 0., 1.)
-
-void main()
-{
-   vec4 color = vec4(0.);
-   color = texture(BackBuffer, vTexCoord.xy);
-
-   // Bloom
-   vec3 colorbloom = vec3(0.);
-   colorbloom += texture(SamplerBloom3, vTexCoord.xy).rgb * 1.0;
-   colorbloom += texture(SamplerBloom5, vTexCoord.xy).rgb * 9.0;
-   colorbloom *= 0.1;
-   colorbloom = saturate(colorbloom);
-   float colorbloomgray = dot(colorbloom, vec3(0.333));
-   colorbloom = mix(vec3(colorbloomgray), colorbloom, vec3(global.fBloomSaturation));
-   colorbloom *= fBloomTint;
-
-   if (global.iBloomMixmode == 0.)
-      color.rgb += colorbloom;
-   else if (global.iBloomMixmode == 1.)
-      color.rgb = 1. - (1. - color.rgb) * (1. - colorbloom);
-   else if (global.iBloomMixmode == 2.)
-      color.rgb = max(vec3(0.0), max(color.rgb, mix(color.rgb, (1. - (1. - saturate(colorbloom)) * (1. - saturate(colorbloom))), 1.0)));
-   else if (global.iBloomMixmode == 3.)
-      color.rgb = max(color.rgb, colorbloom);
-
-   // Anamorphic flare
-   if (bAnamFlareEnable)
-   {
-      vec3 anamflare = texture(SamplerBloom5, vTexCoord.xy).w * 2. * fAnamFlareColor;
-      anamflare = max(anamflare, 0.0);
-      color.rgb += pow(anamflare, vec3(1.0 / global.fAnamFlareCurve));
-   }
-
-   // Lens dirt
-   if (bLensdirtEnable)
-   {
-      float lensdirtmult = dot(texture(SamplerBloom5, vTexCoord).rgb, vec3(0.333));
-      vec3 dirttex = texture(Dirt, vTexCoord).rgb;
-      vec3 lensdirt = dirttex * lensdirtmult * global.fLensdirtIntensity;
-
-      lensdirt = mix(vec3(dot(lensdirt.xyz, vec3(0.333))), lensdirt.xyz, vec3(global.fLensdirtSaturation));
-
-      if (global.iLensdirtMixmode == 0.)
-         color.rgb += lensdirt;
-      else if (global.iLensdirtMixmode == 1.)
-         color.rgb = 1. - (1. - color.rgb) * (1. - lensdirt);
-      else if (global.iLensdirtMixmode == 2.)
-         color.rgb = max(vec3(0.0), max(color.rgb, mix(color.rgb, (1. - (1. - saturate(lensdirt)) * (1. - saturate(lensdirt))), 1.0)));
-      else if (global.iLensdirtMixmode == 3.)
-         color.rgb = max(color.rgb, lensdirt);
-   }
-
-   // Lens flares
-   if (bAnamFlareEnable || bLenzEnable || bGodrayEnable || bChapFlareEnable)
-   {
-      vec3 lensflareSample = texture(LensFlare1, vTexCoord.xy).rgb, lensflareMask;
-      lensflareMask  = texture(Sprite, vTexCoord + vec2( 0.5,  0.5) * PixelSize).rgb;
-      lensflareMask += texture(Sprite, vTexCoord + vec2(-0.5,  0.5) * PixelSize).rgb;
-      lensflareMask += texture(Sprite, vTexCoord + vec2( 0.5, -0.5) * PixelSize).rgb;
-      lensflareMask += texture(Sprite, vTexCoord + vec2(-0.5, -0.5) * PixelSize).rgb;
-
-      color.rgb += lensflareMask * 0.25 * lensflareSample;
-   }
-   FragColor = color;
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/frag_funcs.inc b/reshade/shaders/bloom/frag_funcs.inc
deleted file mode 100644
index 6132709214..0000000000
--- a/reshade/shaders/bloom/frag_funcs.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-#define PixelSize (params.SourceSize.zw)
-#define BackBuffer Original
-
-vec4 GaussBlur22(vec2 coord, sampler2D tex, float mult, float lodlevel, bool isBlurVert)
-{
-   vec4 sum = vec4(0.);
-   vec2 axis = isBlurVert ? vec2(0., 1.) : vec2(1., 0.);
-
-   const float weight[11] = {
-      0.082607,
-      0.080977,
-      0.076276,
-      0.069041,
-      0.060049,
-      0.050187,
-      0.040306,
-      0.031105,
-      0.023066,
-      0.016436,
-      0.011254
-   };
-
-   for (int i = -10; i < 11; i++)
-   {
-      float currweight = weight[abs(i)];
-      sum += textureLod(tex, vec2(coord.xy + axis.xy * float(i) * PixelSize * mult), lodlevel) * currweight;
-   }
-
-   return sum;
-}
-
-vec3 GetDnB(sampler2D tex, vec2 coords)
-{
-   vec3 color = vec3(max(0, dot(textureLod(tex, vec2(coords.xy), 4.).rgb, vec3(0.333)) - global.fChapFlareThreshold) * global.fChapFlareIntensity);
-/* This isn't something RA has, so just comment it out
-#if CHAPMAN_DEPTH_CHECK
-   if (textureLod(ReShade::DepthBuffer, vec4(coords.xy, 0, 3)).x < 0.99999)
-      color = 0;
-#endif
-*/
-   return color;
-}
-vec3 GetDistortedTex(sampler2D tex, vec2 sample_center, vec2 sample_vector, vec3 distortion)
-{
-   vec2 final_vector = sample_center + sample_vector * min(min(distortion.r, distortion.g), distortion.b);
-
-   if (final_vector.x > 1.0 || final_vector.y > 1.0 || final_vector.x < -1.0 || final_vector.y < -1.0)
-      return vec3(0, 0, 0);
-   else
-      return vec3(
-         GetDnB(tex, sample_center + sample_vector * distortion.r).r,
-         GetDnB(tex, sample_center + sample_vector * distortion.g).g,
-         GetDnB(tex, sample_center + sample_vector * distortion.b).b);
-}
-
-vec3 GetBrightPass(vec2 coords)
-{
-   vec3 c = texture(BackBuffer, coords).rgb;
-   vec3 bC = max(c - global.fFlareLuminance.xxx, 0.0);
-   float bright = dot(bC, vec3(1.0));
-   bright = smoothstep(0.0f, 0.5, bright);
-   vec3 result = mix(vec3(0.0), c, vec3(bright));
-/* This isn't something RA has, so just comment it out
-#if FLARE_DEPTH_CHECK
-   float checkdepth = tex2D(ReShade::DepthBuffer, coords).x;
-   if (checkdepth < 0.99999)
-      result = 0;
-#endif
-*/
-   return result;
-}
-vec3 GetAnamorphicSample(int axis, vec2 coords, float blur)
-{
-   coords = 2.0 * coords - 1.0;
-   coords.x /= -blur;
-   coords = 0.5 * coords + 0.5;
-   return GetBrightPass(coords);
-}
\ No newline at end of file
diff --git a/reshade/shaders/bloom/params.inc b/reshade/shaders/bloom/params.inc
deleted file mode 100644
index b1801ecc4e..0000000000
--- a/reshade/shaders/bloom/params.inc
+++ /dev/null
@@ -1,159 +0,0 @@
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   float iBloomMixmode;
-   float fBloomThreshold;
-   float fBloomAmount;
-   float fBloomSaturation;
-   float fBloomTint_r;
-   float fBloomTint_g;
-   float fBloomTint_b;
-   float bLensdirtEnable_toggle;
-   float iLensdirtMixmode;
-   float fLensdirtIntensity;
-   float fLensdirtSaturation;
-   float fLensdirtTint_r;
-   float fLensdirtTint_g;
-   float fLensdirtTint_b;
-   float bAnamFlareEnable_toggle;
-   float fAnamFlareThreshold;
-   float fAnamFlareWideness;
-   float fAnamFlareAmount;
-   float fAnamFlareCurve;
-   float fAnamFlareColor_r;
-   float fAnamFlareColor_g;
-   float fAnamFlareColor_b;
-   float bLenzEnable_toggle;
-   float fLenzIntensity;
-   float fLenzThreshold;
-   float bChapFlareEnable_toggle;
-   float fChapFlareThreshold;
-   float iChapFlareCount;
-   float fChapFlareDispersal;
-   float fChapFlareSize;
-   float fChapFlareCA_r;
-   float fChapFlareCA_g;
-   float fChapFlareCA_b;
-   float fChapFlareIntensity;
-   float bGodrayEnable_toggle;
-   float fGodrayDecay;
-   float fGodrayExposure;
-   float fGodrayWeight;
-   float fGodrayDensity;
-   float fGodrayThreshold;
-   float iGodraySamples;
-   float fFlareLuminance;
-   float fFlareBlur;
-   float fFlareIntensity;
-   float fFlareTint_r;
-   float fFlareTint_g;
-   float fFlareTint_b;
-} global;
-
-#pragma parameter bLensdirtEnable_toggle "Lens Dirt Enable" 0.0 0.0 1.0 1.0
-#pragma parameter bAnamFlareEnable_toggle "Anam Flare Enable" 0.0 0.0 1.0 1.0
-#pragma parameter bLenzEnable_toggle "Lenz Enable" 0.0 0.0 1.0 1.0
-#pragma parameter bChapFlareEnable_toggle "Chap Flare Enable" 0.0 0.0 1.0 1.0
-#pragma parameter bGodrayEnable_toggle "Godray Enable" 0.0 0.0 1.0 1.0
-
-#pragma parameter iBloomMixmode "Bloom Mix Mode" 0.0 0.0 2.0 1.0
-//Linear add\0Screen add\0Screen/Lighten/Opacity\0Lighten\0
-#pragma parameter fBloomThreshold "Bloom Threshold" 0.8 0.1 1.0 0.1
-//Every pixel brighter than this value triggers bloom.
-#pragma parameter fBloomAmount "Bloom Amount" 0.8 0.0 20.0 0.1
-//Intensity of bloom.
-#pragma parameter fBloomSaturation "Bloom Saturation" 0.8 0.0 2.0 0.1
-//Bloom saturation. 0.0 means white bloom, 2.0 means very, very colorful bloom.
-#pragma parameter fBloomTint_r "Bloom Tint R" 0.7 0.0 1.0 0.05
-#pragma parameter fBloomTint_g "Bloom Tint G" 0.8 0.0 1.0 0.05
-#pragma parameter fBloomTint_b "Bloom Tint B" 1.0 0.0 1.0 0.05
-//R, G and B components of bloom tint the bloom color gets shifted to.
-#pragma parameter iLensdirtMixmode "Lens Dirt Mix Mode" 0.0 0.0 3.0 1.0
-//Linear add\0Screen add\0Screen/Lighten/Opacity\0Lighten\0
-#pragma parameter fLensdirtIntensity "Lens Dirt Intensity" 0.4 0.0 2.0 0.1
-//Intensity of lensdirt.
-#pragma parameter fLensdirtSaturation "Lens Dirt Saturation" 2.0 0.0 2.0 0.1
-//Color saturation of lensdirt.
-#pragma parameter fLensdirtTint_r "Lens Dirt Tint R" 1.0 0.0 1.0 0.05
-#pragma parameter fLensdirtTint_g "Lens Dirt Tint G" 1.0 0.0 1.0 0.05
-#pragma parameter fLensdirtTint_b "Lens Dirt Tint B" 1.0 0.0 1.0 0.05
-//R, G and B components of lensdirt tint the lensdirt color gets shifted to.
-#pragma parameter fAnamFlareThreshold "Anam Flare Threshold" 0.9 0.1 1.0 0.1
-//Every pixel brighter than this value gets a flare.
-#pragma parameter fAnamFlareWideness "Anam Flare Width" 2.4 1.0 2.5 0.1
-//Horizontal wideness of flare. Don't set too high, otherwise the single samples are visible.
-#pragma parameter fAnamFlareAmount "Anam Flare Amt" 14.5 1.0 20.0 0.5
-//Intensity of anamorphic flare.
-#pragma parameter fAnamFlareCurve "Anam Flare Curve" 1.2 1.0 2.0 0.1
-//Intensity curve of flare with distance from source.
-#pragma parameter fAnamFlareColor_r "Anam Flare Col R" 0.012 0.0 1.0 0.01
-#pragma parameter fAnamFlareColor_g "Anam Flare Col G" 0.313 0.0 1.0 0.01
-#pragma parameter fAnamFlareColor_b "Anam Flare Col B" 0.588 0.0 1.0 0.01
-//R, G and B components of anamorphic flare. Flare is always same color.
-#pragma parameter fLenzIntensity "Lenz Intensity" 1.0 0.2 3.0 0.1
-//Power of lens flare effect
-#pragma parameter fLenzThreshold "Lenz Threshold" 0.8 0.6 1.0 0.1
-//Minimum brightness an object must have to cast lensflare.
-#pragma parameter fChapFlareThreshold "Chap Flare Threshold" 0.9 0.7 0.99 0.05
-//Brightness threshold for lensflare generation. Everything brighter than this value gets a flare.
-#pragma parameter iChapFlareCount "Chap Flare Count" 15.0 1.0 20.0 1.0
-//Number of single halos to be generated. If set to 0, only the curved halo around is visible.
-#pragma parameter fChapFlareDispersal "Chap Flare Dispersal" 0.25 0.25 1.0 0.05
-//Distance from screen center (and from themselves) the flares are generated.
-#pragma parameter fChapFlareSize "Chap Flare Size" 0.45 0.2 0.8 0.05
-//Distance (from screen center) the halo and flares are generated.
-#pragma parameter fChapFlareCA_r "Chap Flare CA R" 0.0 0.0 1.0 0.01
-#pragma parameter fChapFlareCA_g "Chap Flare CA G" 0.01 0.0 1.0 0.01
-#pragma parameter fChapFlareCA_b "Chap Flare CA B" 0.02 0.0 1.0 0.01
-//Offset of RGB components of flares as modifier for Chromatic abberation. Same 3 values means no CA.
-#pragma parameter fChapFlareIntensity "Chap Flare Intensity" 100.0 5.0 200.0 5.0
-//Intensity of flares and halo, remember that higher threshold lowers intensity, you might play with both values to get desired result.
-#pragma parameter fGodrayDecay "Godray Decay" 0.99 0.5 0.9999 0.05
-//How fast they decay. It's logarithmic, 1.0 means infinite long rays which will cover whole screen
-#pragma parameter fGodrayExposure "Godray Exposure" 1.0 0.7 1.5 0.05
-//Upscales the godray's brightness
-#pragma parameter fGodrayWeight "Godray Weight" 1.25 0.8 1.7 0.05
-//weighting
-#pragma parameter fGodrayDensity "Godray Density" 1.0 0.2 2.0 0.2
-//Density of rays, higher means more and brighter rays
-#pragma parameter fGodrayThreshold "Godray Threshold" 0.9 0.6 1.0 0.05
-//Minimum brightness an object must have to cast godrays
-#pragma parameter iGodraySamples "Godray Samples" 128.0 16.0 256.0 16.0
-//2^x format values; How many samples the godrays get
-#pragma parameter fFlareLuminance "Flare Luminance" 0.095 0.0 1.0 0.005
-//bright pass luminance value
-#pragma parameter fFlareBlur "Flare Blur" 200.0 1.0 10000.0 50.0
-//manages the size of the flare
-#pragma parameter fFlareIntensity "Flare Intensity" 2.07 0.2 5.0 0.1
-//effect intensity
-#pragma parameter fFlareTint_r "Flare Tint R" 0.137 0.0 1.0 0.05
-#pragma parameter fFlareTint_g "Flare Tint G" 0.216 0.0 1.0 0.05
-#pragma parameter fFlareTint_b "Flare Tint B" 1.0 0.0 1.0 0.05
-//effect tint RGB
-
-vec3 fFlareTint = vec3(global.fFlareTint_r, global.fFlareTint_g, global.fFlareTint_b);
-vec3 fAnamFlareColor = vec3(global.fAnamFlareColor_r, global.fAnamFlareColor_g, global.fAnamFlareColor_b);
-vec3 fLensdirtTint = vec3(global.fLensdirtTint_r, global.fLensdirtTint_g, global.fLensdirtTint_b);
-vec3 fBloomTint = vec3(global.fBloomTint_r, global.fBloomTint_g, global.fBloomTint_b);
-vec3 fChapFlareCA = vec3(global.fChapFlareCA_r, global.fChapFlareCA_g, global.fChapFlareCA_b);
-
-bool bGodrayEnable = bool(global.bGodrayEnable_toggle);
-bool bChapFlareEnable = bool(global.bChapFlareEnable_toggle);
-bool bLenzEnable = bool(global.bLenzEnable_toggle);
-bool bAnamFlareEnable = bool(global.bAnamFlareEnable_toggle);
-bool bLensdirtEnable = bool(global.bLensdirtEnable_toggle);
-
-// If 1, only pixels with depth = 1 get lens flares
-// This prevents white objects from getting lens flares sources, which would normally happen in LDR
-#ifndef LENZ_DEPTH_CHECK
-   #define LENZ_DEPTH_CHECK 0
-#endif
-#ifndef CHAPMAN_DEPTH_CHECK
-   #define CHAPMAN_DEPTH_CHECK 0
-#endif
-#ifndef GODRAY_DEPTH_CHECK
-   #define GODRAY_DEPTH_CHECK 0
-#endif
-#ifndef FLARE_DEPTH_CHECK
-   #define FLARE_DEPTH_CHECK 0
-#endif
\ No newline at end of file
diff --git a/reshade/shaders/blur-haze-sh1nra358.slang b/reshade/shaders/blur-haze-sh1nra358.slang
deleted file mode 100755
index 44e26c1be7..0000000000
--- a/reshade/shaders/blur-haze-sh1nra358.slang
+++ /dev/null
@@ -1,161 +0,0 @@
-#version 450
-
-// Implementation based on the article "Efficient Gaussian blur with linear sampling"
-// http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
-/* A version for MasterEffect Reborn, a standalone version, and a custom shader version for SweetFX can be 
-   found at http://reshade.me/forum/shader-presentation/27-gaussian-blur-bloom-unsharpmask */
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float GaussStrength;
-	float BloomStrength;
-	float SW;
-	float BRIGHT;
-} params;
-
- /*-----------------------------------------------------------.
-/                  Gaussian Blur settings                     /
-'-----------------------------------------------------------*/
-
-#pragma parameter GaussStrength "Gauss Strength" 0.30 0.0 1.0 0.01
-#define GaussStrength params.GaussStrength
-#pragma parameter BloomStrength "Bloom Strength" 0.33 0.000 1.000 0.005
-#define BloomStrength params.BloomStrength
-#pragma parameter SW             "Haze Width"     2.0 1.0 4.0 0.25
-#define SW params.SW
-#pragma parameter BRIGHT         "Brightness adjust" 0.5 0.3 0.6 0.01
-#define BRIGHT params.BRIGHT
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-//GaussEffect
-//0 = off, 1 = Blur, 2 = Unsharpmask (expensive), 3 = Bloom, 4 = Sketchy, 5 = effects image only.
-#define GaussEffect 1
-
-//GaussStrength
-//[0.00 to 1.00]   Amount of effect blended into the final image.
-//#define GaussStrength 0.45
-
-//addBloom
-//Set to 1 to add bloom to Blur or Unsharpmask. 0 = off. Set GaussEffect to 0 for bloom only.
-#define addBloom 1
-#define bloomPass 1
-#define USE_addBlur 0
-
-//Bloom Strength
-//[0.00 to 1.00] Amount of addBloom added to the final image.
-//#define BloomStrength 0.33
-
-//Bloom Intensity *also affects blur and unsharpmask*
-//Makes bright spots brighter. Only works when BrightPass is set to 1.
-//#define BloomIntensity 3.00
-
-//GaussBloomWarmth
-//0 = neutral, 1 = warm, 2 = hazy/foggy 
-#define GaussBloomWarmth 0
-
-//SW is Slant. Higher numbers = wider bloom.
-//#define SW 2.00
-
-#define CoefLuma_G            vec3(0.2126, 0.7152, 0.0722)      // BT.709 & sRBG luma coefficient (Monitors and HD Television)
-#define sharp_strength_luma_G (CoefLuma_G * GaussStrength + 0.2)
-#define sharp_clampG        0.035
-
-#define texCoordp vTexCoord
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D scanpass;
-
-void main()
-{
-	vec2 texp = texCoordp;
-	vec2 texcoord  = vTexCoord;
-	vec2 PIXEL_SIZE = params.SourceSize.zw;	
-
-	float sampleOffsets[5] = { 0.0, 1.4347826, 3.3478260, 5.2608695, 7.1739130 };
-	float sampleWeights[5] = { 0.16818994, 0.27276957, 0.11690125, 0.024067905, 0.0021112196 };
-
-	vec4 color = texture(Source, texcoord) * sampleWeights[0];
-	for(int i = 1; i < 5; ++i) {
-		color += texture(Source, texcoord + vec2(sampleOffsets[i]*SW * PIXEL_SIZE.x, sampleOffsets[i] * PIXEL_SIZE.y)) * sampleWeights[i];
-		color += texture(Source, texcoord - vec2(sampleOffsets[i]*SW * PIXEL_SIZE.x, sampleOffsets[i] * PIXEL_SIZE.y)) * sampleWeights[i];
-		color += texture(Source, texcoord + vec2(-sampleOffsets[i]*SW * PIXEL_SIZE.x, sampleOffsets[i] * PIXEL_SIZE.y)) * sampleWeights[i];
-		color += texture(Source, texcoord + vec2(sampleOffsets[i]*SW * PIXEL_SIZE.x, -sampleOffsets[i] * PIXEL_SIZE.y)) * sampleWeights[i];
-	}  
-	vec4 blur = BRIGHT*color;
-	
-	vec4 orig = texture(scanpass, texp); 	 	
-	
-	vec3 sharp;
-	#if (GaussEffect == 0)
-		orig = orig;
-	#elif (GaussEffect == 1)
-		// Blur...
-		orig = mix(orig, blur, GaussStrength);
-	#elif (GaussEffect == 2)
-		// Sharpening
-		sharp = orig.rgb - blur.rgb;
-		float sharp_luma = dot(sharp, sharp_strength_luma_G);
-		sharp_luma = clamp(sharp_luma, -sharp_clampG, sharp_clampG);
-		orig = orig + sharp_luma;
-	#elif (GaussEffect == 3)
-		// Bloom
-		#if (GaussBloomWarmth == 0)
-			orig = mix(orig, blur *4, GaussStrength);                                     
-// Neutral
-		#elif (GaussBloomWarmth == 1)
-			orig = mix(orig, max(orig *1.8 + (blur *5) - 1.0, 0.0), GaussStrength);       // Warm and cheap
-		#else
-			orig = mix(orig, (1.0 - ((1.0 - orig) * (1.0 - blur *1.0))), GaussStrength);  // Foggy bloom
-		#endif
-	#elif (GaussEffect == 4)
-		// Sketchy
-		sharp = orig.rgb - blur.rgb;		
-		orig = vec4(1.0, 1.0, 1.0, 0.0) - min(orig, dot(sharp, sharp_strength_luma_G)) *3;
-		// orig = vec4(1.0, 1.0, 1.0, 0.0) - min(blur, orig);      // Negative
-	#else
-		orig = blur;
-	#endif
-
-	#if (addBloom == 1)
-		#if (GaussBloomWarmth == 0)
-			orig += mix(orig, blur *4, BloomStrength);
-			orig = orig * 0.5;
-		#elif (GaussBloomWarmth == 1)
-			orig += mix(orig, max(orig *1.8 + (blur *5) - 1.0, 0.0), BloomStrength);
-			orig = orig * 0.5;
-		#else
-			orig += mix(orig, (1.0 - ((1.0 - orig) * (1.0 - blur *1.0))), BloomStrength);
-			orig = orig * 0.5;
-		#endif
-	#else
-		orig = orig;
-	#endif
-	
-	#if (USE_addBlur == 1)
-		orig += mix(orig, blur2, BlurStrength);
-		//orig = blur2;
-	#endif	
-   FragColor = orig;
-}
\ No newline at end of file
diff --git a/reshade/shaders/scanlines.slang b/reshade/shaders/scanlines.slang
deleted file mode 100755
index df9a643790..0000000000
--- a/reshade/shaders/scanlines.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float opacity;
-} params;
-
-#pragma parameter opacity "Scanlines dark" 50.0 0.0 100.0 1.0
-#define opacity params.opacity
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec4 frame = texture(Source, vTexCoord);
-   vec2 fragpos   = floor(vTexCoord.xy*params.OutputSize.xy);
-   vec4 background;
-   if (mod(fragpos.y,2.0) == 0.0) background = vec4(0.0, 0.0, 0.0, 1.0); else background = vec4(1.0, 1.0, 1.0, 0.0);
-   if (params.OutputSize.y > 1600) { if (mod(fragpos.y,4.0) < 2.0) background = vec4(0.0, 0.0, 0.0, 1.0); else background = vec4(1.0, 1.0, 1.0, 0.0);} 
-   background.a *= opacity / 100.0;
-   FragColor = mix(frame, background, background.a);
-}
\ No newline at end of file
diff --git a/reshade/shaders/vibrance-pass-sh1nra358.slang b/reshade/shaders/vibrance-pass-sh1nra358.slang
deleted file mode 100755
index 3b58b0a9d8..0000000000
--- a/reshade/shaders/vibrance-pass-sh1nra358.slang
+++ /dev/null
@@ -1,62 +0,0 @@
-#version 450
-
-/**
- * Vibrance
- * by Christian Cann Schuldt Jensen ~ CeeJay.dk
- *
- * Vibrance intelligently boosts the saturation of pixels so pixels that had little color get a larger boost than pixels that had a lot.
- * This avoids oversaturation of pixels that were already very saturated.
- */
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	#ifndef Vibrance_RGB_balance //for backwards compatibility with setting presets for older version.
-		#define Vibrance_RGB_balance vec3(1.00, 1.00, 1.00)
-	#endif
-	#define Vibrance 0.5
-	#define Vibrance_coeff vec3(Vibrance_RGB_balance.r * Vibrance, Vibrance_RGB_balance.g * Vibrance, Vibrance_RGB_balance.b * Vibrance)
-
-	vec3 col = texture(Source, vTexCoord).rgb;
-	vec3 lumCoeff = vec3(0.212656, 0.715158, 0.072186);  //Values to calculate luma with
-
-	float luma = dot(lumCoeff, col); //calculate luma (grey)
-
-	float max_color = max(col.r, max(col.g,col.b)); //Find the strongest color
-	float min_color = min(col.r, min(col.g,col.b)); //Find the weakest color
-
-	float color_saturation = max_color - min_color; //The difference between the two is the saturation
-  
-    col.r = mix(luma, col.r, (1.0 + (Vibrance_coeff.r * (1.0 - (sign(Vibrance_coeff.r) * color_saturation)))));
-    col.g = mix(luma, col.g, (1.0 + (Vibrance_coeff.g * (1.0 - (sign(Vibrance_coeff.g) * color_saturation)))));
-    col.b = mix(luma, col.b, (1.0 + (Vibrance_coeff.b * (1.0 - (sign(Vibrance_coeff.b) * color_saturation)))));
-   FragColor = vec4(col, 1.0);
-}
\ No newline at end of file
diff --git a/scanlines/integer-scaling-scanlines.slangp b/scanlines/integer-scaling-scanlines.slangp
deleted file mode 100644
index 61c2713c31..0000000000
--- a/scanlines/integer-scaling-scanlines.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-
-shader0 = shaders/integer-scaling-scanlines.slang
-filter_linear0 = false
-scale_type0 = viewport
diff --git a/scanlines/ossc.slangp b/scanlines/ossc.slangp
deleted file mode 100644
index 1f4cbdb3c8..0000000000
--- a/scanlines/ossc.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/ossc.slang
-scale_type0 = viewport
diff --git a/scanlines/ossc_slot.slangp b/scanlines/ossc_slot.slangp
deleted file mode 100644
index 971e08e0f7..0000000000
--- a/scanlines/ossc_slot.slangp
+++ /dev/null
@@ -1,53 +0,0 @@
-shaders = "5"
-feedback_pass = "0"
-shader0 = "../misc/shaders/simple_color_controls.slang"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../interpolation/shaders/lanczos3-x.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_edge"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "viewport"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-shader2 = "../interpolation/shaders/lanczos3-y.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_edge"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-shader3 = "../scanlines/shaders/ossc.slang"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "viewport"
-scale_x3 = "1.000000"
-scale_type_y3 = "viewport"
-scale_y3 = "1.000000"
-shader4 = "../crt/shaders/slotmask.slang"
-wrap_mode4 = "clamp_to_border"
-mipmap_input4 = "false"
-alias4 = ""
-float_framebuffer4 = "false"
-srgb_framebuffer4 = "false"
-SAT = "1.10000"
-BRIGHTNESS = "1.050000"
-contrast = "1.040000"
-BLACK = "0.010000"
-postbr = "1.150000"
-gamma_out_red = "2.400000"
-gamma_out_blue = "2.500000"
diff --git a/scanlines/scanline.slangp b/scanlines/scanline.slangp
deleted file mode 100644
index 06931bb329..0000000000
--- a/scanlines/scanline.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/scanline.slang
-scale_type0 = viewport
diff --git a/scanlines/shaders/integer-scaling-scanlines.slang b/scanlines/shaders/integer-scaling-scanlines.slang
deleted file mode 100644
index 9eec775dbd..0000000000
--- a/scanlines/shaders/integer-scaling-scanlines.slang
+++ /dev/null
@@ -1,81 +0,0 @@
-#version 450
-/* 
-Simple pixel perfect scanlines for use *only* with interger scaling mode. 
-Perfect for low res output and low performance machines.
-Also great if you dont want any moire patterns pin sharp scanlines 
-Use in combination with HDR mode in latest RetroArch and very bright 
-HDR monitors to get 'glowing' scanlines much like the original CRT's but sharper 
-
-Recommended setting for 720p 1 pixel width scalines at 2x or 3x scalings
-Recommended setting for 1080p 2 or 3 pixel width scalines at 4x or 5x scalings
-Recommended setting for 4K 4 or 5 pixel width scalines at 8x or 9x scalings
-*/
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float ScanlineWidth;
-   float ScreenWidth;
-   float ScreenHeight; 
-} params;
-
-#pragma parameter ScanlineWidth "Scanline Width"  4.0    0.0 20.0   1.0
-#pragma parameter ScreenWidth   "Screen Width"    3840.0 0.0 7680.0 1.0
-#pragma parameter ScreenHeight  "Screen Height"   2160.0 0.0 4320.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out float Scale;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-
-   vec2 ScreenSize = max(params.OutputSize.xy, vec2(params.ScreenWidth, params.ScreenHeight));
-
-   if((params.SourceSize.x > ScreenSize.x) || (params.SourceSize.y > ScreenSize.y))
-   {
-	   Scale = 1.0;
-   }
-   else 
-   {
-      float ScaleFactor = 2.0;
-        
-      while(((params.SourceSize.x * ScaleFactor) <= ScreenSize.x) && ((params.SourceSize.y * ScaleFactor) <= ScreenSize.y))
-    	{
-	      ScaleFactor += 1.0;
-      }
-
-	   Scale = ScaleFactor - 1.0;
-   }
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in float Scale;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec2 InPixels = (vTexCoord * params.SourceSize.xy) * vec2(Scale);
-
-   if(floor(mod(InPixels.y, Scale)) < params.ScanlineWidth)
-   {
-      FragColor = vec4(texture(Source, vTexCoord).xyz, 1.0);
-   }
-   else
-   {
-      FragColor = vec4(0.0,0.0,0.0,1.0);
-   }
-}
diff --git a/scanlines/shaders/ossc.slang b/scanlines/shaders/ossc.slang
deleted file mode 100644
index 5aad005284..0000000000
--- a/scanlines/shaders/ossc.slang
+++ /dev/null
@@ -1,146 +0,0 @@
-#version 450
-
-
-// An OSSC-like shader
-// By DariusG @May/2023
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float OVERSCAN,ASPECTx,ASPECTy, LINES, L1, L2,L3,L4,L5,TATE, HYBRID;
-} params;
-
-#pragma parameter LINES "Lines" 4.0 2.0 5.0 1.0
-#define LINES params.LINES
-
-#pragma parameter TATE "TATE mode"  0.0 0.0 1.0 1.0
-#define TATE params.TATE
-
-#pragma parameter L1 "Line 1 Scanline Strength %" 0.25 0.0 1.0 0.01
-#define L1 params.L1
-
-#pragma parameter L2 "Line 2 Scanline Strength %" 0.0 0.0 1.0 0.01
-#define L2 params.L2
-
-#pragma parameter L3 "Line 3 Scanline Strength %" 0.0 0.0 1.0 0.01
-#define L3 params.L3
-
-#pragma parameter L4 "Line 4 Scanline Strength %" 0.4 0.0 1.0 0.01
-#define L4 params.L4
-
-#pragma parameter L5 "Line 5 Scanline Strength %" 0.5 0.0 1.0 0.01
-#define L5 params.L5
-
-#pragma parameter HYBRID "Scanline Hybrid Blend % (depend on pixel overlayed)" 0.0 0.0 1.0 0.01
-#define HYBRID params.HYBRID
-
-#pragma parameter OVERSCAN "Overscan" 0.0 0.0 1.0 1.0 
-#define OVERSCAN params.OVERSCAN
-
-#pragma parameter something "--Set Retroarch Aspect to FULL--" 0.0 0.0 0.0 0.0
-
-#pragma parameter ASPECTx "Aspect Ratio X" 4.0 1.0 32.0 1.0 
-#define ASPECTx params.ASPECTx
-
-#pragma parameter ASPECTy "Aspect Ratio Y" 3.0 1.0 32.0 1.0 
-#define ASPECTy params.ASPECTy
-
-#define OutputSize params.OutputSize
-#define SourceSize params.SourceSize
-#define OriginalSize params.OriginalSize
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-	
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-vec2 Overscan(vec2 pos, float dx, float dy){
-	pos=pos*2.0-1.0;    
-	pos*=vec2(dx/(ASPECTx/ASPECTy/OutputSize.x*OutputSize.y),dy);
-	return pos*0.5 + 0.5;
-} 
-
-float scanline5(float y, float lm)
-{
-	float l = 1.0/LINES;
-	float m = fract(y*l);
-	if (m<l) return 1.0-L1*(1.0-lm*HYBRID);
-	else if (m<2.0*l) return 1.0-L2*(1.0-lm*HYBRID);
-	else if (m<3.0*l) return 1.0-L3*(1.0-lm*HYBRID);
-	else if (m<4.0*l) return 1.0-L4*(1.0-lm*HYBRID);
-	else return 1.0-L5*(1.0-lm*HYBRID);
-}
-
-float scanline4(float y, float lm)
-{
-	float l = 1.0/LINES;
-	float m = fract(y*l);
-	if (m<l) return 1.0-L1*(1.0-lm*HYBRID);
-	else if (m<2.0*l) return 1.0-L2*(1.0-lm*HYBRID);
-	else if (m<3.0*l) return 1.0-L3*(1.0-lm*HYBRID);
-	else return   1.0-L4*(1.0-lm*HYBRID);
-	
-}
-float scanline3(float y, float lm)
-{
-	float l = 1.0/LINES;
-	float m = fract(y*l);
-	if (m<l) return 1.0-L1*(1.0-lm*HYBRID);
-	else if (m<2.0*l) return 1.0-L2*(1.0-lm*HYBRID);
-	else return   1.0-L3*(1.0-lm*HYBRID);
-	
-}
-
-float scanline2(float y, float lm)
-{
-	float l = 1.0/LINES;
-	float m = fract(y*l);
-	if (m<l) return 1.0-L1*(1.0-lm*HYBRID);
-	else return 1.0-L2*(1.0-lm*HYBRID);
-		
-}
-
-void main()
-{
-	vec2 texcoord = vTexCoord.xy;
-	vec2 ofactor = OutputSize.xy/OriginalSize.xy;
-	vec2 intfactor;
-	if (OVERSCAN == 0.0) intfactor = floor(ofactor); else intfactor = ceil(ofactor);
-	vec2 diff = ofactor/intfactor;
-	float scan = diff.y;
-	texcoord = Overscan(texcoord, scan, scan);
-
-   vec2 OGL2Pos = vTexCoord.xy*OutputSize.xy;
-   if (TATE == 1.0) OGL2Pos = vec2(OGL2Pos.y,OGL2Pos.x);
-	
-	vec3 res = texture(Source, texcoord).rgb;
-	vec3 lumweight = vec3 (0.2126,0.7152,0.0722);
-	float lum = dot(res, lumweight);
-
-	if (LINES == 5.0) {res *= scanline5(OGL2Pos.y, lum);}
-	else if (LINES == 4.0){res *= scanline4(OGL2Pos.y,lum);}
-	else if (LINES == 3.0){res *= scanline3(OGL2Pos.y,lum);}
-	else if (LINES == 2.0){res *= scanline2(OGL2Pos.y,lum);}
-
-   FragColor = vec4(res,1.0);
-}
diff --git a/scanlines/shaders/scanline.slang b/scanlines/shaders/scanline.slang
deleted file mode 100644
index 35faab0d39..0000000000
--- a/scanlines/shaders/scanline.slang
+++ /dev/null
@@ -1,51 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float SCANLINE_SINE_COMP_A;
-	float SCANLINE_SINE_COMP_B;
-} params;
-
-#pragma parameter SCANLINE_SINE_COMP_A "Scanline Sine Comp A" 0.0 0.0 0.10 0.01
-#pragma parameter SCANLINE_SINE_COMP_B "Scanline Sine Comp B" 0.15 0.0 1.0 0.05
-
-#define SCANLINE_SINE_COMP_A params.SCANLINE_SINE_COMP_A
-#define SCANLINE_SINE_COMP_B params.SCANLINE_SINE_COMP_B
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#define pi 3.141592654
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec2 omega;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord*1.0001;
-   omega = vec2(pi * params.OutputSize.x, 1.999 * pi * params.SourceSize.y);
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec2 omega;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   vec2 sine_comp = vec2(SCANLINE_SINE_COMP_A, SCANLINE_SINE_COMP_B);
-   vec3 res = texture(Source, vTexCoord).xyz;
-   vec3 scanline = res * ((1.0-SCANLINE_SINE_COMP_B*0.5) + dot(sine_comp * sin(vTexCoord * omega), vec2(1.0, 1.0)));
-   FragColor = vec4(scanline, 1.0);
-}
diff --git a/sharpen/Anime4k.slangp b/sharpen/Anime4k.slangp
deleted file mode 100755
index 2fc2fa4bca..0000000000
--- a/sharpen/Anime4k.slangp
+++ /dev/null
@@ -1,49 +0,0 @@
-shaders = 4
-
-shader0 = "shaders/anime4k/anime4k-compute-lum.slang"
-filter_linear0 = "false"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = ""
-float_framebuffer0 = "false"
-srgb_framebuffer0 = "false"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-
-shader1 = "shaders/anime4k/anime4k-push.slang"
-filter_linear1 = "false"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = ""
-float_framebuffer1 = "false"
-srgb_framebuffer1 = "false"
-scale_type_x1 = "source"
-scale_x1 = "1.000000"
-scale_type_y1 = "source"
-scale_y1 = "1.000000"
-
-shader2 = "shaders/anime4k/anime4k-compute-gradient.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-scale_type_x2 = "source"
-scale_x2 = "1.000000"
-scale_type_y2 = "source"
-scale_y2 = "1.000000"
-
-shader3 = "shaders/anime4k/anime4k-pushgrad-weak.slang"
-filter_linear3 = "false"
-wrap_mode3 = "clamp_to_border"
-mipmap_input3 = "false"
-alias3 = ""
-float_framebuffer3 = "false"
-srgb_framebuffer3 = "false"
-scale_type_x3 = "source"
-scale_x3 = "1.000000"
-scale_type_y3 = "source"
-scale_y3 = "1.000000"
diff --git a/sharpen/shaders/anime4k/anime4k-compute-lum.slang b/sharpen/shaders/anime4k/anime4k-compute-lum.slang
deleted file mode 100755
index 0cc6b45eba..0000000000
--- a/sharpen/shaders/anime4k/anime4k-compute-lum.slang
+++ /dev/null
@@ -1,45 +0,0 @@
-#version 450
-
-/*
-	Anime4k - Luma shader - ported by Hyllian - 2020
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec4 c0 = texture(Source, vTexCoord);
-	
-	//Quick luminance approximation
-	float lum = (c0.r + c0[0].r + c0.g + c0.g + c0.g + c0.b) / 6;
-	
-	//Computes the luminance and saves it in the unused alpha channel
-	FragColor = vec4(c0.r, c0.g, c0.b, lum);
-}
\ No newline at end of file
diff --git a/sharpen/super-xbr-super-res.slangp b/sharpen/super-xbr-super-res.slangp
deleted file mode 100644
index 49b4b084b6..0000000000
--- a/sharpen/super-xbr-super-res.slangp
+++ /dev/null
@@ -1,52 +0,0 @@
-shaders = "10"
-
-shader0 = ../stock.slang
-alias0 = diff_refpass
-
-shader1 = ../stock.slang
-alias1 = XbrSource
-
-shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
-filter_linear2 = "false"
-scale_type2 = "source"
-scale2 = "1.000000"
-
-shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
-filter_linear3 = "false"
-scale_type3 = "source"
-scale3 = "2.000000"
-
-shader4 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
-filter_linear4 = "false"
-scale_type4 = "source"
-scale4 = "1.000000"
-alias4 = "REF"
-
-shader5 = "../interpolation/shaders/cubic.slang"
-filter_linear5 = "false"
-scale_type5 = "source"
-scale5 = "0.500000"
-
-shader6 = "shaders/diff.slang"
-filter_linear6 = "false"
-scale_type6 = "source"
-scale6 = "1.000000"
-
-shader7 = "shaders/super-res-ex.slang"
-filter_linear7 = "true"
-scale_type7 = "source"
-scale7 = "2.000000"
-
-shader8 = "../misc/shaders/deposterize/deposterize-pass0.slang"
-filter_linear8 = "false"
-scale_type8 = "source"
-scale8 = "1.000000"
-
-shader9 = "../misc/shaders/deposterize/deposterize-pass1.slang"
-filter_linear9 = "false"
-scale_type9 = "source"
-scale9 = "1.000000"
-
-shader10 = "../edge-smoothing/xbr/shaders/super-xbr/custom-jinc2-sharper.slang"
-filter_linear10 = "false"
-scale_type10 = viewport
diff --git a/spec/SHADER_SPEC.md b/spec/SHADER_SPEC.md
deleted file mode 100644
index 146e4debbb..0000000000
--- a/spec/SHADER_SPEC.md
+++ /dev/null
@@ -1,779 +0,0 @@
-# Vulkan GLSL RetroArch shader system
-
-This document is a draft of RetroArch's new GPU shader system.
-It will outline the features in the new shader subsystem and describe details for how it will work in practice.
-
-In addition this document will contain various musings on why certain design choices are made and which compromised have been made to arrive at the conclusion. This is mostly for discussing and deliberation while the new system is under development.
-
-## Introduction
-
-### Target shader languages
- - Vulkan
- - GL 2.x (legacy desktop)
- - GL 3.x+ (modern desktop)
- - GLES2 (legacy mobile)
- - GLES3 (modern mobile)
- - (HLSL, potentially)
- - (Metal, potentially)
-
-RetroArch is still expected to run on GLES2 and GL2 systems.
-GL2 is mostly not relevant any longer, but GLES2 is certainly a very relevant platform still and having GLES2 compatibility makes GL2 very easy.
-We therefore want to avoid speccing out a design which deliberately ruins GLES2 compatibility.
-
-However, we also do not want to artificially limit ourselves to shader features which are only available in GLES2.
-There are many shader builtins for example which only work in GLES3/GL3 and we should not hold back support in these cases.
-When we want to consider GLES2 compat we should not spec out high level features which do not make much sense in the context of GLES2.
-
-### Why a new spec?
-
-The current shader subsystem in RetroArch is quite mature with a large body of shaders written for it.
-While it has served us well, it is not forward-compatible.
-
-The current state of writing high-level shading languages that work "everywhere" is very challenging.
-There was no good ready-made solution for this.
-Up until now, we have relied on nVidia Cg to serve as a basic foundation for shaders, but Cg has been discontinued for years and is closed source.
-This is very problematic since Cg is not a forward compatible platform.
-It has many warts which are heavily tied in to legacy APIs and systems.
-For this reason, we cannot use Cg for newer APIs such as Vulkan and potentially D3D12 and Metal.
-
-Cg cross compilation to GLSL is barely working and it is horribly unmaintainable with several unfixable issues.
-The output is so horribly mangled and unoptimized that it is clearly not the approach we should be taking.
-We also cannot do the Cg transform in runtime on mobile due to lack of open source Cg runtime, so there's that as well.
-
-Another alternative is to write straight-up GLSL, but this too has some severe problems.
-All the different GL versions and GLSL variants are different enough that it becomes painful to write portable GLSL code that works without modification.
-Examples include:
-
- - varying/attribute vs in/out (legacy vs modern)
- - precision qualifiers (GLSL vs ESSL)
- - texture2D vs texture (legacy vs modern)
- - Lack of standard support for #include to reduce copy-pasta
-
-The problem really is that GLSL shaders are dependent on the runtime GL version, which makes it very annoying and hard to test all shader variants.
-
-We do not want to litter every shader with heaps of #ifdefs everywhere to combat this problem.
-We also want to avoid having to write pseudo-GLSL with some text based replacement behind the scenes.
-
-#### Vulkan GLSL as the portable solution
-
-Fortunately, there is now a forward looking and promising solution to our problems.
-Vulkan GLSL is a GLSL dialect designed for Vulkan and SPIR-V intermediate representation.
-The good part is that we can use whatever GLSL version we want when writing shaders, as it is decoupled from the GL runtime.
-
-In runtime, we can have a vendor-neutral mature compiler,
-[https://github.com/KhronosGroup/glslang](glslang) which compiles our Vulkan GLSL to SPIR-V.
-Using [https://github.com/KhronosGroup/SPIRV-Cross](SPIRV-Cross), we can then do reflection on the SPIR-V binary to deduce our filter chain layout.
-We can also disassemble back to our desired GLSL dialect in the GL backend based on which GL version we're running,
-which effectively means we can completely sidestep all our current problems with a pure GLSL based shading system.
-
-Another upside of this is that we no longer have to deal with vendor-specific quirks in the GLSL frontend.
-A common problem when people write for nVidia is that people mistakingly use float2/float3/float4 types from Cg/HLSL, which is supported
-as an extension in their GLSL frontend.
-
-##### Why not SPIR-V directly?
-
-This was considered, but there are several convenience problems with having a shading spec around pure SPIR-V.
-The first problem is metadata. In GLSL, we can quite easily extend with custom #pragmas or similar, but there is no trivial way to do this in SPIR-V
-outside writing custom tools to emit special metadata as debug information or similar with OpSource.
-
-We could also have this metadata outside in a separate file, but juggling more files means more churn, which we should try to avoid.
-The other problem is convenience. If RetroArch only accepts SPIR-V, we would need an explicit build step outside RetroArch first before we could
-test a shader. This gets very annoying during shader development,
-so it is clear that we need to support GLSL anyways, making SPIR-V support kinda redundant.
-
-The main argument for supporting SPIR-V would be to allow new shading languages to be used. This is a reasonable thing to consider, which is why
-the goal is to not design ourselves into a corner where it's only Vulkan GLSL that can possibly work down the line. We are open to the idea that
-new shading languages that target SPIR-V will emerge.
-
-### Warts in old shader system
-
-While the old shader system is functional it has some severe warts which have accumulated over time.
-In hindsight, some of the early design decisions were misguided and need to be properly fixed.
-
-#### Forced POT with padding
-
-This is arguably the largest wart of them all. The original reason behind this design decision was caused by a misguided effort to combat FP precision issues with texture sampling. The idea at the time was to avoid cases where nearest neighbor sampling at texel edges would cause artifacts. This is a typical case when textures are scaled with non-integer factors. However, the problem to begin with is naive nearest neighbor and non-integer scaling factors, and not FP precision. It was pure luck that POT tended to give better results with broken shaders, but we should not make this mistake again. POT padding has some severe issues which are not just cleanliness related either.
-
-Technically, GLES2 doesn't require non-POT support, but in practice, all GPUs support this.
-
-##### No proper UV wrapping
-Since the texture "ends" at UV coords < 1.0, we cannot properly
-use sampler wrapping modes. We can only fake `CLAMP_TO_BORDER` by padding with black color, but this filtering mode is not available by default in GLES2 and even GLES3!
-`CLAMP_TO_BORDER` isn't necessarily what we want either. `CLAMP_TO_EDGE` is usually a far more sane default.
-
-##### Extra arguments for actual width vs. texture width
-
-With normalized coordinates we need to think in both real resolution (e.g. 320x240) vs. POT padded resolutions (512x512) to deal with normalized UV coords. This complicates things massively and
-we were passing an insane amount of attributes and varyings to deal with this because the ratios between the two needn't be the same for two different textures.
-
-#### Arbitrary limits
-The way the old shader system deals with limits is quite naive.
-There is a hard limit of 8 when referencing other passes and older frames.
-There is no reason why we should have arbitrary limits like these.
-Part of the reason is C where dealing with dynamic memory is more painful than is should be so it was easier to take the lazy way out.
-
-#### Tacked on format handling
-
-In more complex shaders we need to consider more than just the plain `RGBA8_UNORM` format.
-The old shader system tacked on these things after the fact by adding booleans for SRGB and FP support, but this obviously doesn't scale.
-This point does get problematic since GLES2 has terrible support for render target formats, but we should allow complex shaders to use complex RT formats
-and rather just allow some shader presets to drop GLES2 compat.
-
-#### PASS vs PASSPREV
-
-Ugly. We do not need two ways to access previous passes, the actual solution is to have aliases for passes instead and access by name.
-
-#### Inconsistencies in parameter passing
-
-MVP matrices are passed in with weird conventions in the Cg spec, and its casing is weird.
-The source texture is passed with magic TEXUNIT0 semantic while other textures are passed via uniform struct members, etc.
-This is the result of tacking on feature support slowly over time without proper forethought.
-
-## High level Overview
-
-The RetroArch shader format outlines a filter chain/graph, a series of shader passes which operate on previously generated data to produce a final result.
-The goal is for every individual pass to access information from *all* previous shader passes, even across frames, easily.
-
- - The filter chain specifies a number of shader passes to be executed one after the other.
- - Each pass renders a full-screen quad to a texture of a certain resolution and format.
- - The resolution can be dependent on external information.
- - All filter chains begin at an input texture, which is created by a libretro core or similar.
- - All filter chains terminate by rendering to the "backbuffer".
-
-The backbuffer is somewhat special since the resolution of it cannot be controlled by the shader.
-It can also not be fed back into the filter chain later
-because the frontend (here RetroArch) will render UI elements and such on top of the final pass output.
-
-Let's first look at what we mean by filter chains and how far we can expand this idea.
-
-### Simplest filter chain
-
-The simplest filter chain we can specify is a single pass.
-
-```
-(Input) -> [ Shader Pass #0 ] -> (Backbuffer)
-```
-
-In this case there are no offscreen render targets necessary since our input is rendered directly to screen.
-
-### Multiple passes
-
-A trivial extension is to keep our straight line view of the world where each pass looks at the previous output.
-
-```
-(Input) -> [ Shader Pass #0 ] -> (Framebuffer) -> [ Shader Pass #1 ] -> (Backbuffer)
-```
-
-Framebuffer here might have a different resolution than both Input and Backbuffer.
-A very common scenario for this is separable filters where we first scale horizontally, then vertically.
-
-### Multiple passes and multiple inputs
-
-There is no reason why we should restrict ourselves to a straight-line view.
-
-```
-     /------------------------------------------------\
-    /                                                  v
-(Input) -> [ Shader Pass #0 ] -> (Framebuffer #0) -> [ Shader Pass #1 ] -> (Backbuffer)
-```
-
-In this scenario, we have two inputs to shader pass #1, both the original, untouched input as well as the result of a pass in-between.
-All the inputs to a pass can have different resolutions.
-We have a way to query the resolution of individual textures to allow highly controlled sampling.
-
-We are now at a point where we can express an arbitrarily complex filter graph, but we can do better.
-For certain effects, time (or rather, results from earlier frames) can be an important factor.
-
-### Multiple passes, multiple inputs, with history
-
-We now extend our filter graph, where we also have access to information from earlier frames. Note that this is still a causal filter system.
-
-```
-Frame N:        (Input     N, Input N - 1, Input N - 2) -> [ Shader Pass #0 ] -> (Framebuffer     N, Framebuffer N - 1, Input N - 3) -> [ Shader Pass #1 ] -> (Backbuffer)
-Frame N - 1:    (Input N - 1, Input N - 2, Input N - 3) -> [ Shader Pass #0 ] -> (Framebuffer N - 1, Framebuffer N - 2, Input N - 4) -> [ Shader Pass #1 ] -> (Backbuffer)
-Frame N - 2:    (Input N - 2, Input N - 3, Input N - 4) -> [ Shader Pass #0 ] -> (Framebuffer N - 2, Framebuffer N - 3, Input N - 5) -> [ Shader Pass #1 ] -> (Backbuffer)
-```
-
-For framebuffers we can read the previous frame's framebuffer. We don't really need more than one frame of history since we have a feedback effect in place.
-Just like IIR filters, the "response" of such a feedback in the filter graph gives us essentially "infinite" history back in time,
-although it is mostly useful for long-lasting blurs and ghosting effects. Supporting more than one frame of feedback would also be extremely memory intensive since framebuffers tend to be
-much higher resolution than their input counterparts. One frame is also a nice "clean" limit. Once we go beyond just 1, the floodgate opens to arbitrary numbers, which we would want to avoid.
-It is also possible to fake as many feedback frames of history we want anyways,
-since we can copy a feedback frame to a separate pass anyways which effectively creates a "shift register" of feedback framebuffers in memory.
-
-Input textures can have arbitrary number of textures as history (just limited by memory).
-They cannot feedback since the filter chain cannot render into it, so it effectively is finite response (FIR).
-
-For the very first frames, frames with frame N < 0 are transparent black (all values 0).
-
-### No POT padding
-
-No texture in the filter chain is padded at any time. It is possible for resolutions in the filter chain to vary over time which is common with certain emulated systems.
-In this scenarios, the textures and framebuffers are simply resized appropriately.
-Older frames still keep their old resolution in the brief moment that the resolution is changing.
-
-It is very important that shaders do not blindly sample with nearest filter with any scale factor. If naive nearest neighbor sampling is to be used, shaders must make sure that
-the filter chain is configured with integer scaling factors so that ambiguous texel-edge sampling is avoided.
-
-### Deduce shader inputs by reflection
-
-We want to have as much useful information in the shader source as possible. We want to avoid having to explicitly write out metadata in shaders whereever we can.
-The biggest hurdle to overcome is how we describe our pipeline layout. The pipeline layout contains information about how we access resources such as uniforms and textures.
-There are three main types of inputs in this shader system.
-
- - Texture samplers (sampler2D)
- - Look-up textures for static input data
- - Uniform data describing dimensions of textures
- - Uniform ancillary data for render target dimensions, backbuffer target dimensions, frame count, etc
- - Uniform user-defined parameters
- - Uniform MVP for vertex shader
-
-#### Deduction by name
-
-There are two main approaches to deduce what a sampler2D uniform wants to sample from.
-The first way is to explicitly state somewhere else what that particular sampler needs, e.g.
-
-```
-uniform sampler2D geeWhatAmI;
-
-// Metadata somewhere else
-SAMPLER geeWhatAmI = Input[-2]; // Input frame from 2 frames ago
-```
-
-The other approach is to have built-in identifiers which correspond to certain textures.
-
-```
-// Source here being defined as the texture from previous framebuffer pass or the input texture if this is the first pass in the chain.
-uniform sampler2D Source;
-```
-
-In SPIR-V, we can use `OpName` to describe these names, so we do not require the original Vulkan GLSL source to perform this reflection.
-We use this approach throughout the specification. An identifier is mapped to an internal meaning (semantic). The shader backend looks at these semantics and constructs
-a filter chain based on all shaders in the chain.
-
-Identifiers can also have user defined meaning, either as an alias to existing identifiers or mapping to user defined parameters.
-
-### Combining vertex and fragment into a single shader file
-
-One strength of Cg is its ability to contain multiple shader stages in the same .cg file.
-This is very convenient since we always want to consider vertex and fragment together.
-This is especially needed when trying to mix and match shaders in a GUI window for example.
-We don't want to require users to load first a vertex shader, then fragment manually.
-
-GLSL however does not support this out of the box. This means we need to define a light-weight system for preprocessing
-one GLSL source file into multiple stages.
-
-#### Should we make vertex optional?
-
-In most cases, the vertex shader will remain the same.
-This leaves us with the option to provide a "default" vertex stage if the shader stage is not defined.
-
-### #include support
-
-With complex filter chains there is a lot of oppurtunity to reuse code.
-We therefore want light support for the #include directive.
-
-### User parameter support
-
-Since we already have a "preprocessor" of sorts, we can also trivially extend this idea with user parameters.
-In the shader source we can specify which uniform inputs are user controlled, GUI visible name, their effective range, etc.
-
-### Lookup textures
-
-A handy feature to have is reading from lookup textures.
-We can specify that some sampler inputs are loaded from a PNG file on disk as a plain RGBA8 texture.
-
-#### Do we want to support complex reinterpretation?
-
-There could be valid use cases for supporting other formats than plain `RGBA8_UNORM`.
-`SRGB` and `UINT` might be valid cases as well and maybe even 2x16-bit, 1x32-bit integer formats.
-
-#### Lookup buffers
-
-Do we want to support lookup buffers as UBOs as well?
-This wouldn't be doable in GLES2, but it could be useful as a more modern feature.
-If the LUT is small enough, we could realize it via plain old uniforms as well perhaps.
-
-This particular feature could be very interesting for generic polyphase lookup banks with different LUT files for different filters.
-
-## Vulkan GLSL specification
-
-This part of the spec considers how Vulkan GLSL shaders are written. The frontend uses the glslang frontend to compile GLSL sources.
-This ensures that we do not end up with vendor-specific extensions.
-The #version string should be as recent as possible, e.g. `#version 450` or `#version 310 es`.
-It is recommended to use 310 es since it allows mediump which can help on mobile.
-Note that after the Vulkan GLSL is turned into SPIR-V, the original #version string does not matter anymore.
-Also note that SPIR-V cannot be generated from legacy shader versions such as #version 100 (ES 2.0) or #version 120 (GL 2.1).
-
-The frontend will use reflection on the resulting SPIR-V file in order to deduce what each element in the UBO or what each texture means.
-The main types of data passed to shaders are read-only and can be classified as:
-
- - `uniform sampler2D`: This is used for input textures, framebuffer results and lookup-textures.
- - `uniform Block { };`: This is used for any constant data which is passed to the shader.
- - `layout(push_constant) uniform Push {} name;`: This is used for any push constant data which is passed to the shader.
-
-### Resource usage rules
-
-Certain rules must be adhered to in order to make it easier for the frontend to dynamically set up bindings to resources.
-
- - All resources must be using descriptor set #0, or don't use layout(set = #N) at all.
- - layout(binding = #N) must be declared for all UBOs and sampler2Ds.
- - All resources must use different bindings.
- - There can be only one UBO.
- - There can be only use push constant block.
- - It is possible to have one regular UBO and one push constant UBO.
- - If a UBO is used in both vertex and fragment, their binding number must match.
- - If a UBO is used in both vertex and fragment, members with the same name must have the same offset/binary interface.
-   This problem is easily avoided by having the same UBO visible to both vertex and fragment as "common" code.
- - If a push constant block is used in both vertex and fragment, members with the same name must have the same offset/binary interface.
- - sampler2D cannot be used in vertex, although the size parameters of samplers can be used in vertex.
- - Other resource types such as SSBOs, images, atomic counters, etc, etc, are not allowed.
- - Every member of the UBOs and push constant blocks as well as every texture must be meaningful
-   to the frontend in some way, or an error is generated.
-
-### Initial preprocess of slang files
-
-The very first line of a `.slang` file must contain a `#version` statement.
-
-The first process which takes place is dealing with `#include` statements.
-A slang file is preprocessed by scanning through the slang and resolving all `#include` statements.
-The include process does not consider any preprocessor defines or conditional expressions.
-The include path must always be relative, and it will be relative to the file path of the current file.
-Nested includes are allowed, but includes in a cycle are undefined as preprocessor guards are not considered.
-
-E.g.:
-```
-#include "common.inc"
-```
-
-After includes have been resolved, the frontend scans through all lines of the shader and considers `#pragma` statements.
-These pragmas build up ancillary reflection information and otherwise meaningful metadata.
-
-#### `#pragma stage`
-This pragma controls which part of a `.slang` file are visible to certain shader stages.
-Currently, two variants of this pragma are supported:
-
- - `#pragma stage vertex`
- - `#pragma stage fragment`
-
-If no `#pragma stage` has been encountered yet, lines of code in a shader belong to all shader stages.
-If a `#pragma stage` statement has been encountered, that stage is considered active, and the following lines of shader code will only be used when building source for that particular shader stage. A new `#pragma stage` can override which stage is active.
-
-#### `#pragma name`
-This pragma lets a shader set its identifier. This identifier can be used to create simple aliases for other passes.
-
-E.g.:
-```
-#pragma name HorizontalPass
-```
-
-#### `#pragma format`
-This pragma controls the format of the framebuffer which this shader will render to.
-The default render target format is `R8G8B8A8_UNORM`.
-
-Supported render target formats are listed below. From a portability perspective,
-please be aware that GLES2 has abysmal render target format support,
-and GLES3/GL3 may have restricted floating point render target support.
-
-If rendering to uint/int formats, make sure your fragment shader output target is uint/int.
-
-#### 8-bit
- - `R8_UNORM`
- - `R8_UINT`
- - `R8_SINT`
- - `R8G8_UNORM`
- - `R8G8_UINT`
- - `R8G8_SINT`
- - `R8G8B8A8_UNORM`
- - `R8G8B8A8_UINT`
- - `R8G8B8A8_SINT`
- - `R8G8B8A8_SRGB`
-
-#### 10-bit
- - `A2B10G10R10_UNORM_PACK32`
- - `A2B10G10R10_UINT_PACK32`
-
-#### 16-bit
- - `R16_UINT`
- - `R16_SINT`
- - `R16_SFLOAT`
- - `R16G16_UINT`
- - `R16G16_SINT`
- - `R16G16_SFLOAT`
- - `R16G16B16A16_UINT`
- - `R16G16B16A16_SINT`
- - `R16G16B16A16_SFLOAT`
-
-#### 32-bit
- - `R32_UINT`
- - `R32_SINT`
- - `R32_SFLOAT`
- - `R32G32_UINT`
- - `R32G32_SINT`
- - `R32G32_SFLOAT`
- - `R32G32B32A32_UINT`
- - `R32G32B32A32_SINT`
- - `R32G32B32A32_SFLOAT`
-
-E.g.:
-```
-#pragma format R16_SFLOAT
-```
-#### `#pragma parameter`
-
-Shader parameters allow shaders to take user-defined inputs as uniform values.
-This makes shaders more configurable.
-
-The format is:
-```
-#pragma parameter IDENTIFIER "DESCRIPTION" INITIAL MINIMUM MAXIMUM [STEP]
-```
-The step parameter is optional.
-INITIAL, MINIMUM and MAXIMUM are floating point values.
-IDENTIFIER is the meaningful string which is the name of the uniform which will be used in a UBO or push constant block.
-DESCRIPTION is a string which is human readable representation of IDENTIFIER.
-
-E.g:
-```
-layout(push_constant) uniform Push {
-   float DummyVariable;
-} registers;
-#pragma parameter DummyVariable "This is a dummy variable" 1.0 0.2 2.0 0.1
-```
-
-### I/O interface variables
-
-The slang shader spec specifies two vertex inputs and one fragment output.
-Varyings between vertex and fragment shaders are user-defined.
-
-#### Vertex inputs
-Two attributes are provided and must be present in a shader.
-It is only the layout(location = #N) which is actually significant.
-The particular names of input and output variables are ignored, but should be consistent for readability.
-
-##### `layout(location = 0) in vec4 Position;`
-This attribute is a 2D position in the form `vec4(x, y, 0.0, 1.0);`.
-Shaders should not try to extract meaning from the x, y.
-`gl_Position` must be assigned as:
-
-```
-gl_Position = MVP * Position;
-```
-##### `layout(location = 1) in vec2 TexCoord;`
-The texture coordinate is semantically such that (0.0, 0.0) is top-left and (1.0, 1.0) is bottom right.
-If TexCoord is passed to a varying unmodified, the interpolated varying will be `uv = 0.5 / OutputSize` when rendering the upper left pixel as expected and `uv = 1.0 - 0.5 / OutputSize` when rendering the bottom-right pixel.
-
-#### Vertex/Fragment interface
-Vertex outputs and fragment inputs link by location, and not name.
-
-E.g.:
-```
-// Vertex
-layout(location = 0) out vec4 varying;
-// Fragment
-layout(location = 0) in vec4 some_other_name;
-```
-will still link fine, although using same names are encouraged for readability.
-
-#### Fragment outputs
-
-##### `layout(location = 0) out vec4 FragColor;`
-Fragment shaders must have a single output to location = 0.
-Multiple render targets are not allowed. The type of the output depends on the render target format.
-int/uint type must be used if UINT/INT render target formats are used, otherwise float type.
-
-### Builtin variables
-
-#### Builtin texture variables
-The input of textures get their meaning from their name.
-
- - Original: This accesses the input of the filter chain, accessible from any pass.
- - Source: This accesses the input from previous shader pass, or Original if accessed in the first pass of the filter chain.
- - OriginalHistory#: This accesses the input # frames back in time.
-   There is no limit on #, except larger numbers will consume more VRAM.
-   OriginalHistory0 is an alias for Original, OriginalHistory1 is the previous frame and so on.
- - PassOutput#: This accesses the output from pass # in this frame.
-   PassOutput# must be causal, it is an error to access PassOutputN in pass M if N >= M.
-   PassOutput# will typically be aliased to a more readable value.
- - PassFeedback#: This accesses PassOutput# from the previous frame.
-   Any pass can read the feedback of any feedback, since it is causal.
-   PassFeedback# will typically be aliased to a more readable value.
- - User#: This accesses look-up textures.
-   However, the direct use of User# is discouraged and should always be accessed via aliases.
-
-#### Builtin texture size uniform variables
-
-If a member of a UBO or a push constant block is called ???Size# where ???# is the name of a texture variable,
-that member must be a vec4, which will receive these values:
- - X: Horizontal size of texture
- - Y: Vertical size of texture
- - Z: 1.0 / (Horizontal size of texture)
- - W: 1.0 / (Vertical size of texture)
-
-It is valid to use a size variable without declaring the texture itself. This is useful for vertex shading.
-It is valid (although probably not useful) for a variable to be present in both a push constant block and a UBO block at the same time.
-
-#### Builtin uniform variables
-
-Other than uniforms related to textures, there are other special uniforms available.
-These builtin variables may be part of a UBO block and/or a push constant block.
-
- - MVP: mat4 model view projection matrix.
- - OutputSize: a vec4(x, y, 1.0 / x, 1.0 / y) variable describing the render target size (x, y) for this pass.
- - FinalViewportSize: a vec4(x, y, 1.0 / x, 1.0 / y) variable describing the render target size for the final pass.
-   Accessible from any pass.
- - FrameCount: a uint variable taking a value which increases by one every frame.
-   This value could be pre-wrapped by modulo if specified in preset.
-   This is useful for creating time-dependent effects.
-
-#### Aliases
-Aliases can give meaning to arbitrary names in a slang file.
-This is mostly relevant for LUT textures, shader parameters and accessing other passes by name.
-
-If a shader pass has a `#pragma name NAME` associated with it, meaning is given to the shader:
- - NAME, is a sampler2D.
- - NAMESize is a vec4 size uniform associated with NAME.
- - NAMEFeedback is a sampler2D for the previous frame.
- - NAMEFeedbackSize is a vec4 size uniform associated with NAMEFeedback.
-
-#### Example slang shader
-
-```
-#version 450
-// 450 or 310 es are recommended
-
-layout(set = 0, binding = 0, std140) uniform UBO
-{
-   mat4 MVP;
-   vec4 SourceSize; // Not used here, but doesn't hurt
-   float ColorMod;
-};
-
-#pragma name StockShader
-#pragma format R8G8B8A8_UNORM
-#pragma parameter ColorMod "Color intensity" 1.0 0.1 2.0 0.1
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-void main()
-{
-   gl_Position = MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(binding = 1) uniform sampler2D Source;
-void main()
-{
-   FragColor = texture(Source, vTexCoord) * ColorMod;
-}
-```
-
-### Push constants vs uniform blocks
-Push constants are fast-access uniform data which on some GPUs will improve performance over plain UBOs.
-It is encouraged to use push constant data as much as possible.
-
-```
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 FinalViewportSize;
-} registers;
-```
-
-However, be aware that there is a limit to how large push constant blocks can be used.
-Vulkan puts a minimum required size of 128 bytes, which equals 8 vec4s.
-It is an error to use more than 128 bytes.
-If you're running out of space, you can move the MVP to a UBO instead, which frees up 64 bytes.
-Always prioritize push constants for data used in fragment shaders as there are many more fragment threads than vertex.
-Also note that like UBOs, the push constant space is shared across vertex and fragment.
-
-If you need more than 8 vec4s, you can spill uniforms over to plain UBOs,
-but more than 8 vec4s should be quite rare in practice.
-
-E.g.:
-
-```
-layout(binding = 0, std140) uniform UBO
-{
-   mat4 MVP; // Only used in vertex
-   vec4 SpilledUniform;
-} global;
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 BlurPassSize;
-   // ...
-} registers;
-```
-
-### Samplers
-Which samplers are used for textures are specified by the preset format.
-The sampler remains constant throughout the frame, there is currently no way to select samplers on a frame-by-frame basic.
-This is mostly to make it possible to use the spec in GLES2 as GLES2 has no concept of separate samplers and images.
-
-### sRGB
-The input to the filter chain will not be of an sRGB format.
-This is due to many reasons, the main one being that it is very difficult for the frontend to get "free" passthrough of sRGB. It is possible to have a first pass which linearizes the input to a proper sRGB render target. In this way, custom gammas can be used as well.
-
-Similarly, the final pass will not be an sRGB backbuffer for similar reasons.
-
-### Caveats
-
-#### Frag Coord
-TexCoord also replaces `gl_FragCoord`. Do not use `gl_FragCoord` as it doesn't consider the viewports correctly.
-If you need `gl_FragCoord` use `vTexCoord * OutputSize.xy` instead.
-
-#### Derivatives
-Be careful with derivatives of vTexCoord. The screen might have been rotated by the vertex shader, which will also rotate the derivatives, especially in the final pass which hits the backbuffer.
-However, derivatives are fortunately never really needed, since w = 1 (we render flat 2D quads),
-which means derivatives of varyings are constant. You can do some trivial replacements which will be faster and more robust.
-
-```
-dFdx(vTexCoord) = vec2(OutputSize.z, 0.0);
-dFdy(vTexCoord) = vec2(0.0, OutputSize.w);
-fwidth(vTexCoord) = max(OutputSize.z, OutputSize.w);
-```
-To avoid issues with rotation or unexpected derivatives in case derivatives are really needed,
-off-screen passes will not have rotation and
-dFdx and dFdy will behave as expected.
-
-#### Correctly sampling textures
-A common mistake made by shaders is that they aren't careful enough about sampling textures correctly.
-There are three major cases to consider
-
-##### Bilinear sampling
-If bilinear is used, it is always safe to sample a texture.
-
-##### Nearest, with integer scale
-If the OutputSize / InputSize is integer,
-the interpolated vTexCoord will always fall inside the texel safely, so no special precautions have to be used.
-For very particular shaders which rely on nearest neighbor sampling, using integer scale to a framebuffer and upscaling that
-with more stable upscaling filters like bicubic for example is usually a great choice.
-
-##### Nearest, with non-integer scale
-Sometimes, it is necessary to upscale images to the backbuffer which have an arbitrary size.
-Bilinear is not always good enough here, so we must deal with a complicated case.
-
-If we interpolate vTexCoord over a frame with non-integer scale, it is possible that we end up just between two texels.
-Nearest neighbor will have to find a texel which is nearest, but there is no clear "nearest" texel. In this scenario, we end up having lots of failure cases which are typically observed as weird glitches in the image which change based on the resolution.
-
-To correctly sample nearest textures with non-integer scale, we must pre-quantize our texture coordinates.
-Here's a snippet which lets us safely sample a nearest filtered texture and emulate bilinear filtering.
-
-```
-   vec2 uv = vTexCoord * global.SourceSize.xy - 0.5; // Shift by 0.5 since the texel sampling points are in the texel center.
-   vec2 a = fract(uv);
-   vec2 tex = (floor(uv) + 0.5) * global.SourceSize.zw; // Build a sampling point which is in the center of the texel.
-
-   // Sample the bilinear footprint.
-   vec4 t0 = textureLodOffset(Source, tex, 0.0, ivec2(0, 0));
-   vec4 t1 = textureLodOffset(Source, tex, 0.0, ivec2(1, 0));
-   vec4 t2 = textureLodOffset(Source, tex, 0.0, ivec2(0, 1));
-   vec4 t3 = textureLodOffset(Source, tex, 0.0, ivec2(1, 1));
-
-   // Bilinear filter.
-   vec4 result = mix(mix(t0, t1, a.x), mix(t2, t3, a.x), a.y);
-```
-
-The concept of splitting up the integer texel along with the fractional texel helps us safely
-do arbitrary non-integer scaling safely.
-The uv variable could also be passed pre-computed from vertex to avoid the extra computation in fragment.
-
-### Preset format (.slangp)
-
-The present format is essentially unchanged from the old .cgp and .glslp, except the new preset format is called .slangp.
-
-## Porting guide from legacy Cg spec
-
-### Common functions
- - mul(mat, vec) -> mat * vec
- - lerp() -> mix()
- - ddx() -> dFdx()
- - ddy() -> dFdy()
- - tex2D() -> texture()
- - frac() -> fract()
-
-### Types
-
- - floatN -> vecN
- - boolN -> bvecN
- - intN -> ivecN
- - uintN -> uvecN
- - float4x4 -> mat4
-
-### Builtin uniforms and misc
-
- - modelViewProj -> MVP
- - IN.video\_size -> SourceSize.xy
- - IN.texture\_size -> SourceSize.xy (no POT shenanigans, so they are the same)
- - IN.output\_size -> OutputSize.xy
- - IN.frame\_count -> FrameCount (uint instead of float)
- - \*.tex\_coord -> TexCoord (no POT shenanigans, so they are all the same)
- - \*.lut\_tex\_coord -> TexCoord
- - ORIG -> `Original`
- - PASS# -> PassOutput#
- - PASSPREV# -> No direct analog, PassOutput(CurrentPass - #), but prefer aliases
-
-### Cg semantics
-
- - POSITION -> gl\_Position
- - float2 texcoord : TEXCOORD0 -> layout(location = 1) in vec2 TexCoord;
- - float4 varying : TEXCOORD# -> layout(location = #) out vec4 varying;
- - uniform float4x4 modelViewProj -> uniform UBO { mat4 MVP; };
-
-Output structs should be flattened into separate varyings.
-
-E.g. instead of
-```
-struct VertexData
-{
-   float pos : POSITION;
-   float4 tex0 : TEXCOORD0;
-   float4 tex1 : TEXCOORD1;
-};
-
-void main_vertex(out VertexData vout)
-{
-   vout.pos = ...;
-   vout.tex0 = ...;
-   vout.tex1 = ...;
-}
-
-void main_fragment(in VertexData vout)
-{
-   ...
-}
-```
-
-do this
-
-```
-#pragma stage vertex
-layout(location = 0) out vec4 tex0;
-layout(location = 1) out vec4 tex1;
-void main()
-{
-   gl_Position = ...;
-   tex0 = ...;
-   tex1 = ...;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec4 tex0;
-layout(location = 1) in vec4 tex1;
-void main()
-{
-}
-```
-
-Instead of returning a float4 from main\_fragment, have an output in fragment:
-
-```
-layout(location = 0) out vec4 FragColor;
-```
diff --git a/stereoscopic-3d/fubax_vr.slangp b/stereoscopic-3d/fubax_vr.slangp
deleted file mode 100644
index b7760f3c90..0000000000
--- a/stereoscopic-3d/fubax_vr.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-scale_type0 = viewport
-scale0 = 1.0
-
-shader1 = shaders/fubax_vr/VR.slang
-scale_type1 = viewport
-scale1 = 1.0
-filter_linear1 = true
-
-shader2 = shaders/fubax_vr/Chromatic.slang
-scale_type2 = viewport
-scale2 = 1.0
-filter_linear2 = true
-
-shader3 = shaders/fubax_vr/FilmicSharpen.slang
-scale_type3 = viewport
-scale3 = 1.0
-filter_linear3 = true
-
-shader4 = shaders/fubax_vr/VR_nose.slang
-scale_type4 = viewport
-scale4 = 1.0
-filter_linear4 = true
-
-textures = "noseTex"
-noseTex = shaders/fubax_vr/nose.png
diff --git a/stereoscopic-3d/shaders/fubax_vr/Chromatic.slang b/stereoscopic-3d/shaders/fubax_vr/Chromatic.slang
deleted file mode 100644
index eecfb69178..0000000000
--- a/stereoscopic-3d/shaders/fubax_vr/Chromatic.slang
+++ /dev/null
@@ -1,163 +0,0 @@
-#version 450
-
-/*
-/// VR shader ///
-
-Make any game VR and any screen with lenses a VR headset.
-Thanks to this shader you'll be able to correct distortions of any lens types
-(DIY, experimental) and chromatic aberration.
-Also if a game outputs depth pass you can have a stereo-3D vision thanks to
-the parallax mapping (which needs some further improvement).
-
-Copyright (c) 2019 Jacob Max Fober
-
-This work is licensed under the Creative Commons 
-Attribution-NonCommercial-ShareAlike 4.0 International License.
-To view a copy of this license, visit 
-http://creativecommons.org/licenses/by-nc-sa/4.0/
-
-If you want to use it commercially, contact me at jakub.m.fober@pm.me
-If you have questions, visit https://reshade.me/forum/shader-discussion/
-
-I'm author of most of equations present here,
-beside Brown-Conrady distortion correction model and
-Parallax Steep and Occlusion mapping which
-I changed and adopted from various sources.
-
-Version 0.4.2 alpha
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "fubax_vr_params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "fubax_vr_shared_funcs.inc"
-
-void main()
-{
-	// Bypass chromatic aberration switch
-	if(!ChromaticAbrSwitch)
-	{ 
-	   FragColor = vec4(texture(Source, texcoord).rgb, 1.0);
-	   return;
-	}
-
-	// Get display aspect ratio (horizontal/vertical resolution)
-	float rAspect = params.OutputSize.x*params.OutputSize.w;
-
-	// Generate negative-positive stereo mask
-	float SideScreenSwitch = step(0.5, texcoord.x)*2.0-1.0;
-
-	// Divide screen in two if stereo vision mode enabled
-	vec2 CenterCoord = StereoSwitch? StereoVision(texcoord, IPD) : texcoord;
-
-	CenterCoord = CenterCoord*2.0-1.0; // Center coordinates
-	CenterCoord.x *= rAspect; // Correct aspect ratio
-
-	float Diagonal = rAspect;
-	Diagonal *= StereoSwitch ? 0.5 : 1.0;
-	Diagonal = length(vec2(Diagonal, 1.0));
-
-	CenterCoord /= Diagonal; // Normalize diagonally
-
-	// Left/right eye mask
-	float L = step(0.5, 1.0-texcoord.x);
-	float R = step(0.5, texcoord.x);
-
-	// Offset center green
-	vec2 CoordGreen = ChGreenOffsetL * L + ChGreenOffsetR * R;
-	CoordGreen.x *= -1.0;
-	CoordGreen = 0.01 * CoordGreen + CenterCoord;
-	// Offset center blue
-	vec2 CoordBlue = ChBlueOffsetL * L + ChBlueOffsetR * R;
-	CoordBlue.x *= -1.0;
-	CoordBlue = 0.01 * CoordBlue + CenterCoord;
-
-//	float RadiusGreen = dot(CoordGreen, CoordGreen); // Radius squared (techically accurate)
-//	float RadiusBlue = dot(CoordBlue, CoordBlue); // Radius squared (techically accurate)
-	float RadiusGreen = length(CoordGreen); // Radius
-	float RadiusBlue = length(CoordBlue); // Radius
-
-	// Calculate radial distortion K
-	float correctionGreenK = (1.0+ChGreenK.x)*kRadial(RadiusGreen, ChGreenK.y, ChGreenK.z, ChGreenK.w, 0.0);
-	float correctionBlueK = (1.0+ChBlueK.x)*kRadial(RadiusBlue, ChBlueK.y, ChBlueK.z, ChBlueK.w, 0.0);
-
-	// Apply chromatic aberration correction
-	CoordGreen = CoordGreen * correctionGreenK;
-	CoordBlue = CoordBlue * correctionBlueK;
-
-	CoordGreen *= Diagonal; CoordBlue *= Diagonal; // Back to vertical normalization
-	CoordGreen.x /= rAspect; CoordBlue.x /= rAspect; // Back to square
-
-	// Move origin to left top corner
-	CoordGreen = CoordGreen * 0.5 + 0.5; CoordBlue = CoordBlue * 0.5 + 0.5;
-
-	// Generate border mask for green and blue channel
-	float MaskBlue, MaskGreen; if(StereoSwitch)
-	{
-		// Mask compensation for center cut
-		float CenterCut = 0.5+(0.5-IPD)*SideScreenSwitch;
-
-		// Mask sides and center cut for blue channel
-		vec2 MaskCoordBlue;
-		MaskCoordBlue.x = CoordBlue.x*2.0 - CenterCut; // Compensate for 2 views
-		MaskCoordBlue.y = CoordBlue.y;
-		MaskBlue = BorderMaskAA(MaskCoordBlue);
-
-		// Mask sides and center cut for green channel
-		vec2 MaskCoordGreen;
-		MaskCoordGreen.x = CoordGreen.x*2.0 - CenterCut; // Compensate for 2 views
-		MaskCoordGreen.y = CoordGreen.y;
-		MaskGreen = BorderMaskAA(MaskCoordGreen);
-
-		// Reverse stereo coordinates to single view
-		CoordGreen = InvStereoVision(CoordGreen, int(SideScreenSwitch), IPD);
-		CoordBlue = InvStereoVision(CoordBlue, int(SideScreenSwitch), IPD);
-	}
-	else
-	{
-		MaskBlue = BorderMaskAA(CoordBlue);
-		MaskGreen = BorderMaskAA(CoordGreen);
-	};
-
-	vec3 Image;
-	// Sample image red
-	Image.r = texture(Source, texcoord).r;
-	// Sample image green
-	Image.g = mix(
-		texture(Source, CoordGreen).g,
-		0.0, // Black borders
-		MaskGreen // Anti-aliased border mask
-	);
-	// Sample image blue
-	Image.b = mix(
-		texture(Source, CoordBlue).b,
-		0.0, // Black borders
-		MaskBlue // Anti-aliased border mask
-	);
-
-	// Display chromatic aberration
-   FragColor = vec4(Image, 1.0);
-}
diff --git a/stereoscopic-3d/shaders/fubax_vr/FilmicSharpen.slang b/stereoscopic-3d/shaders/fubax_vr/FilmicSharpen.slang
deleted file mode 100644
index 3441470836..0000000000
--- a/stereoscopic-3d/shaders/fubax_vr/FilmicSharpen.slang
+++ /dev/null
@@ -1,101 +0,0 @@
-#version 450
-
-/*
-/// VR shader ///
-
-Make any game VR and any screen with lenses a VR headset.
-Thanks to this shader you'll be able to correct distortions of any lens types
-(DIY, experimental) and chromatic aberration.
-Also if a game outputs depth pass you can have a stereo-3D vision thanks to
-the parallax mapping (which needs some further improvement).
-
-Copyright (c) 2019 Jacob Max Fober
-
-This work is licensed under the Creative Commons 
-Attribution-NonCommercial-ShareAlike 4.0 International License.
-To view a copy of this license, visit 
-http://creativecommons.org/licenses/by-nc-sa/4.0/
-
-If you want to use it commercially, contact me at jakub.m.fober@pm.me
-If you have questions, visit https://reshade.me/forum/shader-discussion/
-
-I'm author of most of equations present here,
-beside Brown-Conrady distortion correction model and
-Parallax Steep and Occlusion mapping which
-I changed and adopted from various sources.
-
-Version 0.4.2 alpha
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "fubax_vr_params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "fubax_vr_shared_funcs.inc"
-
-void main()
-{
-   vec2 UvCoord = texcoord;
-	// Bypass sharpening
-	if(!Sharpen)
-	{
-	   FragColor = vec4(texture(Source, UvCoord).rgb, 1.0);
-	   return;
-	}
-	
-	vec2 Pixel = (texcoord.xy * params.OutputSize.xy) * Offset;
-	// Sample display image
-	vec3 ImgSource = texture(Source, UvCoord).rgb;
-
-	vec2 NorSouWesEst[4] = {
-		vec2(UvCoord.x, UvCoord.y + Pixel.y),
-		vec2(UvCoord.x, UvCoord.y - Pixel.y),
-		vec2(UvCoord.x + Pixel.x, UvCoord.y),
-		vec2(UvCoord.x - Pixel.x, UvCoord.y)
-	};
-
-	// Luma high-pass
-	float HighPass = 0.0;
-	for(int i=0; i<4; i++)
-	{
-	   HighPass += Luma(texture(Source, NorSouWesEst[i]).rgb);
-	}
-	HighPass = 0.5 - 0.5 * (HighPass * 0.25 - Luma(ImgSource));
-
-	// Sharpen strength
-	HighPass = mix(0.5, HighPass, Strength * 0.01);
-
-	// Clamping sharpen
-	HighPass = (Clamp != 1.0) ? max(min(HighPass, Clamp), 1.0 - Clamp) : HighPass;
-
-	vec3 Sharpen = vec3(
-		Overlay(ImgSource.r, HighPass),
-		Overlay(ImgSource.g, HighPass),
-		Overlay(ImgSource.b, HighPass)
-	);
-
-   FragColor.rgb = (Preview) ? vec3(HighPass) : Sharpen;
-   FragColor.a = 1.0;
-}
diff --git a/stereoscopic-3d/shaders/fubax_vr/VR.slang b/stereoscopic-3d/shaders/fubax_vr/VR.slang
deleted file mode 100644
index 425491808c..0000000000
--- a/stereoscopic-3d/shaders/fubax_vr/VR.slang
+++ /dev/null
@@ -1,172 +0,0 @@
-#version 450
-
-/*
-/// VR shader ///
-
-Make any game VR and any screen with lenses a VR headset.
-Thanks to this shader you'll be able to correct distortions of any lens types
-(DIY, experimental) and chromatic aberration.
-Also if a game outputs depth pass you can have a stereo-3D vision thanks to
-the parallax mapping (which needs some further improvement).
-
-Copyright (c) 2019 Jacob Max Fober
-
-This work is licensed under the Creative Commons 
-Attribution-NonCommercial-ShareAlike 4.0 International License.
-To view a copy of this license, visit 
-http://creativecommons.org/licenses/by-nc-sa/4.0/
-
-If you want to use it commercially, contact me at jakub.m.fober@pm.me
-If you have questions, visit https://reshade.me/forum/shader-discussion/
-
-I'm author of most of equations present here,
-beside Brown-Conrady distortion correction model and
-Parallax Steep and Occlusion mapping which
-I changed and adopted from various sources.
-
-Version 0.4.2 alpha
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "fubax_vr_params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord * 1.00001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "fubax_vr_shared_funcs.inc"
-
-void main()
-{
-	// Get display aspect ratio (horizontal/vertical resolution)
-	const float rAspect = params.OutputSize.x*params.OutputSize.w;
-
-	// Divide screen in two
-	vec2 UvCoord = StereoSwitch? StereoVision(texcoord, IPD) : texcoord;
-
-	// Generate negative-positive stereo mask
-	float StereoMask = step(0.5, texcoord.x)*2.0-1.0;
-
-	// Correct lens distortion
-	if(PerspectiveSwitch)
-	{
-		// Center coordinates
-		UvCoord = UvCoord*2.0-1.0;
-		UvCoord.x *= rAspect;
-		vec2 StereoCoord = UvCoord; // Save coordinates for Brown-Conrady correction
-
-		// Base distortion correction
-		if(bool(FOV)) // If FOV is not equal 0
-		{
-			float radFOV = radians(FOV);
-			// Calculate radius
-			float Radius = length(UvCoord);
-			// Apply base lens correction
-			switch(LensType)
-			{
-				case 0:
-					{ UvCoord *= Orthographic(radFOV, Radius); break; }
-				case 1:
-					{ UvCoord *= Equisolid(radFOV, Radius); break; }
-				case 2:
-					{ UvCoord *= Equidistant(radFOV, Radius); break; }
-				case 3:
-					{ UvCoord *= Stereographic(radFOV, Radius); break; }
-			}
-		};
-
-		// Lens geometric aberration correction (Brown-Conrady model)
-		float Diagonal = rAspect;
-		Diagonal *= StereoSwitch ? 0.5 : 1.0;
-		Diagonal = length(vec2(Diagonal, 1.0));
-		float InvDiagonal2 = 1.0 / pow(Diagonal, 2);
-
-		StereoCoord /= Diagonal; // Normalize diagonally
-		float Radius2 = dot(StereoCoord, StereoCoord); // Squared radius
-		float correctionK = kRadial(Radius2, K.x, K.y, K.z, K.w);
-		// Apply negative-positive stereo mask for tangental distortion (flip side)
-		float SideScreenSwitch = (StereoSwitch) ? StereoMask : 1.0;
-
-		vec2 correctionP = pTangental(
-			StereoCoord,
-			Radius2,
-			P.x * SideScreenSwitch,
-			P.y,
-			P.z,
-			0.0
-		);
-		// Expand background to vertical border (but not for test grid for ease of calibration)
-		UvCoord /= TestGrid ? vec2(1.0) : vec2(kRadial(InvDiagonal2, K.x, K.y, K.z, K.w));
-		UvCoord = UvCoord * correctionK + correctionP; // Apply lens correction
-
-		// Scale image
-		UvCoord /= TestGrid ? vec2(1.0) : vec2(ImageScale);
-
-		// Revert aspect ratio to square
-		UvCoord.x /= rAspect;
-		// Move origin back to left top corner
-		UvCoord = UvCoord*0.5 + vec2(0.5);
-	}
-
-	// Display test grid
-	if(TestGrid) {
-	   FragColor = vec4(Grid(UvCoord, rAspect), 1.0);
-	   return;
-	}
-
-/* Disable for RetroArch since there's no depth buffer
-	// Create parallax effect
-	if(ParallaxSwitch)
-	{
-		float ParallaxDirection = ParallaxOffset*0.01;
-		// For stereo-vison flip direction on one side
-		ParallaxDirection *= StereoSwitch ? StereoMask : 1.0;
-		// Apply parallax effect
-		UvCoord = Parallax(
-			UvCoord,
-			ParallaxDirection,
-			ParallaxCenter,
-			ParallaxMaskScalar,
-			ParallaxSteps
-		);
-	}
-*/
-
-   // added by hunterk to adjust aspect ratio of the image
-	vec2 corrected_size = params.SourceSize.xy * vec2(img_ar.x / img_ar.y, 1.0)
-		 * vec2(params.SourceSize.y / params.SourceSize.x, 1.0);
-	float full_scale = params.OutputSize.y / params.SourceSize.y;
-	vec2 scale = (params.OutputSize.xy / corrected_size) / full_scale;
-	vec2 middle = vec2(0.49999, 0.49999);
-	vec2 diff = UvCoord.xy - middle;
-	vec2 screen_coord = middle + diff * scale;
-	UvCoord = ((screen_coord - vec2(0.5)) * imgzoom) + vec2(0.5);
-
-	// Sample image with black borders to display
-	vec3 Image = mix(
-		texture(Source, UvCoord).rgb, // Display image
-		vec3(0.0), // Black borders
-		BorderMaskAA(UvCoord) // Anti-aliased border mask
-	);
-
-	// Display image
-   FragColor = vec4(Image, 1.0);
-}
diff --git a/stereoscopic-3d/shaders/fubax_vr/VR_nose.slang b/stereoscopic-3d/shaders/fubax_vr/VR_nose.slang
deleted file mode 100644
index 424e2f8f45..0000000000
--- a/stereoscopic-3d/shaders/fubax_vr/VR_nose.slang
+++ /dev/null
@@ -1,95 +0,0 @@
-#version 450
-
-/*
-Nose PS (c) 2019 Jacob Maximilian Fober
-
-Anti-nausea shader for VR
-
-This work is licensed under the Creative Commons 
-Attribution-ShareAlike 4.0 International License. 
-To view a copy of this license, visit 
-http://creativecommons.org/licenses/by-sa/4.0/.
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#ifndef nose
-#define nose 128 // Nose texture resolution
-#endif
-
-#define mul(c,d) (d*c)
-
-#include "fubax_vr_params.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D noseTex;
-
-//#include "fubax_vr_shared_funcs.inc"
-// Convert RGB to YUV
-vec3 yuv(vec3 rgbImage)
-{
-	// RGB to YUV709 matrix
-	const mat3 YUV709 =
-	mat3(
-		vec3(0.2126, 0.7152, 0.0722),
-		vec3(-0.09991, -0.33609, 0.436),
-		vec3(0.615, -0.55861, -0.05639)
-	);
-	return mul(YUV709, rgbImage);
-}
-
-// Overlay blending mode
-float Overlay(float LayerAB)
-{
-	float MinAB = min(LayerAB, 0.5);
-	float MaxAB = max(LayerAB, 0.5);
-	return 2.0 * (MinAB*MinAB + 2.0*MaxAB - MaxAB*MaxAB) - 1.5;
-}
-
-void main()
-{
-   vec2 UvCoord = texcoord;
-	// Bypass sharpening
-	if(!Nose)
-	{
-	   FragColor = vec4(texture(Source, UvCoord).rgb, 1.0);
-	   return;
-	}
-	
-	// Divide screen in two (mirrored)
-	vec2 StereoCoord = texcoord;
-	StereoCoord.x = 1.0-abs(StereoCoord.x*2.0-1.0)/Scale.x;
-	StereoCoord.y = 1.0-(1.0-StereoCoord.y)/Scale.y;
-
-	// Sample display image
-	vec3 Display = texture(Source, texcoord).rgb;
-	// Sample nose texture
-	vec4 NoseTexture = texture(noseTex, StereoCoord);
-	// Change skintone
-	NoseTexture.rgb *= mix(smoothstep(0.0, 1.0, yuv(NoseTexture.rgb).x), 1.0, Brightness);
-
-
-	// Blend nose with display image
-	FragColor.rgb = mix(Display, NoseTexture.rgb, NoseTexture.a);
-   FragColor.a = 1.0;
-}
diff --git a/stereoscopic-3d/shaders/fubax_vr/fubax_vr_params.inc b/stereoscopic-3d/shaders/fubax_vr/fubax_vr_params.inc
deleted file mode 100644
index 48459b88d2..0000000000
--- a/stereoscopic-3d/shaders/fubax_vr/fubax_vr_params.inc
+++ /dev/null
@@ -1,123 +0,0 @@
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   float SoloLines, TestGrid, IPD, StereoSwitch, FOV, LensType, K1, K2,
-      K3, K4, P1, P2, P3, ImageScale, PerspectiveSwitch, ChGreenK1, ChGreenK2,
-      ChGreenK3, ChGreenK4, SoloGreen, ChBlueK1, ChBlueK2, ChBlueK3, ChBlueK4,
-      SoloBlue, ChromaticAbrSwitch, ChGreenOffsetL_x, ChGreenOffsetL_y,
-      ChBlueOffsetL_x, ChBlueOffsetL_y, ChGreenOffsetR_x, ChGreenOffsetR_y,
-      ChBlueOffsetR_x, ChBlueOffsetR_y, Strength, Clamp, Offset, Preview,
-      Sharpen, Nose, Brightness, Scale_x, Scale_y, imgzoom, aspect_x, aspect_y;
-      /*ParallaxOffset, ParallaxCenter, ParallaxSteps, ParallaxMaskScalar,
-      ParallaxSwitch */
-} global;
-
-#ifndef MaximumParallaxSteps
-#define MaximumParallaxSteps 1024 // Defefine max steps to make loop finite
-#endif
-
-// Grid settings
-#ifndef BoxAmount
-#define BoxAmount 31 // Number of boxes horizontally (choose odd number)
-#endif
-
-#ifndef thicknessA
-#define thicknessA 0.25 // White grid thickness
-#endif
-
-#ifndef thicknessB
-#define thicknessB 0.125 // Yellow cross thickness
-#endif
-
-#ifndef crossColor
-#define crossColor vec3(1.0, 1.0, 0.0) // Center cross color (yellow)
-#endif
-
-#pragma parameter TestGrid "Toggle Calibration Grid" 0.0 0.0 1.0 1.0
-#pragma parameter StereoSwitch "Toggle Stereo Vision" 1.0 0.0 1.0 1.0
-#pragma parameter PerspectiveSwitch "Toggle Lens Correction" 1.0 0.0 1.0 1.0
-//#pragma parameter ParallaxSwitch "Toggle Parallax Effect" 1.0 0.0 1.0 1.0
-#pragma parameter ChromaticAbrSwitch "Toggle Chromatic Correction" 1.0 0.0 1.0 1.0
-#pragma parameter Nose "Toggle Virtual Nose (helps nausea)" 0.0 0.0 1.0 1.0
-#pragma parameter Sharpen "Toggle Sharpening" 1.0 0.0 1.0 1.0
-#pragma parameter SoloLines "Lines (All, Horz, Vert, Rad)" 0.0 0.0 3.0 1.0
-#pragma parameter IPD "IPD (Interpupillary Distance)" 0.500 0.0 0.75 0.001
-#pragma parameter imgzoom "Image Zoom" 1.6 0.1 5.0 0.01
-#pragma parameter aspect_x "Image Aspect Ratio Numerator" 64.0 1.0 256.0 1.0
-#pragma parameter aspect_y "Image Aspect Ratio Denominator" 49.0 1.0 256. 1.0
-//#pragma parameter ParallaxOffset "Parallax Horizontal Offset" 0.355 0.0 1.0 0.001
-//#pragma parameter ParallaxCenter "Parallax Rotation Center (ZPD)" 1.0 0.0 1.0 0.001
-//#pragma parameter ParallaxSteps "Parallax Sampling Steps" 16.0 1.0 128.0 0.2
-//#pragma parameter ParallaxMaskScalar "Parallax Gap Compensation" 10.0 0.0 32.0 0.2
-#pragma parameter FOV "Lens Distortion Power" 96.0 0.0 170.0 0.1
-#pragma parameter LensType "Lens Dist Type (Ortho, Equisolid, Equidist, Stereo)" 0.0 0.0 3.0 1.0
-#pragma parameter K1 "Radial Correction #1 (Brown-Conrady Model)" 0.0 0.0 1.0 0.01
-#pragma parameter K2 "Radial Correction #2 (Brown-Conrady Model)" 0.0 0.0 1.0 0.01
-#pragma parameter K3 "Radial Correction #3 (Brown-Conrady Model)" 0.0 0.0 1.0 0.01
-#pragma parameter K4 "Radial Correction #4 (Brown-Conrady Model)" 0.0 0.0 1.0 0.01
-#pragma parameter P1 "Tangential Correction #1 (Brown-Conrady Model)" 0.0 0.0 1.0 0.001
-#pragma parameter P2 "Tangential Correction #2 (Brown-Conrady Model)" 0.0 0.0 1.0 0.001
-#pragma parameter P3 "Tangential Correction #3 (Brown-Conrady Model)" 0.0 0.0 1.0 0.001
-#pragma parameter ImageScale "Image Scale" 1.0 0.25 1.0 0.01
-#pragma parameter ChGreenK1 "Chromatic Green Correction (Zoom)" 0.0 0.0 1.0 0.001 
-#pragma parameter ChGreenK2 "Chromatic Green Correction (K1)" 0.0 0.0 1.0 0.001
-#pragma parameter ChGreenK3 "Chromatic Green Correction (K2)" 0.0 0.0 1.0 0.001
-#pragma parameter ChGreenK4 "Chromatic Green Correction (K3)" 0.0 0.0 1.0 0.001
-#pragma parameter SoloGreen "Green Channel Adj Solo" 0.0 0.0 1.0 1.0
-#pragma parameter ChBlueK1 "Chromatic Blue Correction (Zoom)" 0.0 0.0 1.0 0.001
-#pragma parameter ChBlueK2 "Chromatic Blue Correction (K1)" 0.0 0.0 1.0 0.001
-#pragma parameter ChBlueK3 "Chromatic Blue Correction (K2)" 0.0 0.0 1.0 0.001
-#pragma parameter ChBlueK4 "Chromatic Blue Correction (K3)" 0.0 0.0 1.0 0.001
-#pragma parameter SoloBlue "Blue Channel Adj Solo" 0.0 0.0 1.0 1.0
-#pragma parameter ChGreenOffsetL_x "Left Green Center Offset X" 0.0 -0.2 0.2 0.001
-#pragma parameter ChGreenOffsetL_y "Left Green Center Offset Y" 0.0 -0.2 0.2 0.001
-#pragma parameter ChBlueOffsetL_x "Left Blue Center Offset X" 0.0 -0.2 0.2 0.001
-#pragma parameter ChBlueOffsetL_y "Left Blue Center Offset Y" 0.0 -0.2 0.2 0.001
-#pragma parameter ChGreenOffsetR_x "Right Green Center Offset X" 0.0 -0.2 0.2 0.001
-#pragma parameter ChGreenOffsetR_y "Right Green Center Offset Y" 0.0 -0.2 0.2 0.001
-#pragma parameter ChBlueOffsetR_x "Right Blue Center Offset X" 0.0 -0.2 0.2 0.001
-#pragma parameter ChBlueOffsetR_y "Right Blue Center Offset Y" 0.0 -0.2 0.2 0.001
-#pragma parameter Strength "Sharpen Strength" 25.0 0.0 100.0 0.5
-#pragma parameter Clamp "Sharpen Clamping" 0.65 0.5 1.0 0.001
-#pragma parameter Offset "High-pass Offset" 0.1 0.01 2.0 0.002
-#pragma parameter Preview "Preview Sharpen Layer" 0.0 0.0 1.0 1.0
-#pragma parameter Brightness "Virtual Nose Brightness" 1.0 0.0 1.0 0.01
-#pragma parameter Scale_x "Virtual Nose Scale X" 0.382 0.1 1.0 0.01
-#pragma parameter Scale_y "Virtual Nose Scale Y" 0.618 0.1 1.0 0.01
-
-int SoloLines = int(global.SoloLines);
-bool TestGrid = bool(global.TestGrid);
-float IPD = global.IPD;
-bool StereoSwitch = bool(global.StereoSwitch);
-//float ParallaxOffset = global.ParallaxOffset;
-//float ParallaxCenter = global.ParallaxCenter;
-//int ParallaxSteps = int(global.ParallaxSteps);
-//int ParallaxMaskScalar = int(global.ParallaxMaskScalar);
-//bool ParallaxSwitch = bool(global.ParallaxSwitch);
-int FOV = int(global.FOV);
-int LensType = int(global.LensType);
-vec4 K = vec4(global.K1, global.K2, global.K3, global.K4);
-vec3 P = vec3(global.P1, global.P2, global.P3);
-float ImageScale = global.ImageScale;
-bool PerspectiveSwitch = bool(global.PerspectiveSwitch);
-vec4 ChGreenK = vec4(global.ChGreenK1, global.ChGreenK2, global.ChGreenK3,
-   global.ChGreenK4);
-bool SoloGreen = bool(global.SoloGreen);
-vec4 ChBlueK = vec4(global.ChBlueK1, global.ChBlueK2, global.ChBlueK3,
-   global.ChBlueK4);
-bool SoloBlue = bool(global.SoloBlue);
-bool ChromaticAbrSwitch = bool(global.ChromaticAbrSwitch);
-vec2 ChGreenOffsetL = vec2(global.ChGreenOffsetL_x, global.ChGreenOffsetL_y);
-vec2 ChBlueOffsetL = vec2(global.ChBlueOffsetL_x, global.ChBlueOffsetL_y);
-vec2 ChGreenOffsetR = vec2(global.ChGreenOffsetR_x, global.ChGreenOffsetR_y);
-vec2 ChBlueOffsetR = vec2(global.ChBlueOffsetR_x, global.ChBlueOffsetR_y);
-float Strength = global.Strength;
-float Clamp = global.Clamp;
-float Offset = global.Offset;
-bool Preview = bool(global.Preview);
-bool Sharpen = bool(global.Sharpen);
-bool Nose = bool(global.Nose);
-float Brightness = global.Brightness;
-vec2 Scale = vec2(global.Scale_x, global.Scale_y);
-float imgzoom = global.imgzoom;
-vec2 img_ar = vec2(global.aspect_x, global.aspect_y);
diff --git a/stereoscopic-3d/shaders/fubax_vr/fubax_vr_shared_funcs.inc b/stereoscopic-3d/shaders/fubax_vr/fubax_vr_shared_funcs.inc
deleted file mode 100644
index 8cab660a6c..0000000000
--- a/stereoscopic-3d/shaders/fubax_vr/fubax_vr_shared_funcs.inc
+++ /dev/null
@@ -1,205 +0,0 @@
-// Adjust to limited RGB
-vec3 tv(vec3 Input)
-{ return Input*((235.0-16.0)/255.0)+16.0/255.0; }
-
-// Generate test grid
-vec3 Grid(vec2 Coordinates, float AspectRatio)
-{
-// Grid settings
-#ifndef BoxAmount
-#define BoxAmount 31 // Number of boxes horizontally (choose odd number)
-#endif
-
-#ifndef thicknessA
-#define thicknessA 0.25 // White grid thickness
-#endif
-
-#ifndef thicknessB
-#define thicknessB 0.125 // Yellow cross thickness
-#endif
-
-#ifndef crossColor
-#define crossColor vec3(1.0, 1.0, 0.0) // Center cross color (yellow)
-#endif
-
-   bool RadialPattern = (SoloLines == 3);
-   
-   vec2 GridCoord = Coordinates;
-	GridCoord.y -= 0.5; // Center coordinates vertically
-	GridCoord.y /= AspectRatio; // Correct aspect
-	GridCoord.y += 0.5; // Center at middle
-	
-	vec2 CrossUV = GridCoord; // Store center cross coordinates
-	
-	vec2 PixelSize; vec3 gridColor;
-	// Generate grid pattern
-	GridCoord = (RadialPattern) ? vec2(length(GridCoord-0.5)*1.618) : GridCoord; // Switch to radial pattern
-	GridCoord = abs(fract(GridCoord*BoxAmount)*2.0-1.0)*(thicknessA+1.0);
-	// Anti-aliased grid
-	PixelSize = fwidth(GridCoord.xy);
-	GridCoord = smoothstep(1.0-PixelSize, 1.0+PixelSize, GridCoord);
-
-	// Combine/solo vertical and horizontal lines
-	switch(SoloLines)
-	{
-		case 1:
-			{ gridColor = vec3(GridCoord.y); break; }
-		case 2:
-			{ gridColor = vec3(GridCoord.x); break; }
-		default:
-			{ gridColor = vec3(max(GridCoord.x, GridCoord.y)); break; }
-	};
-
-	// Generate center cross
-	CrossUV = 1.0-abs(CrossUV*2.0-1.0);
-	CrossUV = CrossUV*(thicknessB/BoxAmount+1.0);
-	// Anti-aliased cross
-	PixelSize = fwidth(CrossUV);
-	CrossUV = smoothstep(1.0-PixelSize, 1.0+PixelSize, CrossUV);
-	// Combine vertical and horizontal line
-	float CrossMask = max(CrossUV.y, CrossUV.x);
-
-	// Blend grid and center cross
-	gridColor = mix(gridColor, ((RadialPattern) ? vec3(1.0) : crossColor), vec3(CrossMask));
-
-	// Solo colors
-	if(SoloGreen) gridColor.b = 0.0;
-	if(SoloBlue) gridColor.g = 0.0;
-
-	// Reduce grid brightness
-	return tv(gridColor);
-}
-
-// Divide screen into two halfs
-vec2 StereoVision(vec2 Coordinates, float Center)
-{
-	vec2 StereoCoord = Coordinates;
-	StereoCoord.x = 0.25 + abs( StereoCoord.x*2.0-1.0 ) * 0.5; // Divide screen in two
-	StereoCoord.x -= mix(-0.25, 0.25, Center); // Change center for interpupillary distance (IPD)
-	// Mirror left half
-	float ScreenSide = step(0.5, Coordinates.x);
-	StereoCoord.x *= ScreenSide*2.0-1.0;
-	StereoCoord.x += 1.0 - ScreenSide;
-	return StereoCoord;
-}
-
-// Convert stereo coordinates to mono
-vec2 InvStereoVision(vec2 Coordinates, int ScreenMask, float Center)
-{
-	vec2 stereoCoord = Coordinates;
-	stereoCoord.x += Center*0.5 * ScreenMask;
-	return stereoCoord;
-}
-
-// Generate border mask with anti-aliasing from UV coordinates
-float BorderMaskAA(vec2 Coordinates)
-{
-	vec2 RaidalCoord = abs(Coordinates*2.0-1.0);
-	// Get pixel size in transformed coordinates (for anti-aliasing)
-	vec2 PixelSize = fwidth(RaidalCoord);
-
-	// Create borders mask (with anti-aliasing)
-	vec2 Borders = smoothstep(1.0-PixelSize, 1.0+PixelSize, RaidalCoord);
-
-	// Combine side and top borders
-	return max(Borders.x, Borders.y);
-}
-
-/*
-// Can't really use this one as RetroArch can't access the depth buffer
-float GetDepth(vec2 texcoord)
-{
-	return ReShade::GetLinearizedDepth(texcoord);
-} 
-
-
-// Horizontal parallax offset effect
-vec2 Parallax(vec2 Coordinates, float Offset, float Center, int GapOffset, int Steps)
-{
-// Limit amount of loop steps to make it finite
-#ifndef MaximumParallaxSteps
-#def MaximumParallaxSteps 64
-#endif
-
-	// Offset per step progress
-	float LayerDepth = 1.0 / min(MaximumParallaxSteps, Steps);
-
-	// Netto layer offset change
-	float deltaCoordinates = Offset * LayerDepth;
-
-	vec2 ParallaxCoord = Coordinates;
-	// Offset image horizontally so that parallax is in the depth appointed center
-	ParallaxCoord.x += Offset * Center;
-	float CurrentDepthMapValue = GetDepth(ParallaxCoord); // Replace function
-
-	// Steep parallax mapping
-	float CurrentLayerDepth = 0.0;
-	[loop]
-	while(CurrentLayerDepth < CurrentDepthMapValue)
-	{
-		// Shift coordinates horizontally in linear fasion
-		ParallaxCoord.x -= deltaCoordinates;
-		// Get depth value at current coordinates
-		CurrentDepthMapValue = GetDepth(ParallaxCoord); // Replace function
-		// Get depth of next layer
-		CurrentLayerDepth += LayerDepth;
-		continue;
-	}
-
-	// Parallax Occlusion Mapping
-	vec2 PrevParallaxCoord = ParallaxCoord;
-	PrevParallaxCoord.x += deltaCoordinates;
-	float afterDepthValue = CurrentDepthMapValue - CurrentLayerDepth;
-	float beforeDepthValue = GetDepth(PrevParallaxCoord); // Replace function
-	// Store depth read difference for masking
-	float DepthDifference = beforeDepthValue - CurrentDepthMapValue;
-
-	beforeDepthValue += LayerDepth - CurrentLayerDepth;
-	// Interpolate coordinates
-	float weight = afterDepthValue / (afterDepthValue - beforeDepthValue);
-	ParallaxCoord = PrevParallaxCoord * weight + ParallaxCoord * (1.0 - weight);
-
-	// Apply gap masking (by JMF)
-	DepthDifference *= GapOffset * Offset * 100.0;
-	DepthDifference *= ReShade::PixelSize.x; // Replace function
-	ParallaxCoord.x += DepthDifference;
-
-	return ParallaxCoord;
-};
-*/
-
-// Lens projection model (algorithm by JMF)
-float Orthographic(float rFOV, float R){ return tan(asin(sin(rFOV*0.5)*R))/(tan(rFOV*0.5)*R); }
-float Equisolid(float rFOV, float R){ return tan(asin(sin(rFOV*0.25)*R)*2.0)/(tan(rFOV*0.5)*R); }
-float Equidistant(float rFOV, float R){ return tan(R*rFOV*0.5)/(tan(rFOV*0.5)*R); }
-float Stereographic(float rFOV, float R){ return tan(atan(tan(rFOV*0.25)*R)*2.0)/(tan(rFOV*0.5)*R); }
-
-// Brown-Conrady radial distortion model (multiply by coordinates)
-float kRadial(float R2, float K1, float K2, float K3, float K4)
-{ return 1.0 + K1*R2 + K2*pow(R2,2) + K3*pow(R2,4) + K4*pow(R2,6); }
-
-// Brown-Conrady tangental distortion model (add to coordinates)
-vec2 pTangental(vec2 Coord, float R2, float P1, float P2, float P3, float P4)
-{
-	return vec2(
-		(P1*(R2+pow(Coord.x,2)*2.0)+2.0*P2*Coord.x*Coord.y)*(1.0+P3*R2+P4*pow(R2,2)),
-		(P2*(R2+pow(Coord.y,2)*2.0)+2.0*P1*Coord.x*Coord.y)*(1.0+P3*R2+P4*pow(R2,2))
-	);
-}
-
-// RGB to YUV709.luma
-float Luma(vec3 Input)
-{
-	const vec3 Luma709 = vec3(0.2126, 0.7152, 0.0722);
-	return dot(Input, Luma709);
-}
-
-// Overlay blending mode
-float Overlay(float LayerA, float LayerB)
-{
-	float MinA = min(LayerA, 0.5);
-	float MinB = min(LayerB, 0.5);
-	float MaxA = max(LayerA, 0.5);
-	float MaxB = max(LayerB, 0.5);
-	return 2.0 * (MinA * MinB + MaxA + MaxB - MaxA * MaxB) - 1.5;
-}
diff --git a/stereoscopic-3d/shaders/fubax_vr/nose.png b/stereoscopic-3d/shaders/fubax_vr/nose.png
deleted file mode 100644
index 350b46de92..0000000000
Binary files a/stereoscopic-3d/shaders/fubax_vr/nose.png and /dev/null differ
diff --git a/stereoscopic-3d/shaders/shutter-to-anaglyph.slang b/stereoscopic-3d/shaders/shutter-to-anaglyph.slang
deleted file mode 100644
index 6475f7b6ba..0000000000
--- a/stereoscopic-3d/shaders/shutter-to-anaglyph.slang
+++ /dev/null
@@ -1,60 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float flip_eye_toggle;
-   float green;
-   float blue;
-} params;
-
-#pragma parameter flip_eye_toggle "Flip Left/Right" 0.0 0.0 1.0 1.0
-bool flip_eye = bool(params.flip_eye_toggle);
-#pragma parameter green "Green" 1.0 0.0 1.0 1.0
-#pragma parameter blue "Blue" 1.0 0.0 1.0 1.0
-
-const vec3 rec_709_luma = vec3(0.212, 0.701, 0.087);
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out float oscillator;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-   oscillator = float(mod(params.FrameCount, 2.));
-   oscillator = (flip_eye) ? oscillator : 1. - oscillator;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in float oscillator;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-
-void main()
-{
-// convert current and previous frames to luma to preserve details
-   vec3 curr = texture(Source, vTexCoord).rgb;
-   float curr_lum = dot(curr, rec_709_luma);
-   vec3 last = texture(OriginalHistory1, vTexCoord).rgb;
-   float last_lum = dot(last, rec_709_luma);
-// image for left/right eyes alternate on each frame
-   float one_eye = last_lum * oscillator + (curr_lum * (1. - oscillator));
-   float other_eye = curr_lum * oscillator + (last_lum * (1. - oscillator));
-// one eye gets the red channel, the other eye goes to green and/or blue, depending on glasses
-   vec3 combined = vec3(one_eye, other_eye * params.green, other_eye * params.blue);
-   FragColor = vec4(combined, 1.0);
-}
diff --git a/stereoscopic-3d/shutter-to-anaglyph.slangp b/stereoscopic-3d/shutter-to-anaglyph.slangp
deleted file mode 100644
index 059682d2c1..0000000000
--- a/stereoscopic-3d/shutter-to-anaglyph.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/shutter-to-anaglyph.slang
-scale_type0 = source
diff --git a/stock.slang b/stock.slang
deleted file mode 100644
index bf3cf6b7e8..0000000000
--- a/stock.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-   FragColor = vec4(texture(Source, vTexCoord).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/test/decode-format.slang b/test/decode-format.slang
deleted file mode 100644
index f3f5593db4..0000000000
--- a/test/decode-format.slang
+++ /dev/null
@@ -1,28 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform usampler2D Source;
-
-void main()
-{
-   vec4 current = unpackUnorm4x8(texture(Source, vTexCoord).r);
-   FragColor = current;
-}
diff --git a/test/feedback-noncausal.slang b/test/feedback-noncausal.slang
deleted file mode 100644
index d93a2a75fc..0000000000
--- a/test/feedback-noncausal.slang
+++ /dev/null
@@ -1,37 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 SourceSize;
-   vec4 PassOutputSize0;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-// This should intentionally fail to validate in the frontend.
-layout(set = 0, binding = 2) uniform sampler2D PassOutput0;
-
-void main()
-{
-   vec2 tex = floor(global.PassOutputSize0.xy * vTexCoord);
-   tex = (tex + 0.5) * global.PassOutputSize0.zw;
-
-   vec3 current = texture(Source, tex).rgb;
-   vec3 prev = texture(PassOutput0, tex).rgb;
-   FragColor = vec4(mix(current, prev, 0.8), 1.0);
-}
diff --git a/test/feedback-noncausal.slangp b/test/feedback-noncausal.slangp
deleted file mode 100644
index e5e99a14b0..0000000000
--- a/test/feedback-noncausal.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-shader0 = feedback-noncausal.slang
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
diff --git a/test/feedback.slang b/test/feedback.slang
deleted file mode 100644
index e8e518d736..0000000000
--- a/test/feedback.slang
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 SourceSize;
-   vec4 PassFeedbackSize0;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-layout(set = 0, binding = 2) uniform sampler2D PassFeedback0;
-
-void main()
-{
-   vec2 tex = floor(global.PassFeedbackSize0.xy * vTexCoord);
-   tex = (tex + 0.5) * global.PassFeedbackSize0.zw;
-
-   vec3 current = texture(Source, tex).rgb;
-   vec3 prev = texture(PassFeedback0, tex).rgb;
-   FragColor = vec4(mix(current, prev, 0.8), 1.0);
-}
diff --git a/test/feedback.slangp b/test/feedback.slangp
deleted file mode 100644
index 952ae40cfb..0000000000
--- a/test/feedback.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-shader0 = feedback.slang
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
diff --git a/test/format.slang b/test/format.slang
deleted file mode 100644
index a3f4e51997..0000000000
--- a/test/format.slang
+++ /dev/null
@@ -1,30 +0,0 @@
-#version 450
-
-#pragma format R32_UINT
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out uint FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-void main()
-{
-   vec3 current = texture(Source, vTexCoord).rgb;
-   FragColor = packUnorm4x8(0.3 * vec4(current, 1.0));
-}
diff --git a/test/format.slangp b/test/format.slangp
deleted file mode 100644
index e5fdae6a24..0000000000
--- a/test/format.slangp
+++ /dev/null
@@ -1,7 +0,0 @@
-shaders = 2
-shader0 = format.slang
-shader1 = decode-format.slang
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
-filter_linear1 = false
diff --git a/test/frame_count.slang b/test/frame_count.slang
deleted file mode 100644
index b3a76403a8..0000000000
--- a/test/frame_count.slang
+++ /dev/null
@@ -1,30 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   uint FrameCount;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-
-void main()
-{
-   vec3 current = texture(Source, vTexCoord).rgb;
-   FragColor = sqrt(0.5 + 0.4 * sin(float(global.FrameCount) * 6.28 * 0.01)) *
-      vec4(current, 1.0);
-}
diff --git a/test/frame_count.slangp b/test/frame_count.slangp
deleted file mode 100644
index 820a7255cd..0000000000
--- a/test/frame_count.slangp
+++ /dev/null
@@ -1,6 +0,0 @@
-shaders = 1
-shader0 = frame_count.slang
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
-frame_count_mod0 = 100
diff --git a/test/history.slang b/test/history.slang
deleted file mode 100644
index 140a4e8265..0000000000
--- a/test/history.slang
+++ /dev/null
@@ -1,38 +0,0 @@
-#version 450
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 SourceSize;
-   vec4 OriginalHistorySize1;
-   vec4 OriginalHistorySize3;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-layout(set = 0, binding = 2) uniform sampler2D OriginalHistory1;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory3;
-
-void main()
-{
-   vec2 tex = floor(global.OriginalHistorySize1.xy * vTexCoord);
-   tex = (tex + 0.5) * global.OriginalHistorySize1.zw;
-
-   vec3 current = texture(Source, tex).rgb;
-   vec3 prev = texture(OriginalHistory1, tex).rgb;
-   vec3 prev2 = texture(OriginalHistory3, tex).rgb;
-   FragColor = vec4(abs(current - prev + prev2), 1.0);
-}
diff --git a/test/history.slangp b/test/history.slangp
deleted file mode 100644
index 4e73877b81..0000000000
--- a/test/history.slangp
+++ /dev/null
@@ -1,2 +0,0 @@
-shaders = 1
-shader0 = history.slang
diff --git a/test/pragma-name.slang b/test/pragma-name.slang
deleted file mode 100644
index 7572b5c670..0000000000
--- a/test/pragma-name.slang
+++ /dev/null
@@ -1,37 +0,0 @@
-#version 450
-
-#pragma name MainPass
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-   vec4 SourceSize;
-   vec4 MainPassFeedbackSize;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 1) uniform sampler2D Source;
-layout(set = 0, binding = 2) uniform sampler2D MainPassFeedback;
-
-void main()
-{
-   vec2 tex = floor(global.MainPassFeedbackSize.xy * vTexCoord);
-   tex = (tex + 0.5) * global.MainPassFeedbackSize.zw;
-
-   vec3 current = texture(Source, tex).rgb;
-   vec3 prev = texture(MainPassFeedback, tex).rgb;
-   FragColor = vec4(0.5 * mix(current, prev, 0.8), 1.0);
-}
diff --git a/test/pragma-name.slangp b/test/pragma-name.slangp
deleted file mode 100644
index 288ba696eb..0000000000
--- a/test/pragma-name.slangp
+++ /dev/null
@@ -1,5 +0,0 @@
-shaders = 1
-shader0 = pragma-name.slang
-scale_type0 = source
-scale0 = 1.0
-filter_linear0 = false
diff --git a/vhs/VHSPro.slangp b/vhs/VHSPro.slangp
deleted file mode 100644
index 571ea7d0d0..0000000000
--- a/vhs/VHSPro.slangp
+++ /dev/null
@@ -1,38 +0,0 @@
-shaders = 6
-
-#moved this to the first pass to avoid complications with feedback
-shader0 = shaders/VHSPro/VHSPro_Third.slang
-alias0 = third
-scale_type0 = source
-filter_linear0 = true
-
-shader1 = shaders/VHSPro/VHSPro_Tape.slang
-alias1 = tape
-filter_linear1 = true
-scale_type1 = source
-
-shader2 = shaders/VHSPro/VHSPro_First.slang
-alias2 = first
-filter_linear2 = true
-scale_type2 = source
-
-shader3 = shaders/VHSPro/VHSPro_Second.slang
-alias3 = second
-filter_linear3 = true
-scale_type3 = source
-
-#doesn't really do anything for us
-#shader4 = shaders/VHSPro/VHSPro_LastFrame.slang
-#alias4 = lastframe
-#filter_linear4 = true
-#scale_type4 = source
-
-shader4 = shaders/VHSPro/VHSPro_Forth.slang
-alias4 = forth
-filter_linear4 = true
-scale_type4 = source
-
-shader5 = shaders/VHSPro/VHSPro_Clear.slang
-alias5 = clear
-filter_linear5 = true
-scale_type5 = source
\ No newline at end of file
diff --git a/vhs/gristleVHS.slangp b/vhs/gristleVHS.slangp
deleted file mode 100644
index 30eacc3d8b..0000000000
--- a/vhs/gristleVHS.slangp
+++ /dev/null
@@ -1,28 +0,0 @@
-shaders = 5
-
-shader0 = ../stock.slang
-alias0 = gristleVHS_refpass
-
-shader1 = shaders/gristleVHS/HorizontalSoften.slang
-scale_type1 = absolute
-scale_y1 = 480
-scale_x1 = 333
-frame_count_mod1 = 256
-filter_linear1 = true
-
-shader2 = ../blurs/shaders/sunset_gaussian/sunset_horz.slang
-scale_type2 = absolute
-scale_x2 = 80
-scale_y2 = 480
-filter_linear2 = true
-
-shader3 = shaders/gristleVHS/VHS.slang
-scale_type3 = absolute
-scale_y3 = 480
-scale_x3 = 333
-frame_count_mod3 = 256
-filter_linear3 = true
-
-shader4 = ../stock.slang
-filter_linear4 = true
-scale_type4 = viewport
diff --git a/vhs/mudlord-pal-vhs.slangp b/vhs/mudlord-pal-vhs.slangp
deleted file mode 100644
index 4ea791ef23..0000000000
--- a/vhs/mudlord-pal-vhs.slangp
+++ /dev/null
@@ -1,4 +0,0 @@
-shaders = 1
-
-shader0 = shaders/mudlord-pal-vhs.slang
-scale_type0 = viewport
diff --git a/vhs/ntsc-vcr.slangp b/vhs/ntsc-vcr.slangp
deleted file mode 100644
index b6d9c5d8de..0000000000
--- a/vhs/ntsc-vcr.slangp
+++ /dev/null
@@ -1,37 +0,0 @@
-shaders = 5
-shader0 = ../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
-shader1 = ../ntsc/shaders/maister/ntsc-pass2-3phase.slang
-shader2 = ../ntsc/shaders/maister/ntsc-stock.slang
-shader3 = shaders/static.slang
-shader4 = ../misc/shaders/image-adjustment.slang
-
-filter_linear0 = false
-filter_linear1 = false
-filter_linear2 = false
-
-scale_type0 = source
-scale_x0 = 4.0
-scale_y0 = 1.0
-frame_count_mod0 = 2
-float_framebuffer0 = true
-
-scale_type1 = source
-scale_x1 = 0.5
-scale_y1 = 1.0
-
-scale_type_x2 = source
-scale_type_y2 = viewport
-scale2 = 1.0
-
-scale_type3 = source
-scale_type4 = source
-
-parameters = "GRAIN_STR;luminance;bright_boost;target_gamma;saturation"
-GRAIN_STR = 6.0
-luminance = 1.10
-bright_boost = 0.10
-target_gamma = 3.50
-saturation = 0.70
-
-textures = "play"
-play = resources/play.png
diff --git a/vhs/resources/play.png b/vhs/resources/play.png
deleted file mode 100644
index 31d3a9677f..0000000000
Binary files a/vhs/resources/play.png and /dev/null differ
diff --git a/vhs/resources/rew.png b/vhs/resources/rew.png
deleted file mode 100644
index 684f2a3ece..0000000000
Binary files a/vhs/resources/rew.png and /dev/null differ
diff --git a/vhs/shaders/VHSPro/VHSPro_Clear.slang b/vhs/shaders/VHSPro/VHSPro_Clear.slang
deleted file mode 100644
index 6106b47c3b..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_Clear.slang
+++ /dev/null
@@ -1,37 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define SamplerColorVHS Source
-
-#include "VHSPro_params.inc"
-#include "VHSPro_constants.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 txcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   txcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 txcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "VHSPro_functions.inc"
-
-void main()
-{
-   FragColor = vec4(texture(SamplerColorVHS, txcoord).rgb, 1.0);
-}
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_First.slang b/vhs/shaders/VHSPro/VHSPro_First.slang
deleted file mode 100644
index 07d1c25d01..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_First.slang
+++ /dev/null
@@ -1,282 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   int FrameDirection;
-} params;
-
-#define SamplerColorVHS Original
-
-#include "VHSPro_params.inc"
-#include "VHSPro_constants.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 txcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   txcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 txcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Original;
-layout(set = 0, binding = 3) uniform sampler2D tape;
-
-#include "VHSPro_functions.inc"
-#define SamplerTape tape
-
-void main()
-{
-    const float t = float(params.FrameCount) * 0.0075;//_Time.y;                            
-    vec2 p = txcoord.xy;
-    
-    float SLN = screenLinesNum; //TODO use only SLN
-    float SLN_Noise = noiseLinesNum; //TODO only SLN_Noise
-    float ONE_X = 0.0;
-    float ONE_Y = 0.0;
-
-    //basically if its 0 -> set it to fullscreen
-    //TODO calc it before shader / already float done
-    SLN = screenLinesNum; //TODO use only SLN
-    SLN_Noise = noiseLinesNum; //TODO only SLN_Noise
-    if(SLN==0.0) SLN = _ScreenParams.y;
-
-    if(SLN_Noise==0 || SLN_Noise>SLN) SLN_Noise = SLN;                                    
-                    
-    ONE_X = 1.0/_ScreenParams.x; //assigning works only here 
-    ONE_Y = 1.0/_ScreenParams.y;                     
-                    
-
-    if (VHS_Twitch_V){
-        p = twitchVertical(0.5*twitchVFreq, p, t); 
-    }
-
-    if (VHS_Twitch_H){
-        p = twitchHorizonal(0.1*twitchHFreq, p, t);
-    }    
-
-    //make discrete lines /w or wo float 
-    if(VHS_LinesFloat){
-        float sh = fract(-t*linesFloatSpeed); //shift  // float sh = fmod(t, 1.); //shift
-        // if(p.x>0.5)
-        p.y = -floor( -p.y * SLN + sh )/SLN + sh/SLN;  //v1.3
-        // p.y = floor( p.y * SLN + sh )/SLN - sh/SLN; //v1.2
-    } else {
-        // if(p.x>0.5)
-        p.y = -floor( -p.y * SLN )/SLN;  //v1.3
-        // p.y = floor( p.y * SLN )/SLN; //v1.2
-    }
-                    
-    if (VHS_Stretch){
-        p = stretch(p, t, 15.0, 1.0, 0.5, 0.0);
-        p = stretch(p, t, 8.0, 1.2, 0.45, 0.5);
-        p = stretch(p, t, 11.0, 0.5, -0.35, 0.25); //up   
-    }
-
-    if (VHS_Jitter_H){
-        if( fmod( p.y * SLN, 2.0)<1.0) 
-        p.x += ONE_X*sin(t*130.0)*jitterHAmount;
-    }
-    
-    //just init    
-    vec3 col = vec3(0.0,0.0,0.0);
-    vec3 signal = vec3(0.0,0.0,0.0);// rgb2yiq(col);
-
-    //gotta initiate all these things here coz of tape noise distortion
-
-    //[NOISE uv init]
-    //if SLN_Noise different from SLN->recalc linefloat                    
-    vec2 pn = p;
-    if(SLN!=SLN_Noise){
-        if(VHS_LineNoise){
-            const float sh = fract(t); //shift  // float sh = fmod(t, 1.); //shift
-            pn.y = floor( pn.y * SLN_Noise + sh )/SLN_Noise - sh/SLN_Noise;
-        } else  {
-            pn.y = floor( pn.y * SLN_Noise )/SLN_Noise;
-        }                 
-    }      
-
-    //SLN_X is quantization of X. goest from _ScreenParams.x to SLN_X
-    const float ScreenLinesNumX = SLN_Noise * _ScreenParams.x / _ScreenParams.y;
-    const float SLN_X = noiseQuantizeX*(_ScreenParams.x - ScreenLinesNumX) + ScreenLinesNumX;
-    pn.x = floor( pn.x * SLN_X )/SLN_X;
-
-    const vec2 pn_ = pn*_ScreenParams.xy;
-
-    //TODO probably it shud be 1.0/SLN_Noise
-    const float ONEXN = 1.0/SLN_X;
-    //[//noise uv init]
-
-    float distShift = 0; // for 2nd part of tape noise
-
-    if (VHS_TapeNoise) {
-
-        //uv distortion part of tapenoise
-        distShift = 0; // for 2nd part of tape noise 
-        for (int ii = 0; ii < 20 % 1023; ii++){
-
-            //this is t.n. line value at pn.y and down each pixel
-            //TODO i guess ONEXN shud be 1.0/sln noise                            
-            float tnl = textureLod(SamplerTape, vec2(0.0,pn.y-ONEXN*ii), 0.).y;
-            // float tnl = texture(SamplerTape, vec2(0.0,pn.y-ONEXN*ii)).y;
-            // float tnl = tapeNoiseLines(vec2(0.0,pn.y-ONEXN*i), t*tapeNoiseSpeed)*tapeNoiseAmount;
-            tnl -= 0.15 * float(params.FrameDirection);
-            // float fadediff = hash12(vec2(pn.x-ONEXN*i,pn.y)); 
-            if(tnl>0.27) {                            
-                    //TODO get integer part other way
-                    const float sh = sin( 1.0*PI*(float(ii)/float(20))) ; //0..1                                
-                    p.x -= float(int(sh)*4.0*ONEXN); //displacement
-                    distShift += sh ; //for 2nd part
-                    // p.x +=  ONEXN * float(int(((tnl-thth)/thth)*4.0));
-                    // col.x = sh;    
-                }
-            }
-        }
-
-    //uv transforms over
-
-    //picture proccess start
-    if (VHS_Jitter_V){
-        signal = yiqDist(p, jitterVAmount, t*jitterVSpeed);
-    } else {
-        col = texture(SamplerColorVHS, p).rgb;
-        // col = vec3(p.xy, 0.0);//debug
-        signal = rgb2yiq(col);
-    }
-
-
-    if (VHS_LineNoise || VHS_FilmGrain){
-        signal.x += texture(SamplerTape, pn).z;
-    }
-                       
-    //iq noise from yiq
-    if (VHS_YIQNoise){
-        if (signalNoiseType == 0) {
-                        //TODO make cheaper noise                         
-                        //type 1 (best) w Y mask
-                        const vec2 noise = n4rand_bw( pn_,t,1.0-signalNoisePower ) ; 
-                        signal.y += (noise.x*2.0-1.0)*signalNoiseAmount*signal.x;
-                        signal.z += (noise.y*2.0-1.0)*signalNoiseAmount*signal.x;
-                } else if (signalNoiseType == 1){
-                        //type 2
-                        const vec2 noise = n4rand_bw( pn_,t, 1.0-signalNoisePower ) ; 
-                        signal.y += (noise.x*2.0-1.0)*signalNoiseAmount;
-                        signal.z += (noise.y*2.0-1.0)*signalNoiseAmount;
-                } else {
-                        //type 3
-                        const vec2 noise = n4rand_bw( pn_,t, 1.0-signalNoisePower )*signalNoiseAmount ; 
-                        signal.y *= noise.x;
-                        signal.z *= noise.y;    
-                        signal.x += (noise.x*2.0-1.0)*0.05;
-                }
-            }
-
-    //2nd part with noise, tail and yiq col shift
-    if (VHS_TapeNoise){
-
-    //here is normilized p (0..1)
-    float tn = texture(SamplerTape, pn).x;
-    signal.x = bms(signal.x, tn*tapeNoiseAmount ).x;  
-    // float tn = tapeNoise(pn, t*tapeNoiseSpeed)*tapeNoiseAmount;
-
-    //tape noise tail
-    const int tailLength=10; //TODO adjustable
-
-    for(int j = 0; j < tailLength % 1023; j++){
-
-        const float jj = float(j);
-        const vec2 d = vec2(pn.x-ONEXN*jj,pn.y);
-        tn = textureLod(SamplerTape, vec2(d), 0. ).x;
-        // tn = texture(SamplerTape, d).x;
-        // tn = tapeNoise(vec2(pn.x-ONEXN*i,pn.y), t*tapeNoiseSpeed)*tapeNoiseAmount;
-
-        float fadediff = 0.0;
-
-        //for tails length difference
-//        if(__RENDERER__ == 0x0A100 || __RENDERER__ == 0x0B000) {
-//            fadediff = textureLod(SamplerTape, vec2(d), 0.).a; //hash12(d);
-//        }
-
-//        if(__RENDERER__ == 0x09300 || __RENDERER__ >= 0x10000) {
-            fadediff = texture(SamplerTape, d).a; //hash12(d);
-//        }
-
-        if( tn > 0.8 ){                                
-            float nsx =  0.0; //new signal x
-            const float newlength = float(tailLength)*(1.0-fadediff); //tail lenght diff
-            if( jj <= newlength ) nsx = 1.0-( jj/ newlength ); //tail
-            signal.x = bms(signal.x, nsx*tapeNoiseAmount).x;                                    
-        }                
-    }
-
-    //tape noise color shift
-    if(distShift>0.4){
-        // float tnl = tapeNoiseLines(vec2(0.0,pn.y), t*tapeNoiseSpeed)*tapeNoiseAmount;
-        const float tnl = texture(SamplerTape, pn).y;//tapeNoiseLines(vec2(0.0,pn.y), t*tapeNoiseSpeed)*tapeNoiseAmount;
-        signal.y *= 1.0/distShift;//tnl*0.1;//*distShift;//*signal.x;
-        signal.z *= 1.0/distShift;//*distShift;//*signal.x;
-
-        }
-}
-
-    //back to rgb color space
-    //signal has negative values
-    col = yiq2rgb(signal);
-
-    //TODO put it into 2nd pass
-    if (VHS_ScanLines){
-        col *= scanLines(txcoord.xy, t);                         
-    }
-
-    //fisheye cutoff / outside fisheye
-    //helps to remove noise outside the fisheye
-    if (VHS_FishEye){
-
-        p = txcoord.xy;
-
-        float far;
-        const vec2 hco = vec2(ONE_X*cutoffX, ONE_Y*cutoffY) * 0.25; //hard cuttoff x
-        const vec2 sco = vec2(ONE_X*cutoffFadeX, ONE_Y*cutoffFadeY) * 0.25; //soft cuttoff x
-
-        //hard cutoff
-        if( p.x<=(0.0+hco.x) || p.x>=(1.0-hco.x) || p.y<=(0.0+hco.y) || p.y>=(1.0-hco.y) ){
-            col = vec3(0.0,0.0,0.0);
-        } else { 
-            //fades
-                            
-            if( //X
-                (p.x>(0.0+hco.x) && p.x<(0.0+(sco.x+hco.x) )) || (p.x>(1.0-(sco.x+hco.x)) && p.x<(1.0-hco.x)) 
-            ){    
-                if(p.x<0.5)    far = (0.0-hco.x+p.x)/(sco.x);                                    
-                else            
-                far = (1.0-hco.x-p.x)/(sco.x);
-                                
-                col *= float(far).xxx;
-            }; 
-
-                if( //Y
-                    (p.y>(0.0+hco.y)              && p.y<(0.0+(sco.y+hco.y) )) || (p.y>(1.0-(sco.y+hco.y)) && p.y<(1.0-hco.y)) 
-                ){
-                    if(p.y<0.5)    far = (0.0-hco.y+p.y)/(sco.y);                                    
-                    else
-                    far = (1.0-hco.y-p.y)/(sco.y);
-                                
-                    col *= float(far).xxx;
-                }
-            }
-        }
-        
-    // col = texture(SamplerTape, txcoord.xy).x;
-
-    FragColor = vec4(col, 1.0); 
-//    FragColor = (VHS_TapeNoise && params.FrameDirection < 0) ? FragColor + (vec4(texture(tape, txcoord).g)) * 2. : FragColor;
-}
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_Forth.slang b/vhs/shaders/VHSPro/VHSPro_Forth.slang
deleted file mode 100644
index 93b1858591..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_Forth.slang
+++ /dev/null
@@ -1,56 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define SamplerColorVHS second
-#define _FeedbackTex third
-
-#include "VHSPro_params.inc"
-#include "VHSPro_constants.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D second;
-layout(set = 0, binding = 3) uniform sampler2D third;
-
-#include "VHSPro_functions.inc"
-
-void main()
-{
-   // needed to add distortion here or the trails don't match up to the image
-   vec2 p = texcoord;
-    //distortions
-    if (VHS_FishEye){
-        p = fishEye(p, fisheyeSize, fisheyeBend); // p = fishEye(p, 1.2, 2.0);
-        // return vec4( fract(p*5.0)/2.5, 1.0, 1.0); //debug
-    }
-    vec3 col = texture( SamplerColorVHS, texcoord).rgb; //curent frame
-    const vec3 fbb = texture( _FeedbackTex, p).rgb; //feedback buffer
-    
-    if (VHS_Feedback){
-        col = bm_screen(col, fbb*feedbackAmp);
-        if (feedbackDebug){
-            col = fbb;
-        }
-    }
-                   
-    FragColor = vec4(col, 1.0); 
-}
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_LastFrame.slang b/vhs/shaders/VHSPro/VHSPro_LastFrame.slang
deleted file mode 100644
index b7d787c5a6..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_LastFrame.slang
+++ /dev/null
@@ -1,49 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define SamplerColorVHS second
-#define _FeedbackTex Source
-
-#include "VHSPro_params.inc"
-#include "VHSPro_constants.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D second;
-
-#include "VHSPro_functions.inc"
-
-void main()
-{
-    vec3 col = texture( SamplerColorVHS, texcoord).rgb; //curent frame
-    const vec3 fbb = texture( _FeedbackTex, texcoord).rgb; //feedback buffer
-    
-    if (VHS_Feedback){
-        col = bm_screen(col, fbb*feedbackAmp);
-        if (feedbackDebug){
-            col = fbb;
-        }
-    }
-                   
-    FragColor = vec4(col, 1.0); 
-}
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_Second.slang b/vhs/shaders/VHSPro/VHSPro_Second.slang
deleted file mode 100644
index 0eb3484692..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_Second.slang
+++ /dev/null
@@ -1,152 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define SamplerColorVHS Source
-
-#include "VHSPro_params.inc"
-#include "VHSPro_constants.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 txcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   txcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 txcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-#include "VHSPro_functions.inc"
-
-void main()
-{
-    const float t = float(params.FrameCount) * 0.25;//_Time.y;                    
-    vec2 p = txcoord.xy;    
-    float SLN = screenLinesNum; //TODO use only SLN
-
-    //basically if its 0 -> set it to fullscreen
-    if(SLN==0.0) SLN = _ScreenParams.y;
-
-     //TODO maybe make it based on num of lines? and height ? 
-    //TODO make switch between real pixels and pixelated pixels!
-    // ONE_X = 1.0 / screenLinesNum;
-
-    float ONE_X = 1.0 / _ScreenParams.x;  // 1px
-    ONE_X *= bleedAmount; // longer tails, more bleeding, default 1.                    
-
-    //distortions
-    if (VHS_FishEye){
-        p = fishEye(p, fisheyeSize, fisheyeBend); // p = fishEye(p, 1.2, 2.0);
-        // return vec4( fract(p*5.0)/2.5, 1.0, 1.0); //debug
-    }
-
-    int bleedLength = 21;
-
-    if((VHS_BleedMode == 0 || VHS_BleedMode == 1 || VHS_BleedMode == 3))
-    {
-        bleedLength = 25;
-    }
-                      
-    if((VHS_BleedMode == 2 || VHS_BleedMode == 4))
-    {
-        bleedLength = 32;
-    }
-     
-#include "taps.inc"
-
-    //Bleeding
-    vec3 signal = vec3(0.0,0.0,0.0);
-
-    if (VHS_Bleed){
-                        
-        vec3 norm =     vec3(0.0,0.0,0.0);
-        vec3 adj =     vec3(0.0,0.0,0.0);
-        
-        const int taps = bleedLength-4;
-        //int taps = bleedLength; //RetroArch
-
-        for (int ii = 0; float(ii) < mod(float(taps) , float(1023)); ii++){
-
-            const float offset = float(ii);
-            const vec3 sums =     fetch_offset(offset - float(taps), ONE_X) +
-                            fetch_offset(float(taps) - offset, ONE_X) ;
-
-            adj = vec3(luma_filter[ii+3], chroma_filter[ii], chroma_filter[ii]);
-            //adj = vec3(luma_filter[ii], chroma_filter[ii], chroma_filter[ii]); //RetroArch
-
-            signal += sums * adj;
-            norm += adj;
-                            
-        }
-
-        adj = vec3(luma_filter[taps], chroma_filter[taps], chroma_filter[taps]);
-
-        signal += t2d(fixCoord) * adj;
-        norm += adj;
-        signal = signal / norm;
-    } else {
-        //no bleeding
-        signal = t2d(p);
-    }
-
-    //[Signal Tweak]
-    if (VHS_SignalTweak){
-                        
-        //adjust
-        signal.x += signalAdjustY; 
-        signal.y += signalAdjustI; 
-        signal.z += signalAdjustQ; 
-
-        //shift
-        signal.x *= signalShiftY; 
-        signal.y *= signalShiftI; 
-        signal.z *= signalShiftQ; 
-
-        // //test YIQ
-        // signal.x = 0.5;
-        // signal.y = p.x*2.0-1.0;
-        // signal.z = p.y*2.0-1.0;
-
-        //signal noise
-        // vec2 noise = n4rand_bw( p,t, 1.0-signalNoisePower )*signalNoiseAmount ; 
-        // signal.y *= noise.x;
-        // signal.z *= noise.y;
-
-
-        //phase - it cant be dont coz of intervals
-        // signal.x = fract( (signal.x +1.0)*0.5f )*2.0f - 1.0f ;
-        //signal.y = fract( (signal.y +1.0)*0.5f )*2.0f - 1.0f ;
-        //signal.z = fract( (signal.z +1.0)*0.5f )*2.0f - 1.0f ;
-    }
-                    
-    vec3 rgb = yiq2rgb(signal);                    
-                   
-    if (VHS_SignalTweak){
-        if(gammaCorection!=1.0) rgb = pow(abs(rgb), vec3(gammaCorection)); //vec3(gammaCorection).rgb
-    }
-
-    //cut trash after fish eye
-    // if( p.x<0. || p.x>1. || p.y<0. || p.y>1.){
-    //     rgb *= 0.0;
-    // }
-
-    //TODO maybe on yiq channel                    
-    if (VHS_Vignette){
-        rgb *= vignette(p, t*vignetteSpeed); //TODO params //txcoord.xy
-    }
-
-    FragColor = vec4(rgb, 1.0); 
-}
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_Tape.slang b/vhs/shaders/VHSPro/VHSPro_Tape.slang
deleted file mode 100644
index 84de853cd0..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_Tape.slang
+++ /dev/null
@@ -1,68 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#define SamplerColorVHS Original
-
-#include "VHSPro_params.inc"
-#include "VHSPro_constants.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 txcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   txcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 txcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Original;
-
-#include "VHSPro_functions.inc"
-
-void main()
-{
-    const float t = float(params.FrameCount) * 0.025;
-    vec2 p = txcoord.xy;
-    
-    p.y=1-p.y;
-    
-    const vec2 p_ = p*_ScreenParams;
-    
-    float ns = 0.0; //signal noise //tex2D(_TapeTex, p);
-    float nt = 0.0; //tape noise
-    float nl = 0.0; //lines for tape noise
-    float ntail = 0.0; //tails values for tape noise 
-    
-    if (VHS_TapeNoise) {
-
-        //here is normilized p (0..1)
-            nl = tapeNoiseLines(p, t*tapeNoiseSpeed)*1.0;//tapeNoiseAmount;
-            nt = tapeNoise(nl, p, t*tapeNoiseSpeed)*1.0;//tapeNoiseAmount;
-            ntail = hash12(p+ vec2(0.01,0.02) );
-    }
-    
-    if (VHS_LineNoise) {
-            ns += lineNoise(p_, t*lineNoiseSpeed)*lineNoiseAmount;
-            // col += lineNoise(pn_, t*lineNoiseSpeed)*lineNoiseAmount;//i.uvn
-    }
-            
-    //y noise from yiq
-    if (VHS_FilmGrain) {
-        //cheap n ok atm
-        ns += filmGrain((p_-0.5*_ScreenParams.xy)*0.5, t, filmGrainPower ) * filmGrainAmount;
-    }
-        
-    FragColor = vec4(nt,nl,ns,ntail);
-}
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_Third.slang b/vhs/shaders/VHSPro/VHSPro_Third.slang
deleted file mode 100644
index 4d77477a9d..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_Third.slang
+++ /dev/null
@@ -1,66 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-#include "VHSPro_params.inc"
-#include "VHSPro_constants.inc"
-
-#define SamplerColorVHS Original
-#define VHS_InputB OriginalHistory1
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 texcoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   texcoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 texcoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Original;
-layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1;
-layout(set = 0, binding = 4) uniform sampler2D PassFeedback0;
-
-#define _FeedbackTex PassFeedback0
-
-#include "VHSPro_functions.inc"
-
-void main()
-{
-    vec2 p = texcoord.xy;
-    const float one_x = 1.0/_ScreenParams.x;
-    vec3 fc = texture( SamplerColorVHS, texcoord).rgb;    // curent frame
-    
-    //new feedback
-    const vec3 fl = texture( VHS_InputB, texcoord).rgb;    //last frame without feedback
-    float  diff = abs(fl.x-fc.x + fl.y-fc.y + fl.z-fc.z)/3.0; //dfference between frames
-    if(diff<feedbackThresh) diff = 0.0;
-    vec3 fbn = fc*diff*feedbackAmount; //feedback new
-    // fbn = vec3(0.0, 0.0, 0.0);
-
-    //feedback buffer
-    vec3 fbb = ( //blur old bufffer a bit
-            texture( _FeedbackTex, texcoord).rgb + 
-            texture( _FeedbackTex, texcoord + vec2(one_x, 0.0)).rgb + 
-            texture( _FeedbackTex, texcoord - vec2(one_x, 0.0)).rgb
-        ) / 3.0;
-    fbb *= feedbackFade;
-
-    //blend
-    fc = bm_screen(fc, fbb);
-    fbn = bm_screen(fbn, fbb); //feedback
-    vec4 feedbackoutput = vec4(fc, 1.0); 
-    vec4 feedback = vec4(fbn * feedbackColor, 1.0);
-    FragColor = feedback;
-}
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_constants.inc b/vhs/shaders/VHSPro/VHSPro_constants.inc
deleted file mode 100644
index 4da9bb38ee..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_constants.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-//textures and samplers
-#ifndef screenLinesRes
-    #define screenLinesRes 480.0    //Screen Resolution (to use in _TapeTex, has to be the same as screenLinesNum)
-#endif
-
-#ifndef noiseLinesRes
-    #define noiseLinesRes 480.0    //Vertical Resolution (to use in _TapeTex, has to be the same as noiseLinesNum)
-#endif
-
-const float fisheyeSize = 1.2;                     //Size (DO NOT CHANGE)
-const float filmGrainPower = 1.0;                //Film Grain Power (DO NOT CHANGE)
-const float feedbackAmp = 1.0;                     //Feedback Amp (DO NOT CHANGE)
-
-#define _ScreenParams vec2(params.OutputSize.x, params.OutputSize.y)
-#undef PixelSize
-#define PixelSize      vec2(params.OutputSize.z, params.OutputSize.w)
-
-const float Pi2 = 6.283185307;
-
-#define TEXHEIGHT   int(noiseLinesRes)
-#define TEXWIDTH     int((float(TEXHEIGHT)*float(params.OutputSize.x)/float(params.OutputSize.y)))
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_functions.inc b/vhs/shaders/VHSPro/VHSPro_functions.inc
deleted file mode 100644
index 6db1c5e475..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_functions.inc
+++ /dev/null
@@ -1,361 +0,0 @@
-//functions
-
-#define PI 3.14159265359
-const vec3 MOD3 = vec3(443.8975, 397.2973, 491.1871);
-
-float fmod(float a, float b) {
-    const float c = fract(abs(a / b)) * abs(b);
-    if (a < 0)
-        return -c;
-    else
-        return c;
-}
-
-vec3 bms(vec3 c1, vec3 c2){ return 1.0- (1.0-c1)*(1.0-c2); }
-
-float bms(float c1, float c2){ return 1.0- (1.0-c1)*(1.0-c2); }
-
-//turns sth on and off //a - how often 
-float onOff(float a, float b, float c, float t)
-{
-    return step(c, sin(t + a*cos(t*b)));
-}
-
-float hash( float n ){ return fract(sin(n)*43758.5453123); }
-
-float hash12(vec2 p){
-    vec3 p3  = fract(vec3(p.xyx) * MOD3);
-    p3 += dot(p3, p3.yzx + 19.19);
-    return fract(p3.x * p3.z * p3.y);
-}
-
-vec2 hash22(vec2 p) {
-    vec3 p3 = fract(vec3(p.xyx) * MOD3);
-    p3 += dot(p3.zxy, p3.yzx+19.19);
-    return fract(vec2((p3.x + p3.y)*p3.z, (p3.x+p3.z)*p3.y));
-}
-
-//random hash                
-vec4 hash42(vec2 p)
-{                    
-    vec4 p4 = fract(vec4(p.xyxy) * vec4(443.8975,397.2973, 491.1871, 470.7827));
-    p4 += dot(p4.wzxy, p4 + 19.19);
-    return fract(vec4(p4.x * p4.y, p4.x*p4.z, p4.y*p4.w, p4.x*p4.w));
-}
-
-float niq( in vec3 x ){
-    const vec3 p = floor(x);
-    vec3 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    const float n = p.x + p.y*57.0 + 113.0*p.z;
-    return mix(mix(        mix( hash(n+  0.0), hash(n+  1.0),f.x),
-                            mix( hash(n+ 57.0), hash(n+ 58.0),f.x),f.y),
-                            mix( mix( hash(n+113.0), hash(n+114.0),f.x),
-                            mix( hash(n+170.0), hash(n+171.0),f.x),f.y),f.z);
-}
-
-float filmGrain(vec2 uv, float t, float c )
-{                     
-//cheap noise - is ok atm
-    return pow(hash12( uv + 0.07*fract( t ) ), 3);
-}
-
-vec2 n4rand_bw( vec2 p, float t, float c )
-{                
-    t = fract( t );//that's why its sort of twitching 
-    vec2 nrnd0 = hash22( p + 0.07*t );
-    c = 1.0 / (10.0*c); //iMouse.y  / iResolution.y
-    return pow(nrnd0, vec2(c,c)); //TODO try to invert 1-...
-}
-
-float scanLines(vec2 p, float t)
-{
-                        
-    //cheap (maybe make an option later)
-    // float scanLineWidth = 0.26;
-    // float scans = 0.5*(cos((p.y*screenLinesNum+t+.5)*2.0*PI) + 1.0);
-    // if(scans>scanLineWidth) scans = 1.; else scans = 0.;                        
-
-        float t_sl = 0.0;                           
-        //if lines aren't floating -> scanlines also shudn't 
-        if (VHS_LinesFloat) {
-            t_sl = t*linesFloatSpeed;
-        }
-                        
-        //expensive but better                        
-        float scans = 0.5*(cos( (p.y*(screenLinesNum * 0.5)+t_sl)*2.0*PI) + 1.0);
-        scans = pow(scans, scanLineWidth); 
-        return 1.0 - scans; 
-}        
-
-float gcos(vec2 uv, float s, float p)
-{
-    return (cos( uv.y * PI * 2.0 * s + p)+1.0)*0.5;
-}    
-
-//mw - maximum width
-//wcs = widthChangeSpeed
-//lfs = line float speed = .5
-//lf phase = line float phase = .0
-vec2 stretch(vec2 uv, float t, float mw, float wcs, float lfs, float lfp){    
-   
-    const float SLN = screenLinesNum; //TODO use only SLN
-    //width change
-    const float tt = t*wcs; //widthChangeSpeed
-    const float t2 = tt-fmod(tt, 0.5);
-                       
-    //float dw  = hash42( vec2(0.01, t2) ).x ; //on t and not on y
-    float w = gcos(uv, 2.0*(1.0-fract(t2)), PI-t2) * clamp( gcos(uv, fract(t2), t2) , 0.5, 1.0);
-    //w = clamp(w,0.,1.);
-    w = floor(w*mw)/mw;
-    w *= mw;
-    //get descreete line number
-    float ln = (1.0-fract(t*lfs + lfp)) *screenLinesNum; 
-    ln = ln - fract(ln); 
-    // float ln = (1.-fmod(t*lfs + lfp, 1.))*SLN; 
-    // ln = ln - fmod(ln, 1.); //descreete line number
-                       
-    //ln = 10.;
-    //w = 4.;
-                       
-    //////stretching part///////
-                       
-    const float oy = 1.0/SLN; //TODO global
-    const float sh2 =  1.0 - fmod(ln, w)/w; // shift 0..1
-
-    // #if VHS_LINESFLOAT_ON
-    //     float sh = fmod(t, 1.);                       
-    //      uv.y = floor( uv.y *SLN  +sh )/SLN - sh/SLN;
-    // #else 
-    //      uv.y = floor( uv.y *SLN  )/SLN;
-    //  #endif
-
-    // uv.y = floor( uv.y  *SLN  )/SLN ;
-                        
-    const float slb = SLN / w; //screen lines big        
-
-    //TODO finish
-    // #if VHS_LINESFLOAT_ON
-
-        //  if(uv.y<oy*ln && uv.y>oy*(ln-w)) ////if(uv.y>oy*ln && uv.y<oy*(ln+w)) 
-        //     uv.y = floor( uv.y*slb +sh2 +sh )/slb - (sh2-1.)/slb - sh/slb;
-
-    //   #else
-                           
-        if(uv.y<oy*ln && uv.y>oy*(ln-w)) ////if(uv.y>oy*ln && uv.y<oy*(ln+w)) 
-            uv.y = floor( uv.y*slb +sh2 )/slb - (sh2-1.0)/slb ;
-                      
-    // #endif
-
-    return uv;
-}
-
-float rnd_rd(vec2 co)
-{
-    return fract(sin(fmod(dot(co.xy ,vec2(12.9898,78.233)),3.14)) * 43758.5453);
-}
-
-//DANG WINDOWS
-vec3 rgb2yiq(vec3 c)
-{   
-    return vec3(
-    0.2989*c.x + 0.5959*c.y + 0.2115*c.z,
-    0.5870*c.x - 0.2744*c.y - 0.5229*c.z,
-    0.1140*c.x - 0.3216*c.y + 0.3114*c.z);
-}
-
-vec3 yiq2rgb(vec3 c)
-{                
-    return vec3(
-    1.0*c.x +1.0*c.y +1.0*c.z,
-    0.956*c.x - 0.2720*c.y - 1.1060*c.z,
-    0.6210*c.x - 0.6474*c.y + 1.7046*c.z);
-}
-
-//rgb distortion
-vec3 rgbDistortion(vec2 uv,  float magnitude, float t)
-{
-    magnitude *= 0.0001; // float magnitude = 0.0009;
-    vec3 offsetX = vec3( uv.x, uv.x, uv.x );    
-    offsetX.r += rnd_rd(vec2(t*0.03,uv.y*0.42)) * 0.001 + sin(rnd_rd(vec2(t*0.2, uv.y)))*magnitude;
-    offsetX.g += rnd_rd(vec2(t*0.004,uv.y*0.002)) * 0.004 + sin(t*9.0)*magnitude;
-    // offsetX.b = uv.y + rnd_rd(vec2(cos(t*0.01),sin(uv.y)))*magnitude;
-    // offsetX.b = uv.y + rand_rd(vec2(cos(t*0.01),sin(uv.y)))*magnitude;
-                        
-    vec3 col = vec3(0.0, 0.0, 0.0);
-    //it cud be optimized / but hm
-    col.x = rgb2yiq( texture( SamplerColorVHS, vec2(offsetX.r, uv.y) ).rgb ).x;
-    col.y = rgb2yiq( texture( SamplerColorVHS, vec2(offsetX.g, uv.y) ).rgb ).y;
-    col.z = rgb2yiq( texture( SamplerColorVHS, vec2(offsetX.b, uv.y) ).rgb ).z;
-
-    col = yiq2rgb(col);
-    return col;
-}
-
-float rndln(vec2 p, float t)
-{
-    float sample_ln = rnd_rd(vec2(1.0,2.0*cos(t))*t*8.0 + p*1.0).x;
-    sample_ln *= sample_ln;//*sample;
-    return sample_ln;
-}
-
-float lineNoise(vec2 p, float t)
-{                   
-    float n = rndln(p* vec2(0.5,1.0) + vec2(1.0,3.0), t)*20.0;
-                        
-    float freq = abs(sin(t));  //1.
-    float c = n*smoothstep(fmod(p.y*4.0 + t/2.0+sin(t + sin(t*0.63)),freq), 0.0,0.95);
-
-    return c;
-}
-
-
-// 3d noise function (iq's)
-float n( in vec3 x )
-{
-    const vec3 p = floor(x);
-    vec3 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    const float n = p.x + p.y*57.0 + 113.0*p.z;
-    return mix(mix(mix( hash(n+0.0), hash(n+1.0),f.x),
-    mix( hash(n+ 57.0), hash(n+ 58.0),f.x),f.y),
-    mix( mix( hash(n+113.0), hash(n+114.0),f.x),
-    mix( hash(n+170.0), hash(n+171.0),f.x),f.y),f.z);
-}
-
-float tapeNoiseLines(vec2 p, float t){
-
-//so atm line noise is depending on hash for int values
-//i gotta rewrite to for hash for 0..1 values 
-//then i can use normilized p for generating lines
-
-    const float y = p.y*_ScreenParams.y;
-    const float s = t*2.0;
-    return      (niq( vec3(y*0.01 +s,             1.0, 1.0) ) + 0.0)
-                *(niq( vec3(y*0.011+1000.0+s,    1.0, 1.0) ) + 0.0) 
-                *(niq( vec3(y*0.51+421.0+s,     1.0, 1.0) ) + 0.0)   
-                ;
-}
-
-
-float tapeNoise(float nl, vec2 p, float t){
-
-    //TODO custom adjustable density (Probability distribution)
-    // but will be expensive (atm its ok)
-
-    //atm its just contrast noise 
-                   
-    //this generates noise mask
-    float nm =     hash12( fract(p+t*vec2(0.234,0.637)) ) 
-                // *hash12( fract(p+t*vec2(0.123,0.867)) ) 
-                // *hash12( fract(p+t*vec2(0.441,0.23)) );
-                                    ;                        
-        nm = pow(nm, 4) +0.3; //cheap and ok
-        //nm += 0.3 ; //just bit brighter or just more to threshold?
-
-        nl*= nm; // put mask
-        // nl += 0.3; //Value add .3//
-
-    if(nl<tapeNoiseTH) nl = 0.0; else nl =1.0;  //threshold
-    return nl;
-}
-
-vec2 twitchVertical(float freq, vec2 uv, float t){
-
-    float vShift = 0.4*onOff(freq,3.0,0.9, t);
-    vShift*=(sin(t)*sin(t*20.0) + (0.5 + 0.1*sin(t*200.0)*cos(t)));
-    uv.y = fmod(uv.y + vShift, 1.0); 
-    return uv;
-}
-
-vec2 twitchHorizonal(float freq, vec2 uv, float t){
-
-    uv.x += sin(uv.y*10.0 + t)/250.0*onOff(freq,4.0,0.3, t)*(1.0+cos(t*80.0))*(1.0/(1.0+20.0*(uv.y-fmod(t/4.0,1.0))*(uv.y-fmod(t/4.0, 1.0))));
-    return uv;
-}
-
-
-//all that shit is for postVHS"Pro"_First - end
-
-//all that shit is for postVHS"Pro"_Second
-
-//size 1.2, bend 2.
-vec2 fishEye(vec2 uv, float size, float bend)
-{
-    if (!VHS_FishEye_Hyperspace){
-        uv -= vec2(0.5,0.5);
-        uv *= size*(1.0/size+bend*uv.x*uv.x*uv.y*uv.y);
-        uv += vec2(0.5,0.5);
-    }
-                        
-            if (VHS_FishEye_Hyperspace){
-
-                //http://paulbourke.net/miscellaneous/lenscorrection/
-
-                const float prop = _ScreenParams.x / _ScreenParams.y;
-                const vec2 m = vec2(0.5, 0.5 / prop);    
-                const vec2 d = (uv*_ScreenParams.xy) /_ScreenParams.x - m;    
-                const float r = sqrt(dot(d, d));
-                float bind;
-
-                float power = ( 2.0 * 3.141592 / (2.0 * sqrt(dot(m, m))) ) *
-                (bend/50.0 - 0.5); //amount of effect
-
-                if (power > 0.0) bind = sqrt(dot(m, m));//stick to corners
-                else {if (prop < 1.0) bind = m.x; else bind = m.x;}//stick to borders
-
-                if (power > 0.0) //fisheye
-                    uv = m + normalize(d) * tan(r * power) * bind / tan( bind * power);
-                else if (power < 0.0) //antifisheye
-                    uv = m + normalize(d) * atan(r * -power * 10.0) * bind / atan(-power * bind * 10.0);
-                else uv = (uv*_ScreenParams.xy) /_ScreenParams.x; 
-
-            uv.y *=  prop;
-        }
-
-    //adjust size
-    // uv -= vec2(0.5,0.5);
-    // uv *= size;
-    // uv += vec2(0.5,0.5);
-
-    return uv;
-}
-
-//pulse vignette
-float vignette(vec2 uv, float t)
-{
-    const float vigAmt = 2.5+0.1*sin(t + 5.0*cos(t*5.0));
-    float c = (1.0-vigAmt*(uv.y-0.5)*(uv.y-0.5))*(1.0-vigAmt*(uv.x-0.5)*(uv.x-0.5));
-    c = pow(abs(c), vignetteAmount); //expensive!
-    return c;
-}
-
-vec3 t2d(vec2 p)
-{
-    return rgb2yiq( texture (SamplerColorVHS, p ).rgb );
-}
-
-vec3 yiqDist(vec2 uv, float m, float t)
-{    
-                        m *= 0.0001; // float m = 0.0009;
-                        vec3 offsetX = vec3( uv.x, uv.x, uv.x );    
-
-                        offsetX.r += rnd_rd(vec2(t*0.03, uv.y*0.42)) * 0.001 + sin(rnd_rd(vec2(t*0.2, uv.y)))*m;
-                        offsetX.g += rnd_rd(vec2(t*0.004,uv.y*0.002)) * 0.004 + sin(t*9.0)*m;
-                        // offsetX.b = uv.y + rnd_rd(vec2(cos(t*0.01),sin(uv.y)))*m;
-                        // offsetX.b = uv.y + rand_rd(vec2(cos(t*0.01),sin(uv.y)))*m;
-                        
-                       vec3 signal = vec3(0.0, 0.0, 0.0);
-                       //it cud be optimized / but hm
-                       signal.x = rgb2yiq( texture( SamplerColorVHS, vec2(offsetX.r, uv.y) ).rgb ).x;
-                       signal.y = rgb2yiq( texture( SamplerColorVHS, vec2(offsetX.g, uv.y) ).rgb ).y;
-                       signal.z = rgb2yiq( texture( SamplerColorVHS, vec2(offsetX.b, uv.y) ).rgb ).z;
-
-                       // signal = yiq2rgb(col);
-                        return signal;    
-}
-
-#define fixCoord (p - vec2( 0.5 * PixelSize.x, .0)) 
-#define fetch_offset(offset, one_x) t2d(fixCoord + vec2( (offset) * (ONE_X), 0.0));
-
-vec3 bm_screen(vec3 a, vec3 b){     return 1.0- (1.0-a)*(1.0-b); }
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/VHSPro_params.inc b/vhs/shaders/VHSPro/VHSPro_params.inc
deleted file mode 100644
index 65967fbf39..0000000000
--- a/vhs/shaders/VHSPro/VHSPro_params.inc
+++ /dev/null
@@ -1,246 +0,0 @@
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-   float screenLinesNum, VHS_Bleed_toggle, VHS_BleedMode_select, bleedAmount, VHS_FishEye_toggle,
-      VHS_FishEye_Hyperspace_toggle, fisheyeBend, cutoffX, cutoffY, cutoffFadeX, cutoffFadeY,
-      VHS_Vignette_toggle, vignetteAmount, vignetteSpeed, noiseLinesLum, noiseQuantizeX,
-      VHS_FilmGrain_toggle, filmGrainAmount, VHS_YIQNoise_toggle, signalNoiseType_select,
-      signalNoiseAmount, signalNoisePower, VHS_LineNoise_toggle, lineNoiseAmount, lineNoiseSpeed,
-      VHS_TapeNoise_toggle, tapeNoiseTH, tapeNoiseAmount, tapeNoiseSpeed, VHS_ScanLines_toggle,
-      scanLineWidth, VHS_LinesFloat_toggle, linesFloatSpeed, VHS_Stretch_toggle,VHS_Jitter_H_toggle,
-      jitterHAmount, VHSJitter_V_toggle, jitterVAmount, jitterVSpeed, VHS_Twitch_H_toggle,
-      twitchHFreq, VHS_Twitch_V_toggle, twitchVFreq, VHS_SignalTweak_toggle, signalAdjustY,
-      signalAdjustI, signalAdjustQ, signalShiftY, signalShiftI, signalShiftQ, gammaCorection,
-      VHS_Feedback_toggle, feedbackAmount, feedbackFade, feedbackThresh, feedbackColor_R,
-      feedbackColor_G, feedbackColor_B, feedbackDebug_toggle, noiseLinesNum;
-} global;
-
-#pragma parameter screenLinesNum "Screen Resolution [VHSPro]" 1080.0 1.0 2160.0 16.0
-#define screenLinesNum global.screenLinesNum
-// "Screen Resolution (in lines).\nChange screenLinesRes in Preprocessor Definitions to have the same value as this."
-
-#pragma parameter VHS_Bleed_toggle "Toggle Bleeding [VHSPro]" 1.0 0.0 1.0 1.0
-bool VHS_Bleed = bool(global.VHS_Bleed_toggle);
-// "Enables beam screen bleeding (makes the image blurry)."
-
-#pragma parameter VHS_BleedMode_select "Bleeding Mode [VHSPro]" 1.0 1.0 5.0 1.0
-int VHS_BleedMode = int(global.VHS_BleedMode_select);
-// "Toggles between different bleeding modes."
-
-#pragma parameter bleedAmount "Bleed Stretch [VHSPro]" 0.5 0.0 15.0 0.1
-#define bleedAmount global.bleedAmount
-// "Length of the bleeding." // default value of 1.0 was too much
-
-#pragma parameter VHS_FishEye_toggle "Toggle Fisheye [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_FishEye = bool(global.VHS_FishEye_toggle);
-// "Enables a CRT Curvature." // defaulting to off
-
-#pragma parameter VHS_FishEye_Hyperspace_toggle "Toggle Fisheye Hyperspace [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_FishEye_Hyperspace = bool(global.VHS_FishEye_Hyperspace_toggle);
-// "Changes the curvature to look like some sort of hyperspace warping."
-
-#pragma parameter fisheyeBend "Fisheye Bend [VHSPro]" 0.5 0.0 3.0 0.05
-#define fisheyeBend global.fisheyeBend
-// "Curvature of the CRT." // default value of 2.0 was way too high
-
-#pragma parameter cutoffX "Fisheye Cutoff X [VHSPro]" 2.0 0.0 50.0 1.0
-#define cutoffX global.cutoffX
-// "Cutoff of the Horizontal Borders."
-
-#pragma parameter cutoffY "Fisheye Cutoff Y [VHSPro]" 3.0 0.0 50.0 1.0
-#define cutoffY global.cutoffY
-// "Cutoff of the Vertical Borders."
-
-#pragma parameter cutoffFadeX "Fisheye Cutoff Fade X [VHSPro]" 25.0 0.0 50.0 1.0
-#define cutoffFadeX global.cutoffFadeX
-// "Size of the Horizontal gradient cutoff."
-
-#pragma parameter cutoffFadeY "Fisheye Cutoff Fade Y [VHSPro]" 25.0 0.0 50.0 1.0
-#define cutoffFadeY global.cutoffFadeY
-// "Size of the Vertical gradient cutoff."
-
-#pragma parameter VHS_Vignette_toggle "Toggle Vignette [VHSPro]" 1.0 0.0 1.0 1.0
-bool VHS_Vignette = bool(global.VHS_Vignette_toggle);
-// "Enables screen vignetting" // default to 'on' to make up for lost fisheye
-
-#pragma parameter vignetteAmount "Vignette Amount [VHSPro]" 0.3 0.0 5.0 0.05
-#define vignetteAmount global.vignetteAmount
-// "Strength of the vignette." // default value of 1.0 was way too much
-
-#pragma parameter vignetteSpeed "Vignette Pulse Speed [VHSPro]" 1.0 0.0 5.0 0.05
-#define vignetteSpeed global.vignetteSpeed
-// "Speed of the vignette pulsing. (Setting it to 0 makes it stop pulsing)"
-
-#pragma parameter noiseLinesNum "Vertical Resolution [VHSPro]" 240.0 1.0 1080.0 16.0
-#define noiseLinesNum global.noiseLinesNum
-// "Noise Resolution (in lines).\nChange noiseLinesRes in Preprocessor Definitions to have the same value as this."
-
-#pragma parameter noiseQuantizeX "Quantize Noise X [VHSPro]" 0.0 0.0 1.0 0.01
-#define noiseQuantizeX global.noiseQuantizeX
-// "Makes the noise longer or shorter."
-
-#pragma parameter VHS_FilmGrain_toggle "Toggle Film Grain [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_FilmGrain = bool(global.VHS_FilmGrain_toggle);
-// "Enables a Film Grain on the screen."
-
-#pragma parameter filmGrainAmount "Film Grain Alpha [VHSPro]" 0.5 0.0 1.0 0.01
-float filmGrainAmount = global.filmGrainAmount * 0.1;
-// "Intensity of the Film Grain." // default was too low
-
-#pragma parameter VHS_YIQNoise_toggle "Toggle Signal Noise [VHSPro]" 1.0 0.0 1.0 1.0
-bool VHS_YIQNoise = bool(global.VHS_YIQNoise_toggle);
-// "Adds noise to the YIQ Signal, causing a Pink (or green) noise."
-
-#pragma parameter signalNoiseType_select "Signal Noise Type [VHSPro]" 1.0 1.0 3.0 1.0
-int signalNoiseType = int(global.signalNoiseType_select);
-// "Signal Noise Type [VHS Pro]"
-
-#pragma parameter signalNoiseAmount "Signal Noise Amount [VHSPro]" 0.10 0.0 1.0 0.01
-#define signalNoiseAmount global.signalNoiseAmount
-// "Amount of the signal noise."
-
-#pragma parameter signalNoisePower "Signal Noise Power [VHSPro]" 0.75 0.0 1.0 0.01
-#define signalNoisePower global.signalNoisePower
-// "Power of the signal noise. Higher values will make it green, lower values will make it more pink."
-
-#pragma parameter VHS_LineNoise_toggle "Toggle Line Noise [VHSPro]" 1.0 0.0 1.0 1.0
-bool VHS_LineNoise = bool(global.VHS_LineNoise_toggle);
-// "Enables blinking line noise in the image."
-
-#pragma parameter lineNoiseAmount "Line Noise Amount [VHSPro]" 1.0 0.0 10.0 0.1
-#define lineNoiseAmount global.lineNoiseAmount
-// "Intensity of the line noise."
-
-#pragma parameter lineNoiseSpeed  "Line Noise Speed [VHSPro]" 5.0 0.0 10.0 0.1
-#define lineNoiseSpeed global.lineNoiseSpeed
-// "Speed of the line noise blinking delay."
-
-#pragma parameter VHS_TapeNoise_toggle "Toggle Tape Noise [VHSPro]" 1.0 0.0 1.0 1.0
-bool VHS_TapeNoise = bool(global.VHS_TapeNoise_toggle);
-// "Adds scrolling noise like in old VHS Tapes."
-
-#pragma parameter tapeNoiseTH "Tape Noise Amount [VHSPro]" 0.63 0.0 1.5 0.01
-#define tapeNoiseTH global.tapeNoiseTH
-// "Intensity of Tape Noise in the image."
-
-#pragma parameter tapeNoiseAmount "Tape Noise Alpha [VHSPro]" 0.05 0.0 1.5 0.01
-#define tapeNoiseAmount global.tapeNoiseAmount
-// "Amount of Tape Noise in the image."
-
-#pragma parameter tapeNoiseSpeed "Tape Noise Speed [VHSPro]" 1.0 -1.5 1.5 0.05
-#define tapeNoiseSpeed global.tapeNoiseSpeed
-// "Scrolling speed of the Tape Noise."
-
-#pragma parameter VHS_ScanLines_toggle "Toggle Scanlines [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_ScanLines = bool(global.VHS_ScanLines_toggle);
-// "Enables TV/CRT Scanlines."
-
-#pragma parameter scanLineWidth "Scanlines Width [VHSPro]" 10.0 0.0 20.0 0.25
-#define scanLineWidth global.scanLineWidth
-// "Width of the Scanlines."
-
-#pragma parameter VHS_LinesFloat_toggle "Toggle Lines Float [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_LinesFloat = bool(global.VHS_LinesFloat_toggle);
-// "Makes the lines of the screen floats up or down. Works best with low Screen Lines resolutions."
-
-#pragma parameter linesFloatSpeed "Lines Float Speed [VHSPro]" 1.0 -3.0 3.0 0.1
-#define linesFloatSpeed global.linesFloatSpeed
-// "Speed (and direction) of the floating lines."
-
-#pragma parameter VHS_Stretch_toggle "Toggle Stretch Noise" 1.0 0.0 1.0 1.0
-bool VHS_Stretch = bool(global.VHS_Stretch_toggle);
-// "Enables a stretching noise that scrolls up and down on the Image, simulating magnetic interference of VHS tapes."
-
-#pragma parameter VHS_Jitter_H_toggle "Toggle Interlacing [VHSPro]" 1.0 0.0 1.0 1.0
-bool VHS_Jitter_H = bool(global.VHS_Jitter_H_toggle);
-// "Enables interlacing."
-
-#pragma parameter jitterHAmount "Interlacing Amount [VHSPro]" 0.15 0.0 5.0 0.05
-#define jitterHAmount global.jitterHAmount
-// "Strength of the Interlacing." //default 0.50 was too much
-
-#pragma parameter VHSJitter_V_toggle "Toggle Jitter [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_Jitter_V = bool(global.VHSJitter_V_toggle);
-// "Adds vertical jittering noise."
-
-#pragma parameter jitterVAmount "Jitter Amount [VHSPro]" 7.5 0.0 15.0 0.1
-#define jitterVAmount global.jitterVAmount
-// "Amount of the vertical jittering noise." //default 1.0 was invisible
-
-#pragma parameter jitterVSpeed "Jitter Speed [VHSPro]" 1.0 0.0 5.0 0.1
-#define jitterVSpeed global.jitterVSpeed
-// "Speed of the vertical jittering noise."
-
-#pragma parameter VHS_Twitch_H_toggle "Toggle Horizontal Twitch [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_Twitch_H = bool(global.VHS_Twitch_H_toggle);
-// "Makes the image twitches horizontally in certain timed intervals."
-
-#pragma parameter twitchHFreq "Horizontal Twitch Frequency [VHSPro]" 1.0 0.0 5.0 0.1
-#define twitchHFreq global.twitchHFreq
-// "Frequency of time in which the image twitches horizontally."
-
-#pragma parameter VHS_Twitch_V_toggle "Toggle Vertical Twitch [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_Twitch_V = bool(global.VHS_Twitch_V_toggle);
-// "Makes the image twitches vertically in certain timed intervals."
-
-#pragma parameter twitchVFreq "Vertical Twitch Frequency [VHSPro]" 1.0 0.0 5.0 0.1
-#define twitchVFreq global.twitchVFreq
-// "Frequency of time in which the image twitches vertically."
-
-#pragma parameter VHS_SignalTweak_toggle "Toggle Signal Tweak [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_SignalTweak = bool(global.VHS_SignalTweak_toggle);
-// "Tweak the values of the YIQ signal."
-
-#pragma parameter signalAdjustY "Signal Shift Y [VHSPro]" 0.0 -0.25 0.25 0.01
-#define signalAdjustY global.signalAdjustY
-// "Shifts/Tweaks the Luma part of the signal."
-
-#pragma parameter signalAdjustI "Signal Shift I [VHSPro]" 0.0 -0.25 0.25 0.01
-#define signalAdjustI global.signalAdjustI
-// "Shifts/Tweaks the Chroma part of the signal."
-
-#pragma parameter signalAdjustQ "Signal Shift Q [VHSPro]" 0.0 -0.25 0.25 0.01
-#define signalAdjustQ global.signalAdjustQ
-// "Shifts/Tweaks the Chroma part of the signal."
-
-#pragma parameter signalShiftY "Signal Adjust Y [VHSPro]" 1.0 -2.0 2.0 0.05
-#define signalShiftY global.signalShiftY
-// "Adjusts the Luma part of the signal."
-
-#pragma parameter signalShiftI "Signal Adjust I [VHSPro]" 1.0 -2.0 2.0 0.05
-#define signalShiftI global.signalShiftI
-// "Adjusts the Chroma part of the signal."
-
-#pragma parameter signalShiftQ "Signal Adjust Q [VHSPro]" 1.0 -2.0 2.0 0.05
-#define signalShiftQ global.signalShiftQ
-// "Adjusts the Chroma part of the signal."
-
-#pragma parameter gammaCorection "Signal Gamma Correction [VHSPro]" 1.0 0.0 2.0 0.05
-#define gammaCorection global.gammaCorection
-// "Gamma corrects the image."
-
-#pragma parameter VHS_Feedback_toggle "Toggle Phosphor Trails [VHSPro]" 0.0 0.0 1.0 1.0
-bool VHS_Feedback = bool(global.VHS_Feedback_toggle);
-// "Enables phosphor-trails from old CRT monitors."
-
-#pragma parameter feedbackAmount "Input Amount [VHSPro]" 2.0 0.0 3.0 0.05
-#define feedbackAmount global.feedbackAmount
-// "Amount of Phosphor Trails."
-
-#pragma parameter feedbackFade "Phosphor Fade [VHSPro]" 0.82 0.0 1.0 0.01
-#define feedbackFade global.feedbackFade
-// "Fade-time of the phosphor-trails."
-
-#pragma parameter feedbackThresh "Input Cutoff [VHSPro]" 0.1 0.0 1.0 0.01
-#define feedbackThresh global.feedbackThresh
-// "Cutoff of the trail."
-
-#pragma parameter feedbackColor_R "Red Tint of Phosphor Trail" 1.0 0.0 1.0 0.01
-#pragma parameter feedbackColor_G "Green Tint of Phosphor Trail" 0.5 0.0 1.0 0.01
-#pragma parameter feedbackColor_B "Blue Tint of Phosphor Trail" 0.0 0.0 1.0 0.01
-vec3 feedbackColor = vec3(global.feedbackColor_R, global.feedbackColor_G, global.feedbackColor_B);
-// "Color of the trail."
-
-#pragma parameter feedbackDebug_toggle "Toggle Debug Trail [VHSPro]" 0.0 0.0 1.0 1.0
-bool feedbackDebug = bool(global.feedbackDebug_toggle);
-// "Enables the visualization of the phosphor-trails only."
\ No newline at end of file
diff --git a/vhs/shaders/VHSPro/taps.inc b/vhs/shaders/VHSPro/taps.inc
deleted file mode 100644
index b88d25a28e..0000000000
--- a/vhs/shaders/VHSPro/taps.inc
+++ /dev/null
@@ -1,318 +0,0 @@
-    float luma_filter[33] = {
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000
-    };
-    
-    float chroma_filter[33] = {
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000,
-    0.000000000
-    };
-    
-    if (VHS_BleedMode == 0 || VHS_BleedMode == 3){ //Three Phase and Three Phase (RetroArch)
-        luma_filter[0] =    -0.000012020;
-        luma_filter[1] =    -0.000022146;
-        luma_filter[2] =    -0.000013155;
-        luma_filter[3] =    -0.000012020;
-        luma_filter[4] =    -0.000049979;
-        luma_filter[5] =    -0.000113940;
-        luma_filter[6] =    -0.000122150;
-        luma_filter[7] =    -0.000005612;
-        luma_filter[8] =    0.000170516;
-        luma_filter[9] =    0.000237199;
-        luma_filter[10] =    0.000169640;
-        luma_filter[11] =    0.000285688;
-        luma_filter[12] =    0.000984574;
-        luma_filter[13] =    0.002018683;
-        luma_filter[14] =    0.002002275;
-        luma_filter[15] =    -0.000909882;
-        luma_filter[16] =    -0.007049081;
-        luma_filter[17] =    -0.013222860;
-        luma_filter[18] =    -0.012606931;
-        luma_filter[19] =    0.002460860;
-        luma_filter[20] =    0.035868225;
-        luma_filter[21] =    0.084016453;
-        luma_filter[22] =    0.135563500;
-        luma_filter[23] =    0.175261268;
-        luma_filter[24] =    0.190176552;
-
-        chroma_filter[0] =    -0.000118847;
-        chroma_filter[1] =    -0.000271306;
-        chroma_filter[2] =    -0.000502642;
-        chroma_filter[3] =    -0.000930833;
-        chroma_filter[4] =    -0.001451013;
-        chroma_filter[5] =    -0.002064744;
-        chroma_filter[6] =    -0.002700432;
-        chroma_filter[7] =    -0.003241276;
-        chroma_filter[8] =    -0.003524948;
-        chroma_filter[9] =    -0.003350284;
-        chroma_filter[10] =    -0.002491729;
-        chroma_filter[11] =    -0.000721149;
-        chroma_filter[12] =    0.002164659;
-        chroma_filter[13] =    0.006313635;
-        chroma_filter[14] =    0.011789103;
-        chroma_filter[15] =    0.018545660;
-        chroma_filter[16] =    0.026414396;
-        chroma_filter[17] =    0.035100710;
-        chroma_filter[18] =    0.044196567;
-        chroma_filter[19] =    0.053207202;
-        chroma_filter[20] =    0.061590275;
-        chroma_filter[21] =    0.068803602;
-        chroma_filter[22] =    0.074356193;
-        chroma_filter[23] =    0.077856564;
-        chroma_filter[24] =    0.079052396;
-    }
-    
-    else if (VHS_BleedMode == 1) { //Old Three-Phase
-        luma_filter[0] = -0.000071070;
-        luma_filter[1] = -0.000032816;
-        luma_filter[2] = 0.000128784;
-        luma_filter[3] = 0.000134711;
-        luma_filter[4] = -0.000226705;
-        luma_filter[5] = -0.000777988;
-        luma_filter[6] = -0.000997809;
-        luma_filter[7] = -0.000522802;
-        luma_filter[8] = 0.000344691;
-        luma_filter[9] = 0.000768930;
-        luma_filter[10] = 0.000275591;
-        luma_filter[11] = -0.000373434;
-        luma_filter[12] = 0.000522796;
-        luma_filter[13] = 0.003813817;
-        luma_filter[14] = 0.007502825;
-        luma_filter[15] = 0.006786001;
-        luma_filter[16] = -0.002636726;
-        luma_filter[17] = -0.019461182;
-        luma_filter[18] = -0.033792479;
-        luma_filter[19] = -0.029921972;
-        luma_filter[20] = 0.005032552;
-        luma_filter[21] = 0.071226466;
-        luma_filter[22] = 0.151755921;
-        luma_filter[23] = 0.218166470;
-        luma_filter[24] = 0.243902439;
-            
-        chroma_filter[0] = 0.001845562;
-        chroma_filter[1] = 0.002381606;
-        chroma_filter[2] = 0.003040177;
-        chroma_filter[3] = 0.003838976;
-        chroma_filter[4] = 0.004795341;
-        chroma_filter[5] = 0.005925312;
-        chroma_filter[6] = 0.007242534;
-        chroma_filter[7] = 0.008757043;
-        chroma_filter[8] = 0.010473987;
-        chroma_filter[9] = 0.012392365;
-        chroma_filter[10] = 0.014503872;
-        chroma_filter[11] = 0.016791957;
-        chroma_filter[12] = 0.019231195;
-        chroma_filter[13] = 0.021787070;
-        chroma_filter[14] = 0.024416251;
-        chroma_filter[15] = 0.027067414;
-        chroma_filter[16] = 0.029682613;
-        chroma_filter[17] = 0.032199202;
-        chroma_filter[18] = 0.034552198;
-        chroma_filter[19] = 0.036677005;
-        chroma_filter[20] = 0.038512317;
-        chroma_filter[21] = 0.040003044;
-        chroma_filter[22] = 0.041103048;
-        chroma_filter[23] = 0.041777517;
-        chroma_filter[24] = 0.042004791;
-    }
-    
-    else if (VHS_BleedMode == 2) { //Two-Phase
-        luma_filter[0] =    -0.000205844;
-        luma_filter[1] =    -0.000149453;
-        luma_filter[2] =    -0.000051693;
-        luma_filter[3] =    0.000000000;
-        luma_filter[4] =    -0.000066171;
-        luma_filter[5] =    -0.000245058;
-        luma_filter[6] =    -0.000432928;
-        luma_filter[7] =    -0.000472644;
-        luma_filter[8] =    -0.000252236;
-        luma_filter[9] =    0.000198929;
-        luma_filter[10] =    0.000687058;
-        luma_filter[11] =    0.000944112;
-        luma_filter[12] =    0.000803467;
-        luma_filter[13] =    0.000363199;
-        luma_filter[14] =    0.000013422;
-        luma_filter[15] =    0.000253402;
-        luma_filter[16] =    0.001339461;
-        luma_filter[17] =    0.002932972;
-        luma_filter[18] =    0.003983485;
-        luma_filter[19] =    0.003026683;
-        luma_filter[20] =    -0.001102056;
-        luma_filter[21] =    -0.008373026;
-        luma_filter[22] =    -0.016897700;
-        luma_filter[23] =    -0.022914480;
-        luma_filter[24] =    -0.021642347;
-        luma_filter[25] =    -0.008863273;
-        luma_filter[26] =    0.017271957;
-        luma_filter[27] =    0.054921920;
-        luma_filter[28] =    0.098342579;
-        luma_filter[29] =    0.139044281;
-        luma_filter[30] =    0.168055832;
-        luma_filter[31] =    0.178571429;
-        
-        chroma_filter[0] =    0.001384762;
-        chroma_filter[1] =    0.001678312;
-        chroma_filter[2] =    0.002021715;
-        chroma_filter[3] =    0.002420562;
-        chroma_filter[4] =    0.002880460;
-        chroma_filter[5] =    0.003406879;
-        chroma_filter[6] =    0.004004985;
-        chroma_filter[7] =    0.004679445; 
-        chroma_filter[8] =    0.005434218;
-        chroma_filter[9] =    0.006272332; 
-        chroma_filter[10] =    0.007195654; 
-        chroma_filter[11] =    0.008204665; 
-        chroma_filter[12] =    0.009298238; 
-        chroma_filter[13] =    0.010473450;
-        chroma_filter[14] =    0.011725413; 
-        chroma_filter[15] =    0.013047155;
-        chroma_filter[16] =    0.014429548;
-        chroma_filter[17] =    0.015861306; 
-        chroma_filter[18] =    0.017329037; 
-        chroma_filter[19] =    0.018817382;
-        chroma_filter[20] =    0.020309220; 
-        chroma_filter[21] =    0.021785952;
-        chroma_filter[22] =    0.023227857;
-        chroma_filter[23] =    0.024614500; 
-        chroma_filter[24] =    0.025925203;
-        chroma_filter[25] =    0.027139546; 
-        chroma_filter[26] =    0.028237893;
-        chroma_filter[27] =    0.029201910; 
-        chroma_filter[28] =    0.030015081; 
-        chroma_filter[29] =    0.030663170;
-        chroma_filter[30] =    0.031134640;
-        chroma_filter[31] =    0.031420995; 
-        chroma_filter[32] =    0.031517031;
-    }
-    
-    else if (VHS_BleedMode == 4) { //Two-Phase (RetroArch)
-        luma_filter[0] =  -0.000174844;
-        luma_filter[1] =  -0.000205844;
-        luma_filter[2] =  -0.000149453;
-        luma_filter[3] =  -0.000051693;
-        luma_filter[4] = 0.000000000;
-        luma_filter[5] =  -0.000066171;
-        luma_filter[6] =  -0.000245058;
-        luma_filter[7] =  -0.000432928;
-        luma_filter[8] =  -0.000472644;
-        luma_filter[9] =  -0.000252236;
-        luma_filter[10] =  0.000198929;
-        luma_filter[11] =  0.000687058;
-        luma_filter[12] =  0.000944112;
-        luma_filter[13] =  0.000803467;
-        luma_filter[14] =  0.000363199;
-        luma_filter[15] =  0.000013422;
-        luma_filter[16] =  0.000253402;
-        luma_filter[17] =  0.001339461;
-        luma_filter[18] =  0.002932972;
-        luma_filter[19] =  0.003983485;
-        luma_filter[20] =  0.003026683;
-        luma_filter[21] =  -0.001102056;
-        luma_filter[22] =  -0.008373026;
-        luma_filter[23] =  -0.016897700;
-        luma_filter[24] =  -0.022914480;
-        luma_filter[25] =  -0.021642347;
-        luma_filter[26] =  -0.008863273;
-        luma_filter[27] =  0.017271957;
-        luma_filter[28] =  0.054921920;
-        luma_filter[29] =  0.098342579;
-        luma_filter[30] =  0.139044281;
-        luma_filter[31] =  0.168055832;
-        luma_filter[32] =  0.178571429;
-            
-        chroma_filter[0] =   0.001384762;
-        chroma_filter[1] =   0.001678312;
-        chroma_filter[2] =   0.002021715;
-        chroma_filter[3] =   0.002420562;
-        chroma_filter[4] =   0.002880460;
-        chroma_filter[5] =   0.003406879;
-        chroma_filter[6] =   0.004004985;
-        chroma_filter[7] =   0.004679445;
-        chroma_filter[8] =   0.005434218;
-        chroma_filter[9] =   0.006272332;
-        chroma_filter[10] =   0.007195654;
-        chroma_filter[11] =   0.008204665;
-        chroma_filter[12] =   0.009298238;
-        chroma_filter[13] =   0.010473450;
-        chroma_filter[14] =   0.011725413;
-        chroma_filter[15] =   0.013047155;
-        chroma_filter[16] =   0.014429548;
-        chroma_filter[17] =   0.015861306;
-        chroma_filter[18] =   0.017329037;
-        chroma_filter[19] =   0.018817382;
-        chroma_filter[20] =   0.020309220;
-        chroma_filter[21] =   0.021785952;
-        chroma_filter[22] =   0.023227857;
-        chroma_filter[23] =   0.024614500;
-        chroma_filter[24] =   0.025925203;
-        chroma_filter[25] =   0.027139546;
-        chroma_filter[26] =   0.028237893;
-        chroma_filter[27] =   0.029201910;
-        chroma_filter[28] =   0.030015081;
-        chroma_filter[29] =   0.030663170;
-        chroma_filter[30] =   0.031134640;
-        chroma_filter[31] =   0.031420995;
-        chroma_filter[32] =   0.031517031;
-    }
\ No newline at end of file
diff --git a/vhs/shaders/gristleVHS/HorizontalSoften.slang b/vhs/shaders/gristleVHS/HorizontalSoften.slang
deleted file mode 100644
index e317ec89f4..0000000000
--- a/vhs/shaders/gristleVHS/HorizontalSoften.slang
+++ /dev/null
@@ -1,42 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-const float rndtable[256] = float[](
-    0.000, 0.031, 0.427, 0.863, 0.871, 0.945, 0.584, 0.420, 0.294, 0.973, 0.996, 0.549, 0.063, 0.259, 0.290, 0.082, 0.827, 0.184, 0.314, 0.949, 0.604, 0.106, 0.804, 0.502, 0.631, 0.349, 0.302, 0.141, 0.373, 0.431, 0.333, 0.188, 0.831, 0.549, 0.827, 0.976, 0.086, 0.310, 0.784, 0.196, 0.110, 0.737, 0.204, 0.549, 0.792, 0.471, 0.267, 0.569, 0.243, 0.275, 0.722, 0.745, 0.357, 0.773, 0.596, 0.878, 0.584, 0.408, 0.098, 0.698, 0.988, 0.714, 0.792, 0.714, 0.553, 0.773, 0.016, 0.318, 0.710, 0.949, 0.569, 0.165, 0.153, 0.890, 0.612, 0.776, 0.882, 0.757, 0.859, 0.365, 0.478, 0.686, 0.976, 0.000, 0.686, 0.561, 0.275, 0.937, 0.180, 0.965, 0.639, 0.208, 0.639, 0.427, 0.659, 0.529, 0.008, 0.922, 0.098, 0.361, 0.078, 0.569, 0.541, 0.302, 0.271, 0.651, 0.306, 0.690, 0.678, 0.831, 0.651, 0.443, 0.369, 0.631, 0.161, 0.196, 0.937, 0.192, 0.435, 0.643, 0.275, 0.235, 0.008, 0.145, 0.671, 0.294, 0.533, 0.612, 0.043, 0.220, 0.165, 0.573, 0.541, 0.898, 0.286, 0.573, 0.302, 0.239, 0.384, 0.769, 0.529, 0.416, 0.247, 0.773, 0.765, 0.337, 0.376, 0.796, 0.443, 0.396, 0.667, 0.969, 0.710, 0.443, 0.314, 0.980, 0.424, 0.027, 1.000, 0.929, 0.506, 0.886, 0.310, 0.420, 0.439, 0.651, 0.404, 0.945, 0.094, 0.875, 0.937, 0.471, 0.776, 0.227, 0.235, 0.322, 0.502, 0.012, 0.722, 0.259, 0.561, 0.878, 0.569, 0.878, 0.318, 0.808, 0.639, 0.176, 0.247, 0.353, 0.659, 0.447, 0.231, 0.129, 0.624, 0.373, 0.110, 0.545, 0.482, 0.384, 0.490, 0.769, 0.059, 0.275, 0.761, 0.992, 0.212, 0.055, 0.427, 0.886, 0.278, 0.067, 0.631, 0.365, 0.729, 0.341, 0.957, 0.541, 0.078, 0.204, 0.482, 0.984, 0.102, 0.141, 0.067, 0.180, 0.204, 0.906, 0.910, 0.298, 0.122, 0.867, 0.329, 0.145, 0.847, 0.647, 0.831, 0.416, 0.773, 0.949, 0.384, 0.169, 0.153, 0.686, 0.996, 0.569, 0.745, 0.329, 0.463, 0.871, 0.733, 0.533, 0.471, 0.639, 0.925, 0.976
-);
-
-void main()
-{
-	vec3 Image = texture(Source, vTexCoord + vec2(params.SourceSize.z * rndtable[params.FrameCount] * 0.4, 0.0)).xyz
-               + texture(Source, vTexCoord - vec2(params.SourceSize.z * rndtable[params.FrameCount] * 0.4, 0.0)).xyz;
-
-	FragColor = vec4(Image * 0.5, 1.0);
-}
diff --git a/vhs/shaders/gristleVHS/VHS.slang b/vhs/shaders/gristleVHS/VHS.slang
deleted file mode 100644
index bcf8e94466..0000000000
--- a/vhs/shaders/gristleVHS/VHS.slang
+++ /dev/null
@@ -1,48 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D gristleVHS_refpass;
-
-#define RGB_to_YIQ 	mat3x3( 0.299 , 0.595716 , 0.211456 ,	0.587    , -0.274453 , -0.522591 ,		0.114    , -0.321263 , 0.311135 )
-#define YIQ_to_RGB 	mat3x3( 1.0   , 1.0      , 1.0      ,	0.9563   , -0.2721   , -1.1070   ,		0.6210   , -0.6474   , 1.7046   )
-
-const float rndtable[256] = float[](
-    0.000, 0.031, 0.427, 0.863, 0.871, 0.945, 0.584, 0.420, 0.294, 0.973, 0.996, 0.549, 0.063, 0.259, 0.290, 0.082, 0.827, 0.184, 0.314, 0.949, 0.604, 0.106, 0.804, 0.502, 0.631, 0.349, 0.302, 0.141, 0.373, 0.431, 0.333, 0.188, 0.831, 0.549, 0.827, 0.976, 0.086, 0.310, 0.784, 0.196, 0.110, 0.737, 0.204, 0.549, 0.792, 0.471, 0.267, 0.569, 0.243, 0.275, 0.722, 0.745, 0.357, 0.773, 0.596, 0.878, 0.584, 0.408, 0.098, 0.698, 0.988, 0.714, 0.792, 0.714, 0.553, 0.773, 0.016, 0.318, 0.710, 0.949, 0.569, 0.165, 0.153, 0.890, 0.612, 0.776, 0.882, 0.757, 0.859, 0.365, 0.478, 0.686, 0.976, 0.000, 0.686, 0.561, 0.275, 0.937, 0.180, 0.965, 0.639, 0.208, 0.639, 0.427, 0.659, 0.529, 0.008, 0.922, 0.098, 0.361, 0.078, 0.569, 0.541, 0.302, 0.271, 0.651, 0.306, 0.690, 0.678, 0.831, 0.651, 0.443, 0.369, 0.631, 0.161, 0.196, 0.937, 0.192, 0.435, 0.643, 0.275, 0.235, 0.008, 0.145, 0.671, 0.294, 0.533, 0.612, 0.043, 0.220, 0.165, 0.573, 0.541, 0.898, 0.286, 0.573, 0.302, 0.239, 0.384, 0.769, 0.529, 0.416, 0.247, 0.773, 0.765, 0.337, 0.376, 0.796, 0.443, 0.396, 0.667, 0.969, 0.710, 0.443, 0.314, 0.980, 0.424, 0.027, 1.000, 0.929, 0.506, 0.886, 0.310, 0.420, 0.439, 0.651, 0.404, 0.945, 0.094, 0.875, 0.937, 0.471, 0.776, 0.227, 0.235, 0.322, 0.502, 0.012, 0.722, 0.259, 0.561, 0.878, 0.569, 0.878, 0.318, 0.808, 0.639, 0.176, 0.247, 0.353, 0.659, 0.447, 0.231, 0.129, 0.624, 0.373, 0.110, 0.545, 0.482, 0.384, 0.490, 0.769, 0.059, 0.275, 0.761, 0.992, 0.212, 0.055, 0.427, 0.886, 0.278, 0.067, 0.631, 0.365, 0.729, 0.341, 0.957, 0.541, 0.078, 0.204, 0.482, 0.984, 0.102, 0.141, 0.067, 0.180, 0.204, 0.906, 0.910, 0.298, 0.122, 0.867, 0.329, 0.145, 0.847, 0.647, 0.831, 0.416, 0.773, 0.949, 0.384, 0.169, 0.153, 0.686, 0.996, 0.569, 0.745, 0.329, 0.463, 0.871, 0.733, 0.533, 0.471, 0.639, 0.925, 0.976
-);
-
-void main()
-{
-	vec3 ChromaPass = texture(Source, vTexCoord - vec2(params.SourceSize.z*0.333,0.0)).xyz * RGB_to_YIQ;
-	vec3 LuminaPass = texture(gristleVHS_refpass, vTexCoord).xyz * RGB_to_YIQ;
-
-	vec3 MergedPass= vec3(LuminaPass.x,ChromaPass.yz) * YIQ_to_RGB;
-
-	FragColor = vec4(MergedPass, 1.0);
-}
diff --git a/vhs/shaders/mudlord-pal-vhs.slang b/vhs/shaders/mudlord-pal-vhs.slang
deleted file mode 100644
index a2046f9036..0000000000
--- a/vhs/shaders/mudlord-pal-vhs.slang
+++ /dev/null
@@ -1,129 +0,0 @@
-#version 450
-
-layout(push_constant) uniform Push
-{
-   vec4 SourceSize;
-   vec4 OriginalSize;
-   vec4 OutputSize;
-   uint FrameCount;
-
-   float frameShape;
-   float frameLimit;
-   float frameSharpness;
-   float TVNoise;
-   float PALSignal;
-   float phosphors;
-   float border;
-} params;
-
-#pragma parameter frameShape "Border mask shape" 0.35 0.0 1.0 0.01
-#pragma parameter frameLimit "Border mask limit" 0.30 0.0 1.0 0.01
-#pragma parameter frameSharpness "Border mask sharpness" 1.10 0.0 4.0 0.01
-#pragma parameter TVNoise "PAL signal modulation + noise" 1.0 0.0 1.0 1.0
-#pragma parameter PALSignal "PAL signal simulation" 1.0 0.0 1.0 1.0
-#pragma parameter phosphors "Phosphor mask" 1.0 0.0 1.0 1.0
-#pragma parameter border "Border mask" 1.0 0.0 1.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-   mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-float rand(float x)
-{
-    vec2 co = vec2(x,x);
-    float a = 12.9898;
-    float b = 78.233;
-    float c = 43758.5453;
-    float dt= dot(co.xy ,vec2(a,b));
-    float sn= mod(dt,3.14);
-    return fract(sin(sn) * c);
-}
-
-vec2 crt(vec2 s,float e)
-{
-   vec2 tempvar = (s - 0.5) * 2.;
-   tempvar *= 0.5;
-   tempvar.x *= 1.+pow(abs(tempvar.y)/e,2.);
-   tempvar.y *= 1.+pow(abs(tempvar.x)/e,2.);
-   tempvar = tempvar + .5, tempvar;
-   return tempvar;
-}
-
-void main()
-{
-    vec4 col = vec4(0.0);
-    vec2 q = vTexCoord.xy;
-    vec2 uv = q;
-    vec2 uv_q = uv;
-
-    vec2 uv_n = uv_q;
-    mat3 rgbtoyuv = mat3(0.299, -0.147,  0.615, 0.587, -0.289, -0.515, 0.114, 0.436, -0.100);
-	mat3 yuvtorgb = mat3(1.000, 1.000, 1.000, 0.000, -0.395, 2.032, 1.140, -0.581, 0.000);
-    float shade = 1.0;
-
-if(params.TVNoise == 1.0)
-{
-shade -= rand((uv_q.x*params.FrameCount) * 0.1 + (uv_q.y*params.FrameCount) * 50.0 + params.FrameCount) * 0.5;
-}
-
-if(params.PALSignal == 1.0)
-{
-     vec3 yuv = vec3(0.0);
-	float fix = 0.3;
-	float lumadelay = -0.002;
-
-  for (int x = 10; x >= 0; x -= 1)
-  {
-       float xx = float(x) / 10.0;
-       if(xx < 0.0) xx = 0.0 ;
-       float x1 = (xx * -0.05)* fix + lumadelay;
-       float x2 = (xx * 0.1)* fix + lumadelay;
-       vec3 mult = (vec3(1.0) - pow(vec3(xx), vec3(0.2, 1.0, 1.0))) * 0.2;
-        vec2 uv1 = uv_n + vec2(x1,0.0);
-       vec2 uv2 = uv_n + vec2(x2,0.0);
-       yuv += (rgbtoyuv * texture(Source,uv1).rgb) * mult;
-       yuv += (rgbtoyuv * texture(Source,uv2).rgb) * mult;
-
-  }
-  yuv.r = yuv.r * 0.2 + (rgbtoyuv *  texture(Source,uv_n).rgb).r * 0.8;
-    col.rgb = yuvtorgb * yuv * shade;
-}
-else
-{
- col.rgb = texture(Source,uv_n).rgb;
-}
-     
-if(params.phosphors==1.0)
-{
-    float mod_factor = uv.y * params.OutputSize.y * params.OutputSize.y / params.OutputSize.y;
-	vec3 dotMaskWeights = mix(vec3(1.0, 0.7, 1.0),vec3(0.7, 1.0, 0.7),floor(mod(mod_factor, 2.0)));
-    col.rgb*= dotMaskWeights;
-}
- 
-if(params.border ==1.0)
-{
-    vec2 p=-1.0+2.0*crt(uv, 2.0);
-	float f = (1.0- p.x *p.x) * (1.0-p.y *p.y);
-	float frame = clamp(params.frameSharpness * (pow(f, params.frameShape) - params.frameLimit), 0.0, 1.0);
-	col.rgb*=frame;
-}
-    FragColor = vec4(col.rgb, 1.0);
-}
diff --git a/vhs/shaders/rewind.slang b/vhs/shaders/rewind.slang
deleted file mode 100644
index 8a53861231..0000000000
--- a/vhs/shaders/rewind.slang
+++ /dev/null
@@ -1,95 +0,0 @@
-#version 450
-
-// VHS Rewind Effect
-// adapter from VHS Pause Effect shadertoy by caaaaaaarter
-// https://www.shadertoy.com/view/4lB3Dc
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   int FrameDirection;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D rew;
-
-#define iTime float(params.FrameCount)
-
-float rand(vec2 co)
-{
-    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-}
-
-float onOff(float a, float b, float c, float framecount)
-{
-	return step(c, sin((framecount * 0.001) + a*cos((framecount * 0.001)*b)));
-}
-
-vec2 jumpy(vec2 uv, float framecount)
-{
-	vec2 look = uv;
-	float window = 1./(1.+80.*(look.y-mod(framecount/4.,1.))*(look.y-mod(framecount/4.,1.)));
-	look.x += 0.05 * sin(look.y*10. + framecount)/20.*onOff(4.,4.,.3, framecount)*(0.5+cos(framecount*20.))*window;
-	float vShift = 0.4*onOff(2.,3.,.9, framecount)*(sin(framecount)*sin(framecount*20.) + 
-										 (0.5 + 0.1*sin(framecount*200.)*cos(framecount)));
-	look.y = mod(look.y - 0.01 * vShift, 1.);
-	return look;
-}
-
-void main()
-{
-    vec4 texColor = texture(Source, vTexCoord);
-	if (float(params.FrameDirection) < 0.0)
-	{
-		vec2 uv = vTexCoord.xy;
-		uv.x -= sin(0.0006 * mod(iTime, 11.0)) * cos(mod(iTime, 17.0) * -uv.y);
-		texColor = texture(Source, jumpy(uv, iTime));
-		vec4 rew_osd = texture(rew, jumpy(vTexCoord, iTime));
-		rew_osd.a = ((mod(iTime, 100.0) < 50.0)) ? rew_osd.a : 0.0;
-		texColor = mix(texColor, rew_osd, rew_osd.a);
-		// get position to sample
-		vec2 samplePosition = uv.xy - vec2(0.0, 0.45);
-		float whiteNoise;
-		
-	 	// Jitter each line left and right
-		samplePosition.x += (rand(vec2(iTime,vTexCoord.y))+0.5);
-		// Jitter the whole picture up and down
-		samplePosition.y = samplePosition.y+(rand(vec2(iTime))-0.5)/32.0;
-		// Slightly add color noise to each line
-		texColor = texColor + (vec4(-0.5)+vec4(rand(vec2(vTexCoord.y,iTime)),rand(vec2(vTexCoord.y,iTime+1.0)),rand(vec2(vTexCoord.y,iTime+2.0)),0))*0.1;
-	   
-		// Either sample the texture, or just make the pixel white (to get the staticy-bit at the bottom)
-		whiteNoise = rand(vec2(floor(samplePosition.y*160.0),floor(samplePosition.x*cos(iTime)))+vec2(iTime,0.));
-		if ((whiteNoise > 11.5-30.0*samplePosition.y || whiteNoise < 1.5-5.0*samplePosition.y) &&
-			(whiteNoise > 11.5-30.0*(samplePosition.y + 0.5) || whiteNoise < 1.5-5.0*(samplePosition.y + 0.4))) {
-		    // Sample the texture.
-			samplePosition.y = 1.0-samplePosition.y; //Fix for upside-down texture
-		} else {
-		    // Use white. (I'm adding here so the color noise still applies)
-		    texColor += vec4(0.5 + rand(samplePosition));
-		}
-	}
-	FragColor = texColor;
-}
\ No newline at end of file
diff --git a/vhs/shaders/static.slang b/vhs/shaders/static.slang
deleted file mode 100644
index ad6bb36657..0000000000
--- a/vhs/shaders/static.slang
+++ /dev/null
@@ -1,141 +0,0 @@
-#version 450
-
-// Loose Connection shader
-// by hunterk
-// adapted from drmelon's VHS Distortion shadertoy:
-// https://www.shadertoy.com/view/4dBGzK
-// ryk's VCR Distortion shadertoy:
-// https://www.shadertoy.com/view/ldjGzV
-// and Vladmir Storm's VHS Tape Noise shadertoy:
-// https://www.shadertoy.com/view/MlfSWr
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	float magnitude;
-	float always_on;
-} params;
-
-#pragma parameter magnitude "Distortion Magnitude" 0.9 0.0 25.0 0.1
-#pragma parameter always_on "OSD Always On" 0.0 0.0 1.0 1.0
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-float rand(vec2 co)
-{
-     float a = 12.9898;
-     float b = 78.233;
-     float c = 43758.5453;
-     float dt= dot(co.xy ,vec2(a,b));
-     float sn= mod(dt,3.14);
-    return fract(sin(sn) * c);
-}
-
-//random hash
-vec4 hash42(vec2 p){
-    
-	vec4 p4 = fract(vec4(p.xyxy) * vec4(443.8975,397.2973, 491.1871, 470.7827));
-    p4 += dot(p4.wzxy, p4+19.19);
-    return fract(vec4(p4.x * p4.y, p4.x*p4.z, p4.y*p4.w, p4.x*p4.w));
-}
-
-float hash( float n ){
-    return fract(sin(n)*43758.5453123);
-}
-
-// 3d noise function (iq's)
-float n( in vec3 x ){
-    vec3 p = floor(x);
-    vec3 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float n = p.x + p.y*57.0 + 113.0*p.z;
-    float res = mix(mix(mix( hash(n+  0.0), hash(n+  1.0),f.x),
-                        mix( hash(n+ 57.0), hash(n+ 58.0),f.x),f.y),
-                    mix(mix( hash(n+113.0), hash(n+114.0),f.x),
-                        mix( hash(n+170.0), hash(n+171.0),f.x),f.y),f.z);
-    return res;
-}
-
-//tape noise
-float nn(vec2 p, float framecount){
-
-
-    float y = p.y;
-    float s = mod(framecount * 0.15, 4837.0);
-    
-    float v = (n( vec3(y*.01 +s, 			1., 1.0) ) + .0)
-          	 *(n( vec3(y*.011+1000.0+s, 	1., 1.0) ) + .0) 
-          	 *(n( vec3(y*.51+421.0+s, 	1., 1.0) ) + .0)   
-        ;
-   	v*= hash42(   vec2(p.x +framecount*0.01, p.y) ).x +.3 ;
-
-    
-    v = pow(v+.3, 1.);
-	if(v<.99) v = 0.;  //threshold
-    return v;
-}
-
-vec3 distort(sampler2D tex, vec2 uv, float magnitude, float framecount){
-	float mag = params.magnitude * 0.0001;
-
-	vec2 offset_x = vec2(uv.x);
-	offset_x.x += rand(vec2(mod(framecount, 9847.0) * 0.03, uv.y * 0.42)) * 0.001 + sin(rand(vec2(mod(framecount, 5583.0) * 0.2, uv.y))) * mag;
-	offset_x.y += rand(vec2(mod(framecount, 5583.0) * 0.004, uv.y * 0.002)) * 0.004 + sin(mod(framecount, 9847.0) * 9.0) * mag;
-	
-	return vec3(texture(tex, vec2(offset_x.x, uv.y)).r,
-				texture(tex, vec2(offset_x.y, uv.y)).g,
-				texture(tex, uv).b);
-}
-
-float onOff(float a, float b, float c, float framecount)
-{
-	return step(c, sin((framecount * 0.001) + a*cos((framecount * 0.001)*b)));
-}
-
-vec2 jumpy(vec2 uv, float framecount)
-{
-	vec2 look = uv;
-	float window = 1./(1.+80.*(look.y-mod(framecount/4.,1.))*(look.y-mod(framecount/4.,1.)));
-	look.x += 0.05 * sin(look.y*10. + framecount)/20.*onOff(4.,4.,.3, framecount)*(0.5+cos(framecount*20.))*window;
-	float vShift = 0.4*onOff(2.,3.,.9, framecount)*(sin(framecount)*sin(framecount*20.) + 
-										 (0.5 + 0.1*sin(framecount*200.)*cos(framecount)));
-	look.y = mod(look.y - 0.01 * vShift, 1.);
-	return look;
-}
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-	gl_Position = global.MVP * Position;
-	vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D play;
-
-void main()
-{
-	float timer = float(params.FrameCount);
-	vec3 res = distort(Source, jumpy(vTexCoord, timer), params.magnitude, timer);
-	float col = nn(-vTexCoord * params.SourceSize.y * 4.0, timer);
-	vec3 play_osd = distort(play, jumpy(vTexCoord, timer), params.magnitude, timer);
-	float overlay_alpha = texture(play, jumpy(vTexCoord, timer)).a;
-	float show_overlay = (mod(timer, 100.0) < 50.0) && (timer < 500.0) ? texture(play, jumpy(vTexCoord, timer)).a : 0.0;
-	show_overlay = clamp(show_overlay + params.always_on * overlay_alpha, 0.0, 1.0);
-	res = mix(res, play_osd, show_overlay);
-
-	FragColor = vec4(res + clamp(vec3(col), 0.0, 0.5), 1.0);
-}
\ No newline at end of file
diff --git a/vhs/shaders/vhs.slang b/vhs/shaders/vhs.slang
deleted file mode 100644
index c5acde5939..0000000000
--- a/vhs/shaders/vhs.slang
+++ /dev/null
@@ -1,177 +0,0 @@
-#version 450
-
-// VHS shader
-// by hunterk
-// adapted from ompuco's more AVdistortion shadertoy:
-// https://www.shadertoy.com/view/XlsczN
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   int FrameDirection;
-	float wiggle;
-	float smear;
-} params;
-
-#pragma parameter wiggle "Wiggle" 0.0 0.0 10.0 1.0
-#pragma parameter smear "Chroma Smear" 0.5 0.0 1.0 0.05
-
-#define wiggle params.wiggle
-#define smear params.smear
-#define FrameCount params.FrameCount
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-layout(set = 0, binding = 3) uniform sampler2D play;
-
-#define iTime mod(float(FrameCount), 7.0)
-#define iChannel0 Source
-
-//YIQ/RGB shit
-vec3 rgb2yiq(vec3 c){   
-	return vec3(
-		(0.2989*c.x + 0.5959*c.y + 0.2115*c.z),
-		(0.5870*c.x - 0.2744*c.y - 0.5229*c.z),
-		(0.1140*c.x - 0.3216*c.y + 0.3114*c.z)
-	);
-}
-
-vec3 yiq2rgb(vec3 c){				
-	return vec3(
-		(1.0*c.x	+ 1.0*c.y	+ 1.0*c.z),
-		(0.956*c.x	- 0.2720*c.y	- 1.1060*c.z),
-		(0.6210*c.x	- 0.6474*c.y	+ 1.7046*c.z)
-	);
-}
-        
-vec2 Circle(float Start, float Points, float Point) 
-{
-	float Rad = (3.141592 * 2.0 * (1.0 / Points)) * (Point + Start);
-	//return vec2(sin(Rad), cos(Rad));
-		return vec2(-(.3+Rad), cos(Rad));
-
-}
-
-vec3 Blur(vec2 uv, float d){
-	float t = (sin(iTime*5.0+uv.y*5.0))/10.0;
-    float b = 1.0;
-    t=0.0;
-    vec2 PixelOffset=vec2(d+.0005*t,0);
-    
-    float Start = 2.0 / 14.0;
-    vec2 Scale = 0.66 * 4.0 * 2.0 * PixelOffset.xy;
-    
-    vec3 N0 = texture(iChannel0, uv + Circle(Start, 14.0, 0.0) * Scale).rgb;
-    vec3 N1 = texture(iChannel0, uv + Circle(Start, 14.0, 1.0) * Scale).rgb;
-    vec3 N2 = texture(iChannel0, uv + Circle(Start, 14.0, 2.0) * Scale).rgb;
-    vec3 N3 = texture(iChannel0, uv + Circle(Start, 14.0, 3.0) * Scale).rgb;
-    vec3 N4 = texture(iChannel0, uv + Circle(Start, 14.0, 4.0) * Scale).rgb;
-    vec3 N5 = texture(iChannel0, uv + Circle(Start, 14.0, 5.0) * Scale).rgb;
-    vec3 N6 = texture(iChannel0, uv + Circle(Start, 14.0, 6.0) * Scale).rgb;
-    vec3 N7 = texture(iChannel0, uv + Circle(Start, 14.0, 7.0) * Scale).rgb;
-    vec3 N8 = texture(iChannel0, uv + Circle(Start, 14.0, 8.0) * Scale).rgb;
-    vec3 N9 = texture(iChannel0, uv + Circle(Start, 14.0, 9.0) * Scale).rgb;
-    vec3 N10 = texture(iChannel0, uv + Circle(Start, 14.0, 10.0) * Scale).rgb;
-    vec3 N11 = texture(iChannel0, uv + Circle(Start, 14.0, 11.0) * Scale).rgb;
-    vec3 N12 = texture(iChannel0, uv + Circle(Start, 14.0, 12.0) * Scale).rgb;
-    vec3 N13 = texture(iChannel0, uv + Circle(Start, 14.0, 13.0) * Scale).rgb;
-    vec3 N14 = texture(iChannel0, uv).rgb;
-    
-	vec4 clr = texture(iChannel0, uv);
-    float W = 1.0 / 15.0;
-    
-    clr.rgb= 
-		(N0 * W) +
-		(N1 * W) +
-		(N2 * W) +
-		(N3 * W) +
-		(N4 * W) +
-		(N5 * W) +
-		(N6 * W) +
-		(N7 * W) +
-		(N8 * W) +
-		(N9 * W) +
-		(N10 * W) +
-		(N11 * W) +
-		(N12 * W) +
-		(N13 * W) +
-		(N14 * W);
-    return  vec3(clr.xyz)*b;
-}
-
-float onOff(float a, float b, float c, float framecount)
-{
-	return step(c, sin((framecount * 0.001) + a*cos((framecount * 0.001)*b)));
-}
-
-vec2 jumpy(vec2 uv, float framecount)
-{
-	vec2 look = uv;
-	float window = 1./(1.+80.*(look.y-mod(framecount/4.,1.))*(look.y-mod(framecount/4.,1.)));
-	look.x += 0.05 * sin(look.y*10. + framecount)/20.*onOff(4.,4.,.3, framecount)*(0.5+cos(framecount*20.))*window;
-	float vShift = (0.1*wiggle) * 0.4*onOff(2.,3.,.9, framecount)*(sin(framecount)*sin(framecount*20.) + 
-										 (0.5 + 0.1*sin(framecount*200.)*cos(framecount)));
-	look.y = mod(look.y - 0.01 * vShift, 1.);
-	return look;
-}
-
-void main()
-{
-	float d = .1-round(mod(iTime/3.0,1.0))*.1;
-	vec2 uv = jumpy(vTexCoord.xy, iTime);
-	vec2 uv2 = uv;
-
-	float s = 0.0001 * wiggle * -d + 0.0001 * wiggle * sin(iTime);
-   
-	float e = min(.30,pow(max(0.0,cos(uv.y*4.0+.3)-.75)*(s+0.5)*1.0,3.0))*25.0;
-	float r = (iTime*(2.0*s));
-	uv.x += abs(r*pow(min(.003,(-uv.y+(.01*mod(iTime, 17.0))))*3.0,2.0));
-    
-	d = .051+abs(sin(s/4.0));
-	float c = max(0.0001,.002*d) * smear;
-	vec2 uvo = uv;
-	vec4 final;
-	final.xyz =Blur(uv,c+c*(uv.x));
-	float y = rgb2yiq(final.xyz).r;
-    
-	uv.x += .01*d;
-	c *= 6.0;
-	final.xyz =Blur(uv,c);
-	float i = rgb2yiq(final.xyz).g;
-    
-	uv.x += .005*d;
-    
-	c *= 2.50;
-	final.xyz =Blur(uv,c);
-	float q = rgb2yiq(final.xyz).b;
-	final = vec4(yiq2rgb(vec3(y,i,q))-pow(s+e*2.0,3.0), 1.0);
-   
-	vec4 play_osd = texture(play, uv2);
-   float timer = (params.FrameDirection > 0.5) ? float(FrameCount) : 0.0;
-	float show_overlay = (mod(timer, 100.0) < 50.0) && (timer != 0.0) && (timer < 500.0) ? play_osd.a : 0.0;
-	show_overlay = clamp(show_overlay, 0.0, 1.0);
-	final = mix(final, play_osd, show_overlay);
-	
-	FragColor = final;
-}
diff --git a/vhs/shaders/vhs_font.slang b/vhs/shaders/vhs_font.slang
deleted file mode 100644
index d2c9f055da..0000000000
--- a/vhs/shaders/vhs_font.slang
+++ /dev/null
@@ -1,393 +0,0 @@
-#version 450
-
-// Text with VHS font
-// by Astherix
-// https://www.shadertoy.com/view/NdGyDK
-// adapted for slang by hunterk
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-	int FrameDirection;
-	float godot_warp_amount;
-} params;
-
-#pragma parameter godot_warp_amount "Warp Amount" 1.0 0.0 5.0 0.1
-float warp_amount = params.godot_warp_amount; // Warp the texture edges simulating the curved glass of a CRT monitor or old TV.
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-// shadertoy compatibility macros
-#define iChannel0 Source
-#define iResolution params.OutputSize.xy
-#define fragCoord (vTexCoord.xy * params.OutputSize.xy)
-#define fragColor FragColor
-#define iFrame params.FrameCount
-#define iTime (params.FrameCount / 60.)
-
-// Font data gotten from STV5730's ROM, modified for size
-
-/* stv5730.bin (6/18/2022 2:37:22 PM)
-   StartOffset(h): 00000000, EndOffset(h): 00000A1F, Length(h): 00000A20 */
-
-int[] font = int[](
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x60606060, 0x60606060, 0x60606060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x06000600, 0x1E001E00,
-	0x06000600, 0x06000600, 0x06000600,
-	0x06000600, 0x1F801F80, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x006000E0, 0x1FC03F80, 0x70006000,
-	0x60006000, 0x7FE07FE0, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x006000E0, 0x07C007C0, 0x00E00060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x07800F80, 0x1D803980,
-	0x71806180, 0x61806180, 0x7FE07FE0,
-	0x01800180, 0x01800180, 0x00000000,
-	0x00000000, 0x7FE07FE0, 0x60006000,
-	0x7F807FC0, 0x00E00060, 0x00600060,
-	0x606070E0, 0x3FC01F00, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x60006000, 0x7F807FC0, 0x60E06060,
-	0x606070C0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x7FE07FE0, 0x006000C0,
-	0x01800300, 0x06000600, 0x06000600,
-	0x06000600, 0x06000600, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x606070E0, 0x3FC03FC0, 0x70E06060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x60607060, 0x3FE01FE0, 0x00600060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x3FC03FC0, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x06000F00, 0x1F8039C0,
-	0x70E06060, 0x60606060, 0x7FE07FE0,
-	0x60606060, 0x60606060, 0x00000000,
-	0x00000000, 0x7F807FC0, 0x60E06060,
-	0x606060E0, 0x7FC07FC0, 0x60E06060,
-	0x606060E0, 0x7FC07F80, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x60006000, 0x60006000, 0x60006000,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x7F807FC0, 0x60E06060,
-	0x60606060, 0x60606060, 0x60606060,
-	0x606060E0, 0x7FC07F80, 0x00000000,
-	0x00000000, 0x7FE07FE0, 0x60006000,
-	0x60006000, 0x7F807F80, 0x60006000,
-	0x60006000, 0x7FE07FE0, 0x00000000,
-	0x00000000, 0x7FE07FE0, 0x60006000,
-	0x60006000, 0x7F807F80, 0x60006000,
-	0x60006000, 0x60006000, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x60006000, 0x63E063E0, 0x60606060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x60606060, 0x60606060,
-	0x60606060, 0x7FE07FE0, 0x60606060,
-	0x60606060, 0x60606060, 0x00000000,
-	0x00000000, 0x1F801F80, 0x06000600,
-	0x06000600, 0x06000600, 0x06000600,
-	0x06000600, 0x1F801F80, 0x00000000,
-	0x00000000, 0x07E007E0, 0x01800180,
-	0x01800180, 0x01800180, 0x01800180,
-	0x61807380, 0x3F001E00, 0x00000000,
-	0x00000000, 0x606060E0, 0x61C06380,
-	0x67007E00, 0x7C007C00, 0x6E006700,
-	0x638061C0, 0x60E06060, 0x00000000,
-	0x00000000, 0x60006000, 0x60006000,
-	0x60006000, 0x60006000, 0x60006000,
-	0x60006000, 0x7FE07FE0, 0x00000000,
-	0x00000000, 0x60606060, 0x70E079E0,
-	0x7FE06F60, 0x66606060, 0x60606060,
-	0x60606060, 0x60606060, 0x00000000,
-	0x00000000, 0x60606060, 0x60607060,
-	0x78607C60, 0x6E606760, 0x63E061E0,
-	0x60E06060, 0x60606060, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x60606060, 0x60606060, 0x60606060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x7F807FC0, 0x60E06060,
-	0x606060E0, 0x7FC07F80, 0x60006000,
-	0x60006000, 0x60006000, 0x00000000,
-	0x00000000, 0x1F803FC0, 0x70E06060,
-	0x60606060, 0x60606060, 0x66606760,
-	0x63E071C0, 0x3FE01E60, 0x00000000,
-	0x00000000, 0x7F807FC0, 0x60E06060,
-	0x606060E0, 0x7FC07F80, 0x6E006700,
-	0x638061C0, 0x60E06060, 0x00000000,
-	0x00000000, 0x1FE03FE0, 0x70006000,
-	0x60007000, 0x3F801FC0, 0x00E00060,
-	0x006000E0, 0x7FC07F80, 0x00000000,
-	0x00000000, 0x7FE07FE0, 0x06000600,
-	0x06000600, 0x06000600, 0x06000600,
-	0x06000600, 0x06000600, 0x00000000,
-	0x00000000, 0x60606060, 0x60606060,
-	0x60606060, 0x60606060, 0x60606060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x60606060, 0x60606060,
-	0x60606060, 0x60606060, 0x606070E0,
-	0x39C01F80, 0x0F000600, 0x00000000,
-	0x00000000, 0x60606060, 0x60606060,
-	0x60606060, 0x60606660, 0x6F607FE0,
-	0x79E070E0, 0x60606060, 0x00000000,
-	0x00000000, 0x60606060, 0x606070E0,
-	0x39C01F80, 0x0F000F00, 0x1F8039C0,
-	0x70E06060, 0x60606060, 0x00000000,
-	0x00000000, 0x60606060, 0x60606060,
-	0x70E039C0, 0x1F800F00, 0x06000600,
-	0x06000600, 0x06000600, 0x00000000,
-	0x00000000, 0x7FE07FE0, 0x006000E0,
-	0x01C00380, 0x07000E00, 0x1C003800,
-	0x70006000, 0x7FE07FE0, 0x00000000,
-	0x00000000, 0x00000000, 0x06000600,
-	0x00000000, 0x00000000, 0x00000000,
-	0x06000600, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x60006000, 0x00000000,
-	0x00000000, 0x00000000, 0x006000E0,
-	0x01C00380, 0x07000E00, 0x1C003800,
-	0x70006000, 0x00000000, 0x00000000,
-	0x00000000, 0x06000600, 0x02000400,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x1F003F80, 0x31C000C0, 0x1FC03FC0,
-	0x70C060C0, 0x7FE03F60, 0x00000000,
-	0x00000000, 0x60006000, 0x60006000,
-	0x6F807FC0, 0x70E06060, 0x60606060,
-	0x606060E0, 0x7FC07F80, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x1F803FC0, 0x70E06000, 0x60006000,
-	0x600070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x00C000C0, 0x00C000C0,
-	0x1FC03FC0, 0x30C060C0, 0x60C060C0,
-	0x60C030C0, 0x3FE01FE0, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x1F803FC0, 0x70E06060, 0x7FE07FE0,
-	0x600070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x07800FC0, 0x0CC00C00,
-	0x0C003F00, 0x3F000C00, 0x0C000C00,
-	0x0C000C00, 0x0C000C00, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x1F603FE0, 0x70E06060, 0x70E03FE0,
-	0x1F600060, 0x70E03FC0, 0x1F800000,
-	0x00000000, 0x60006000, 0x60006000,
-	0x67806FC0, 0x78E07060, 0x60606060,
-	0x60606060, 0x60606060, 0x00000000,
-	0x00000000, 0x06000600, 0x00000000,
-	0x0E000600, 0x06000600, 0x06000600,
-	0x06000600, 0x06001F80, 0x00000000,
-	0x00000000, 0x01800180, 0x00000000,
-	0x03800180, 0x01800180, 0x01800180,
-	0x01803180, 0x3B801F00, 0x0E000000,
-	0x00000000, 0x60006000, 0x60006000,
-	0x606060E0, 0x61C06380, 0x67006F00,
-	0x7F8079C0, 0x60E06060, 0x00000000,
-	0x00000000, 0x0E000600, 0x06000600,
-	0x06000600, 0x06000600, 0x06000600,
-	0x06000680, 0x07800300, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x6DC076C0, 0x66606660, 0x66606660,
-	0x66606660, 0x66606660, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x6F807FC0, 0x70E07060, 0x60606060,
-	0x60606060, 0x60606060, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x1F803FC0, 0x70E06060, 0x60606060,
-	0x606070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x6F807FC0, 0x70E06060, 0x606070E0,
-	0x7FC06F80, 0x60006000, 0x60000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x1F603FE0, 0x70E06060, 0x606070E0,
-	0x3FE01F60, 0x00600060, 0x00600000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x6F807FC0, 0x78E07060, 0x60006000,
-	0x60006000, 0x60006000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x1F803FC0, 0x70E07000, 0x3F803FC0,
-	0x00E070E0, 0x3FC01F80, 0x00000000,
-	0x00000000, 0x06000600, 0x06000600,
-	0x1F801F80, 0x06000600, 0x06000600,
-	0x06000600, 0x07800380, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x60606060, 0x60606060, 0x60606060,
-	0x606070E0, 0x3FE01F60, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x60606060, 0x60606060, 0x606070E0,
-	0x39C01F80, 0x0F000600, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x60606060, 0x66606660, 0x66606660,
-	0x6F607FE0, 0x39C01080, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x606070E0, 0x39C01F80, 0x0F000F00,
-	0x1F8039C0, 0x70E06060, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x60606060, 0x60606060, 0x70603FE0,
-	0x1FE00060, 0x00E01FC0, 0x1F800000,
-	0x00000000, 0x00000000, 0x00000000,
-	0x7FE07FE0, 0x01C00380, 0x07000E00,
-	0x1C003800, 0x7FE07FE0, 0x00000000,
-	0x00000000, 0x00001000, 0x18001C00,
-	0x1E001F00, 0x1F801FC0, 0x1F801F00,
-	0x1E001C00, 0x18001000, 0x00000000,
-	0x00000000, 0x00008400, 0xC600E700,
-	0xF780FFC0, 0xFFE0FFF0, 0xFFE0FFC0,
-	0xF780E700, 0xC6008400, 0x00000000,
-	0x00000000, 0x00000210, 0x06300E70,
-	0x1EF03FF0, 0x7FF0FFF0, 0x7FF03FF0,
-	0x1EF00E70, 0x06300210, 0x00000000,
-	0x00000000, 0x00007FE0, 0x7FE07FE0,
-	0x7FE07FE0, 0x7FE07FE0, 0x7FE07FE0,
-	0x7FE07FE0, 0x7FE07FE0, 0x00000000
-);
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-// Character values are on the bottom of this document
-// https://github.com/codeman38/vcr-fonts/blob/master/sources/stv5730/STV5730a.pdf
-
-int get_char_pixel(int x, int y, int c, bool inv) {
-    int base = ((x >> 3) + (y * 2) + (c * 0x24)) >> 2;
-    
-    int offset = ((y & 0x1) != 0) ? 0 : 16; 
-    int value = (font[base] >> offset) & 0xffff;
-    
-    if (inv) {
-        return (value & (1 << (0xf - (x & 0xf)))) == 0 ? 1 : 2;
-    } else {
-        return (value & (1 << (0xf - (x & 0xf)))) != 0 ? 1 : 0;
-    }
-}
-
-int print_char(vec2 p, vec2 g, int c, bool inv, bool border) {
-    bool box = (p.x >= (g.x * 12.0)) && (p.x < ((g.x + 1.0) * 12.0)) &&
-               (p.y >= (g.y * 18.0)) && (p.y < ((g.y + 1.0) * 18.0));
-    
-    if (!box) return 0;
-    
-    if (border && !inv) {
-        int pixel = get_char_pixel(int(p.x) % 12, int(p.y) % 18, c, inv);
-        
-        if (pixel != 0) return 1;
-        
-        for (int y = -1; y <= 1; y++) {
-            for (int x = -1; x <= 1; x++) {
-                pixel = get_char_pixel((int(p.x) + x) % 12, (int(p.y) + y) % 18, c, false);
-           
-                if (pixel != 0) return 2;
-            }
-        }
-    }
-
-    return get_char_pixel(int(p.x) % 12, int(p.y) % 18, c, inv);
-}
-
-int characters[2];
-
-void number_to_characters(float n) {
-    int high = int(floor(n / 10.0)),
-        low = int(n) - (high * 10);
-    
-    characters[0] = high;
-    characters[1] = low;
-}
-
-// I don't love this, but we have to match the CRT pass' curvature at least somewhat
-// Takes in the UV and warps the edges, creating the spherized effect
-vec2 warp(vec2 uv){
-	vec2 delta = uv - 0.5;
-	float delta2 = dot(delta.xy, delta.xy);
-	float delta4 = delta2 * delta2;
-	float delta_offset = delta4 * warp_amount;
-	
-	return uv + delta * delta_offset;
-}
-
-void main()
-{
-	vec2 uv = warp(vTexCoord);
-    vec2 p = uv.xy * vec2(300.,225.);//vec2(fragCoord.x, iResolution.y - fragCoord.y) / 2.;
-    
-    vec4 t = texture(iChannel0, vTexCoord);
-	float timer = (params.FrameDirection > 0.5) ? float(params.FrameCount) : 0.0;
-    
-    int acc = 0;
-if(params.FrameDirection < -0.5){ // when rewind is detected, show the REWIND message
-		// Rewind
-		acc += int(print_char(p, vec2(2.0, 1.0) , 0x1d, false, true)); // R
-		acc += int(print_char(p, vec2(3.0, 1.0) , 0x10, false, true)); // E
-		acc += int(print_char(p, vec2(4.0, 1.0) , 0x22, false, true)); // W
-		acc += int(print_char(p, vec2(5.0, 1.0) , 0x14, false, true)); // I
-		acc += int(print_char(p, vec2(6.0, 1.0) , 0x19, false, true)); // N
-		acc += int(print_char(p, vec2(7.0, 1.0) , 0x0f, false, true)); // D
-		acc += int(print_char(p, vec2(9.0, 1.0) , 0x46, false, true)); // <<
-	}
-	// blink the PLAY message for 1000 frames
-	else if((mod(timer, 100.0) < 50.0) && (timer != 0.0) && (timer < 1000.0))
-	{  
-		// Play
-		acc += int(print_char(p, vec2(2.0, 1.0) , 0x1b, false, true)); // P
-		acc += int(print_char(p, vec2(3.0, 1.0) , 0x17, false, true)); // L
-		acc += int(print_char(p, vec2(4.0, 1.0) , 0x0c, false, true)); // A
-		acc += int(print_char(p, vec2(5.0, 1.0) , 0x24, false, true)); // Y
-		acc += int(print_char(p, vec2(7.0, 1.0) , 0x44, false, true)); // >
-	}
-
-    float s = mod(floor(iTime),        60.0);
-    float m = mod(floor(iTime/60.0),   60.0);
-    float h = mod(floor(iTime/3600.0), 24.0);
-
-    // Timecode
-    acc += int(print_char(p, vec2(2.0, 10.0) , 0x1e, false, true)); // S
-    acc += int(print_char(p, vec2(3.0, 10.0) , 0x1b, false, true)); // P
-
-    number_to_characters(h);
-    acc += int(print_char(p, vec2(5.0, 10.0) , characters[0], false, true)); // 0
-    acc += int(print_char(p, vec2(6.0, 10.0) , characters[1], false, true)); // 0
-    acc += int(print_char(p, vec2(7.0, 10.0) , 0x26, false, true)); // :
-
-    number_to_characters(m);
-    acc += int(print_char(p, vec2(8.0, 10.0) , characters[0], false, true)); // 0
-    acc += int(print_char(p, vec2(9.0, 10.0) , characters[1], false, true)); // 0
-    acc += int(print_char(p, vec2(10.0, 10.0), 0x26, false, true)); // :
-
-    number_to_characters(s);
-    acc += int(print_char(p, vec2(11.0, 10.0), characters[0], false, true)); // 0
-    acc += int(print_char(p, vec2(12.0, 10.0), characters[1], false, true)); // 0
-    
-    // This pass lets iChannel0 pass through
-    if (acc == 0) fragColor = t;
-    if (acc == 1) fragColor = vec4(1.0);
-    if (acc == 2) fragColor = vec4(0.0, 0.0, 0.0, 1.0);
-	
-	// only show the OSD when the content first launches or during rewind
-	fragColor = ((timer < 1000.0) || (params.FrameDirection < -0.5)) ? fragColor : t;
-}
diff --git a/vhs/shaders/vhs_mpalko/vhs_mpalko.inc b/vhs/shaders/vhs_mpalko/vhs_mpalko.inc
deleted file mode 100644
index 2ae31bd4a8..0000000000
--- a/vhs/shaders/vhs_mpalko/vhs_mpalko.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-#define lerp mix
-
-#define NTSC 0
-#define PAL 1
-
-// Effect params
-#define VIDEO_STANDARD PAL
-
-#if VIDEO_STANDARD == NTSC
-    const vec2 maxResLuminance = vec2(333.0, 480.0);
-    const vec2 maxResChroma = vec2(40.0, 480.0);
-#elif VIDEO_STANDARD == PAL
-    const vec2 maxResLuminance = vec2(335.0, 576.0);
-    const vec2 maxResChroma = vec2(40.0, 240.0);
-#endif
-
-const vec2 blurAmount = vec2(0.2, 0.2);
-
-// End effect params
-
-#define VIDEO_TEXTURE iChannel0
-
-
-
-mat3 rgb2yiq = mat3(0.299, 0.596, 0.211,
-                        0.587, -0.274, -0.523,
-                        0.114, -0.322, 0.312);
-
-mat3 yiq2rgb = mat3(1, 1, 1,
-                        0.956, -0.272, -1.106,
-                        0.621, -0.647, 1.703);
-
-// from http://www.java-gaming.org/index.php?topic=35123.0
-vec4 cubic(float v)
-{
-    vec4 n = vec4(1.0, 2.0, 3.0, 4.0) - v;
-    vec4 s = n * n * n;
-    float x = s.x;
-    float y = s.y - 4.0 * s.x;
-    float z = s.z - 4.0 * s.y + 6.0 * s.x;
-    float w = 6.0 - x - y - z;
-    return vec4(x, y, z, w) * (1.0/6.0);
-}
-
-vec4 textureBicubic(sampler2D tex, vec2 texCoords)
-{
-
-    vec2 texSize = vec2(textureSize(tex, 0));
-    vec2 invTexSize = vec2(1.0) / texSize;
-
-    texCoords = texCoords * texSize - 0.5;
-
-
-    vec2 fxy = fract(texCoords);
-    texCoords -= fxy;
-
-    vec4 xcubic = cubic(fxy.x);
-    vec4 ycubic = cubic(fxy.y);
-
-    vec4 c = texCoords.xxyy + vec2 (-0.5, +1.5).xyxy;
-
-    vec4 s = vec4(xcubic.xz + xcubic.yw, ycubic.xz + ycubic.yw);
-    vec4 offset = c + vec4 (xcubic.yw, ycubic.yw) / s;
-
-    offset *= invTexSize.xxyy;
-
-    vec4 sample0 = texture(tex, offset.xz);
-    vec4 sample1 = texture(tex, offset.yz);
-    vec4 sample2 = texture(tex, offset.xw);
-    vec4 sample3 = texture(tex, offset.yw);
-
-    float sx = s.x / (s.x + s.y);
-    float sy = s.z / (s.z + s.w);
-
-    return mix(
-       mix(sample3, sample2, sx), mix(sample1, sample0, sx)
-    , sy);
-}
\ No newline at end of file
diff --git a/vhs/shaders/vhs_mpalko/vhs_mpalko_pass0.slang b/vhs/shaders/vhs_mpalko/vhs_mpalko_pass0.slang
deleted file mode 100644
index 14fe999f71..0000000000
--- a/vhs/shaders/vhs_mpalko/vhs_mpalko_pass0.slang
+++ /dev/null
@@ -1,115 +0,0 @@
-#version 450
-
-// based on VHS Compression
-// shadertoy by mpalko https://www.shadertoy.com/view/tsfXWj
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#include "vhs_mpalko.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-
-//////////// -- SET UP LUTS HERE -- ////////////
-
-#define iChannel0 Source
-
-//////////////// -- END PASSES AND LUTS -- ////////////////
-
-//////////// -- SET UP SHADERTOY VARIABLES -- ////////////
-
-float iGlobalTime = float(params.FrameCount)*0.025;
-float iTime = float(params.FrameCount)*0.025;
-vec2 iResolution = params.OutputSize.xy;
-#define FragCoord (params.OutputSize.xy * vTexCoord.xy)
-int iFrame = int(params.FrameCount);
-
-//////////// -- END SHADERTOY VARIABLES -- ////////////
-
-//////////// -- PASTE SHADERTOY HERE -- ////////////
-
-// Downsample buffer A and convert to YIQ color space
-
-
-vec3 downsampleVideo(vec2 uv, vec2 pixelSize, ivec2 samples)
-{
-    //return texture(VIDEO_TEXTURE, uv).rgb * rgb2yiq;
-    
-    vec2 uvStart = uv - pixelSize / 2.0;
-    vec2 uvEnd = uv + pixelSize;
-    
-    vec3 result = vec3(0.0, 0.0, 0.0);
-    for (int i_u = 0; i_u < samples.x; i_u++)
-    {
-        float u = lerp(uvStart.x, uvEnd.x, float(i_u) / float(samples.x));
-        
-        for (int i_v = 0; i_v < samples.y; i_v++)
-        {
-            float v = lerp(uvStart.y, uvEnd.y, float(i_v) / float(samples.y));
-            
-            result += texture(VIDEO_TEXTURE, vec2(u, v)).rgb;
-        }
-    }    
-    
-    return (result / float(samples.x * samples.y)) * rgb2yiq;
-}
-
-vec3 downsampleVideo(vec2 fragCoord, vec2 downsampledRes)
-{
-   
-    if (fragCoord.x > downsampledRes.x || fragCoord.y > downsampledRes.y)
-    {
-        return vec3(0.0);
-    }
-    
-    vec2 uv = fragCoord / downsampledRes;
-    vec2 pixelSize = 1.0 / downsampledRes;
-    ivec2 samples = ivec2(8, 3);
-    
-    pixelSize *= 1.0 + blurAmount; // Slight box blur to avoid aliasing
-    
-    return downsampleVideo(uv, pixelSize, samples);
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord)
-{
-    vec2 resLuminance = min(maxResLuminance, vec2(iResolution));
-    vec2 resChroma = min(maxResChroma, vec2(iResolution));    
-    
-    float luminance = downsampleVideo(fragCoord, resLuminance).r;
-    vec2 chroma = downsampleVideo(fragCoord, resChroma).gb;
-    
-    fragColor = vec4(luminance, chroma, 1);
-}
-
-//////////// -- END SHADERTOY -- ////////////
-
-void main()
-{
-   mainImage(FragColor, FragCoord.xy);
-}
\ No newline at end of file
diff --git a/vhs/shaders/vhs_mpalko/vhs_mpalko_pass1.slang b/vhs/shaders/vhs_mpalko/vhs_mpalko_pass1.slang
deleted file mode 100644
index 46a8584889..0000000000
--- a/vhs/shaders/vhs_mpalko/vhs_mpalko_pass1.slang
+++ /dev/null
@@ -1,81 +0,0 @@
-#version 450
-
-// based on VHS Compression
-// shadertoy by mpalko https://www.shadertoy.com/view/tsfXWj
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-} params;
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#include "vhs_mpalko.inc"
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-//////////// -- SET UP PASSES AND LUTS HERE -- ////////////
-
-#define iChannel1 Source
-
-//////////////// -- END PASSES AND LUTS -- ////////////////
-
-float iGlobalTime = float(params.FrameCount)*0.025;
-float iTime = float(params.FrameCount)*0.025;
-vec2 iResolution = params.OutputSize.xy;
-#define FragCoord (params.OutputSize.xy * vTexCoord.xy)
-
-//////////// -- PASTE SHADERTOY HERE -- ////////////
-
-vec2 rotate(vec2 v, float a)
-{
-	float s = sin(a);
-	float c = cos(a);
-	mat2 m = mat2(c, -s, s, c);
-	return m * v;
-}
-
-void mainImage( out vec4 fragColor, in vec2 fragCoord )
-{
-    vec2 uv = fragCoord / iResolution.xy;
-    
-    vec2 resLuminance = min(maxResLuminance, vec2(iResolution));
-    vec2 resChroma = min(maxResChroma, vec2(iResolution));
-    
-    vec2 uvLuminance = uv * (resLuminance / vec2(iResolution));
-    vec2 uvChroma = uv * (resChroma / vec2(iResolution));
-    
-    vec3 result;
-    float luminance = textureBicubic(iChannel1, uvLuminance).x;
-    vec2 chroma = textureBicubic(iChannel1, uvChroma).yz;
-    result = vec3(luminance, chroma) * yiq2rgb;
-    
-    fragColor = vec4(result, 1);
-}
-
-//////////// -- END SHADERTOY -- ////////////
-
-void main()
-{
-   mainImage(FragColor, FragCoord.xy);
-}
\ No newline at end of file
diff --git a/vhs/vhs.slangp b/vhs/vhs.slangp
deleted file mode 100644
index b5d207c2e7..0000000000
--- a/vhs/vhs.slangp
+++ /dev/null
@@ -1,12 +0,0 @@
-shaders = 2
-
-shader0 = shaders/vhs.slang
-filter_linear0 = true
-
-shader1 = shaders/rewind.slang
-filter_linear1 = true
-scale_type1 = source
-
-textures = "rew;play"
-play = resources/play.png
-rew = resources/rew.png
diff --git a/vhs/vhs_mpalko.slangp b/vhs/vhs_mpalko.slangp
deleted file mode 100644
index caba550c4d..0000000000
--- a/vhs/vhs_mpalko.slangp
+++ /dev/null
@@ -1,19 +0,0 @@
-shaders = 3
-
-shader0 = shaders/vhs_mpalko/vhs_mpalko_pass0.slang
-alias0 = Pass1
-float_framebuffer0 = true
-filter_linear0 = true
-scale_type0 = source
-scale0 = 4.0
-
-shader1 = shaders/vhs_mpalko/vhs_mpalko_pass1.slang
-filter_linear1 = true
-
-shader2 = shaders/rewind.slang
-filter_linear2 = true
-scale_type2 = viewport
-
-textures = "rew;play"
-play = resources/play.png
-rew = resources/rew.png
diff --git a/warp/shaders/smart-morph.slang b/warp/shaders/smart-morph.slang
deleted file mode 100644
index a298a3fc93..0000000000
--- a/warp/shaders/smart-morph.slang
+++ /dev/null
@@ -1,115 +0,0 @@
-#version 450
-
-/*
-	Smart Morph v1.1
-	by Sp00kyFox, 2014
-
-
-Determines the brightest (or darkest) pixel X in the orthogonal neighborship of pixel E (including itself).
-Output is a linear combination of X and E weighted with their luma difference d (range: [0.0, 1.0]):
-
-w = sstp{sat[(d - CUTLO)/(CUTHI - CUTLO)]^PWR} * (STRMAX - STRMIN) + STRMIN
-
-with
-sstp(x) := smoothstep(0, 1, x) = -2x^3 + 3x^2
-sat(x)  := saturate(x) = max(0, min(1, x))
-
-*/
-
-layout(push_constant) uniform Push
-{
-	vec4 SourceSize;
-	vec4 OriginalSize;
-	vec4 OutputSize;
-	uint FrameCount;
-   float SM_MODE, SM_RANGE, SM_PWR, SM_STRMIN, SM_STRMAX, SM_CUTLO, SM_CUTHI, SM_DEBUG;
-} params;
-
-#pragma parameter SM_MODE   "SmartMorph Dilation / Erosion"	0.0 0.0 1.0 1.0		// Switches between dilation and erosion (line thinning or thickening).
-#pragma parameter SM_RANGE  "SmartMorph Range 0-multi 1-hor 2-vert"	0.0 0.0 2.0 1.0	// Switches between all directions / horizontal only / vertical only.
-#pragma parameter SM_PWR    "SmartMorph Luma Exponent"		0.5 0.0 10.0 0.1	// range: [0.0, +inf)   - Raises d by the exponent of PWR. Smaller values for stronger morphing.
-#pragma parameter SM_STRMIN "SmartMorph MIN Strength"		0.0 0.0 1.0 0.01	// range: [0.0, STRMAX] - Minimal strength to apply
-#pragma parameter SM_STRMAX "SmartMorph MAX Strength"		1.0 0.0 1.0 0.01	// range: [STRMIN, 1.0] - Maximal strength to apply.
-#pragma parameter SM_CUTLO  "SmartMorph LO Contrast Cutoff"	0.0 0.0 1.0 0.01	// range: [0.0, CUTHI)  - Cutoff for low contrasts. For d smaller than CUTLO, STRMIN is applied.
-#pragma parameter SM_CUTHI  "SmartMorph HI Contrast Cutoff"	1.0 0.0 1.0 0.01	// range: (CUTLO, 1.0]  - Cutoff for high contrasts. For d bigger than CUTHI, STRMAX is applied.
-#pragma parameter SM_DEBUG  "SmartMorph Adjust View"		0.0 0.0 1.0 1.0
-
-// STRMIN = CUTLO = 1.0 behaves equivalent to Hyllian's shaders.
-
-const vec3 y_weights = vec3(0.299, 0.587, 0.114);
-
-#define TEX(dx,dy) texture(Source, vTexCoord+vec2((dx),(dy))*params.SourceSize.zw)
-#define mul(c,d) (d*c)
-
-layout(std140, set = 0, binding = 0) uniform UBO
-{
-	mat4 MVP;
-} global;
-
-#pragma stage vertex
-layout(location = 0) in vec4 Position;
-layout(location = 1) in vec2 TexCoord;
-layout(location = 0) out vec2 vTexCoord;
-
-void main()
-{
-   gl_Position = global.MVP * Position;
-   vTexCoord = TexCoord * 1.0001;
-}
-
-#pragma stage fragment
-layout(location = 0) in vec2 vTexCoord;
-layout(location = 0) out vec4 FragColor;
-layout(set = 0, binding = 2) uniform sampler2D Source;
-
-void main()
-{
-	vec3 B = TEX( 0.,-1.).rgb;
-	vec3 D = TEX(-1., 0.).rgb;
-	vec3 E = TEX( 0., 0.).rgb;
-	vec3 F = TEX( 1., 0.).rgb;
-	vec3 H = TEX( 0., 1.).rgb;
-   vec3 res;
-
-	float  e = dot(E, y_weights);
-	float di = 0.0;
-
-   if (params.SM_RANGE == 2.0){
-      vec2 b = mul( mat2x3(B, H), y_weights );
-      if(params.SM_MODE > 0.5)
-         di = max(b.x, b.y);
-      else
-         di = min(b.x, b.y);
-
-      res = (di==b.y) ? B : H;
-   }
-   else if (params.SM_RANGE == 1.0){
-      vec2 b = mul( mat2x3(D,F), y_weights );
-      if(params.SM_MODE > 0.5)
-         di = max(b.x, b.y);
-      else
-         di = min(b.x, b.y);
-
-      res = (di==b.y) ? D : F;
-   }
-   else{
-      vec4 b = mul( mat4x3(B, D, H, F), y_weights );
-      if(params.SM_MODE > 0.5)
-         di = min(min(b.x, b.y), min(b.z, min(b.w, e)));
-      else
-         di = max(max(b.x, b.y), max(b.z, max(b.w, e)));
-
-      res = (di==b.x) ? B : (di==b.y) ? D : (di==b.z) ? H : F;
-   }
-
-	di = abs(e-di);
-
-	float str = (di<=params.SM_CUTLO) ? params.SM_STRMIN : (di>=params.SM_CUTHI) ? params.SM_STRMAX : smoothstep( 0.0, 1.0, pow((di-params.SM_CUTLO)/(params.SM_CUTHI-params.SM_CUTLO), params.SM_PWR) ) * (params.SM_STRMAX-params.SM_STRMIN) + params.SM_STRMIN;
-
-	if(params.SM_DEBUG > 0.5){
-		FragColor.rgb = vec3(str);
-      return;
-   }
-
-	FragColor.rgb = (di==0.0) ? E : mix(E, res, str);
-}
\ No newline at end of file